setiastrosuitepro 1.6.4__py3-none-any.whl → 1.6.12__py3-none-any.whl

setiastro/saspro/plate_solver.py

@@ -116,16 +116,15 @@ def _status_popup_update(text: str):
         _STATUS_POPUP.update_text(text)
 
 def _status_popup_close():
-    """Hide (but do not destroy) the singleton status popup if it exists."""
     global _STATUS_POPUP
+    if _STATUS_POPUP is None:
+        return
     try:
-        if _STATUS_POPUP is not None:
-            _STATUS_POPUP.hide()
-            # keep instance for reuse (fast re-open)
+        _STATUS_POPUP.hide()
     except Exception:
-        # Completely safe to ignore; worst case the popup was already gone.
         pass
 
+
 def _sleep_ui(ms: int):
     """Non-blocking sleep that keeps the UI responsive."""
     loop = QEventLoop()
@@ -137,54 +136,38 @@ def _with_events():
     QApplication.processEvents()
 
 def _set_status_ui(parent, text: str):
-    """
-    Update dialog/main-window status or batch log; if neither exists (headless),
-    show/update a small modeless popup. Always pumps events for responsiveness.
-    """
     try:
         updated_any = False
 
-        def _do():
-            nonlocal updated_any
-            target = None
-            # Dialog status label?
-            if hasattr(parent, "status") and isinstance(getattr(parent, "status"), QLabel):
-                target = parent.status
-            # Named child fallback
-            if target is None and hasattr(parent, "findChild"):
-                target = parent.findChild(QLabel, "status_label")
-            if target is not None:
-                target.setText(text)
+        target = None
+        if hasattr(parent, "status") and isinstance(getattr(parent, "status"), QLabel):
+            target = parent.status
+        if target is None and hasattr(parent, "findChild"):
+            target = parent.findChild(QLabel, "status_label")
+        if target is not None:
+            target.setText(text)
+            updated_any = True
+
+        logw = getattr(parent, "log", None)
+        if logw and hasattr(logw, "append"):
+            tr_status = QCoreApplication.translate("PlateSolver", "Status:")
+            if text and (text.startswith("Status:") or text.startswith(tr_status) or text.startswith("▶") or text.startswith("✔") or text.startswith("❌")):
+                logw.append(text)
                 updated_any = True
 
-            # Batch log?
-            logw = getattr(parent, "log", None)
-            if logw and hasattr(logw, "append"):
-                tr_status = QCoreApplication.translate("PlateSolver", "Status:")
-                if text and (text.startswith("Status:") or text.startswith(tr_status) or text.startswith("▶") or text.startswith("✔") or text.startswith("❌")):
-                    logw.append(text)
-                    updated_any = True
-
-            # If we couldn't update any inline widget, use the headless popup.
-            if not updated_any:
-                _status_popup_open(parent, text)
-            else:
-                # If inline widgets exist and popup is visible, keep it quiet.
-                _status_popup_update(text)
-
-            QApplication.processEvents()
-
-        if isinstance(parent, QWidget):
-            QTimer.singleShot(0, _do)
+        if not updated_any:
+            _status_popup_open(parent, text)
         else:
-            _do()
+            _status_popup_update(text)
+
+        QApplication.processEvents()
     except Exception:
-        # Last-resort popup if even the above failed
         try:
             _status_popup_open(parent, text)
         except Exception:
             pass
 
