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

setiastro/saspro/multiscale_decomp.py

@@ -219,6 +219,10 @@ class MultiscaleDecompDialog(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.setMinimumSize(1050, 700)
         self.residual_enabled = True
         self._layer_noise = None  # list[float] per detail layer
@@ -575,19 +579,29 @@ class MultiscaleDecompDialog(QDialog):
 
     # ---------- Preview plumbing ----------
     def _spinner_on(self):
-        if getattr(self, "busy_spinner", None) is None:
+        if getattr(self, "_closing", False):
+            return
+        try:
+            sp = getattr(self, "busy_spinner", None)
+            if sp is None:
+                return
+            sp.setVisible(True)
+            mv = getattr(self, "_busy_movie", None)
+            if mv is not None and mv.state() != QMovie.MovieState.Running:
+                mv.start()
+        except RuntimeError:
             return
-        self.busy_spinner.setVisible(True)
-        if getattr(self, "_busy_movie", None) is not None:
-            if self._busy_movie.state() != QMovie.MovieState.Running:
-                self._busy_movie.start()
 
     def _spinner_off(self):
-        if getattr(self, "busy_spinner", None) is None:
+        try:
+            sp = getattr(self, "busy_spinner", None)
+            mv = getattr(self, "_busy_movie", None)
+            if mv is not None:
+                mv.stop()
+            if sp is not None:
+                sp.setVisible(False)
+        except RuntimeError:
             return
-        if getattr(self, "_busy_movie", None) is not None:
-            self._busy_movie.stop()
-        self.busy_spinner.setVisible(False)
 
 
     def _show_busy_overlay(self):
@@ -619,11 +633,13 @@ class MultiscaleDecompDialog(QDialog):
         self._schedule_preview()
 
     def _schedule_preview(self):
-        # generic “something changed” entry point
+        if getattr(self, "_closing", False):
+            return
         self._preview_timer.start(60)
 
     def _schedule_roi_preview(self):
-        # view changed (scroll/zoom/pan) — still debounced
+        if getattr(self, "_closing", False):
+            return
         self._preview_timer.start(60)
 
     def _connect_viewport_signals(self):
@@ -760,8 +776,15 @@ class MultiscaleDecompDialog(QDialog):
         return tuned, residual
 
     def _rebuild_preview(self):
+        if getattr(self, "_closing", False):
+            return
         self._spinner_on()
-        QApplication.processEvents()
+        QTimer.singleShot(0, self._rebuild_preview_impl)
+
+    def _rebuild_preview_impl(self):
+        if getattr(self, "_closing", False):
+            return
+
         #self._begin_busy()
         try:
             # ROI preview can't work until we have *some* pixmap in the scene to derive visible rects from.
@@ -1745,3 +1768,19 @@ class _MultiScaleDecompPresetDialog(QDialog):
             "linked_rgb": bool(self.cb_linked.isChecked()),
             "layers_cfg": out_layers,
         }
+def closeEvent(self, ev):
+    self._closing = True
+    try:
+        if hasattr(self, "_preview_timer"):
+            self._preview_timer.stop()
+        if hasattr(self, "_busy_show_timer"):
+            self._busy_show_timer.stop()
+        # Optional: disconnect scrollbars to stop ROI scheduling
+        try:
+            self.view.horizontalScrollBar().valueChanged.disconnect(self._schedule_roi_preview)
+            self.view.verticalScrollBar().valueChanged.disconnect(self._schedule_roi_preview)
+        except Exception:
+            pass
+    except Exception:
+        pass
+    super().closeEvent(ev)

setiastro/saspro/numba_utils.py

@@ -317,61 +317,6 @@ def invert_image_numba(image):
                     output[y, x, c] = 1.0 - image[y, x, c]
         return output
 
