setiastrosuitepro 1.6.0__py3-none-any.whl → 1.6.4.post1__py3-none-any.whl

setiastro/saspro/subwindow.py

@@ -83,12 +83,12 @@ class _DragTab(QLabel):
         self.owner = owner
         self._press_pos = None
         self.setText("⧉")
-        self.setToolTip(
+        self.setToolTip(self.tr(
             "Drag to duplicate/copy view.\n"
             "Hold Alt while dragging to LINK this view with another (live pan/zoom sync).\n"
             "Hold Shift while dragging to drop this image as a mask onto another view.\n"
             "Hold Ctrl while dragging to copy the astrometric solution (WCS) to another view."
-        )
+        ))
 
         self.setFixedSize(22, 18)
         self.setAlignment(Qt.AlignmentFlag.AlignCenter)
@@ -371,7 +371,8 @@ class ImageSubWindow(QWidget):
         # pixel readout live-probe state
         self._space_down = False
         self._readout_dragging = False
-        self._last_readout = None
+        # Pinch gesture state (macOS trackpad)
+        self._gesture_zoom_start = None
         self.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
 
         # Title (doc/view) sync
@@ -414,31 +415,31 @@ class ImageSubWindow(QWidget):
 
         self._preview_btn = QToolButton(self)
         self._preview_btn.setText("⟂")  # crosshair glyph
-        self._preview_btn.setToolTip("Create Preview: click, then drag on the image to define a preview rectangle.")
+        self._preview_btn.setToolTip(self.tr("Create Preview: click, then drag on the image to define a preview rectangle."))
         self._preview_btn.setCheckable(True)
         self._preview_btn.clicked.connect(self._toggle_preview_select_mode)
         row.addWidget(self._preview_btn, 0, Qt.AlignmentFlag.AlignLeft)
         # — Undo / Redo just for this subwindow —
         self._btn_undo = QToolButton(self)
         self._btn_undo.setText("↶")  # or use an icon
-        self._btn_undo.setToolTip("Undo (this view)")
+        self._btn_undo.setToolTip(self.tr("Undo (this view)"))
         self._btn_undo.setEnabled(False)
         self._btn_undo.clicked.connect(self._on_local_undo)
         row.addWidget(self._btn_undo, 0, Qt.AlignmentFlag.AlignLeft)
 
         self._btn_redo = QToolButton(self)
         self._btn_redo.setText("↷")
-        self._btn_redo.setToolTip("Redo (this view)")
+        self._btn_redo.setToolTip(self.tr("Redo (this view)"))
         self._btn_redo.setEnabled(False)
         self._btn_redo.clicked.connect(self._on_local_redo)
         row.addWidget(self._btn_redo, 0, Qt.AlignmentFlag.AlignLeft)
 
         self._btn_replay_main = QToolButton(self)
         self._btn_replay_main.setText("⟳")  # pick any glyph you like
-        self._btn_replay_main.setToolTip(
+        self._btn_replay_main.setToolTip(self.tr(
             "Click: replay the last action on the base image.\n"
             "Arrow: pick a specific past action to replay on the base image."
-        )
+        ))
         self._btn_replay_main.setEnabled(False)  # enabled only when preview + history
 
         # Left-click = your existing 'replay last on base'
@@ -457,7 +458,7 @@ class ImageSubWindow(QWidget):
         # ── NEW: WCS grid toggle ─────────────────────────────────────────
         self._btn_wcs = QToolButton(self)
         self._btn_wcs.setText("⌗")
-        self._btn_wcs.setToolTip("Toggle WCS grid overlay (if WCS exists)")
+        self._btn_wcs.setToolTip(self.tr("Toggle WCS grid overlay (if WCS exists)"))
         self._btn_wcs.setCheckable(True)
 
         # Start OFF on every new view, regardless of WCS presence or past sessions
@@ -484,6 +485,7 @@ class ImageSubWindow(QWidget):
 
         self.scroll = QScrollArea(full_host)
         self.scroll.setWidgetResizable(False)
