shinestacker 1.3.1__py3-none-any.whl → 1.4.0__py3-none-any.whl

shinestacker/retouch/overlaid_view.py

@@ -0,0 +1,212 @@
+# pylint: disable=C0114, C0115, C0116, E0611, E1101, R0904, R0912, R0914, R0902
+from PySide6.QtGui import QPixmap
+from PySide6.QtCore import Qt, QPointF, QEvent, QRectF
+from .. config.gui_constants import gui_constants
+from .view_strategy import ViewStrategy, ImageGraphicsViewBase, ViewSignals
+
+
+class OverlaidView(ViewStrategy, ImageGraphicsViewBase, ViewSignals):
+    def __init__(self, layer_collection, status, parent):
+        ViewStrategy.__init__(self, layer_collection, status)
+        ImageGraphicsViewBase.__init__(self, parent)
+        self.scene = self.create_scene(self)
+        self.create_pixmaps()
+        self.scene.addItem(self.brush_preview)
+        self.brush_cursor = None
+        self.pinch_start_scale = 1.0
+        self.last_scroll_pos = QPointF()
+
+    def create_pixmaps(self):
+        self.pixmap_item_master = self.create_pixmap(self.scene)
+        self.pixmap_item_current = self.create_pixmap(self.scene)
+
+    def get_master_view(self):
+        return self
+
+    def get_master_scene(self):
+        return self.scene
+
+    def get_master_pixmap(self):
+        return self.pixmap_item_master
+
+    def get_views(self):
+        return [self]
+
+    def get_scenes(self):
+        return [self.scene]
+
+    def get_pixmaps(self):
+        return {
+            self.pixmap_item_master: self,
+            self.pixmap_item_current: self
+        }
+
+    def set_master_image(self, qimage):
+        self.status.set_master_image(qimage)
+        pixmap = self.status.pixmap_master
+        self.setSceneRect(QRectF(pixmap.rect()))
+
+        img_width, img_height = pixmap.width(), pixmap.height()
+        self.set_min_scale(min(gui_constants.MIN_ZOOMED_IMG_WIDTH / img_width,
+                               gui_constants.MIN_ZOOMED_IMG_HEIGHT / img_height))
+        self.set_max_scale(gui_constants.MAX_ZOOMED_IMG_PX_SIZE)
+        self.set_zoom_factor(1.0)
+        self.fitInView(self.pixmap_item_master, Qt.KeepAspectRatio)
+        self.set_zoom_factor(self.get_current_scale())
+        self.set_zoom_factor(max(self.min_scale(), min(self.max_scale(), self.zoom_factor())))
+        self.scale(self.zoom_factor(), self.zoom_factor())
+
+    def set_current_image(self, qimage):
+        self.status.set_current_image(qimage)
+        if self.empty():
+            self.setSceneRect(QRectF(self.status.pixmap_current.rect()))
+
+    def show_master(self):
+        self.pixmap_item_master.setVisible(True)
+        self.pixmap_item_current.setVisible(False)
+
+    def show_current(self):
+        self.pixmap_item_master.setVisible(False)
+        self.pixmap_item_current.setVisible(True)
+
+    def update_master_display(self):
+        if not self.empty():
+            master_qimage = self.numpy_to_qimage(
+                self.master_layer())
+            if master_qimage:
+                self.pixmap_item_master.setPixmap(QPixmap.fromImage(master_qimage))
+
+    def update_current_display(self):
+        if not self.empty() and self.number_of_layers() > 0:
+            current_qimage = self.numpy_to_qimage(
+                self.current_layer())
+            if current_qimage:
+                self.pixmap_item_current.setPixmap(QPixmap.fromImage(current_qimage))
+
+    def set_view_state(self, state):
+        self.status.set_state(state)
+        if state:
+            self.resetTransform()
+            self.scale(state['zoom'], state['zoom'])
+            self.horizontalScrollBar().setValue(state['h_scroll'])
+            self.verticalScrollBar().setValue(state['v_scroll'])
+            self.set_zoom_factor(state['zoom'])
+
+    def handle_key_press_event(self, event):
+        if event.key() == Qt.Key_X:
+            self.temp_view_requested.emit(True)
+            self.update_brush_cursor()
+
+    def handle_key_release_event(self, event):
+        if event.key() == Qt.Key_X:
+            self.temp_view_requested.emit(False)
+
+    # pylint: disable=C0103
+    def mousePressEvent(self, event):
+        self.mouse_press_event(event)
+        super().mousePressEvent(event)
+
+    def mouseMoveEvent(self, event):
+        self.mouse_move_event(event)
+
+    def mouseReleaseEvent(self, event):
+        self.mouse_release_event(event)
+        super().mouseReleaseEvent(event)
+
+    def wheelEvent(self, event):
+        if self.empty() or self.gesture_active:
+            return
+        if event.source() == Qt.MouseEventNotSynthesized:  # Physical mouse
+            if self.control_pressed:
+                self.brush_size_change_requested.emit(1 if event.angleDelta().y() > 0 else -1)
+            else:
+                zoom_in_factor = 1.10
+                zoom_out_factor = 1 / zoom_in_factor
+                current_scale = self.get_current_scale()
+                if event.angleDelta().y() > 0:  # Zoom in
+                    new_scale = current_scale * zoom_in_factor
+                    if new_scale <= self.max_scale():
+                        self.scale(zoom_in_factor, zoom_in_factor)
+                        self.set_zoom_factor(new_scale)
+                else:  # Zoom out
+                    new_scale = current_scale * zoom_out_factor
+                    if new_scale >= self.min_scale():
+                        self.scale(zoom_out_factor, zoom_out_factor)
+                        self.set_zoom_factor(new_scale)
+            self.update_brush_cursor()
+        else:  # Touchpad event - fallback for systems without gesture recognition
+            if not self.control_pressed:
+                delta = event.pixelDelta() or event.angleDelta() / 8
+                if delta:
+                    self.scroll_view(self, delta.x(), delta.y())
+            else:  # Control + touchpad scroll for zoom
+                zoom_in = event.angleDelta().y() > 0
+                if zoom_in:
+                    self.zoom_in()
+                else:
+                    self.zoom_out()
+        event.accept()
+
+    def enterEvent(self, event):
+        self.activateWindow()
+        self.setFocus()
+        if not self.empty():
+            self.setCursor(Qt.BlankCursor)
+            if self.brush_cursor:
+                self.brush_cursor.show()
+        super().enterEvent(event)
+    # pylint: enable=C0103
+
+    def event(self, event):
+        if event.type() == QEvent.Gesture:
+            return self.handle_gesture_event(event)
+        return super().event(event)
+
+    def handle_gesture_event(self, event):
+        if self.empty():
+            return False
+        handled = False
+        pan_gesture = event.gesture(Qt.PanGesture)
+        if pan_gesture:
+            self.handle_pan_gesture(pan_gesture)
+            handled = True
+        pinch_gesture = event.gesture(Qt.PinchGesture)
+        if pinch_gesture:
+            self.handle_pinch_gesture(pinch_gesture)
+            handled = True
+        if handled:
+            event.accept()
+            return True
+        return False
+
+    def handle_pan_gesture(self, pan_gesture):
+        if pan_gesture.state() == Qt.GestureStarted:
+            self.last_scroll_pos = pan_gesture.delta()
+            self.gesture_active = True
+        elif pan_gesture.state() == Qt.GestureUpdated:
+            delta = pan_gesture.delta() - self.last_scroll_pos
+            self.last_scroll_pos = pan_gesture.delta()
+            scaled_delta = delta * (1.0 / self.get_current_scale())
+            self.scroll_view(self, int(scaled_delta.x()), int(scaled_delta.y()))
+        elif pan_gesture.state() == Qt.GestureFinished:
+            self.gesture_active = False
+
+    def handle_pinch_gesture(self, pinch):
+        if pinch.state() == Qt.GestureStarted:
+            self.pinch_start_scale = self.get_current_scale()
+            self.pinch_center_view = pinch.centerPoint()
+            self.pinch_center_scene = self.mapToScene(self.pinch_center_view.toPoint())
+            self.gesture_active = True
+        elif pinch.state() == Qt.GestureUpdated:
+            new_scale = self.pinch_start_scale * pinch.totalScaleFactor()
+            new_scale = max(self.min_scale(), min(new_scale, self.max_scale()))
+            if abs(new_scale - self.get_current_scale()) > 0.01:
+                self.resetTransform()
+                self.scale(new_scale, new_scale)
+                self.set_zoom_factor(new_scale)
+                new_center = self.mapToScene(self.pinch_center_view.toPoint())
+                delta = self.pinch_center_scene - new_center
+                self.translate(delta.x(), delta.y())
+                self.update_brush_cursor()
+        elif pinch.state() in (Qt.GestureFinished, Qt.GestureCanceled):
+            self.gesture_active = False