-
-
-@njit(parallel=True, fastmath=True, cache=True)
-def apply_flat_division_numba_2d(image, master_flat, master_bias=None):
-    """
-    Mono version: image.shape == (H,W)
-    """
-    if master_bias is not None:
-        master_flat = master_flat - master_bias
-        image = image - master_bias
-
-    median_flat = np.mean(master_flat)
-    height, width = image.shape
-
-    for y in prange(height):
-        for x in range(width):
-            image[y, x] /= (master_flat[y, x] / median_flat)
-
-    return image
-
-
-@njit(parallel=True, fastmath=True, cache=True)
-def apply_flat_division_numba_3d(image, master_flat, master_bias=None):
-    """
-    Color version: image.shape == (H,W,C)
-    """
-    if master_bias is not None:
-        master_flat = master_flat - master_bias
-        image = image - master_bias
-
-    median_flat = np.mean(master_flat)
-    height, width, channels = image.shape
-
-    for y in prange(height):
-        for x in range(width):
-            for c in range(channels):
-                image[y, x, c] /= (master_flat[y, x, c] / median_flat)
-
-    return image
-
-def apply_flat_division_numba(image, master_flat, master_bias=None):
-    """
-    Dispatcher that calls the correct Numba function
-    depending on whether 'image' is 2D or 3D.
-    """
-    if image.ndim == 2:
-        # Mono
-        return apply_flat_division_numba_2d(image, master_flat, master_bias)
-    elif image.ndim == 3:
-        # Color
-        return apply_flat_division_numba_3d(image, master_flat, master_bias)
-    else:
-        raise ValueError(f"apply_flat_division_numba: expected 2D or 3D, got shape {image.shape}")
-
-
 @njit(parallel=True, cache=True)
 def subtract_dark_3d(frames, dark_frame):
     """
@@ -2495,7 +2440,77 @@ def drizzle_deposit_color_naive(image_data, affine_2x3, drizzle_buffer, coverage
 
     return drizzle_buffer, coverage_buffer
 
-@njit(parallel=True, fastmath=True, cache=True)
+@njit(parallel=True, fastmath=True)
+def numba_mono_from_img(img, bp, denom, median_rescaled, target_median):
+    H, W = img.shape
+    out = np.empty_like(img)
+    for y in prange(H):
+        for x in range(W):
+            r = (img[y, x] - bp) / denom
+            numer = (median_rescaled - 1.0) * target_median * r
+            denom2 = median_rescaled * (target_median + r - 1.0) - target_median * r
+            if abs(denom2) < 1e-12:
+                denom2 = 1e-12
+            out[y, x] = numer / denom2
+    return out
+
+@njit(parallel=True, fastmath=True)
+def numba_color_linked_from_img(img, bp, denom, median_rescaled, target_median):
+    H, W, C = img.shape
+    out = np.empty_like(img)
+    for y in prange(H):
+        for x in range(W):
+            for c in range(C):
+                r = (img[y, x, c] - bp) / denom
+                numer = (median_rescaled - 1.0) * target_median * r
+                denom2 = median_rescaled * (target_median + r - 1.0) - target_median * r
+                if abs(denom2) < 1e-12:
+                    denom2 = 1e-12
+                out[y, x, c] = numer / denom2
+    return out
+
+@njit(parallel=True, fastmath=True)
+def numba_color_unlinked_from_img(img, bp3, denom3, meds_rescaled3, target_median):
+    H, W, C = img.shape
+    out = np.empty_like(img)
+    for y in prange(H):
+        for x in range(W):
+            for c in range(C):
+                r = (img[y, x, c] - bp3[c]) / denom3[c]
+                med = meds_rescaled3[c]
+                numer = (med - 1.0) * target_median * r
+                denom2 = med * (target_median + r - 1.0) - target_median * r
+                if abs(denom2) < 1e-12:
+                    denom2 = 1e-12
+                out[y, x, c] = numer / denom2
+    return out
+
+@njit(parallel=True, fastmath=True)
+def numba_mono_final_formula(rescaled, median_rescaled, target_median):
+    """
+    Applies the final formula *after* we already have the rescaled values.
+    
+    rescaled[y,x] = (original[y,x] - black_point) / (1 - black_point)
+    median_rescaled = median(rescaled)
+    
+    out_val = ((median_rescaled - 1) * target_median * r) /
+              ( median_rescaled*(target_median + r -1) - target_median*r )
+    """
+    H, W = rescaled.shape
+    out = np.empty_like(rescaled)
+
+    for y in prange(H):
+        for x in range(W):
+            r = rescaled[y, x]
+            numer = (median_rescaled - 1.0) * target_median * r
+            denom = median_rescaled * (target_median + r - 1.0) - target_median * r
+            if np.abs(denom) < 1e-12:
+                denom = 1e-12
+            out[y, x] = numer / denom
+
+    return out
+
+@njit(parallel=True, fastmath=True)
 def numba_color_final_formula_linked(rescaled, median_rescaled, target_median):
     """
     Linked color transform: we use one median_rescaled for all channels.