+
 def _wait_process(proc: QProcess, timeout_ms: int, parent=None) -> bool:
     """
     Incrementally wait for a QProcess while pumping UI events so the dialog stays responsive.
@@ -234,10 +217,53 @@ def _get_solvefield_exe(settings) -> str:
     return cand[0]  # may be empty (used to decide web vs. local)
 
 def _get_astrometry_api_key(settings) -> str:
-    return settings.value("astrometry/api_key", "", type=str) or ""
+    """
+    Canonical key: 'api/astrometry_key' (matches SettingsDialog).
+    Also check older legacy keys for backward compatibility.
+    """
+    if settings is None:
+        return ""
+
+    # ✅ canonical
+    key = settings.value("api/astrometry_key", "", type=str) or ""
+    key = key.strip()
+    if key:
+        return key
+
+    # 🔁 legacy fallbacks (if you ever stored them differently)
+    for k in (
+        "api/astrometry",          # old guess
+        "astrometry/api_key",
+        "astrometry/key",
+        "astrometry_key",
+        "plate_solver/astrometry_key",
+    ):
+        v = settings.value(k, "", type=str) or ""
+        v = v.strip()
+        if v:
+            # migrate forward so it works next time
+            settings.setValue("api/astrometry_key", v)
+            try:
+                settings.remove(k)
+            except Exception:
+                pass
+            try:
+                settings.sync()
+            except Exception:
+                pass
+            return v
+
+    return ""
 
-def _set_astrometry_api_key(settings, key: str):
-    settings.setValue("astrometry/api_key", key or "")
+
+def _set_astrometry_api_key(settings, key: str) -> None:
+    if settings is None:
+        return
+    settings.setValue("api/astrometry_key", (key or "").strip())
+    try:
+        settings.sync()
+    except Exception:
+        pass
 
 def _wcs_header_from_astrometry_calib(calib: dict, image_shape: tuple[int, ...]) -> Header:
     """
@@ -1774,7 +1800,8 @@ def _debug_dump_meta(label: str, meta: dict):
         print(f"  {k}: {type(v).__name__}")
     print("================================\n")
 
-
+def tr(s: str) -> str:
+    return QCoreApplication.translate("PlateSolver", s)
 
 def plate_solve_doc_inplace(parent, doc, settings) -> Tuple[bool, Header | str]:
     img = getattr(doc, "image", None)
@@ -1831,8 +1858,9 @@ def plate_solve_doc_inplace(parent, doc, settings) -> Tuple[bool, Header | str]:
         (hasattr(parent, "findChild") and parent.findChild(QLabel, "status_label") is not None)
     )
     if headless:
-        _status_popup_open(parent, QCoreApplication.translate("PlateSolver", "Status: Preparing plate solve…"))
+        _status_popup_open(parent, tr("Status: Preparing plate solve…"))
 
+    ok_solve = False
     try:
         ok, res = _solve_numpy_with_fallback(parent, settings, img, seed_h)
         if not ok:
@@ -1886,11 +1914,18 @@ def plate_solve_doc_inplace(parent, doc, settings) -> Tuple[bool, Header | str]:
         if hasattr(parent, "currentDocumentChanged"):
             QTimer.singleShot(0, lambda: parent.currentDocumentChanged.emit(doc))
 
-        _set_status_ui(parent, QCoreApplication.translate("PlateSolver", "Status: Plate solve completed."))
-        _status_popup_close()
+        _set_status_ui(parent, tr("Status: Plate solve completed."))
+
+
+        ok_solve = True
+        if headless:
+            QTimer.singleShot(1200, _status_popup_close)
+        else:
+            _status_popup_close()
         return True, hdr
     finally:
-        _status_popup_close()
+        if not ok_solve:
+            _status_popup_close()
 
 
 

setiastro/saspro/psf_viewer.py

@@ -13,7 +13,7 @@ from PyQt6.QtWidgets import (
 )
 from setiastro.saspro.widgets.themed_buttons import themed_toolbtn
 
-from PyQt6.QtCore import Qt, QTimer, QThread, pyqtSignal, QObject
+from PyQt6.QtCore import QThread, pyqtSignal, QObject
 from PyQt6.QtWidgets import QWidget
 
 class _ProcessingOverlay(QWidget):
@@ -108,7 +108,10 @@ class PSFViewer(QDialog):
         # Accept either a view (with .document) or a doc directly
         doc = getattr(view_or_doc, "document", None)
         self.doc = doc if doc is not None else view_or_doc
-
+        try:
+            self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose, True)
+        except Exception:
+            pass  # older PyQt6 versions
         # Image + state
         self.image = self._grab_image()
         self.zoom_factor = 1.0
@@ -124,12 +127,19 @@ class PSFViewer(QDialog):
         self.threshold_timer.timeout.connect(self._applyThreshold)
 
         # Auto-update when the document changes
+
+        self._psf_thread = None
+        self._psf_worker = None
+        self._doc_conn = False
         if hasattr(self.doc, "changed"):
             try:
                 self.doc.changed.connect(self._on_doc_changed)
+                self._doc_conn = True
             except Exception:
-                pass
+                self._doc_conn = False
 
