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

shinestacker/retouch/image_viewer.py

@@ -1,465 +1,123 @@
-# pylint: disable=C0114, C0115, C0116, E0611, R0904, R0902, R0914, R0912
-import math
-from PySide6.QtWidgets import (QGraphicsView, QGraphicsScene, QGraphicsPixmapItem,
-                               QGraphicsEllipseItem)
-from PySide6.QtGui import QPixmap, QPainter, QColor, QPen, QBrush, QCursor
-from PySide6.QtCore import Qt, QRectF, QTime, QPoint, QPointF, Signal, QEvent
-from .. config.gui_constants import gui_constants
-from .brush_preview import BrushPreviewItem
-from .brush_gradient import create_default_brush_gradient
-from .layer_collection import LayerCollectionHandler
+# pylint: disable=C0114, C0115, C0116, E0611, R0904, R0902, R0914, R0912, R0913, R0917
+from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QWidget, QVBoxLayout
+from .image_view_status import ImageViewStatus
+from .overlaid_view import OverlaidView
+from .sidebyside_view import SideBySideView, TopBottomView
 
 
-class ImageViewer(QGraphicsView, LayerCollectionHandler):
-    temp_view_requested = Signal(bool)
-    brush_operation_started = Signal(QPoint)
-    brush_operation_continued = Signal(QPoint)
-    brush_operation_ended = Signal()
-    brush_size_change_requested = Signal(int)  # +1 or -1
-
+class ImageViewer(QWidget):
     def __init__(self, layer_collection, parent=None):
-        QGraphicsView.__init__(self, parent)
-        LayerCollectionHandler.__init__(self)
-        self.display_manager = None
-        self.layer_collection = layer_collection
-        self.brush = None
-        self.cursor_style = gui_constants.DEFAULT_CURSOR_STYLE
-        self.scene = QGraphicsScene(self)
-        self.setScene(self.scene)
-        self.pixmap_item = QGraphicsPixmapItem()
-        self.scene.addItem(self.pixmap_item)
-        self.pixmap_item.setPixmap(QPixmap())
-        self.scene.setBackgroundBrush(QBrush(QColor(120, 120, 120)))
-        self.zoom_factor = 1.0
-        self.min_scale = 0.0
-        self.max_scale = 0.0
-        self.last_mouse_pos = None
-        self.setRenderHint(QPainter.Antialiasing)
-        self.setRenderHint(QPainter.SmoothPixmapTransform)
-        self.setTransformationAnchor(QGraphicsView.AnchorUnderMouse)
-        self.setResizeAnchor(QGraphicsView.AnchorUnderMouse)
-        self.setDragMode(QGraphicsView.ScrollHandDrag)
-        self.brush_cursor = None
-        self.setMouseTracking(True)
-        self.space_pressed = False
-        self.control_pressed = False
-        self.setDragMode(QGraphicsView.NoDrag)
-        self.scrolling = False
-        self.dragging = False
-        self.last_update_time = QTime.currentTime()
-        self.set_layer_collection(layer_collection)
-        self.brush_preview = BrushPreviewItem(self.layer_collection)
-        self.scene.addItem(self.brush_preview)
-        self.empty = True
-        self.allow_cursor_preview = True
-        self.last_brush_pos = None
-        self.grabGesture(Qt.PanGesture)
-        self.grabGesture(Qt.PinchGesture)
-        self.pinch_start_scale = 1.0
-        self.last_scroll_pos = QPointF()
-        self.gesture_active = False
-        self.pinch_center_view = None
-        self.pinch_center_scene = None
-
-    def set_image(self, qimage):
-        pixmap = QPixmap.fromImage(qimage)
-        self.pixmap_item.setPixmap(pixmap)
-        self.setSceneRect(QRectF(pixmap.rect()))
-        img_width, img_height = pixmap.width(), pixmap.height()
-        self.min_scale = min(gui_constants.MIN_ZOOMED_IMG_WIDTH / img_width,
-                             gui_constants.MIN_ZOOMED_IMG_HEIGHT / img_height)
-        self.max_scale = gui_constants.MAX_ZOOMED_IMG_PX_SIZE
-        if self.zoom_factor == 1.0:
-            self.fitInView(self.pixmap_item, Qt.KeepAspectRatio)
-            self.zoom_factor = self.get_current_scale()
-            self.zoom_factor = max(self.min_scale, min(self.max_scale, self.zoom_factor))
-            self.resetTransform()
-            self.scale(self.zoom_factor, self.zoom_factor)
-        self.empty = False
-        self.setFocus()
-        self.activateWindow()
-        self.brush_preview.brush = self.brush
+        super().__init__(parent)
+        self.status = ImageViewStatus()
+        self._strategies = {
+            'overlaid': OverlaidView(layer_collection, self.status, self),
+            'sidebyside': SideBySideView(layer_collection, self.status, self),
+            'topbottom': TopBottomView(layer_collection, self.status, self)
+        }
+        for strategy in self._strategies.values():
+            strategy.hide()
+        self.strategy = self._strategies['overlaid']
+        self.layout = QVBoxLayout(self)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.strategy = self._strategies['overlaid']
+        self.layout.addWidget(self.strategy)
+        self.strategy.show()
+
+    def set_strategy(self, label):
+        new_strategy = self._strategies.get(label, None)
+        if new_strategy is None:
+            raise RuntimeError(f"View strategy {label} is invalid.")
+        self.layout.removeWidget(self.strategy)
+        self.strategy.hide()
+        self.strategy = new_strategy
+        self.layout.addWidget(self.strategy)
+        self.strategy.show()
+        self.strategy.resize(self.size())
+        if not self.strategy.empty():
+            self.strategy.update_master_display()
+            self.strategy.update_current_display()
+
+    def empty(self):
+        return self.strategy.empty()
+
+    def set_master_image_np(self, img):
+        self.strategy.set_master_image_np(img)
 
     def clear_image(self):