@@ -2517,7 +2532,7 @@ def numba_color_final_formula_linked(rescaled, median_rescaled, target_median):
 
     return out
 
-@njit(parallel=True, fastmath=True, cache=True)
+@njit(parallel=True, fastmath=True)
 def numba_color_final_formula_unlinked(rescaled, medians_rescaled, target_median):
     """
     Unlinked color transform: a separate median_rescaled per channel.

setiastro/saspro/ops/commands.py

@@ -202,7 +202,7 @@ register(CommandSpec(
         "optional targets, inherit_target."
     ),
     call_style="ctx.run_command",
-    import_path="pro.function_bundle",          # <── important
+    import_path="setiastro.saspro.function_bundle",          # <── important
     callable_name="run_function_bundle_command",# <── important
     notes=(
         "Use this command from scripts to run a saved Function Bundle or an "
@@ -274,7 +274,7 @@ register(CommandSpec(
     group="Bundles",
     summary="Internal bundle runner. steps=[...], targets='all_open'|[doc_ptrs], stop_on_error.",
     call_style="ctx.run_command",
-    import_path="pro.function_bundle",
+    import_path="setiastro.saspro.function_bundle",
     callable_name="run_function_bundle_command",
 ))
 
@@ -388,7 +388,7 @@ register(CommandSpec(
     id="ghs",
     name="Generalized Hyperbolic Stretch",
     group="Stretch",
-    import_path="pro.ghs_preset",
+    import_path="setiastro.saspro.ghs_preset",
     callable_name="apply_ghs_via_preset",
     ui_method="open_ghs_with_preset",
     summary=(
@@ -499,7 +499,7 @@ register(CommandSpec(
     id="curves",
     title="Curves",
     group="Stretch",
-    import_path="pro.curves_preset",
+    import_path="setiastro.saspro.curves_preset",
     callable_name="apply_curves_via_preset",
     ui_method="open_curves_with_preset",
     summary=(
@@ -597,7 +597,7 @@ register(CommandSpec(
     id="abe",
     title="Automatic Background Extraction",
     group="Background",
-    import_path="pro.abe_preset",
+    import_path="setiastro.saspro.abe_preset",
     callable_name="apply_abe_via_preset",
     ui_method="open_abe_with_preset",   # ✅ matches your pro/abe_preset.py
     summary=(
@@ -683,7 +683,7 @@ register(CommandSpec(
     id="graxpert",
     title="GraXpert Gradient / Denoise",
     group="Background",
-    import_path="pro.graxpert_preset",
+    import_path="setiastro.saspro.graxpert_preset",
     callable_name="run_graxpert_via_preset",
     # no ui_method here unless you want to open your optional preset dialog from drops
     # ui_method="open_graxpert_with_preset",  # (only if/when you add one)
@@ -807,7 +807,7 @@ register(CommandSpec(
     id="background_neutral",
     name="Background Neutralization",
     group="Background",
-    import_path="pro.backgroundneutral",
+    import_path="setiastro.saspro.backgroundneutral",
     callable_name="run_background_neutral_via_preset",
     summary=(
         "Neutralizes RGB background either automatically or using a user-specified "
@@ -865,7 +865,7 @@ register(CommandSpec(
     id="remove_green",
     name="Remove Green (SCNR)",
     group="Color",
-    import_path="pro.remove_green",
+    import_path="setiastro.saspro.remove_green",
     callable_name="apply_remove_green_preset_to_doc",
     ui_method="open_remove_green_dialog",
     summary=(
@@ -1044,7 +1044,7 @@ register(CommandSpec(
     id="recombine_luminance",
     name="Recombine Luminance",
     group="Luminance",
-    import_path="pro.luminancerecombine",
+    import_path="setiastro.saspro.luminancerecombine",
     callable_name="run_recombine_luminance_via_preset",
     ui_method="_recombine_luminance_ui",
     notes=(
@@ -1144,7 +1144,7 @@ register(CommandSpec(
     id="wavescale_hdr",
     name="WaveScale HDR",
     group="Contrast",
-    import_path="pro.wavescale_hdr_preset",
+    import_path="setiastro.saspro.wavescale_hdr_preset",
     callable_name="run_wavescale_hdr_via_preset",
     ui_method="_open_wavescale_hdr",   # or whatever your main window uses
     summary=(
@@ -1188,7 +1188,7 @@ register(CommandSpec(
     id="wavescale_dark_enhance",
     name="WaveScale Dark Enhance",
     group="Contrast",
-    import_path="pro.wavescalede_preset",
+    import_path="setiastro.saspro.wavescalede_preset",
     callable_name="run_wavescalede_via_preset",
     ui_method="_open_wavescale_dark_enhance",  # adjust if your main window uses a different name
     summary=(
@@ -1295,7 +1295,7 @@ register(CommandSpec(
     id="aberration_ai",
     title="Aberration AI",
     group="Optics",
-    import_path="pro.aberration_ai_preset",
+    import_path="setiastro.saspro.aberration_ai_preset",
     callable_name="run_aberration_ai_via_preset",
     # ui_method="open_aberration_ai_dialog",   # if you have one; otherwise omit
     presets=[
@@ -1338,7 +1338,7 @@ register(CommandSpec(
     id="convo",
     title="Convolution / Deconvolution",
     group="Blur & Sharpen",
-    import_path="pro.convo_preset",
+    import_path="setiastro.saspro.convo_preset",
     callable_name="run_convo_via_preset",
     aliases=[
         "convolution",
@@ -1433,7 +1433,7 @@ register(CommandSpec(
     id="cosmic_clarity",
     title="Cosmic Clarity",
     group="AI",
-    import_path="pro.cosmicclarity_preset",
+    import_path="setiastro.saspro.cosmicclarity_preset",
     callable_name="run_cosmicclarity_via_preset",
     presets=[
         PresetSpec("mode", "enum", default="sharpen",
@@ -1484,7 +1484,7 @@ register(CommandSpec(
     id="debayer",
     title="Debayer",
     group="Color / CFA",
-    import_path="pro.debayer",
+    import_path="setiastro.saspro.debayer",
     callable_name="run_debayer_via_preset",
     presets=[
         PresetSpec(
@@ -1506,7 +1506,7 @@ register(CommandSpec(
     id="linear_fit",
     title="Linear Fit",
     group="Calibration",
-    import_path="pro.linear_fit",
+    import_path="setiastro.saspro.linear_fit",
     callable_name="run_linear_fit_via_preset",
     presets=[
         PresetSpec(
@@ -1527,7 +1527,7 @@ register(CommandSpec(
     id="morphology",
     title="Morphology",
     group="Masks & Morphology",
-    import_path="pro.morphology",
+    import_path="setiastro.saspro.morphology",
     callable_name="apply_morphology_to_doc",
     presets=[
         PresetSpec(
@@ -1556,7 +1556,7 @@ register(CommandSpec(
     id="remove_stars",
     title="Remove Stars",
     group="Star Tools",
-    import_path="pro.remove_stars_preset",
+    import_path="setiastro.saspro.remove_stars_preset",
     callable_name="run_remove_stars_via_preset",
     replay_apply_name="apply_remove_stars_to_doc",
     presets=[

setiastro/saspro/ops/script_editor.py

@@ -15,6 +15,11 @@ from PyQt6.QtWidgets import (
     QLineEdit, QToolButton, QCheckBox, QTextEdit
 )
 
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from setiastro.saspro.ops.scripts import ScriptEntry
+
 # -----------------------------------------------------------------------------
 # Code editor with line numbers (QPlainTextEdit subclass)
 # -----------------------------------------------------------------------------
@@ -1058,7 +1063,8 @@ class ScriptEditorDock(QDockWidget):
             if man is None:
                 raise RuntimeError("ScriptManager not initialized on main window.")
 
-            entry = man._load_one_script(self._current_path)
+            entry = man.load_script_from_path(self._current_path)
+
             if entry is None or entry.run is None:
                 raise RuntimeError("Script has no run(ctx).")
 
@@ -1074,7 +1080,9 @@ class ScriptEditorDock(QDockWidget):
             self.output.appendPlainText(tb)
             self._log("Script ERROR:\n" + tb)
 
-
+    def load_script_from_path(self, path: Path) -> ScriptEntry | None:
+        scripts_root = get_scripts_dir()
+        return self._load_one_script(path, scripts_root)
 
     # ------------------------------------------------------------------
     # ui helpers

setiastro/saspro/ops/scripts.py

@@ -294,6 +294,125 @@ class ScriptContext:
         # ✅ Normal run: let DocManager decide (ROI preview vs full)
         dm.update_active_document(img, metadata={}, step_name=step_name)
 
+    def _find_subwindow_for_doc(self, base_doc):
+        """Return (sw, widget) for the first subwindow showing base_doc."""
+        for sw, w in self._iter_open_subwindows():
+            d = self._base_doc_for_widget(w)
+            if d is base_doc:
+                return sw, w
+        return None, None
+
+    def rename_active_view(self, new_title: str) -> bool:
+        """Rename only the active MDI view title (this window)."""
+        w = self.active_view()
+        if w is None:
+            return False
+
+        t = (new_title or "").strip()
+        if not t:
+            return False
+
+        try:
+            # ImageSubWindow convention
+            setattr(w, "_view_title_override", t)
+            if hasattr(w, "_sync_host_title"):
+                w._sync_host_title()
+            return True
+        except Exception:
+            return False
+
+    def rename_active_document(self, new_name: str) -> bool:
+        """Rename the underlying document display name (affects explorer + other views)."""
+        doc = self.active_document()
+        if doc is None:
+            return False
+
+        n = (new_name or "").strip()
+        if not n:
+            return False
+
+        try:
+            old = ""
+            try:
+                old = str(doc.display_name() or "")
+            except Exception:
+                old = str(getattr(doc, "metadata", {}).get("display_name", "") or "")
+
+            doc.metadata["display_name"] = n
+            try:
+                doc.changed.emit()
+            except Exception:
+                pass
+
+            # If the active view had an override equal to the old doc name, drop it (matches your UI behavior)
+            w = self.active_view()
+            if w is not None:
+                try:
+                    if getattr(w, "_view_title_override", None) == old:
+                        setattr(w, "_view_title_override", None)
+                except Exception:
+                    pass
+                try:
+                    if hasattr(w, "_sync_host_title"):
+                        w._sync_host_title()
+                except Exception:
+                    pass
+
+            return True
+        except Exception:
+            return False
+
+    def rename_view(self, view_name_or_uid: str, new_title: str) -> bool:
+        """Rename a specific *view/window* by name/title/uid (first match)."""
+        doc = self.get_document(view_name_or_uid)
+        if doc is None:
+            return False
+
+        sw, w = self._find_subwindow_for_doc(doc)
+        if w is None:
+            return False
+
+        t = (new_title or "").strip()
+        if not t:
+            return False
+
+        try:
+            setattr(w, "_view_title_override", t)
+            if hasattr(w, "_sync_host_title"):
+                w._sync_host_title()
+            return True
+        except Exception:
+            return False
+
+    def rename_document(self, view_name_or_uid: str, new_name: str) -> bool:
+        """Rename a specific *document* by view name/title/uid."""
+        doc = self.get_document(view_name_or_uid)
+        if doc is None:
+            return False
+        n = (new_name or "").strip()
+        if not n:
+            return False
+
+        try:
+            doc.metadata["display_name"] = n
+            try:
+                doc.changed.emit()
+            except Exception:
+                pass
+
+            # resync any window currently showing it
+            sw, w = self._find_subwindow_for_doc(doc)
+            if w is not None and hasattr(w, "_sync_host_title"):
+                try:
+                    w._sync_host_title()
+                except Exception:
+                    pass
+
+            return True
+        except Exception:
+            return False
+
+
     # ---- convenience wrappers into main window ----
     def run_command(self, command_id: str, preset=None, **kwargs):
         return _run_command(self, command_id, preset, **kwargs)
@@ -678,6 +797,9 @@ class ScriptManager(QObject):
 
         self._log(f"[Scripts] Loaded {len(self.registry)} script(s) from {scripts_dir}")
 
+    def load_script_from_path(self, path: Path) -> ScriptEntry | None:
+        scripts_root = get_scripts_dir()
+        return self._load_one_script(path, scripts_root)
 
     def _load_one_script(self, path: Path, scripts_root: Path) -> ScriptEntry | None:
         """

