setiastrosuitepro 1.8.1.post2__py3-none-any.whl → 1.8.3__py3-none-any.whl

setiastro/saspro/gui/main_window.py

@@ -33,8 +33,8 @@ from urllib.parse import quote, quote_plus
 # ============================================================================
 import numpy as np
 import matplotlib
-from tifffile import imwrite
-from setiastro.saspro.xisf import XISF
+# tifffile and XISF imports removed (unused in this file)
+
 
 # ============================================================================
 # Bootstrap Configuration (must run early)
@@ -93,18 +93,8 @@ from setiastro.saspro.widgets.common_utilities import (
 )
 
 
-# Reproject for WCS-based alignment
-try:
-    from reproject import reproject_interp
-except ImportError:
-    reproject_interp = None  # fallback if not installed
+# Reproject and OpenCV imports removed (unused or available via lazy_imports)
 
-# OpenCV for transform estimation & warping
-try:
-    import cv2
-    OPENCV_AVAILABLE = True
-except ImportError:
-    OPENCV_AVAILABLE = False
 
 
 
@@ -196,7 +186,7 @@ from setiastro.saspro.resources import (
     colorwheel_path, font_path, csv_icon_path, spinner_path, wims_path, narrowbandnormalization_path,
     wimi_path, linearfit_path, debayer_path, aberration_path, acv_icon_path,
     functionbundles_path, viewbundles_path, selectivecolor_path, rgbalign_path, planetarystacker_path,
-    background_path, script_icon_path, planetprojection_path,clonestampicon_path,
+    background_path, script_icon_path, planetprojection_path,clonestampicon_path, finderchart_path,magnitude_path,
 )
 
 import faulthandler
