shinestacker 1.5.4__py3-none-any.whl → 1.6.1__py3-none-any.whl

shinestacker/retouch/image_view_status.py

@@ -1,9 +1,11 @@
 # pylint: disable=C0114, C0115, C0116, E0611, R0902
-from PySide6.QtCore import QObject, QRectF
+from PySide6.QtCore import QObject, QRectF, Signal
 from PySide6.QtGui import QPixmap
 
 
 class ImageViewStatus(QObject):
+    set_zoom_factor_requested = Signal(float)
+
     def __init__(self, parent=None):
         super().__init__(parent)
         self.pixmap_master = QPixmap()
@@ -53,6 +55,7 @@ class ImageViewStatus(QObject):
 
     def set_zoom_factor(self, zoom_factor):
         self.zoom_factor = zoom_factor
+        self.set_zoom_factor_requested.emit(zoom_factor)
 
     def set_min_scale(self, min_scale):
         self.min_scale = min_scale

shinestacker/retouch/image_viewer.py

@@ -7,13 +7,16 @@ from .sidebyside_view import SideBySideView, TopBottomView
 
 
 class ImageViewer(QWidget):
-    def __init__(self, layer_collection, parent=None):
+    def __init__(self, layer_collection, brush_tool, paint_area_manager, parent=None):
         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)
+            'overlaid':
+                OverlaidView(layer_collection, self.status, brush_tool, paint_area_manager, self),
+            'sidebyside':
+                SideBySideView(layer_collection, self.status, brush_tool, paint_area_manager, self),
+            'topbottom':
+                TopBottomView(layer_collection, self.status, brush_tool, paint_area_manager, self)
         }
         for strategy in self._strategies.values():
             strategy.hide()
@@ -48,12 +51,18 @@ class ImageViewer(QWidget):
     def set_master_image_np(self, img):
         self.strategy.set_master_image_np(img)
 
+    def arrange_images(self):
+        self.strategy.arrange_images()
+
     def show_master(self):
         self.strategy.show_master()
 
     def show_current(self):
         self.strategy.show_current()
 
+    def update_master_display_area(self):
+        self.strategy.update_master_display_area()
+
     def update_master_display(self):
         self.strategy.update_master_display()
 
@@ -122,12 +131,11 @@ class ImageViewer(QWidget):
             st.set_cursor_style(style)
 
     def connect_signals(
-            self, handle_temp_view, begin_copy_brush_area, continue_copy_brush_area,
-            end_copy_brush_area, handle_brush_size_change):
+            self, handle_temp_view, end_copy_brush_area,
+            handle_brush_size_change, handle_needs_update):
         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.end_copy_brush_area_requested.connect(end_copy_brush_area)
             st.brush_size_change_requested.connect(handle_brush_size_change)
+            st.needs_update_requested.connect(handle_needs_update)
             st.setFocusPolicy(Qt.StrongFocus)

shinestacker/retouch/io_gui_handler.py

@@ -1,13 +1,16 @@
-# pylint: disable=C0114, C0115, C0116, E0611, R0902, W0718
+# pylint: disable=C0114, C0115, C0116, E0611, R0902, W0718, R0904, E1101
 import os
 import traceback
 import numpy as np
-from PySide6.QtWidgets import QFileDialog, QMessageBox, QVBoxLayout, QLabel, QDialog, QApplication
+import cv2
+from PySide6.QtWidgets import (QFileDialog, QMessageBox, QVBoxLayout, QLabel, QDialog,
+                               QApplication, QProgressBar)
 from PySide6.QtGui import QGuiApplication, QCursor
 from PySide6.QtCore import Qt, QObject, QTimer, Signal
+from .. algorithms.exif import get_exif, write_image_with_exif_data
 from .file_loader import FileLoader
 from .exif_data import ExifData
-from .io_manager import IOManager, FileMultilayerSaver
+from .io_threads import FileMultilayerSaver, FrameImporter
 from .layer_collection import LayerCollectionHandler
 
 
@@ -22,13 +25,11 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
     def __init__(self, layer_collection, undo_manager, parent):
         QObject.__init__(self, parent)
         LayerCollectionHandler.__init__(self)
-        self.io_manager = IOManager(layer_collection)
         self.undo_manager = undo_manager
         self.set_layer_collection(layer_collection)
         self.loader_thread = None
         self.display_manager = None
         self.image_viewer = None
-        self.blank_layer = None
         self.loading_dialog = None
         self.loading_timer = None
         self.exif_dialog = None