+        # cleanup no matter how the dialog is dismissed (accept/reject/done)
+        self.finished.connect(self._cleanup)
         self._build_ui()
         # Defer first compute until after the dialog is shown/layouted
         QTimer.singleShot(0, self._applyThreshold)
@@ -235,7 +245,7 @@ class PSFViewer(QDialog):
 
         # Close
         close_btn = QPushButton("Close", self)
-        close_btn.clicked.connect(self.accept)
+        close_btn.clicked.connect(self.close)
         main_layout.addWidget(close_btn)
 
         self.setLayout(main_layout)
@@ -279,7 +289,6 @@ class PSFViewer(QDialog):
         self.hist_label.resize(scaled.size())
 
     def _applyThreshold(self):
-        # kick off worker
         if self.image is None:
             self.star_list = None
             self.status_label.setText("Status: No image.")
@@ -288,46 +297,72 @@ class PSFViewer(QDialog):
 
         self._show_processing("Processing… extracting stars / PSFs")
 
-        # kill previous run if any
-        if hasattr(self, "_psf_thread") and self._psf_thread is not None:
-            try:
-                self._psf_thread.quit()
-                self._psf_thread.wait(50)
-            except Exception:
-                pass
+        # stop any previous run cleanly
+        self._stop_psf_worker()
 
         self._psf_thread = QThread(self)
         self._psf_worker = _PSFWorker(self.image, self.detection_threshold)
         self._psf_worker.moveToThread(self._psf_thread)
 
         self._psf_thread.started.connect(self._psf_worker.run)
+        self._psf_worker.finished.connect(self._on_psf_done)
+        self._psf_worker.failed.connect(self._on_psf_fail)
 
-        def _done(tbl, status):
-            self.star_list = tbl
-            self.status_label.setText(status)
-            self._hide_processing()
-            self.drawHistogram()
-            self._psf_thread.quit()
-            self._psf_thread.wait(100)
-
-        def _fail(msg):
-            self.star_list = None
-            self.status_label.setText(f"Status: {msg}")
-            self._hide_processing()
-            self.drawHistogram()
-            self._psf_thread.quit()
-            self._psf_thread.wait(100)
+        # ensure thread quits once worker reports anything
+        self._psf_worker.finished.connect(lambda *_: self._stop_psf_worker(quit_only=False))
+        self._psf_worker.failed.connect(lambda *_: self._stop_psf_worker(quit_only=False))
 
-        self._psf_worker.finished.connect(_done)
-        self._psf_worker.failed.connect(_fail)
 
         self._psf_thread.start()
 
+    def _stop_psf_worker(self, quit_only: bool = False):
+        thr = getattr(self, "_psf_thread", None)
+        wkr = getattr(self, "_psf_worker", None)
+
+        if thr is None:
+            return
+
+        try:
+            thr.quit()
+        except Exception:
+            pass
+        try:
+            thr.wait(250)
+        except Exception:
+            pass
+
+        if not quit_only:
+            try:
+                if wkr is not None:
+                    wkr.deleteLater()
+            except Exception:
+                pass
+            try:
+                thr.deleteLater()
+            except Exception:
+                pass
+            self._psf_worker = None
+            self._psf_thread = None
+
+    def _on_psf_done(self, tbl, status: str):
+        # tbl is an astropy Table or None
+        self.star_list = tbl
+        self.status_label.setText(status)
+        self._hide_processing()
+        self.drawHistogram()
+
+    def _on_psf_fail(self, msg: str):
+        self.star_list = None
+        self.status_label.setText(f"Status: {msg}")
+        self._hide_processing()
+        self.drawHistogram()
+
 
     def updateImage(self, new_image):
         self.image = np.asarray(new_image) if new_image is not None else None
-        self.compute_star_list()
-        self.drawHistogram()
+        if self.threshold_timer.isActive():
+            self.threshold_timer.stop()
+        self.threshold_timer.start()
 
     def updateZoom(self, _=None):
         self._apply_hist_zoom()
@@ -538,12 +573,59 @@ class PSFViewer(QDialog):
                 it.setTextAlignment(Qt.AlignmentFlag.AlignCenter)
                 self.stats_table.setItem(ri, ci, it)
 
