Commit bc63a2e2 authored by Cristian Pozo Gonzalez's avatar Cristian Pozo Gonzalez
Browse files

Fix some bug when open without parameters.

parent 7ac08608

src/galassify/galassify.py

+19 −9
Original line number Diff line number Diff line
@@ -15,6 +15,18 @@ VERSION = '0.1.4' 
def main():

    args = utils.getOptions(VERSION)

    if not len(sys.argv) > 1:

        if utils.exist_basic_files():

            selectedFiles, selectedGroups = utils.getFiles()

            if len(selectedFiles) > 0:

                if args.list:

                    print(selectedFiles.filename)

                else:

                    print(f"INFO:\t {str(len(selectedFiles))} galaxies found in selected group(s).")

                    df = selectedFiles # utils.expand_df(selectedFiles)

                    app = QtWidgets.QApplication(sys.argv)

                    window = gui.Ui(df, selectedGroups)

                    app.exec_()

        else:    

            selec = utils.load_menu()

            if selec == 0:

                utils.init_flag();
@@ -23,10 +35,8 @@ def main(): 
            elif selec == 11:

                utils.example_flag('fits');

    else:

        print(args.init)

        if args.init:

            utils.init_flag();



        elif args.example != '':

            print(f"INFO:\t Create the {args.example} example files ")

            utils.example_flag(args.example);

src/galassify/utils.py

+9 −6
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ def getOptions(version): 
    parser.add_argument("-l", "--list", action="store_true",

                        help="List selected files only and exit.\n")

    

    parser.add_argument('-i', '--inputfile', default='files/galaxies.csv', type=dir_file,

    parser.add_argument('-i', '--inputfile', type=dir_file, default='files/galaxies.csv',

                        help="""Galaxy database file in *.csv format.

                        Minimum required columns: ['galaxy'].

                        Recomended columns: ['group', 'galaxy', 'ra', 'dec',  'filename' and/or 'fits']""")
@@ -67,13 +67,11 @@ def exist_basic_files(): 
    files = ['files/','img/','config']

    test_files = True;

    for file in files:

        print(path.exists(file))

        if not path.exists(file):

            test_files = False;

    if not path.exists('files/galaxies.csv'):

        if not path.exists('files/galaxies_fits.csv'):

            test_files = False;

    print(test_files)

    return test_files



def load_menu():
@@ -177,7 +175,8 @@ def getFiles(): 
    

    if imgpath:

        fname = args.inputfile

        if Path(fname).is_file():

        file = Path(fname)

        if file.is_file():

            groups = readInputFile(fname)

        else:

            groups = createInputFile(imgpath, fname)
@@ -231,13 +230,17 @@ def example_type(type_text): 


def dir_path(path):

    d = Path(path)

    if not d.is_dir():

    if path == 'img/':

        return path

    elif not d.is_dir():

        raise argparse.ArgumentTypeError(f"readable_dir: {path} is not a valid path.")

    return path



def dir_file(file):

    d = Path(file)

    if not d.is_file():

    if file == 'config' or file == 'files/galaxies.csv':

        return file

    elif not d.is_file():

        raise argparse.ArgumentTypeError(f"readable_file: {file} is not a valid file.")

    return file