@@ -37,6 +38,13 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         self.saving_timer = None
         self.current_file_path_master = ''
         self.current_file_path_multi = ''
+        self.frame_importer_thread = None
+        self.frame_loading_dialog = None
+        self.frame_loading_timer = None
+        self.progress_label = None
+        self.progress_bar = None
+        self.exif_data = None
+        self.exif_path = ''
 
     def current_file_path(self):
         return self.current_file_path_master if self.save_master_only.isChecked() \
@@ -57,8 +65,8 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             self.set_layer_labels(labels)
         self.set_master_layer(master_layer)
         self.image_viewer.set_master_image_np(master_layer)
+        self.set_blank_layer()
         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()
 
@@ -72,7 +80,40 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         self.current_file_path_multi = ''
         self.status_message_requested.emit(f"Error loading: {self.current_file_path()}")
 
-    def on_multilayer_save_success(self):
+    def on_frames_imported(self, stack, labels, master):
+        QApplication.restoreOverrideCursor()
+        self.frame_loading_timer.stop()
+        self.frame_loading_dialog.hide()
+        self.frame_loading_dialog.deleteLater()
+        empty_viewer = self.image_viewer.empty()
+        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:
+                labels = self.layer_labels()
+            else:
+                self.set_layer_labels(labels)
+            self.set_master_layer(master)
+            self.set_blank_layer()
+        else:
+            if labels is None:
+                labels = self.layer_labels()
+            for img, label in zip(stack, labels):
+                self.add_layer_label(label)
+                self.add_layer(img)
+        self.finish_loading_setup("Selected frames imported")
+        if empty_viewer:
+            self.image_viewer.update_master_display()
+
+    def on_frames_import_error(self, error_msg):
+        QApplication.restoreOverrideCursor()
+        self.frame_loading_timer.stop()
+        self.frame_loading_dialog.hide()
+        self.frame_loading_dialog.deleteLater()
+        QMessageBox.critical(self.parent(), "Import Error", error_msg)
+        self.status_message_requested.emit("Error importing frames")
+
+    def on_multilayer_saved(self):
         QApplication.restoreOverrideCursor()
         self.saving_timer.stop()
         self.saving_dialog.hide()
@@ -90,6 +131,7 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         QMessageBox.critical(self.parent(), "Save Error", f"Could not save file: {error_msg}")
 
     def open_file(self, file_paths=None):
+        self.cleanup_old_threads()
         if file_paths is None:
             file_paths, _ = QFileDialog.getOpenFileNames(
                 self.parent(), "Open Image", "",
@@ -128,37 +170,37 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             "Images Images (*.tif *.tiff *.jpg *.jpeg);;All Files (*)")
         if file_paths:
             self.import_frames_from_files(file_paths)
-        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:
-            msg = QMessageBox()
-            msg.setIcon(QMessageBox.Critical)
-            msg.setWindowTitle("Import error")
-            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:
-                labels = self.layer_labels()
-            else:
-                self.set_layer_labels(labels)
-            self.set_master_layer(master)
-            self.blank_layer = np.zeros(master.shape[:2])
-        else:
-            if labels is None:
-                labels = self.layer_labels()
-            for img, label in zip(stack, labels):
-                self.add_layer_label(label)
-                self.add_layer(img)
-        self.finish_loading_setup("Selected frames imported")
-        if empty_viewer:
-            self.image_viewer.reset_zoom()
+        self.cleanup_old_threads()
+        QGuiApplication.setOverrideCursor(QCursor(Qt.BusyCursor))
+        self.frame_loading_dialog = QDialog(self.parent())
+        self.frame_loading_dialog.setWindowTitle("Loading Frames")
+        self.frame_loading_dialog.setWindowFlags(Qt.Window | Qt.FramelessWindowHint)
+        self.frame_loading_dialog.setModal(True)
+        layout = QVBoxLayout()
+        self.progress_label = QLabel("Frames loading...")
+        layout.addWidget(self.progress_label)
+        self.progress_bar = QProgressBar()
+        self.progress_bar.setRange(0, 100)
+        self.progress_bar.setValue(0)
+        layout.addWidget(self.progress_bar)
+        self.frame_loading_dialog.setLayout(layout)
+        self.frame_loading_timer = QTimer()
+        self.frame_loading_timer.setSingleShot(True)
+        self.frame_loading_timer.timeout.connect(self.frame_loading_dialog.show)
+        self.frame_loading_timer.start(100)
+        self.frame_importer_thread = FrameImporter(file_paths, self.master_layer())
+        self.frame_importer_thread.finished.connect(self.on_frames_imported)
+        self.frame_importer_thread.error.connect(self.on_frames_import_error)
+        self.frame_importer_thread.progress.connect(self.update_import_progress)
+        self.frame_importer_thread.start()
+
+    def update_import_progress(self, percent, filename):
+        if hasattr(self, 'progress_bar'):
+            self.progress_bar.setValue(percent)
+        if hasattr(self, 'progress_label'):
+            self.progress_label.setText(f"Loading: {filename} ({percent}%)")
 
     def finish_loading_setup(self, message):
         self.display_manager.update_thumbnails()