-        self.scene.clear()
-        self.pixmap_item = QGraphicsPixmapItem()
-        self.scene.addItem(self.pixmap_item)
-        self.zoom_factor = 1.0
-        self.setup_brush_cursor()
-        self.brush_preview = BrushPreviewItem(self.layer_collection)
-        self.scene.addItem(self.brush_preview)
-        self.setCursor(Qt.ArrowCursor)
-        self.brush_cursor.hide()
-        self.empty = True
-
-    # pylint: disable=C0103
-    def keyPressEvent(self, event):
-        if self.empty:
-            return
-        if event.key() == Qt.Key_Space and not self.scrolling:
-            self.space_pressed = True
-            self.setCursor(Qt.OpenHandCursor)
-            if self.brush_cursor:
-                self.brush_cursor.hide()
-        elif event.key() == Qt.Key_X:
-            self.temp_view_requested.emit(True)
-            self.update_brush_cursor()
-            return
-        if event.key() == Qt.Key_Control and not self.scrolling:
-            self.control_pressed = True
-        super().keyPressEvent(event)
+        for st in self._strategies.values():
+            st.clear_image()
 
-    def keyReleaseEvent(self, event):
-        if self.empty:
-            return
-        self.update_brush_cursor()
-        if event.key() == Qt.Key_Space:
-            self.space_pressed = False
-            if not self.scrolling:
-                self.setCursor(Qt.BlankCursor)
-                if self.brush_cursor:
-                    self.brush_cursor.show()
-        elif event.key() == Qt.Key_X:
-            self.temp_view_requested.emit(False)
-            return
-        if event.key() == Qt.Key_Control:
-            self.control_pressed = False
-        super().keyReleaseEvent(event)
+    def show_master(self):
+        self.strategy.show_master()
 