+
+    def _cleanup(self):
+        # stop debounce timer
+        try:
+            if getattr(self, "threshold_timer", None) is not None:
+                self.threshold_timer.stop()
+        except Exception:
+            pass
+
+        # disconnect doc listener
+        try:
+            if self._doc_conn and hasattr(self.doc, "changed"):
+                self.doc.changed.disconnect(self._on_doc_changed)
+        except Exception:
+            pass
+        self._doc_conn = False
+
+        # stop worker/thread
+        try:
+            thr = getattr(self, "_psf_thread", None)
+            wkr = getattr(self, "_psf_worker", None)
+
+            if wkr is not None:
+                try:
+                    wkr.deleteLater()
+                except Exception:
+                    pass
+
+            if thr is not None:
+                try:
+                    thr.requestInterruption()
+                except Exception:
+                    pass
+                try:
+                    thr.quit()
+                except Exception:
+                    pass
+                try:
+                    thr.wait(250)
+                except Exception:
+                    pass
+                try:
+                    thr.deleteLater()
+                except Exception:
+                    pass
+        except Exception:
+            pass
+
+        self._psf_worker = None
+        self._psf_thread = None
+
     # ---------- lifecycle ----------
     def closeEvent(self, e):
-        # Best-effort disconnect
-        if hasattr(self.doc, "changed"):
-            try:
-                self.doc.changed.disconnect(self._on_doc_changed)
-            except Exception:
-                pass
+        self._cleanup()
         super().closeEvent(e)
+

setiastro/saspro/resources.py

@@ -245,6 +245,39 @@ class Icons:
     LIVE_STACKING = property(lambda self: _resource_path('livestacking.png'))
     IMAGE_COMBINE = property(lambda self: _resource_path('imagecombine.png'))
     
+    # Moon phase (WIMS)
+    MOON_NEW            = property(lambda self: _resource_path('new_moon.png'))
+    MOON_WAXING_CRES_1  = property(lambda self: _resource_path('waxing_crescent_1.png'))
+    MOON_WAXING_CRES_2  = property(lambda self: _resource_path('waxing_crescent_2.png'))
+    MOON_WAXING_CRES_3  = property(lambda self: _resource_path('waxing_crescent_3.png'))
+    MOON_WAXING_CRES_4  = property(lambda self: _resource_path('waxing_crescent_4.png'))
+    MOON_WAXING_CRES_5  = property(lambda self: _resource_path('waxing_crescent_5.png'))
+
+    MOON_FIRST_QUARTER  = property(lambda self: _resource_path('first_quarter.png'))
+
+    MOON_WAXING_GIB_1   = property(lambda self: _resource_path('waxing_gibbous_1.png'))
+    MOON_WAXING_GIB_2   = property(lambda self: _resource_path('waxing_gibbous_2.png'))
+    MOON_WAXING_GIB_3   = property(lambda self: _resource_path('waxing_gibbous_3.png'))
+    MOON_WAXING_GIB_4   = property(lambda self: _resource_path('waxing_gibbous_4.png'))
+    MOON_WAXING_GIB_5   = property(lambda self: _resource_path('waxing_gibbous_5.png'))
+
+    MOON_FULL           = property(lambda self: _resource_path('full_moon.png'))
+
+    MOON_WANING_GIB_1   = property(lambda self: _resource_path('waning_gibbous_1.png'))
+    MOON_WANING_GIB_2   = property(lambda self: _resource_path('waning_gibbous_2.png'))
+    MOON_WANING_GIB_3   = property(lambda self: _resource_path('waning_gibbous_3.png'))
+    MOON_WANING_GIB_4   = property(lambda self: _resource_path('waning_gibbous_4.png'))
+    MOON_WANING_GIB_5   = property(lambda self: _resource_path('waning_gibbous_5.png'))
+
+    MOON_LAST_QUARTER   = property(lambda self: _resource_path('last_quarter.png'))
+
+    MOON_WANING_CRES_1  = property(lambda self: _resource_path('waning_crescent_1.png'))
+    MOON_WANING_CRES_2  = property(lambda self: _resource_path('waning_crescent_2.png'))
+    MOON_WANING_CRES_3  = property(lambda self: _resource_path('waning_crescent_3.png'))
+    MOON_WANING_CRES_4  = property(lambda self: _resource_path('waning_crescent_4.png'))
+    MOON_WANING_CRES_5  = property(lambda self: _resource_path('waning_crescent_5.png'))
+
+
     # Special features
     SUPERNOVA = property(lambda self: _resource_path('supernova.png'))
     PEDESTAL = property(lambda self: _resource_path('pedestal.png'))