@@ -203,6 +245,7 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             self.save_multilayer_to_path(path)
 
     def save_multilayer_to_path(self, path):
+        self.cleanup_old_threads()
         try:
             master_layer = {'Master': self.master_layer().copy()}
             individual_layers = dict(zip(
@@ -211,8 +254,8 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             ))
             images_dict = {**master_layer, **individual_layers}
             self.saver_thread = FileMultilayerSaver(
-                images_dict, path, exif_path=self.io_manager.exif_path)
-            self.saver_thread.finished.connect(self.on_multilayer_save_success)
+                images_dict, path, exif_path=self.exif_path)
+            self.saver_thread.finished.connect(self.on_multilayer_saved)
             self.saver_thread.error.connect(self.on_multilayer_save_error)
             QGuiApplication.setOverrideCursor(QCursor(Qt.BusyCursor))
             self.saving_dialog = QDialog(self.parent())
@@ -250,12 +293,13 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
 
     def save_master_to_path(self, path):
         try:
-            self.io_manager.save_master(path)
+            img = cv2.cvtColor(self.master_layer(), cv2.COLOR_RGB2BGR)
+            write_image_with_exif_data(self.exif_data, img, path)
             self.current_file_path_master = os.path.abspath(path)
-            self.mark_as_modified_requested.emit(False)
+            # 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)
+            self.status_message_requested.emit(f"Saved master layer to: {path}")
         except Exception as e:
             traceback.print_tb(e.__traceback__)
             QMessageBox.critical(self.parent(), "Save Error", f"Could not save file: {str(e)}")
@@ -263,14 +307,14 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
     def select_exif_path(self):
         path, _ = QFileDialog.getOpenFileName(None, "Select file with exif data")
         if path:
-            self.io_manager.set_exif_data(path)
+            self.exif_path = path
+            self.exif_data = get_exif(path)
             self.status_message_requested.emit(f"EXIF data extracted from {path}.")
-        self.exif_dialog = ExifData(self.io_manager.exif_data, self.parent())
+        self.exif_dialog = ExifData(self.exif_data, self.parent())
         self.exif_dialog.exec()
 
     def close_file(self):
         self.mark_as_modified_requested.emit(False)
-        self.blank_layer = None
         self.layer_collection.reset()
         self.current_file_path_master = ''
         self.current_file_path_multi = ''
@@ -281,3 +325,11 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         self.update_title_requested.emit()
         self.set_enabled_file_open_close_actions_requested.emit(False)
         self.status_message_requested.emit("File closed")
+
+    def cleanup_old_threads(self):
+        if self.loader_thread and self.loader_thread.isFinished():
+            self.loader_thread = None
+        if self.frame_importer_thread and self.frame_importer_thread.isFinished():
+            self.frame_importer_thread = None
+        if self.saver_thread and self.saver_thread.isFinished():
+            self.saver_thread = None

shinestacker/retouch/io_threads.py