-    def mousePressEvent(self, event):
-        if self.empty:
-            return
-        if event.button() == Qt.LeftButton and self.layer_collection.has_master_layer():
-            if self.space_pressed:
-                self.scrolling = True
-                self.last_mouse_pos = event.position()
-                self.setCursor(Qt.ClosedHandCursor)
-                if self.brush_cursor:
-                    self.brush_cursor.hide()
-            else:
-                self.last_brush_pos = event.position()
-                self.brush_operation_started.emit(event.position().toPoint())
-                self.dragging = True
-                if self.brush_cursor:
-                    self.brush_cursor.show()
-        super().mousePressEvent(event)
+    def show_current(self):
+        self.strategy.show_current()
 
-    def mouseMoveEvent(self, event):
-        if self.empty:
-            return
-        position = event.position()
-        brush_size = self.brush.size
-        if not self.space_pressed:
-            self.update_brush_cursor()
-        if self.dragging and event.buttons() & Qt.LeftButton:
-            current_time = QTime.currentTime()
-            if self.last_update_time.msecsTo(current_time) >= gui_constants.PAINT_REFRESH_TIMER:
-                min_step = brush_size * \
-                    gui_constants.MIN_MOUSE_STEP_BRUSH_FRACTION * self.zoom_factor
-                x, y = position.x(), position.y()
-                xp, yp = self.last_brush_pos.x(), self.last_brush_pos.y()
-                distance = math.sqrt((x - xp)**2 + (y - yp)**2)
-                n_steps = int(float(distance) / min_step)
-                if n_steps > 0:
-                    delta_x = (position.x() - self.last_brush_pos.x()) / n_steps
-                    delta_y = (position.y() - self.last_brush_pos.y()) / n_steps
-                    for i in range(0, n_steps + 1):
-                        pos = QPoint(self.last_brush_pos.x() + i * delta_x,
-                                     self.last_brush_pos.y() + i * delta_y)
-                        self.brush_operation_continued.emit(pos)
-                    self.last_brush_pos = position
-                self.last_update_time = current_time
-        if self.scrolling and event.buttons() & Qt.LeftButton:
-            if self.space_pressed:
-                self.setCursor(Qt.ClosedHandCursor)
-                if self.brush_cursor:
-                    self.brush_cursor.hide()
-            delta = position - self.last_mouse_pos
-            self.last_mouse_pos = position
-            self.horizontalScrollBar().setValue(self.horizontalScrollBar().value() - delta.x())
-            self.verticalScrollBar().setValue(self.verticalScrollBar().value() - delta.y())
-        else:
-            super().mouseMoveEvent(event)
+    def update_master_display(self):
+        self.strategy.update_master_display()
 
-    def mouseReleaseEvent(self, event):
-        if self.empty:
-            return
-        if self.space_pressed:
-            self.setCursor(Qt.OpenHandCursor)
-            if self.brush_cursor:
-                self.brush_cursor.hide()
-        else:
-            self.setCursor(Qt.BlankCursor)
-            if self.brush_cursor:
-                self.brush_cursor.show()
-        if event.button() == Qt.LeftButton:
-            if self.scrolling:
-                self.scrolling = False
-                self.last_mouse_pos = None
-            elif hasattr(self, 'dragging') and self.dragging:
-                self.dragging = False
-                self.brush_operation_ended.emit()
-        super().mouseReleaseEvent(event)
+    def update_current_display(self):
+        self.strategy.update_current_display()
 
-    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.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.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.horizontalScrollBar().setValue(
-                        self.horizontalScrollBar().value() - delta.x()
-                    )
-                    self.verticalScrollBar().setValue(
-                        self.verticalScrollBar().value() - 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)
+    def update_brush_cursor(self):
+        self.strategy.update_brush_cursor()
 
-    def leaveEvent(self, event):
-        if not self.empty:
-            self.setCursor(Qt.ArrowCursor)
-            if self.brush_cursor:
-                self.brush_cursor.hide()
-        super().leaveEvent(event)
-    # pylint: enable=C0103
+    def refresh_display(self):
+        self.strategy.refresh_display()
 
