pyGCG 0.8__tar.gz → 0.8.2__tar.gz

{pygcg-0.8 → pygcg-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyGCG
-Version: 0.8
+Version: 0.8.2
 Summary: A GUI to aid in viewing and classifying NIRISS data products.
 Author-email: Peter Watson <peter.watson+pygcg@inaf.it>
 Project-URL: Homepage, https://github.com/PJ-Watson/pyGCG

{pygcg-0.8 → pygcg-0.8.2}/pyGCG.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyGCG
-Version: 0.8
+Version: 0.8.2
 Summary: A GUI to aid in viewing and classifying NIRISS data products.
 Author-email: Peter Watson <peter.watson+pygcg@inaf.it>
 Project-URL: Homepage, https://github.com/PJ-Watson/pyGCG

{pygcg-0.8 → pygcg-0.8.2}/pygcg/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.8'
-__version_tuple__ = version_tuple = (0, 8)
+__version__ = version = '0.8.2'
+__version_tuple__ = version_tuple = (0, 8, 2)

{pygcg-0.8 → pygcg-0.8.2}/pygcg/tabs/beams.py

@@ -29,7 +29,7 @@ class BeamFrame(ctk.CTkFrame):
     def __init__(self, master, gal_id, PA, **kwargs):
         super().__init__(master, **kwargs)
 
-        self.settings_frame = ctk.CTkFrame(self)
+        self.settings_frame = ctk.CTkFrame(self, fg_color=self._root().bg_colour_name)
         self.settings_frame.grid(
             row=0,
             column=0,

{pygcg-0.8 → pygcg-0.8.2}/pygcg/tabs/spectrum.py

@@ -53,7 +53,9 @@ class SpecFrame(ctk.CTkFrame):
         self.grid_columnconfigure(1, weight=1)
         self.grid_columnconfigure(2, weight=1)
 
-        self.plot_options_frame = ctk.CTkFrame(self)
+        self.plot_options_frame = ctk.CTkFrame(
+            self, fg_color=self._root().bg_colour_name
+        )
         self.plot_options_frame.grid(row=0, column=0, columnspan=2, sticky="ew")
 
         self.redshift_plot = RedshiftPlotFrame(self, self.gal_id)
@@ -70,7 +72,7 @@ class SpecFrame(ctk.CTkFrame):
             row=0, column=1, padx=20, pady=(10, 10), sticky="w"
         )
 
-        self.redshift_frame = ctk.CTkFrame(self)
+        self.redshift_frame = ctk.CTkFrame(self, fg_color=self._root().bg_colour_name)
         self.redshift_frame.grid(row=2, column=2, sticky="news")
         self.redshift_frame.columnconfigure([0, 1, 2, 3, 4, 5], weight=1)
         self.redshift_label = ctk.CTkLabel(
@@ -987,23 +989,27 @@ class ImagesFrame(ctk.CTkFrame):
         self.fig.canvas.get_tk_widget().config(bg=self._root().bg_colour_name)
 
     def update_seg_path(self, pattern="*seg.fits"):
-        self.seg_path = [*self._root().prep_dir.glob(pattern)]
-        if len(self.seg_path) == 0:
+        seg_paths = [str(s) for s in self._root().prep_dir.glob(pattern)]
+        if len(seg_paths) == 0:
             print("Segmentation map not found.")
             self.seg_path = None
         else:
-            self.seg_path = self.seg_path[0]
+            seg_paths = sorted(seg_paths, key=len)
+            self.seg_path = Path(seg_paths[0])
 
     def update_rgb_path(self):
         self.rgb_paths = []
         for p in self._root().filter_names:
-            rgb_path = [*self._root().prep_dir.glob(f"*{p.lower()}*_dr[zc]_sci.fits")]
-            if len(rgb_path) == 0:
+            rgb_paths = [
+                str(s)
+                for s in self._root().prep_dir.glob(f"*{p.lower()}*_dr[zc]_sci.fits")
+            ]
+            if len(rgb_paths) == 0:
                 print(f"{p} image not found.")
                 self.rgb_paths.append(None)
             else:
-                rgb_path.sort(reverse=True)
-                self.rgb_paths.append(rgb_path[0])
+                rgb_paths = sorted(rgb_paths, key=len)
+                self.rgb_paths.append(Path(rgb_paths[0]))
 
     def plot_failed(self, ax, plot_name, text=None):
         for k in ["img", "marker", "text"]:
@@ -1031,34 +1037,6 @@ class ImagesFrame(ctk.CTkFrame):
     def plot_images(self, border=5):
         plot_names = self._root().filter_names[::-1] + ["rgb", "seg"]
 
-        # if self.seg_path is None and all(x is None for x in self.rgb_paths):
-        #     print("No images to plot.")
-        #     missing_data_text = self._root().filter_names[::-1] + [
-        #         "No images found.",
-        #         "Segmentation map\nnot found.",
-        #     ]
-
-        #     try:
-        #         for v in self.plotted_components.values():
-        #             v.set_visible(False)
-        #     except:
-        #         pass
-
-        #     for a, n, t in zip(self.fig_axes, plot_names, missing_data_text):
-        #         print(t)
-        #         self.plotted_components[f"{n}_text"] = a.text(
-        #             0.5,
-        #             0.5,
-        #             t,
-        #             transform=a.transAxes,
-        #             ha="center",
-        #             va="center",
-        #             c=self._root().text_colour,
-        #             visible=True
-        #         )
-        #     self.pyplot_canvas.draw_idle()
-        #     return
-
         try:
             with pf.open(self.seg_path) as hdul:
                 seg_wcs = WCS(hdul[0].header)