@@ -0,0 +1,78 @@
+# pylint: disable=C0114, C0115, C0116, E0611, E1101, W0718, R0903, R0914
+
+# import time
+import os
+import traceback
+import cv2
+from PySide6.QtCore import QThread, Signal
+from .. algorithms.utils import read_img, validate_image, get_img_metadata
+from .. algorithms.multilayer import write_multilayer_tiff_from_images
+
+
+class FileMultilayerSaver(QThread):
+    finished = Signal()
+    error = Signal(str)
+
+    def __init__(self, images_dict, path, exif_path=None):
+        super().__init__()
+        self.images_dict = images_dict
+        self.path = path
+        self.exif_path = exif_path
+
+    def run(self):
+        try:
+            write_multilayer_tiff_from_images(
+                self.images_dict, self.path, exif_path=self.exif_path)
+            self.finished.emit()
+        except Exception as e:
+            traceback.print_tb(e.__traceback__)
+            self.error.emit(str(e))
+
+
+class FrameImporter(QThread):
+    finished = Signal(object, object, object)
+    error = Signal(str)
+    progress = Signal(int, str)
+
+    def __init__(self, file_paths, master_layer):
+        super().__init__()
+        self.file_paths = file_paths
+        self.master_layer = master_layer
+
+    def run(self):
+        try:
+            stack = []
+            labels = []
+            master = None
+            current_master = self.master_layer
+            shape, dtype = None, None
+            if current_master is not None:
+                shape, dtype = get_img_metadata(current_master)
+            total_files = len(self.file_paths)
+            for i, path in enumerate(self.file_paths):
+                progress_percent = int((i / total_files) * 100)
+                self.progress.emit(progress_percent, os.path.basename(path))
+                try:
+                    label = path.split("/")[-1].split(".")[0]
+                    img = cv2.cvtColor(read_img(path), cv2.COLOR_BGR2RGB)
+                    if shape is not None and dtype is not None:
+                        validate_image(img, shape, dtype)
+                    else:
+                        shape, dtype = get_img_metadata(img)
+                    label_x = label
+                    counter = 0
+                    while label_x in labels:
+                        counter += 1
+                        label_x = f"{label} ({counter})"
+                    labels.append(label_x)
+                    stack.append(img)
+                    if master is None:
+                        master = img.copy()
+                    # Add delay for testing
+                    # time.sleep(0.2)
+                except Exception as e:
+                    raise RuntimeError(f"Error loading file: {path}.\n{str(e)}") from e
+            self.progress.emit(100, "Complete")
+            self.finished.emit(stack, labels, master)
+        except Exception as e:
+            self.error.emit(str(e))

shinestacker/retouch/layer_collection.py

@@ -7,6 +7,7 @@ class LayerCollection:
         self.master_layer = None
         self.master_layer_copy = None
         self.layer_stack = None
+        self.blank_layer = None
         self.layer_labels = []
         self.current_layer_idx = 0
         self.sorted_indices = None
@@ -15,6 +16,7 @@ class LayerCollection:
         self.master_layer = None
         self.master_layer_copy = None
         self.layer_stack = None
+        self.blank_layer = None
         self.layer_labels = []
         self.current_layer_idx = 0
         self.sorted_indices = None
@@ -62,6 +64,10 @@ class LayerCollection:
     def set_master_layer(self, img):
         self.master_layer = img
 
+    def set_blank_layer(self):
+        if self.master_layer is not None:
+            self.blank_layer = np.zeros(self.master_layer.shape[:2])
+
     def restore_master_layer(self):
         self.master_layer = self.master_layer_copy.copy()
 
@@ -122,6 +128,9 @@ class LayerCollectionHandler:
     def current_layer(self):
         return self.layer_collection.current_layer()
 
+    def blank_layer(self):
+        return self.layer_collection.blank_layer
+
     def layer_stack(self):
         return self.layer_collection.layer_stack
 
@@ -152,6 +161,9 @@ class LayerCollectionHandler:
     def set_master_layer(self, img):
         self.layer_collection.set_master_layer(img)
 
+    def set_blank_layer(self):
+        self.layer_collection.set_blank_layer()
+
     def add_layer_label(self, label):
         self.layer_collection.add_layer_label(label)
 

shinestacker/retouch/overlaid_view.py

@@ -1,11 +1,11 @@
-# pylint: disable=C0114, C0115, C0116, E0611, E1101, R0904, R0912, R0914, R0902, E0202
+# pylint: disable=C0114, C0115, C0116, E0611, E1101, R0904, R0912, R0914, R0902, E0202, R0913, R0917
 from PySide6.QtCore import Qt, QPointF, QEvent, QRectF
 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)
+    def __init__(self, layer_collection, status, brush_tool, paint_area_manager, parent):
+        ViewStrategy.__init__(self, layer_collection, status, brush_tool, paint_area_manager)
         ImageGraphicsViewBase.__init__(self, parent)
         self.scene = self.create_scene(self)
         self.create_pixmaps()
@@ -121,6 +121,7 @@ class OverlaidView(ViewStrategy, ImageGraphicsViewBase, ViewSignals):
         self.pixmap_item_master.setVisible(True)
         self.pixmap_item_current.setVisible(False)
         self.show_brush_preview()
+        self.enable_paint = True
         if self.brush_cursor:
             self.scene.removeItem(self.brush_cursor)
             self.brush_cursor = self.create_circle(self.scene)
@@ -130,21 +131,28 @@ class OverlaidView(ViewStrategy, ImageGraphicsViewBase, ViewSignals):
         self.pixmap_item_master.setVisible(False)
         self.pixmap_item_current.setVisible(True)
         self.hide_brush_preview()
+        self.enable_paint = False
         if self.brush_cursor:
             self.scene.removeItem(self.brush_cursor)
             self.brush_cursor = self.create_alt_circle(self.scene)
             self.update_brush_cursor()
 
+    def master_is_visible(self):
+        return self.pixmap_item_master.isVisible()
+
+    def current_is_visible(self):
+        return self.pixmap_item_current.isVisible()
+
     def arrange_images(self):
         if self.empty():
             return
-        if self.pixmap_item_master.isVisible():
+        if self.master_is_visible():
             pixmap = self.pixmap_item_master.pixmap()
             if not pixmap.isNull():
                 self.setSceneRect(QRectF(pixmap.rect()))
                 self.centerOn(self.pixmap_item_master)
                 self.center_image(self)
-        elif self.pixmap_item_current.isVisible():
+        elif self.current_is_visible():
             pixmap = self.pixmap_item_current.pixmap()
             if not pixmap.isNull():
                 self.setSceneRect(QRectF(pixmap.rect()))

shinestacker/retouch/paint_area_manager.py

@@ -0,0 +1,30 @@
+# pylint: disable=C0114, C0115, C0116
+from .. config.gui_constants import gui_constants
+
+
+class PaintAreaManager:
+    def __init__(self):
+        self.x_start = None
+        self.y_start = None
+        self.x_end = None
+        self.y_end = None
+        self.reset()
+
+    def reset(self):
+        self.x_end = self.y_end = 0
+        self.x_start = self.y_start = gui_constants.MAX_UNDO_SIZE
+
+    def extend(self, x_start, y_start, x_end, y_end):
+        self.x_start = min(self.x_start, x_start)
+        self.y_start = min(self.y_start, y_start)
+        self.x_end = max(self.x_end, x_end)
+        self.y_end = max(self.y_end, y_end)
+
+    def area(self):
+        return self.x_start, self.y_start, self.x_end, self.y_end
+
+    def set_area(self, x_start, y_start, x_end, y_end):
+        self.x_start = x_start
+        self.y_start = y_start
+        self.x_end = x_end
+        self.y_end = y_end

shinestacker/retouch/sidebyside_view.py

@@ -1,4 +1,4 @@
-# pylint: disable=C0114, C0115, C0116, R0904, R0915, E0611, R0902, R0911, R0914, E1003
+# pylint: disable=C0114, C0115, C0116, R0904, R0915, E0611, R0902, R0911, R0914, E1003, R0913, R0917
 import time
 from PySide6.QtCore import Qt, Signal, QEvent, QRectF
 from PySide6.QtGui import QCursor
@@ -39,8 +39,8 @@ class ImageGraphicsView(ImageGraphicsViewBase):
 
 
 class DoubleViewBase(ViewStrategy, QWidget, ViewSignals):
-    def __init__(self, layer_collection, status, parent):
-        ViewStrategy.__init__(self, layer_collection, status)
+    def __init__(self, layer_collection, status, brush_tool, paint_area_manager, parent):
+        ViewStrategy.__init__(self, layer_collection, status, brush_tool, paint_area_manager)
         QWidget.__init__(self, parent)
         self.current_view = ImageGraphicsView(parent)
         self.master_view = ImageGraphicsView(parent)
@@ -61,6 +61,7 @@ class DoubleViewBase(ViewStrategy, QWidget, ViewSignals):
         self.master_view.setFocusPolicy(Qt.NoFocus)
         self.current_brush_cursor = None
         self.last_color_update_time_current = 0
+        self._updating_scrollbars = False
 
     def setup_layout(self):
         raise NotImplementedError("Subclasses must implement setup_layout")
@@ -78,14 +79,25 @@ class DoubleViewBase(ViewStrategy, QWidget, ViewSignals):
         self.master_view.mouse_moved.connect(self.handle_master_mouse_move)
         self.master_view.mouse_released.connect(self.handle_master_mouse_release)
         self.master_view.gesture_event.connect(self.handle_gesture_event)
