Merge pull request #1879 from pypeit/setup_gui_v1_02

Updates to the Setup GUI
pypeit · Jan 3, 2025 · b8455e6 · b8455e6
2 parents eb54214 + 013886e
commit b8455e6
Show file tree

Hide file tree

Showing 10 changed files with 519 additions and 253 deletions.
diff --git a/doc/api/pypeit.scripts.setup_gui.rst b/doc/api/pypeit.scripts.setup_gui.rst
diff --git a/doc/releases/1.17.2dev.rst b/doc/releases/1.17.2dev.rst
@@ -22,6 +22,8 @@ Functionality/Performance Improvements and Additions
   and `spat_flexure_vrange`, were added to control the detection of the slit edges
   (used to compute the flexure) and the stretching of the image in the QA plot,
   respectively.
+- Setup GUI allows resizing panels when viewing pypeit files.
+- Setup GUI allows selecting which detector to view when viewing raw data.
 
 Instrument-specific Updates
 ---------------------------
@@ -30,7 +32,7 @@ Instrument-specific Updates
 Script Changes
 --------------
 
-
+- `pypeit_setup_gui` script has been removed. The Setup GUI can be started with `pypeit_setup -G`.
 
 Datamodel Changes
 -----------------
@@ -50,3 +52,4 @@ Bug Fixes
   the spectrum is extracted even when `pixelflat_model` does not exist.
 - The variance cube previously had a cubic term, and this has been changed
   to a quadratic term. This has been cross-checked with simple subpixel calculations.
+- Fix Setup GUI sizing issues on MacOS.
diff --git a/pypeit/scripts/setup.py b/pypeit/scripts/setup.py
@@ -80,9 +80,6 @@ def main(args):
         from pypeit.pypeitsetup import PypeItSetup
         from pypeit.calibrations import Calibrations
 
-        # Set the verbosity, and create a logfile if verbosity == 2
-        msgs.set_logfile_and_verbosity('setup', args.verbosity)
-
         if args.spectrograph is None:
             if args.gui is False:
                 raise IOError('spectrograph is a required argument.  Use the -s, --spectrograph '
@@ -96,24 +93,11 @@ def main(args):
                                  'on how to add a new instrument.')
 
         if args.gui:
-            from pypeit.scripts.setup_gui import SetupGUI
-            # Build up arguments to the GUI
-            setup_gui_argv = ["-e", args.extension]
-            if args.spectrograph is not None:
-                setup_gui_argv += ["-s", args.spectrograph]
-
-                # Pass root but only if there's a spectrograph, because
-                # root has a default value but can't be acted upon by the GUI
-                # without a spectrograph.
-                if isinstance(args.root,list):
-                    root_args = args.root
-                else:
-                    # If the root argument is a single string, convert it to a list.
-                    # This can happen when the default for --root is used
-                    root_args = [args.root]
-                setup_gui_argv += ["-r"] + root_args
-            gui_args = SetupGUI.parse_args(setup_gui_argv)
-            SetupGUI.main(gui_args)
+            # Start the GUI
+            from pypeit.setup_gui.controller import start_gui
+            start_gui(args)
+        else:
+            msgs.set_logfile_and_verbosity("setup", args.verbosity)       
 
         # Initialize PypeItSetup based on the arguments
         ps = PypeItSetup.from_file_root(args.root, args.spectrograph, extension=args.extension)

diff --git a/pypeit/scripts/setup_gui.py b/pypeit/scripts/setup_gui.py