-    def event(self, event):
-        if event.type() == QEvent.Gesture:
-            return self.handle_gesture_event(event)
-        return super().event(event)
+    def set_brush(self, brush):
+        for st in self._strategies.values():
+            st.set_brush(brush)
 
-    def handle_gesture_event(self, event):
-        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 set_preview_brush(self, brush):
+        for st in self._strategies.values():
+            st.set_preview_brush(brush)
 
-    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()
-            zoom_factor = self.get_current_scale()
-            scaled_delta = delta * (1.0 / zoom_factor)
-            self.horizontalScrollBar().setValue(
-                self.horizontalScrollBar().value() - int(scaled_delta.x())
-            )
-            self.verticalScrollBar().setValue(
-                self.verticalScrollBar().value() - int(scaled_delta.y())
-            )
-        elif pan_gesture.state() == Qt.GestureFinished:
-            self.gesture_active = False
+    def set_display_manager(self, dm):
+        for st in self._strategies.values():
+            st.set_display_manager(dm)
 
-    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.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
+    def set_allow_cursor_preview(self, state):
+        self.strategy.set_allow_cursor_preview(state)
 
     def setup_brush_cursor(self):
-        self.setCursor(Qt.BlankCursor)
-        pen = QPen(QColor(*gui_constants.BRUSH_COLORS['pen']), 1)
-        brush = QBrush(QColor(*gui_constants.BRUSH_COLORS['cursor_inner']))
-        for item in self.scene.items():
-            if isinstance(item, QGraphicsEllipseItem):
-                self.scene.removeItem(item)
-        self.brush_cursor = self.scene.addEllipse(
-            0, 0, self.brush.size, self.brush.size, pen, brush)
-        self.brush_cursor.setZValue(1000)
-        self.brush_cursor.hide()
-
-    def update_brush_cursor(self):
-        if self.empty:
-            return
-        if not self.brush_cursor or not self.isVisible():
-            return
-        size = self.brush.size
-        mouse_pos = self.mapFromGlobal(QCursor.pos())
-        if not self.rect().contains(mouse_pos):
-            self.brush_cursor.hide()
-            return
-        scene_pos = self.mapToScene(mouse_pos)
-        center_x = scene_pos.x()
-        center_y = scene_pos.y()
-        radius = size / 2
-        self.brush_cursor.setRect(center_x - radius, center_y - radius, size, size)
-        allow_cursor_preview = self.display_manager.allow_cursor_preview()
-        if self.cursor_style == 'preview' and allow_cursor_preview:
-            self._setup_outline_style()
-            self.brush_cursor.hide()
-            pos = QCursor.pos()
-            if isinstance(pos, QPointF):
-                scene_pos = pos
-            else:
-                cursor_pos = self.mapFromGlobal(pos)
-                scene_pos = self.mapToScene(cursor_pos)
-            self.brush_preview.update(scene_pos, int(size))
-        else:
-            self.brush_preview.hide()
-            if self.cursor_style == 'outline' or not allow_cursor_preview:
-                self._setup_outline_style()
-            else:
-                self._setup_simple_brush_style(center_x, center_y, radius)
-        if not self.brush_cursor.isVisible():
-            self.brush_cursor.show()
-
-    def _setup_outline_style(self):
-        self.brush_cursor.setPen(QPen(QColor(*gui_constants.BRUSH_COLORS['pen']),
-                                      gui_constants.BRUSH_LINE_WIDTH / self.zoom_factor))
-        self.brush_cursor.setBrush(Qt.NoBrush)
-
-    def _setup_simple_brush_style(self, center_x, center_y, radius):
-        gradient = create_default_brush_gradient(center_x, center_y, radius, self.brush)
-        self.brush_cursor.setPen(QPen(QColor(*gui_constants.BRUSH_COLORS['pen']),
-                                      gui_constants.BRUSH_LINE_WIDTH / self.zoom_factor))
-        self.brush_cursor.setBrush(QBrush(gradient))
+        self.strategy.setup_brush_cursor()
 
     def zoom_in(self):