+        self.scroll.setAlignment(Qt.AlignmentFlag.AlignCenter)        
         self.label = QLabel(alignment=Qt.AlignmentFlag.AlignCenter)
         self.scroll.setWidget(self.label)
         self.scroll.viewport().setMouseTracking(True)
@@ -498,7 +500,7 @@ class ImageSubWindow(QWidget):
             bar.actionTriggered.connect(self._on_scroll_changed)
 
         # IMPORTANT: add the tab BEFORE connecting signals so currentChanged can't fire early
-        self._full_tab_idx = self._tabs.addTab(full_host, "Full")
+        self._full_tab_idx = self._tabs.addTab(full_host, self.tr("Full"))
         self._full_host = full_host
         self._tabs.tabBar().setVisible(False)  # hidden until a preview exists
         lyt.addWidget(self._tabs)
@@ -1029,7 +1031,7 @@ class ImageSubWindow(QWidget):
         self.label = QLabel(alignment=Qt.AlignmentFlag.AlignCenter)
         self.scroll.setWidget(self.label)
         v.addWidget(self.scroll)
-        self._full_tab_idx = self._tabs.addTab(full_host, "Full")
+        self._full_tab_idx = self._tabs.addTab(full_host, self.tr("Full"))
         self._full_host = full_host    
         self._tabs.tabBar().setVisible(False)  # hidden until a first preview exists
 
@@ -1090,7 +1092,7 @@ class ImageSubWindow(QWidget):
         if self._preview_select_mode:
             mw = self._find_main_window()
             if mw and hasattr(mw, "statusBar"):
-                mw.statusBar().showMessage("Preview mode: drag a rectangle on the image to create a preview.", 6000)
+                mw.statusBar().showMessage(self.tr("Preview mode: drag a rectangle on the image to create a preview."), 6000)
         else:
             self._cancel_rubber()
 
@@ -1165,7 +1167,7 @@ class ImageSubWindow(QWidget):
         if mw and hasattr(mw, "statusBar"):
             sb = mw.statusBar()
             if sb:
-                sb.showMessage("Press Space + Click/Drag to probe pixels (WCS shown if available)", 8000)
+                sb.showMessage(self.tr("Press Space + Click/Drag to probe pixels (WCS shown if available)"), 8000)
 
 
       
@@ -1344,7 +1346,7 @@ class ImageSubWindow(QWidget):
         sub = self._mdi_subwindow()
         if not sub: return
         if base is None:
-            base = self._effective_title() or "Untitled"
+            base = self._effective_title() or self.tr("Untitled")
 
         # ✅ strip any carried-over glyphs (🔗, ■, “Active View: ”) from overrides/doc names
         core, _ = self._strip_decorations(base)
@@ -1420,7 +1422,7 @@ class ImageSubWindow(QWidget):
 
     def base_doc_title(self) -> str:
         """The clean, base title (document display name), no prefixes/suffixes."""
-        return self.document.display_name() or "Untitled"
+        return self.document.display_name() or self.tr("Untitled")
 
     def _active_mask_array(self):
         """Return the active mask ndarray (H,W) or None."""
@@ -1526,17 +1528,17 @@ class ImageSubWindow(QWidget):
 
     def _show_ctx_menu(self, pos):
         menu = QMenu(self)
-        a_view = menu.addAction("Rename View… (F2)")
-        a_doc  = menu.addAction("Rename Document…")
+        a_view = menu.addAction(self.tr("Rename View… (F2)"))
+        a_doc  = menu.addAction(self.tr("Rename Document…"))
         menu.addSeparator()
-        a_min  = menu.addAction("Send to Shelf")
-        a_clear = menu.addAction("Clear View Name (use doc name)")
+        a_min  = menu.addAction(self.tr("Send to Shelf"))
+        a_clear = menu.addAction(self.tr("Clear View Name (use doc name)"))
         menu.addSeparator()
-        a_unlink = menu.addAction("Unlink from Linked Views")   # ← NEW
+        a_unlink = menu.addAction(self.tr("Unlink from Linked Views"))   # ← NEW
         menu.addSeparator()
-        a_help = menu.addAction("Show pixel/WCS readout hint")
+        a_help = menu.addAction(self.tr("Show pixel/WCS readout hint"))
         menu.addSeparator()