@@ -3195,6 +3185,45 @@ class AstroSuiteProMainWindow(
             pass
         self.SFCC_window.show()
 
+    def _open_magnitude_tool(self):
+        import os
+        from PyQt6.QtGui import QIcon
+        from PyQt6.QtWidgets import QMessageBox
+
+        # Keep same window-singleton behavior as SFCC
+        if getattr(self, "MAG_window", None) and self.MAG_window.isVisible():
+            self.MAG_window.raise_()
+            self.MAG_window.activateWindow()
+            return
+
+        # ensure we have a DocManager (mirror SFCC pattern)
+        from setiastro.saspro.doc_manager import DocManager
+        if not hasattr(self, "doc_manager") or self.doc_manager is None:
+            self.doc_manager = DocManager(image_manager=getattr(self, "image_manager", None), parent=self)
+
+        # import tool
+        from setiastro.saspro.magnitude_tool import MagnitudeToolDialog
+
+        self.MAG_window = MagnitudeToolDialog(
+            doc_manager=self.doc_manager,
+            parent=self
+        )
+
+        # optional icon
+        try:
+            self.MAG_window.setWindowIcon(QIcon(magnitude_path))
+        except Exception:
+            pass
+
+        # cleanup
+        try:
+            self.MAG_window.destroyed.connect(lambda _=None: setattr(self, "MAG_window", None))
+        except Exception:
+            pass
+
+        self.MAG_window.show()
+
+
     def show_convo_deconvo(self, doc=None):
         # Reuse existing dialog if it's already open
         sw = self.mdi.activeSubWindow()
@@ -3506,13 +3535,53 @@ class AstroSuiteProMainWindow(
         base = base_title or (getattr(doc, "display_name", lambda: None)() or "RGB")
 
         def _open(arr, suffix):
-            meta = {
+            from astropy.io import fits
+
+            # ---- 1) start from source metadata (preserve headers/WCS) ----
+            src_meta = getattr(doc, "metadata", {}) or {}
+            meta = dict(src_meta)  # shallow copy of top-level dict
+
+            # Preserve header objects safely
+            fits_hdr = src_meta.get("fits_header")
+            wcs_hdr  = src_meta.get("wcs_header")
+            orig_hdr = src_meta.get("original_header")
+
+            # Keep them if they are astropy Headers; otherwise fall back gracefully
+            meta["fits_header"] = fits_hdr.copy() if isinstance(fits_hdr, fits.Header) else fits_hdr
+            meta["wcs_header"]  = wcs_hdr.copy()  if isinstance(wcs_hdr,  fits.Header) else wcs_hdr
+            meta["original_header"] = orig_hdr.copy() if isinstance(orig_hdr, fits.Header) else orig_hdr
+
+            # Preserve WCS object + flags (ok if None)
+            if "wcs" in src_meta:
+                meta["wcs"] = src_meta.get("wcs")
+            if "HasAstrometricSolution" in src_meta:
+                meta["HasAstrometricSolution"] = src_meta.get("HasAstrometricSolution")
+
+            # Preserve image_meta mirror, but make it a copy so we don't mutate parent
+            im = src_meta.get("image_meta")
+            if isinstance(im, dict):
+                meta["image_meta"] = dict(im)
+
+            # ---- 2) overwrite/extend with RGB-extract specific fields ----
+            base = base_title or (getattr(doc, "display_name", lambda: None)() or "RGB")
+            title = f"{base}_{suffix}"
+            try:
+                fh = meta.get("fits_header")
+                if isinstance(fh, fits.Header):
+                    fh["NAXIS"] = 2
+                    if "NAXIS3" in fh:
+                        del fh["NAXIS3"]
+            except Exception:
+                pass
+            meta.update({
                 "source": "RGB Extract",
                 "is_mono": True,
                 "bit_depth": "32-bit floating point",
                 "parent_title": base,
-            }
-            title = f"{base}_{suffix}"
+                "channel": suffix,   # handy for later
+            })
+
+            # ---- 3) create doc ----
             try:
                 if hasattr(dm, "open_array"):
                     newdoc = dm.open_array(arr, metadata=meta, title=title)
@@ -3520,10 +3589,23 @@ class AstroSuiteProMainWindow(
                     newdoc = dm.open_numpy(arr, metadata=meta, title=title)
                 else:
                     newdoc = dm.create_document(image=arr, metadata=meta, name=title)
+
+                # ---- 4) ensure WCS is internally consistent on the new doc ----
+                # If source had a WCS solution, rebuild original_header+wcs using your canonical path.
+                try:
+                    if meta.get("HasAstrometricSolution") or (meta.get("wcs_header") is not None):
+                        wcs_dict = self._extract_wcs_dict(doc)  # from SOURCE doc
+                        if wcs_dict:
+                            self._apply_wcs_dict_to_doc(newdoc, dict(wcs_dict))
+                except Exception:
+                    pass
+
                 self._spawn_subwindow_for(newdoc)
+
             except Exception as ex:
                 QMessageBox.critical(self, "RGB Extract", f"Failed to open '{title}':\n{ex}")
 
+
         _open(r, "R")
         _open(g, "G")
         _open(b, "B")
@@ -4238,6 +4320,38 @@ class AstroSuiteProMainWindow(
         except Exception:
             pass
 
+    def _doc_has_wcs(self, doc) -> bool:
+        if doc is None:
+            return False
+        meta = getattr(doc, "metadata", None) or {}
+        if meta.get("wcs") is not None:
+            return True
+
+        hdr = meta.get("original_header") or meta.get("fits_header") or meta.get("header")
+        if hdr is None:
+            return False
+
+        try:
+            keys = {str(k).upper() for k in hdr.keys()}
+        except Exception:
+            try:
+                keys = {str(k).upper() for k in dict(hdr).keys()}
+            except Exception:
+                return False
+
+        return {"CTYPE1","CTYPE2","CRVAL1","CRVAL2"}.issubset(keys)
+
+
+    def _open_finder_chart(self):
+        doc = self._active_doc()
+        if not self._doc_has_wcs(doc):
+            QMessageBox.information(self, self.tr("Finder Chart"), self.tr("Active image has no astrometric solution (WCS). Plate solve first."))
+            return
+
+        from setiastro.saspro.finder_chart import FinderChartDialog
+        dlg = FinderChartDialog(doc=doc, settings=self.settings, parent=self)
+        dlg.setWindowIcon(QIcon(finderchart_path))
+        dlg.show()
 
     def _open_stellar_alignment(self):
         from setiastro.saspro.star_alignment import StellarAlignmentDialog

setiastro/saspro/gui/mixins/header_mixin.py

@@ -36,16 +36,31 @@ class HeaderMixin:
     }
 
     def _ensure_header_map(self, doc):
-        """Ensure doc has a header dictionary in metadata, return it."""
+        """Ensure doc has an original_header container; preserve fits.Header if present."""
         meta = getattr(doc, "metadata", None)
         if meta is None:
             return None
+
         hdr = meta.get("original_header")
-        if not isinstance(hdr, dict):
-            hdr = {}
-            meta["original_header"] = hdr
+
+        # Preserve astropy Header
+        try:
+            from astropy.io.fits import Header
+            if isinstance(hdr, Header):
+                return hdr
+        except Exception:
+            pass
+
+        # Preserve dict
+        if isinstance(hdr, dict):
+            return hdr
+
+        # If missing/unknown, create dict (but do NOT overwrite a valid Header above)
+        hdr = {}
+        meta["original_header"] = hdr
         return hdr
 
+
     def _coerce_wcs_numbers(self, d: dict) -> dict:
         """Convert common WCS/SIP values to int/float where appropriate."""
         numeric = {
@@ -72,23 +87,33 @@ class HeaderMixin:
         return out
 
     def _extract_wcs_dict(self, doc) -> dict:
-        """Collect a complete WCS/SIP dict from the doc's header/meta."""
         if doc is None:
             return {}
-        src = (getattr(doc, "metadata", {}) or {}).get("original_header")
 
-        wcs = {}
-        if src is None:
+        meta = getattr(doc, "metadata", {}) or {}
+
+        # 0) Preferred: astropy WCS object in metadata
+        w = meta.get("wcs", None)
+        try:
+            from astropy.wcs import WCS as _AstroWCS
+            if isinstance(w, _AstroWCS):
+                h = w.to_header(relax=True)
+                return self._coerce_wcs_numbers({k.upper(): h[k] for k in h.keys()})
+        except Exception:
             pass
-        else:
+
+        src = meta.get("original_header")
+
+        wcs = {}
+        src = meta.get("original_header")
+        if src is not None:
             try:
-                for k, v in dict(src).items():
+                # fits.Header has .keys()
+                items = src.items() if hasattr(src, "items") else dict(src).items()
+                for k, v in items:
                     K = str(k).upper()
-                    if (K.startswith(("CRPIX", "CRVAL", "CDELT", "CD", "PC", "CROTA", "CTYPE", "CUNIT",
-                                      "WCSAXES", "LONPOLE", "LATPOLE", "EQUINOX", "PV")) or
-                        K in {"RADECSYS", "RADESYS", "NAXIS1", "NAXIS2"} or
-                        K.startswith(("A_", "B_", "AP_", "BP_"))):
-                        wcs[K] = v
+                    ...
+                    wcs[K] = v
             except Exception:
                 pass
 

setiastro/saspro/gui/mixins/menu_mixin.py

@@ -181,6 +181,7 @@ class MenuMixin:
         m_tools.addAction(self.act_ppp)
         
         m_tools.addAction(self.act_selective_color)
+        m_tools.addAction(self.act_magnitude)
         m_tools.addSeparator()
         m_tools.addAction(self.act_view_bundles) 
         m_tools.addAction(self.act_function_bundles)
@@ -204,6 +205,7 @@ class MenuMixin:
 
         m_star.addAction(self.act_astrospike)
         m_star.addAction(self.act_exo_detector)
+
         m_star.addAction(self.act_image_peeker)
         m_star.addAction(self.act_isophote)
         m_star.addAction(self.act_live_stacking)
@@ -233,6 +235,7 @@ class MenuMixin:
         m_wim = mb.addMenu(self.tr("&What's In My..."))
         m_wim.addAction(self.act_whats_in_my_sky)
         m_wim.addAction(self.act_wimi)
+        m_wim.addAction(self.act_finder_chart) 
 
         m_scripts = mb.addMenu(self.tr("&Scripts"))
         self.menu_scripts = m_scripts

setiastro/saspro/gui/mixins/toolbar_mixin.py

@@ -36,7 +36,7 @@ from setiastro.saspro.resources import (
     nbtorgb_path, freqsep_path, multiscale_decomp_path, contsub_path, halo_path, cosmic_path,
     satellite_path, imagecombine_path, wims_path, wimi_path, linearfit_path,
     debayer_path, aberration_path, functionbundles_path, viewbundles_path, planetarystacker_path,
-    selectivecolor_path, rgbalign_path, planetprojection_path, clonestampicon_path,
+    selectivecolor_path, rgbalign_path, planetprojection_path, clonestampicon_path, finderchart_path,magnitude_path,
 )
 
 # Import shortcuts module
@@ -254,6 +254,7 @@ class ToolbarMixin:
         tb_tl.addAction(self.act_multiscale_decomp)
         tb_tl.addAction(self.act_contsub)
         tb_tl.addAction(self.act_image_combine)
+        tb_tl.addAction(self.act_magnitude)
 
         self._restore_toolbar_order(tb_tl, "Toolbar/Tools")
         try:
@@ -298,6 +299,7 @@ class ToolbarMixin:
         tb_star.addAction(self.act_planetary_stacker)
         tb_star.addAction(self.act_planet_projection)
         tb_star.addAction(self.act_plate_solve)
+        
         tb_star.addAction(self.act_star_align)
         tb_star.addAction(self.act_star_register)
         tb_star.addAction(self.act_rgb_align)
@@ -332,6 +334,7 @@ class ToolbarMixin:
         tb_wim = DraggableToolBar(self.tr("What's In My..."), self)
         tb_wim.setObjectName("What's In My...")
         tb_wim.setSettingsKey("Toolbar/WhatsInMy")
+        tb_wim.addAction(self.act_finder_chart)
         self.addToolBar(Qt.ToolBarArea.TopToolBarArea, tb_wim)
 
         tb_wim.addAction(self.act_whats_in_my_sky)
@@ -1147,6 +1150,11 @@ class ToolbarMixin:
         self.act_selective_color.setStatusTip(self.tr("Adjust specific hue ranges with CMY/RGB controls"))
         self.act_selective_color.triggered.connect(self._open_selective_color_tool)
 
+        self.act_magnitude = QAction(QIcon(magnitude_path), self.tr("Magnitude / Surface Brightness..."), self)
+        self.act_magnitude.setStatusTip(self.tr("Measure magnitude and mag/arcsec² from the active linear view"))
+        self.act_magnitude.setIconVisibleInMenu(True)
+        self.act_magnitude.triggered.connect(self._open_magnitude_tool)
+
         # NEW: Frequency Separation
         self.act_freqsep = QAction(QIcon(freqsep_path), self.tr("Frequency Separation..."), self)
         self.act_freqsep.setStatusTip(self.tr("Split into LF/HF and enhance HF (scale, wavelet, denoise)"))
@@ -1245,6 +1253,11 @@ class ToolbarMixin:
         self.act_rgb_align.setStatusTip(self.tr("Align R and B channels to G using astroalign (affine/homography/poly)"))
         self.act_rgb_align.triggered.connect(self._open_rgb_align)
 
+        self.act_finder_chart = QAction(QIcon(finderchart_path), self.tr("Finder Chart..."), self)
+        self.act_finder_chart.setIconVisibleInMenu(True)
+        self.act_finder_chart.setStatusTip(self.tr("Show a finder chart for the active plate-solved image"))
+        self.act_finder_chart.triggered.connect(self._open_finder_chart)
+
         self.act_whats_in_my_sky = QAction(QIcon(wims_path), self.tr("What's In My Sky..."), self)
         self.act_whats_in_my_sky.setIconVisibleInMenu(True)
         self.act_whats_in_my_sky.setStatusTip(self.tr("Plan targets by altitude, transit time, and lunar separation"))
@@ -1434,6 +1447,7 @@ class ToolbarMixin:
         reg("image_combine", self.act_image_combine)   
         reg("psf_viewer", self.act_psf_viewer)
         reg("plate_solve", self.act_plate_solve)
+        reg("magnitude_tool", self.act_magnitude)
         reg("star_align", self.act_star_align)
         reg("star_register", self.act_star_register)
         reg("mosaic_master", self.act_mosaic_master)
@@ -1446,6 +1460,7 @@ class ToolbarMixin:
         reg("astrospike", self.act_astrospike)
         reg("exo_detector", self.act_exo_detector)
         reg("isophote", self.act_isophote) 
+        reg("finder_chart", self.act_finder_chart)
         reg("rgb_align", self.act_rgb_align) 
         reg("whats_in_my_sky", self.act_whats_in_my_sky)
         reg("whats_in_my_image", self.act_wimi)

setiastro/saspro/imageops/stretch.py

@@ -1,4 +1,4 @@
-# imageops/stretch.py
+# src/setiastro/saspro/imageops/stretch.py
 from __future__ import annotations
 import numpy as np
 

setiastro/saspro/legacy/image_manager.py

@@ -242,8 +242,16 @@ class ImageManager(QObject):
     def set_image(self, new_image, metadata, step_name=None):
         slot = self.current_slot
         if self._images[slot] is not None:
+            # OPTIMIZATION: If we are setting the EXACT SAME image object (e.g. metadata update),
+            # do not deep-copy the image data to undo stack.
+            # This saves massive memory when just renaming a slot or changing WCS.
+            if new_image is self._images[slot]:
+                 stored_img = self._images[slot] # Shallow copy / reference
+            else:
+                 stored_img = self._images[slot].copy() # Deep copy for safety
+
             self._undo_stacks[slot].append(
-                (self._images[slot].copy(), self._metadata[slot].copy(), step_name or "Unnamed Step")
+                (stored_img, self._metadata[slot].copy(), step_name or "Unnamed Step")
             )
             self._redo_stacks[slot].clear()
             print(f"ImageManager: Previous image in slot {slot} pushed to undo stack.")
@@ -1526,8 +1534,12 @@ def load_image(filename, max_retries=3, wait_seconds=3, return_metadata: bool =
                 # 1) PixInsight astrometric solution (fallback only)
                 try:
                     if not all(k in hdr for k in ("CRPIX1","CRPIX2","CRVAL1","CRVAL2")):
-                        ref_img = props['PCL:AstrometricSolution:ReferenceImageCoordinates']['value']
-                        ref_sky = props['PCL:AstrometricSolution:ReferenceCelestialCoordinates']['value']
+                        p_img = props['PCL:AstrometricSolution:ReferenceImageCoordinates']
+                        p_sky = props['PCL:AstrometricSolution:ReferenceCelestialCoordinates']
+                        
+                        # Resolve lazy properties (decode base64/binary)
+                        ref_img = xisf.resolve_property(p_img)
+                        ref_sky = xisf.resolve_property(p_sky)
 
                         # Some files store extra values; only first two are CRPIX/CRVAL
                         im0, im1 = float(ref_img[0]), float(ref_img[1])
@@ -1547,7 +1559,9 @@ def load_image(filename, max_retries=3, wait_seconds=3, return_metadata: bool =
                 # 2) CD matrix (fallback only)
                 try:
                     if not all(k in hdr for k in ("CD1_1","CD1_2","CD2_1","CD2_2")):
-                        lin = np.asarray(props['PCL:AstrometricSolution:LinearTransformationMatrix']['value'], float)
+                        p_mat = props['PCL:AstrometricSolution:LinearTransformationMatrix']
+                        lin = np.asarray(xisf.resolve_property(p_mat), float)
+                        
                         hdr['CD1_1'], hdr['CD1_2'] = float(lin[0,0]), float(lin[0,1])
                         hdr['CD2_1'], hdr['CD2_2'] = float(lin[1,0]), float(lin[1,1])
                         _filled |= {'CD1_1','CD1_2','CD2_1','CD2_2'}

setiastro/saspro/legacy/xisf.py

@@ -1072,7 +1072,7 @@ class XISF:
         }
         try:
             return _dtypes[s]
-        except:
+        except KeyError:
             raise NotImplementedError(f"sampleFormat {s} not implemented")
 
     # Return XISF data type from numpy dtype
@@ -1087,7 +1087,7 @@ class XISF:
         }
         try:
             return _sampleFormats[str(dtype)]
-        except:
+        except KeyError:
             raise NotImplementedError(f"sampleFormat for {dtype} not implemented")
 
     @staticmethod
@@ -1121,7 +1121,7 @@ class XISF:
         }
         try:
             return _dtypes[type_prefix]
-        except:
+        except KeyError:
             raise NotImplementedError(f"data type {type_name} not implemented")
 
     # __/ Auxiliary functions for compression/shuffling \________