-        if self.empty:
-            return
-        current_scale = self.get_current_scale()
-        new_scale = current_scale * gui_constants.ZOOM_IN_FACTOR
-        if new_scale <= self.max_scale:
-            self.scale(gui_constants.ZOOM_IN_FACTOR, gui_constants.ZOOM_IN_FACTOR)
-            self.zoom_factor = new_scale
-            self.update_brush_cursor()
+        self.strategy.zoom_in()
 
     def zoom_out(self):
-        if self.empty:
-            return
-        current_scale = self.get_current_scale()
-        new_scale = current_scale * gui_constants.ZOOM_OUT_FACTOR
-        if new_scale >= self.min_scale:
-            self.scale(gui_constants.ZOOM_OUT_FACTOR, gui_constants.ZOOM_OUT_FACTOR)
-            self.zoom_factor = new_scale
-            self.update_brush_cursor()
+        self.strategy.zoom_out()
 
     def reset_zoom(self):
-        if self.empty:
-            return
-        self.pinch_start_scale = 1.0
-        self.last_scroll_pos = QPointF()
-        self.gesture_active = False
-        self.pinch_center_view = None
-        self.pinch_center_scene = None
-        self.fitInView(self.pixmap_item, Qt.KeepAspectRatio)
-        self.zoom_factor = self.get_current_scale()
-        self.zoom_factor = max(self.min_scale, min(self.max_scale, self.zoom_factor))
-        self.resetTransform()
-        self.scale(self.zoom_factor, self.zoom_factor)
-        self.update_brush_cursor()
+        self.strategy.reset_zoom()
 
     def actual_size(self):
-        if self.empty:
-            return
-        self.zoom_factor = max(self.min_scale, min(self.max_scale, 1.0))
-        self.resetTransform()
-        self.scale(self.zoom_factor, self.zoom_factor)
-        self.update_brush_cursor()
+        self.strategy.actual_size()
 
     def get_current_scale(self):
-        return self.transform().m11()
+        return self.strategy.get_current_scale()
 
-    def get_view_state(self):
-        return {
-            'zoom': self.zoom_factor,
-            'h_scroll': self.horizontalScrollBar().value(),
-            'v_scroll': self.verticalScrollBar().value()
-        }
-
-    def set_view_state(self, state):
-        if state:
-            self.resetTransform()
-            self.scale(state['zoom'], state['zoom'])
-            self.horizontalScrollBar().setValue(state['h_scroll'])
-            self.verticalScrollBar().setValue(state['v_scroll'])
-            self.zoom_factor = state['zoom']
+    def get_cursor_style(self):
+        return self.strategy.get_cursor_style()
 
     def set_cursor_style(self, style):
-        self.cursor_style = style
-        if self.brush_cursor:
-            self.update_brush_cursor()
+        self.strategy.set_cursor_style(style)
 
     def position_on_image(self, pos):
-        scene_pos = self.mapToScene(pos)
-        item_pos = self.pixmap_item.mapFromScene(scene_pos)
-        return item_pos
-
-    def get_visible_image_region(self):
-        if self.empty:
-            return None
-        view_rect = self.viewport().rect()
-        scene_rect = self.mapToScene(view_rect).boundingRect()
-        image_rect = self.pixmap_item.mapFromScene(scene_rect).boundingRect()
-        image_rect = image_rect.intersected(self.pixmap_item.boundingRect().toRect())
-        return image_rect
+        return self.strategy.position_on_image(pos)
 
     def get_visible_image_portion(self):