-        a_prev = menu.addAction("Create Preview (drag rectangle)")
+        a_prev = menu.addAction(self.tr("Create Preview (drag rectangle)"))
 
         act = menu.exec(self.mapToGlobal(pos))
 
@@ -1569,7 +1571,7 @@ class ImageSubWindow(QWidget):
 
     def _rename_view(self):
         current = self._view_title_override or self.document.display_name()
-        new, ok = QInputDialog.getText(self, "Rename View", "New view name:", text=current)
+        new, ok = QInputDialog.getText(self, self.tr("Rename View"), self.tr("New view name:"), text=current)
         if ok and new.strip():
             self._view_title_override = new.strip()
             self._sync_host_title()  # calls _rebuild_title → emits viewTitleChanged
@@ -1584,7 +1586,7 @@ class ImageSubWindow(QWidget):
 
     def _rename_document(self):
         current = self.document.display_name()
-        new, ok = QInputDialog.getText(self, "Rename Document", "New document name:", text=current)
+        new, ok = QInputDialog.getText(self, self.tr("Rename Document"), self.tr("New document name:"), text=current)
         if ok and new.strip():
             # store on the doc so Explorer + other views update too
             self.document.metadata["display_name"] = new.strip()
@@ -1775,9 +1777,9 @@ class ImageSubWindow(QWidget):
     # ---- DnD 'view tab' -------------------------------------------------
     def _install_view_tab(self):
         self._view_tab = QToolButton(self)
-        self._view_tab.setText("View")
-        self._view_tab.setToolTip("Drag onto another window to copy zoom/pan.\n"
-                                  "Double-click to duplicate this view.")
+        self._view_tab.setText(self.tr("View"))
+        self._view_tab.setToolTip(self.tr("Drag onto another window to copy zoom/pan.\n"
+                                  "Double-click to duplicate this view."))
         self._view_tab.setCursor(Qt.CursorShape.OpenHandCursor)
         self._view_tab.setAutoRaise(True)
         self._view_tab.move(8, 8)     # pinned near top-left of the subwindow
@@ -2526,6 +2528,43 @@ class ImageSubWindow(QWidget):
             p = p.parent()
         return p
 
+    def event(self, e):
+        """Override event() to handle native macOS gestures (pinch zoom)."""
+        # Handle native gestures (macOS trackpad pinch zoom)
+        if e.type() == QEvent.Type.NativeGesture:
+            gesture_type = e.gestureType()
+
+            if gesture_type == Qt.NativeGestureType.BeginNativeGesture:
+                # Start of pinch gesture - store initial scale
+                self._gesture_zoom_start = self.scale
+                e.accept()
+                return True
+
+            elif gesture_type == Qt.NativeGestureType.ZoomNativeGesture:
+                # Ongoing pinch zoom - value() is cumulative scale factor
+                # Typical values: -0.5 to +0.5 for moderate pinches
+                zoom_delta = e.value()
+
+                # Convert delta to zoom factor
+                # Use smaller multiplier for smoother feel (0.5x damping)
+                factor = 1.0 + (zoom_delta * 0.5)
+
+                # Apply incremental zoom
+                self._zoom_at_anchor(factor)
+                e.accept()
+                return True
+
+            elif gesture_type == Qt.NativeGestureType.EndNativeGesture:
+                # End of pinch gesture - cleanup
+                self._gesture_zoom_start = None
+                e.accept()
+                return True
+
+        # Let parent handle all other events
+        return super().event(e)
+
+
+
     def eventFilter(self, obj, ev):
         is_on_view = (obj is self.label) or (obj is self.scroll.viewport())
 
@@ -2557,7 +2596,29 @@ class ImageSubWindow(QWidget):
         # 1) Ctrl + wheel → zoom
         if ev.type() == QEvent.Type.Wheel:
             if ev.modifiers() & Qt.KeyboardModifier.ControlModifier:
-                factor = 1.25 if ev.angleDelta().y() > 0 else 1/1.25
+                # Try pixelDelta first (macOS trackpad gives smooth values)
+                dy = ev.pixelDelta().y()
+
+                if dy != 0:
+                    # Smooth trackpad scrolling: use smaller base factor
+                    # Scale proportionally to delta magnitude for natural feel
+                    # Typical trackpad deltas are 1-10 pixels per event
+                    abs_dy = abs(dy)
+                    if abs_dy <= 3:
+                        base_factor = 1.01  # Very gentle for tiny movements
+                    elif abs_dy <= 10:
+                        base_factor = 1.02  # Gentle for small movements
+                    else:
+                        base_factor = 1.03  # Moderate for larger gestures
+
+                    factor = base_factor if dy > 0 else 1/base_factor
+                else:
+                    # Traditional mouse wheel: use angleDelta with moderate factor
+                    dy = ev.angleDelta().y()
+                    if dy == 0:
+                        return True
+                    # Use 1.15 for mouse wheel (gentler than original 1.25)
+                    factor = 1.15 if dy > 0 else 1/1.15
                 self._zoom_at_anchor(factor)
                 return True
             return False
@@ -2642,7 +2703,7 @@ class ImageSubWindow(QWidget):
 
         pid = self._next_preview_id
         self._next_preview_id += 1
-        name = f"Preview {pid} ({w}×{h})"
+        name = self.tr("Preview {0} ({1}×{2})").format(pid, w, h)
 
         self._previews.append({"id": pid, "name": name, "roi": (x, y, w, h), "arr": crop})
 
@@ -3062,8 +3123,8 @@ class ImageSubWindow(QWidget):
 
             if should_warn:
                 r = QMessageBox.question(
-                    self, "Close Image?",
-                    "This image has edits that aren’t applied/saved.\nClose anyway?",
+                    self, self.tr("Close Image?"),
+                    self.tr("This image has edits that aren’t applied/saved.\nClose anyway?"),
                     QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
                     QMessageBox.StandardButton.No
                 )
@@ -3180,7 +3241,7 @@ class TableSubWindow(QWidget):
         title_row.addWidget(self.title_lbl)
         title_row.addStretch(1)
 
-        self.export_btn = QPushButton("Export CSV…")
+        self.export_btn = QPushButton(self.tr("Export CSV…"))
         self.export_btn.clicked.connect(self._export_csv)
         title_row.addWidget(self.export_btn)
         lyt.addLayout(title_row)
@@ -3238,17 +3299,17 @@ class TableSubWindow(QWidget):
         existing = self.document.metadata.get("table_csv")
         if existing and os.path.exists(existing):
             # Offer to open/save-as that CSV
-            dst, ok = QFileDialog.getSaveFileName(self, "Save CSV As…", os.path.basename(existing), "CSV Files (*.csv)")
+            dst, ok = QFileDialog.getSaveFileName(self, self.tr("Save CSV As…"), os.path.basename(existing), self.tr("CSV Files (*.csv)"))
             if ok and dst:
                 try:
                     import shutil
                     shutil.copyfile(existing, dst)
                 except Exception as e:
-                    QMessageBox.warning(self, "Export CSV", f"Failed to copy CSV:\n{e}")
+                    QMessageBox.warning(self, self.tr("Export CSV"), self.tr("Failed to copy CSV:\n{0}").format(e))
             return
 
         # No pre-export → write one from the model
-        dst, ok = QFileDialog.getSaveFileName(self, "Export CSV…", "table.csv", "CSV Files (*.csv)")
+        dst, ok = QFileDialog.getSaveFileName(self, self.tr("Export CSV…"), "table.csv", self.tr("CSV Files (*.csv)"))
         if not ok or not dst:
             return
         try:
@@ -3264,4 +3325,4 @@ class TableSubWindow(QWidget):
                 for r in range(rows):
                     w.writerow([self._model.data(self._model.index(r, c), Qt.ItemDataRole.DisplayRole) for c in range(cols)])
         except Exception as e:
-            QMessageBox.warning(self, "Export CSV", f"Failed to export CSV:\n{e}")
+            QMessageBox.warning(self, self.tr("Export CSV"), self.tr("Failed to export CSV:\n{0}").format(e))