+
+        def sync_scrollbars(source, target):
+            if not self._updating_scrollbars:
+                self._updating_scrollbars = True
+                target.setValue(source.value())
+                self._updating_scrollbars = False
+
         self.current_view.horizontalScrollBar().valueChanged.connect(
-            self.master_view.horizontalScrollBar().setValue)
+            lambda value: sync_scrollbars(self.current_view.horizontalScrollBar(),
+                                          self.master_view.horizontalScrollBar()))
         self.current_view.verticalScrollBar().valueChanged.connect(
-            self.master_view.verticalScrollBar().setValue)
+            lambda value: sync_scrollbars(self.current_view.verticalScrollBar(),
+                                          self.master_view.verticalScrollBar()))
         self.master_view.horizontalScrollBar().valueChanged.connect(
-            self.current_view.horizontalScrollBar().setValue)
+            lambda value: sync_scrollbars(self.master_view.horizontalScrollBar(),
+                                          self.current_view.horizontalScrollBar()))
         self.master_view.verticalScrollBar().valueChanged.connect(
-            self.current_view.verticalScrollBar().setValue)
+            lambda value: sync_scrollbars(self.master_view.verticalScrollBar(),
+                                          self.current_view.verticalScrollBar()))
         self.current_view.wheel_event.connect(self.handle_wheel_event)
         self.master_view.wheel_event.connect(self.handle_wheel_event)
         # pylint: disable=C0103, W0201
@@ -377,28 +389,32 @@ class DoubleViewBase(ViewStrategy, QWidget, ViewSignals):
     def set_master_image(self, qimage):
         self.status.set_master_image(qimage)
         pixmap = self.status.pixmap_master
-        self.master_view.setSceneRect(QRectF(pixmap.rect()))
+        pixmap_rect = QRectF(pixmap.rect())
+        self.pixmap_item_master.setPos(0, 0)
+        self.master_view.setSceneRect(pixmap_rect)
+        self.master_scene.setSceneRect(pixmap_rect)
         self.pixmap_item_master.setPixmap(pixmap)
-        img_width, img_height, scale_factor = self.setup_view_image(self.master_view, pixmap)
+        _img_width, _img_height, scale_factor = self.setup_view_image(self.master_view, pixmap)
         self.master_view.resetTransform()
         self.master_view.scale(scale_factor, scale_factor)
         self.master_view.centerOn(self.pixmap_item_master)
-        center = self.master_scene.sceneRect().center()
-        self.brush_preview.setPos(max(0, min(center.x(), img_width)),
-                                  max(0, min(center.y(), img_height)))
-        self.master_scene.setSceneRect(QRectF(self.pixmap_item_master.boundingRect()))
         self.center_image(self.master_view)
         self.update_cursor_pen_width()
 
     def set_current_image(self, qimage):
         self.status.set_current_image(qimage)
         pixmap = self.status.pixmap_current
-        self.current_scene.setSceneRect(QRectF(pixmap.rect()))
+        pixmap_rect = QRectF(pixmap.rect())
+        self.pixmap_item_current.setPos(0, 0)
+        self.current_view.setSceneRect(pixmap_rect)
+        self.current_scene.setSceneRect(pixmap_rect)
         self.pixmap_item_current.setPixmap(pixmap)
+        _img_width, _img_height, scale_factor = self.setup_view_image(self.current_view, pixmap)
         self.current_view.resetTransform()
-        self.master_view.scale(self.zoom_factor(), self.zoom_factor())
-        self.current_scene.setSceneRect(QRectF(self.pixmap_item_current.boundingRect()))
+        self.current_view.scale(scale_factor, scale_factor)
+        self.current_view.centerOn(self.pixmap_item_current)
         self.center_image(self.current_view)
+        self.update_cursor_pen_width()
 
     def arrange_images(self):
         if self.status.empty():

shinestacker/retouch/transformation_manager.py

@@ -16,8 +16,7 @@ class TransfromationManager(LayerCollectionHandler):
         if undoable:
             try:
                 undo = self.editor.undo_manager
-                undo.x_start, undo.x_stop = 0, 1
-                undo.y_start, undo.y_stop = 0, 1
+                undo.set_paint_area(0, 1, 0, 1)
                 undo.save_undo_state(self.editor.master_layer(), label)
             except Exception as e:
                 traceback.print_tb(e.__traceback__)
@@ -26,7 +25,6 @@ class TransfromationManager(LayerCollectionHandler):
         self.copy_master_layer()
         self.editor.image_viewer.update_master_display()
         self.editor.image_viewer.update_current_display()
-        self.editor.image_viewer.refresh_display()
         self.editor.display_manager.update_thumbnails()
         self.editor.mark_as_modified()