shinestacker/retouch/shortcuts_help.py

@@ -61,16 +61,26 @@ class ShortcutsHelp(QDialog):
             "Ctrl + +": "zoom in",
             "Ctrl + -": "zoom out",
             "Ctrl + 0": "adapt to screen",
-            "Ctrl + =": "actual size",
+            "Ctrl + R": "actual size"
+        }
+
+        self.add_bold_label(left_layout, "Keyboard Shortcuts")
+        for k, v in shortcuts.items():
+            left_layout.addRow(f"<b>{k}</b>", QLabel(v))
+
+        shortcuts = {
+            "Ctrl + 1": "view mode: overlaid",
+            "Ctrl + 2": "view mode: side by side",
+            "Ctrl + 3": "view mode: top-bottom",
             "[": "increase brush size",
             "]": "decrease brush size",
             "{": "increase brush hardness",
             "}": "decrease brush hardness"
         }
 
-        self.add_bold_label(left_layout, "Keyboard Shortcuts")
+        self.add_bold_label(right_layout, "Keyboard Shortcuts")
         for k, v in shortcuts.items():
-            left_layout.addRow(f"<b>{k}</b>", QLabel(v))
+            right_layout.addRow(f"<b>{k}</b>", QLabel(v))
 
         mouse_controls = {
             "Space + Drag": "pan",