-        if self.has_no_master_layer():
-            return None
-        visible_rect = self.get_visible_image_region()
-        if not visible_rect:
-            return self.master_layer()
-        x, y = int(visible_rect.x()), int(visible_rect.y())
-        w, h = int(visible_rect.width()), int(visible_rect.height())
-        master_img = self.master_layer()
-        return master_img[y:y + h, x:x + w], (x, y, w, h)
+        return self.strategy.get_visible_image_portion()
+
+    def connect_signals(
+            self, handle_temp_view, begin_copy_brush_area, continue_copy_brush_area,
+            end_copy_brush_area, handle_brush_size_change):
+        for st in self._strategies.values():
+            st.temp_view_requested.connect(handle_temp_view)
+            st.brush_operation_started.connect(begin_copy_brush_area)
+            st.brush_operation_continued.connect(continue_copy_brush_area)
+            st.brush_operation_ended.connect(end_copy_brush_area)
+            st.brush_size_change_requested.connect(handle_brush_size_change)
+            st.setFocusPolicy(Qt.StrongFocus)

shinestacker/retouch/io_gui_handler.py

@@ -16,6 +16,7 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
     update_title_requested = Signal()
     mark_as_modified_requested = Signal(bool)
     change_layer_requested = Signal(int)
+    add_recent_file_requested = Signal(str)
 
     def __init__(self, layer_collection, undo_manager, parent):
         QObject.__init__(self, parent)
@@ -54,9 +55,13 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         else:
             self.set_layer_labels(labels)
         self.set_master_layer(master_layer)
+        self.image_viewer.set_master_image_np(master_layer)
+        self.image_viewer.show_master()
+        self.image_viewer.update_master_display()
         self.undo_manager.reset()
         self.blank_layer = np.zeros(master_layer.shape[:2])
         self.finish_loading_setup(f"Loaded: {self.current_file_path()}")
+        self.image_viewer.reset_zoom()
 
     def on_file_error(self, error_msg):
         QApplication.restoreOverrideCursor()
@@ -75,6 +80,7 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         self.saving_dialog.deleteLater()
         self.mark_as_modified_requested.emit(False)
         self.update_title_requested.emit()
+        self.add_recent_file_requested.emit(self.current_file_path_multi)
         self.status_message_requested.emit(f"Saved multilayer to: {self.current_file_path_multi}")
 
     def on_multilayer_save_error(self, error_msg):
@@ -126,6 +132,7 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         self.status_message_requested.emit("Imported selected frames")
 
     def import_frames_from_files(self, file_paths):
+        empty_viewer = self.image_viewer.empty()
         try:
             stack, labels, master = self.io_manager.import_frames(file_paths)
         except Exception as e:
@@ -135,6 +142,7 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             msg.setText(str(e))
             msg.exec()
             return
+        self.image_viewer.set_master_image_np(master)
         if self.layer_stack() is None and len(stack) > 0:
             self.set_layer_stack(np.array(stack))
             if labels is None:
@@ -150,15 +158,17 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
                 self.add_layer_label(label)
                 self.add_layer(img)
         self.finish_loading_setup("Selected frames imported")
+        if empty_viewer:
+            self.image_viewer.reset_zoom()
 
     def finish_loading_setup(self, message):
         self.display_manager.update_thumbnails()
         self.mark_as_modified_requested.emit(True)
         self.change_layer_requested.emit(0)
         self.image_viewer.setup_brush_cursor()
-        self.image_viewer.reset_zoom()
         self.status_message_requested.emit(message)
         self.update_title_requested.emit()
+        self.add_recent_file_requested.emit(self.current_file_path_master)
 
     def save_file(self):
         if self.save_master_only.isChecked():
@@ -218,7 +228,6 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             self.saving_timer.timeout.connect(self.saving_dialog.show)
             self.saving_timer.start(100)
             self.saver_thread.start()
-
         except Exception as e:
             traceback.print_tb(e.__traceback__)
             QMessageBox.critical(self.parent(), "Save Error", f"Could not save file: {str(e)}")
@@ -247,6 +256,7 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             self.mark_as_modified_requested.emit(False)
             self.update_title_requested.emit()
             self.status_message_requested.emit(f"Saved master layer to: {path}")
+            self.add_recent_file_requested.emit(self.current_file_path_master)
         except Exception as e:
             traceback.print_tb(e.__traceback__)
             QMessageBox.critical(self.parent(), "Save Error", f"Could not save file: {str(e)}")