setiastro/saspro/perfect_palette_picker.py

@@ -227,6 +227,7 @@ class PerfectPalettePicker(QWidget):
         self.sii  = None
         self.osc1 = None
         self.osc2 = None
+        self._dim_mismatch_accepted = False
 
         # stretched cache (per input name → stretched array)
         self._stretched: dict[str, np.ndarray] = {}
@@ -675,10 +676,42 @@ class PerfectPalettePicker(QWidget):
             oo = g2b2 if oo is None else 0.5*oo + 0.5*g2b2
 
         # shapes must match for full-size
-        shapes = [x.shape for x in (ha, oo, si) if x is not None]
+        # shapes must match for full-size
+        shapes = [x.shape[:2] for x in (ha, oo, si) if x is not None]
         if len(shapes) and len(set(shapes)) > 1 and not for_thumbs:
-            QMessageBox.critical(self, "Size Mismatch", f"Channel sizes differ: {set(shapes)}")
-            return None, None, None
+            # pick a reference size (prefer Ha, then OIII, then SII)
+            ref = ha if ha is not None else (oo if oo is not None else si)
+            ref_name = "Ha" if ha is not None else ("OIII" if oo is not None else "SII")
+            ref_h, ref_w = ref.shape[:2]
+
+            # Only prompt once per session unless you want every time
+            if not self._dim_mismatch_accepted:
+                msg = (
+                    "The loaded channels have different image dimensions.\n\n"
+                    f"• Ha:   {None if ha is None else ha.shape}\n"
+                    f"• OIII: {None if oo is None else oo.shape}\n"
+                    f"• SII:  {None if si is None else si.shape}\n\n"
+                    f"SASpro can resize (warp) the channels to match the reference frame:\n"
+                    f"• Reference: {ref_name}\n"
+                    f"• Target size: ({ref_w} × {ref_h})\n\n"
+                    "Proceed and resize mismatched channels?"
+                )
+                ret = QMessageBox.question(
+                    self,
+                    "Channel Size Mismatch",
+                    msg,
+                    QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
+                    QMessageBox.StandardButton.Yes
+                )
+                if ret != QMessageBox.StandardButton.Yes:
+                    return None, None, None
+
+                self._dim_mismatch_accepted = True
+
+            # resize to reference
+            ha = self._resize_to(ha, (ref_w, ref_h)) if ha is not None else None
+            oo = self._resize_to(oo, (ref_w, ref_h)) if oo is not None else None
+            si = self._resize_to(si, (ref_w, ref_h)) if si is not None else None
 
         # thumbnails: crop AFTER stretch/synth
         if for_thumbs:
@@ -953,6 +986,7 @@ class PerfectPalettePicker(QWidget):
     def _clear_channels(self):
         self.ha = self.oiii = self.sii = self.osc1 = self.osc2 = None
         self._stretched.clear()
+        self._dim_mismatch_accepted = False
         self.final = None
         self.preview.clear()
         for which in ("Ha","OIII","SII","OSC1","OSC2"):