@@ -284,6 +317,7 @@ class Icons:
     CSV = property(lambda self: _resource_path('cvs.png'))
     PPP = property(lambda self: _resource_path('ppp.png'))
     SCRIPT = property(lambda self: _resource_path('script.png'))
+    ACV = property(lambda self: _resource_path('acv_icon.png'))
     
     # Blink & comparison
     BLINK = property(lambda self: _resource_path('blink.png'))
@@ -393,6 +427,39 @@ def _init_legacy_paths():
         'slot7_path': get_icon_path('slot7.png'),
         'slot8_path': get_icon_path('slot8.png'),
         'slot9_path': get_icon_path('slot9.png'),
+        'acv_icon_path': get_icon_path('acv_icon.png'),
+
+        'moon_new_path': get_icon_path('new_moon.png'),
+        'moon_waxing_crescent_1_path': get_icon_path('waxing_crescent_1.png'),
+        'moon_waxing_crescent_2_path': get_icon_path('waxing_crescent_2.png'),
+        'moon_waxing_crescent_3_path': get_icon_path('waxing_crescent_3.png'),
+        'moon_waxing_crescent_4_path': get_icon_path('waxing_crescent_4.png'),
+        'moon_waxing_crescent_5_path': get_icon_path('waxing_crescent_5.png'),
+
+        'moon_first_quarter_path': get_icon_path('first_quarter.png'),
+
+        'moon_waxing_gibbous_1_path': get_icon_path('waxing_gibbous_1.png'),
+        'moon_waxing_gibbous_2_path': get_icon_path('waxing_gibbous_2.png'),
+        'moon_waxing_gibbous_3_path': get_icon_path('waxing_gibbous_3.png'),
+        'moon_waxing_gibbous_4_path': get_icon_path('waxing_gibbous_4.png'),
+        'moon_waxing_gibbous_5_path': get_icon_path('waxing_gibbous_5.png'),
+
+        'moon_full_path': get_icon_path('full_moon.png'),
+
+        'moon_waning_gibbous_1_path': get_icon_path('waning_gibbous_1.png'),
+        'moon_waning_gibbous_2_path': get_icon_path('waning_gibbous_2.png'),
+        'moon_waning_gibbous_3_path': get_icon_path('waning_gibbous_3.png'),
+        'moon_waning_gibbous_4_path': get_icon_path('waning_gibbous_4.png'),
+        'moon_waning_gibbous_5_path': get_icon_path('waning_gibbous_5.png'),
+
+        'moon_last_quarter_path': get_icon_path('last_quarter.png'),
+
+        'moon_waning_crescent_1_path': get_icon_path('waning_crescent_1.png'),
+        'moon_waning_crescent_2_path': get_icon_path('waning_crescent_2.png'),
+        'moon_waning_crescent_3_path': get_icon_path('waning_crescent_3.png'),
+        'moon_waning_crescent_4_path': get_icon_path('waning_crescent_4.png'),
+        'moon_waning_crescent_5_path': get_icon_path('waning_crescent_5.png'),
+
         'rgbcombo_path': get_icon_path('rgbcombo.png'),
         'rgbextract_path': get_icon_path('rgbextract.png'),
         'copyslot_path': get_icon_path('copyslot.png'),

setiastro/saspro/rgbalign.py

@@ -350,6 +350,10 @@ class RGBAlignDialog(QDialog):
         self.setWindowFlag(Qt.WindowType.Window, True)
         self.setWindowModality(Qt.WindowModality.NonModal)
         self.setModal(False)
+        try:
+            self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose, True)
+        except Exception:
+            pass  # older PyQt6 versions        
         self.parent = parent
         # document could be a view; try to unwrap
         self.doc_view = document

setiastro/saspro/selective_color.py

@@ -458,7 +458,10 @@ class SelectiveColorCorrection(QDialog):
         self.setWindowTitle(self.tr("Selective Color Correction"))
         if window_icon:
             self.setWindowIcon(window_icon)
-
+        try:
+            self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose, True)
+        except Exception:
+            pass  # older PyQt6 versions
         self.docman = doc_manager
         self.document = document
         if self.document is None or getattr(self.document, "image", None) is None: