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

shinestacker/retouch/undo_manager.py

@@ -6,13 +6,10 @@ from .. config.gui_constants import gui_constants
 class UndoManager(QObject):
     stack_changed = Signal(bool, str, bool, str)
 
-    def __init__(self, transformation_manager):
+    def __init__(self, transformation_manager, paint_area_manager):
         super().__init__()
         self.transformation_manager = transformation_manager
-        self.x_start = None
-        self.y_start = None
-        self.x_end = None
-        self.y_end = None
+        self.paint_area_manager = paint_area_manager
         self.undo_stack = None
         self.redo_stack = None
         self.reset()
@@ -24,22 +21,25 @@ class UndoManager(QObject):
         self.stack_changed.emit(False, "", False, "")
 
     def reset_undo_area(self):
-        self.x_end = self.y_end = 0
-        self.x_start = self.y_start = gui_constants.MAX_UNDO_SIZE
+        self.paint_area_manager.reset()
 
     def extend_undo_area(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)
+        self.paint_area_manager.extend(x_start, y_start, x_end, y_end)
+
+    def paint_area(self):
+        return self.paint_area_manager.area()
+
+    def set_paint_area(self, x_start, y_start, x_end, y_end):
+        self.paint_area_manager.set_area(x_start, y_start, x_end, y_end)
 
     def save_undo_state(self, layer, description):
         if layer is None:
             return
         self.redo_stack = []
+        x_start, y_start, x_end, y_end = self.paint_area()
         undo_state = {
-            'master': layer[self.y_start:self.y_end, self.x_start:self.x_end],
-            'area': (self.x_start, self.y_start, self.x_end, self.y_end),
+            'master': layer[y_start:y_end, x_start:x_end].copy(),
+            'area': (x_start, y_start, x_end, y_end),
             'description': description
         }
         if len(self.undo_stack) >= gui_constants.MAX_UNDO_SIZE:
@@ -54,6 +54,7 @@ class UndoManager(QObject):
             return False
         undo_state = self.undo_stack.pop()
         x_start, y_start, x_end, y_end = undo_state['area']
+        self.set_paint_area(x_start, y_start, x_end, y_end)
         redo_state = {
             'master': layer[y_start:y_end, x_start:x_end].copy(),
             'area': (x_start, y_start, x_end, y_end),
@@ -80,6 +81,7 @@ class UndoManager(QObject):
             return False
         redo_state = self.redo_stack.pop()
         x_start, y_start, x_end, y_end = redo_state['area']
+        self.set_paint_area(x_start, y_start, x_end, y_end)
         undo_state = {
             'master': layer[y_start:y_end, x_start:x_end].copy(),
             'area': (x_start, y_start, x_end, y_end),

shinestacker/retouch/view_strategy.py

@@ -9,6 +9,7 @@ from PySide6.QtWidgets import (
     QGraphicsEllipseItem, QGraphicsView, QGraphicsScene, QGraphicsPixmapItem,
     QGraphicsItemGroup, QGraphicsPathItem)
 from .. config.gui_constants import gui_constants
+from .. config.app_config import AppConfig
 from .layer_collection import LayerCollectionHandler
 from .brush_gradient import create_default_brush_gradient
 from .brush_preview import BrushPreviewItem
@@ -78,10 +79,9 @@ class BrushCursor(QGraphicsItemGroup):
 
 class ViewSignals:
     temp_view_requested = Signal(bool)
-    brush_operation_started = Signal(QPoint)
-    brush_operation_continued = Signal(QPoint)
-    brush_operation_ended = Signal()
+    end_copy_brush_area_requested = Signal()
     brush_size_change_requested = Signal(int)  # +1 or -1
+    needs_update_requested = Signal()
 
 
 class ImageGraphicsViewBase(QGraphicsView):
@@ -102,9 +102,12 @@ class ImageGraphicsViewBase(QGraphicsView):
 
 
 class ViewStrategy(LayerCollectionHandler):
-    def __init__(self, layer_collection, status):
+    def __init__(self, layer_collection, status, brush_tool, paint_area_manager):
         LayerCollectionHandler.__init__(self, layer_collection)
         self.status = status
+        self.brush_tool = brush_tool
+        self.paint_area_manager = paint_area_manager
+        self.mask_layer = None
         self.brush = None
         self.brush_cursor = None
         self.brush_preview = BrushPreviewItem(layer_collection)
@@ -121,6 +124,8 @@ class ViewStrategy(LayerCollectionHandler):
         self.last_mouse_pos = None
         self.last_update_time = QTime.currentTime()
         self.last_color_update_time = 0
+        self.last_cursor_update_time = 0
+        self.enable_paint = True
 
     @abstractmethod
     def create_pixmaps(self):
@@ -245,6 +250,8 @@ class ViewStrategy(LayerCollectionHandler):
 
     def set_cursor_style(self, style):
         self.cursor_style = style
+        if style != 'simple' and self.brush_cursor:
+            self.brush_cursor.setBrush(Qt.NoBrush)
         if style == 'preview':
             self.show_brush_preview()
         self.update_brush_cursor()
@@ -270,6 +277,25 @@ class ViewStrategy(LayerCollectionHandler):
             view.verticalScrollBar().setValue(self.status.v_scroll)
             self.arrange_images()
 
+    def update_master_display_area(self):
+        if self.empty():
+            return
+        x_start, y_start, x_end, y_end = self.paint_area_manager.area()
+        dirty_region = self.master_layer()[y_start:y_end, x_start:x_end]
+        qimage = self.numpy_to_qimage(dirty_region)
+        if not qimage:
+            return
+        pixmap = QPixmap.fromImage(qimage)
+        master_pixmap_item = self.get_master_pixmap()
+        current_pixmap = master_pixmap_item.pixmap()
+        if current_pixmap.isNull():
+            self.update_master_display()
+            return
+        painter = QPainter(current_pixmap)
+        painter.drawPixmap(x_start, y_start, pixmap)
+        painter.end()
+        master_pixmap_item.setPixmap(current_pixmap)
+
     def update_master_display(self):
         self.update_view_display(
             self.master_layer(),
@@ -283,7 +309,7 @@ class ViewStrategy(LayerCollectionHandler):
         self.update_view_display(
             self.current_layer(),
             self.get_current_pixmap(),
-            self.get_current_view(),
+            self.get_current_scene(),
             self.get_current_view())
 
     def update_cursor_pen_width(self):
@@ -694,18 +720,60 @@ class ViewStrategy(LayerCollectionHandler):
         self.status.set_scroll(view.horizontalScrollBar().value(),
                                view.verticalScrollBar().value())
 
+    def copy_brush_area_to_master(self, view_pos):
+        if self.layer_stack() is None or self.number_of_layers() == 0:
+            return
+        area = self.brush_tool.apply_brush_operation(
+            self.master_layer_copy(),
+            self.current_layer(),
+            self.master_layer(), self.mask_layer,
+            view_pos)
+        self.paint_area_manager.extend(*area)
+
+    def begin_copy_brush_area(self, pos):
+        self.mask_layer = self.blank_layer().copy()
+        self.copy_master_layer()
+        self.paint_area_manager.reset()
+        self.copy_brush_area_to_master(pos)
+        self.needs_update_requested.emit()
+
+    def continue_copy_brush_area(self, pos):
+        self.copy_brush_area_to_master(pos)
+        self.needs_update_requested.emit()
+
+    def mouse_press_event(self, event):
+        if self.empty():
+            return
+        if self.enable_paint and event.button() & Qt.LeftButton and self.has_master_layer():
+            if self.space_pressed:
+                self.scrolling = True
+                self.last_mouse_pos = event.position()
+                self.setCursor(Qt.ClosedHandCursor)
+            else:
+                self.last_brush_pos = event.position()
+                self.begin_copy_brush_area(event.position().toPoint())
+                self.dragging = True
+            if not self.scrolling:
+                self.show_brush_cursor()
+
     def mouse_move_event(self, event):
         if self.empty():
             return
+        current_time = time.time() * 1000  # ms
+        cursor_update_interval = AppConfig.get('cursor_update_time')
+        if current_time - self.last_cursor_update_time < cursor_update_interval:
+            return
+        self.last_cursor_update_time = current_time
         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:
+        if self.enable_paint and 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()
+            paint_refresh_time = AppConfig.get('paint_refresh_time')
+            if self.last_update_time.msecsTo(current_time) >= paint_refresh_time:
+                min_step = AppConfig.get('min_mouse_step_brush_fraction')
+                min_step = brush_size * min_step * 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)
@@ -716,7 +784,7 @@ class ViewStrategy(LayerCollectionHandler):
                     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.continue_copy_brush_area(pos)
                     self.last_brush_pos = position
                 self.last_update_time = current_time
         if self.scrolling and event.buttons() & Qt.LeftButton:
@@ -728,21 +796,6 @@ class ViewStrategy(LayerCollectionHandler):
             self.last_mouse_pos = position
             self.scroll_view(master_view, delta.x(), delta.y())
 
-    def mouse_press_event(self, event):
-        if self.empty():
-            return
-        if event.button() == Qt.LeftButton and self.has_master_layer():
-            if self.space_pressed:
-                self.scrolling = True
-                self.last_mouse_pos = event.position()
-                self.setCursor(Qt.ClosedHandCursor)
-            else:
-                self.last_brush_pos = event.position()
-                self.brush_operation_started.emit(event.position().toPoint())
-                self.dragging = True
-            if not self.scrolling:
-                self.show_brush_cursor()
-
     def mouse_release_event(self, event):
         if self.empty():
             return
@@ -759,4 +812,4 @@ class ViewStrategy(LayerCollectionHandler):
                 self.last_mouse_pos = None
             elif self.dragging:
                 self.dragging = False
-                self.brush_operation_ended.emit()
+                self.end_copy_brush_area_requested.emit()

{shinestacker-1.5.4.dist-info → shinestacker-1.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.5.4
+Version: 1.6.1
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0

{shinestacker-1.5.4.dist-info → shinestacker-1.6.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 shinestacker/__init__.py,sha256=uq2fjAw2z_6TpH3mOcWFZ98GoEPRsNhTAK8N0MMm_e8,448
-shinestacker/_version.py,sha256=HfPNw49U2WWQOQlRuPSUUE8x8nkPx62dtjaGJfbhyTk,21
+shinestacker/_version.py,sha256=DH87PU9LcZeI_uvttoH-lyhGyb55UShgeFtsG2qIZgE,21
 shinestacker/algorithms/__init__.py,sha256=1FwVJ3w9GGbFFkjYJRUedTvcdE4j0ieSgaH9RC9iCY4,877
 shinestacker/algorithms/align.py,sha256=mb44u-YxZI1TTSHz81nRpX_2c8awlOhnGrK0LyfTQeQ,33543
 shinestacker/algorithms/align_auto.py,sha256=pJetw6zZEWQLouzcelkI8gD4cPiOp887ePXzVbm0E6Q,3800
@@ -9,54 +9,58 @@ shinestacker/algorithms/base_stack_algo.py,sha256=RzxvLDHqxqhnAl83u2onjvfsRea1qG
 shinestacker/algorithms/denoise.py,sha256=GL3Z4_6MHxSa7Wo4ZzQECZS87tHBFqO0sIVF_jPuYQU,426
 shinestacker/algorithms/depth_map.py,sha256=nRBrZQWbdUqFOtYMEQx9UNdnybrBTeAOr1eV91FlN8U,5611
 shinestacker/algorithms/exif.py,sha256=SM4ZDDe8hCJ3xY6053FNndOiwzEStzdp0WrXurlcHVc,9429
-shinestacker/algorithms/multilayer.py,sha256=WlB4L5oY9qra3w7Qahg-tqO6S_s3pMB_LmGR8PPR_7w,9904
+shinestacker/algorithms/multilayer.py,sha256=EEMDr2NlCU9DCFO5ykbBrY-2q9oBUD0-ctm7x0IXU5U,9911
 shinestacker/algorithms/noise_detection.py,sha256=myUiLKYC3Ph62j28upUd_7rZum_JpqyxiN33nZN35zE,9346
 shinestacker/algorithms/pyramid.py,sha256=Z7tlp8Hh3ploAXJCr0VNe33d8H9GNrlqHXq_LapgRwo,8205
 shinestacker/algorithms/pyramid_auto.py,sha256=fl_jXNYLWsBiX0M0UghzCLqai0SGXlmKYHU7Z9SUYSo,6173
 shinestacker/algorithms/pyramid_tiles.py,sha256=ZBWIeifkDOIVFF4SCyspRZHSj6K_1P3dk4WLmuo53RU,12213
 shinestacker/algorithms/sharpen.py,sha256=h7PMJBYxucg194Usp_6pvItPUMFYbT-ebAc_-7XBFUw,949
-shinestacker/algorithms/stack.py,sha256=V9YX0CbNWrgAo7_uti64rmmuwU6RsRcjDoBpsES4aSE,5137
+shinestacker/algorithms/stack.py,sha256=p9bLCbMjDMm7rX_FRfgXRTEJAj3GhNPOCvwePE9hVmc,5549
 shinestacker/algorithms/stack_framework.py,sha256=OMrjD5dKquHQXhM7TfLRExDsqN1n938WWhGAfkPYLZM,13883
 shinestacker/algorithms/utils.py,sha256=l6GJpEXpzDr_ml9Not03a1_F7wYvPwn8JkEWDuNwL9o,12116
 shinestacker/algorithms/vignetting.py,sha256=gJOv-FN3GnTgaVn70W_6d-qbw3WmqinDiO9oL053cus,10351
 shinestacker/algorithms/white_balance.py,sha256=PMKsBtxOSn5aRr_Gkx1StHS4eN6kBN2EhNnhg4UG24g,501
 shinestacker/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shinestacker/app/about_dialog.py,sha256=pkH7nnxUP8yc0D3vRGd1jRb5cwi1nDVbQRk_OC9yLk8,4144
-shinestacker/app/args_parser_opts.py,sha256=TlfMR5GBd6Zz9wZNrN7CGJ1_hm1FnLZn5EoP5mkRHrk,776
-shinestacker/app/gui_utils.py,sha256=fSpkwPXTON_l676UHdAnJNrGq7BPbSlPOiHpOF_LZaI,2519
+shinestacker/app/args_parser_opts.py,sha256=c6IUXOI0SJIFckPWPXYnwmBmdNnOcrtvU5S8hUDU_AQ,979
+shinestacker/app/gui_utils.py,sha256=EGZejp0XZXRLVa_Wd_2VYAwK3oe9hMSoZzNgT7NUNRw,2986
 shinestacker/app/help_menu.py,sha256=g8lKG_xZmXtNQaC3SIRzyROKVWva_PLEgZsQWh6zUcQ,499
-shinestacker/app/main.py,sha256=UkWz4jvaBPH4Fs-arHe8H0NqKVTA4B_1e9BRn9S5oFo,10963
+shinestacker/app/main.py,sha256=OQwPJvhrsAThv9kmiqtX7CX-smfwXdFXagQmGsQdmuU,11258
 shinestacker/app/open_frames.py,sha256=bsu32iJSYJQLe_tQQbvAU5DuMDVX6MRuNdE7B5lojZc,1488
-shinestacker/app/project.py,sha256=_kopeyb8e5JAA3XjNXoCshlYBfT5Avw-kTqiJN4GVlo,2805
-shinestacker/app/retouch.py,sha256=On2oV2QonfMziQAvRkO6qw-h6E6wWQE0svKzZQKHeyg,2687
+shinestacker/app/project.py,sha256=jn4LlMTMxrJeAyQQrR5nVS4Di1rOrjiOJ8LOg0CZbwE,3045
+shinestacker/app/retouch.py,sha256=fyk74fgpeoBqY1mRJiXWf1hRzSeG7xXFx4V-Sphr3Kg,3069
+shinestacker/app/settings_dialog.py,sha256=0P3nqqZEiTIFgidW1_e3Q_zE7NbAouNsuj-yNsU41vk,8192
 shinestacker/config/__init__.py,sha256=aXxi-LmAvXd0daIFrVnTHE5OCaYeK1uf1BKMr7oaXQs,197
+shinestacker/config/app_config.py,sha256=rM1Rndk1GDa5c0AhcVNEN9zSAzxPZixzQYfjODbJUwE,771
 shinestacker/config/config.py,sha256=eBko2D3ADhLTIm9X6hB_a_WsIjwgfE-qmBVkhP1XSvc,1636
-shinestacker/config/constants.py,sha256=EEdr7pZg4JpbIjUWaP7kJQfTuBB85FN739myDNAfn8A,8301
-shinestacker/config/gui_constants.py,sha256=55Qr0KzrTx8eQHCkT-EVabSiD59VvLZIh5o2cA9028s,2791
+shinestacker/config/constants.py,sha256=Z7QjaklrYYsPjTX68Tjyh_wCOuYyQPBR8dnYrZfNwA8,8376
+shinestacker/config/gui_constants.py,sha256=PNxzwmVEppJ2mV_vwp68NhWzJOEitVy1Pk9SwSmRsho,2882
+shinestacker/config/settings.py,sha256=4p4r6wKOCbttzfH9tyHQSTd-iv-GfgCd1LxI3C7WIjU,3861
 shinestacker/core/__init__.py,sha256=IUEIx6SQ3DygDEHN3_E6uKpHjHtUa4a_U_1dLd_8yEU,484
 shinestacker/core/colors.py,sha256=kr_tJA1iRsdck2JaYDb2lS-codZ4Ty9gdu3kHfiWvuM,1340
-shinestacker/core/core_utils.py,sha256=1LYj19Dfc9jZN9-4dlf1paximDH5WZYa7DXvKr7R7QY,1719
+shinestacker/core/core_utils.py,sha256=wmpu9_idDRe866JFEylMvGPJRT8lSVhikK9PljcbPSI,1392
 shinestacker/core/exceptions.py,sha256=2-noG-ORAGdvDhL8jBQFs0xxZS4fI6UIkMqrWekgk2c,1618
 shinestacker/core/framework.py,sha256=QaTfnzEUHwzlbyFG7KzeyteckTSWHWEEJE4d5Tc8H18,11015
-shinestacker/core/logging.py,sha256=9SuSSy9Usbh7zqmLYMqkmy-VBkOJW000lwqAR0XQs30,3067
+shinestacker/core/logging.py,sha256=T-ZTGYjN2n2_5Vu2mBJ2id9qj1c9NA79OD2H2w-W0nM,3096
 shinestacker/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shinestacker/gui/action_config.py,sha256=HeDbRy3YSl9IldLZBCdXj7eWIfTTHmUqC_AW9LJU2Pk,25859
-shinestacker/gui/action_config_dialog.py,sha256=Jp0LVhE0gdz70ve47LCL5N2sSLuj8_arZb4xL50_pkk,41101
+shinestacker/gui/action_config.py,sha256=Xv7SGbhPl1F_dUnU04VBt_E-wIItnN_q6QuhU_d9GfI,25929
+shinestacker/gui/action_config_dialog.py,sha256=QN95FiVPYL6uin2sYO5F7tq6G5rBWh9yRkeTVvwKrwU,38341
 shinestacker/gui/base_form_dialog.py,sha256=KAUQNtmJazttmOIe4E4pFifbtvcByTAhtCmcIYeA4UE,766
 shinestacker/gui/colors.py,sha256=-HaFprDuzRSKjXoZfX1rdOuvawQAkazqdgLBEiZcFII,1476
+shinestacker/gui/config_dialog.py,sha256=yt3nvh0HPHQuCn3AFlzlIHUJnnxcz-Rrw3W3jS9ZYiE,3447
 shinestacker/gui/flow_layout.py,sha256=3yBU_z7VtvHKpx1H97CHVd81eq9pe1Dcja2EZBGGKcI,3791
 shinestacker/gui/folder_file_selection.py,sha256=IYWfZQFkoD5iO7zJ7BxVVDP9F3Dc0EXLILAhL4q-Cb8,4117
 shinestacker/gui/gui_images.py,sha256=k39DpdsxcmYoRdHNNZj6OpFAas0GOHS4JSG542wfheg,5728
 shinestacker/gui/gui_logging.py,sha256=kiZcrC2AFYCWgPZo0O5SKw-E5cFrezwf4anS3HjPuNw,8168
 shinestacker/gui/gui_run.py,sha256=zr7x4BVmM0n_ZRsSEaJVVKvHSWHuwhftgkUvgeg90gU,15767
-shinestacker/gui/main_window.py,sha256=zOxIRn6urmnmfDOR1JJ3n6xsT1qryOt1s7kZxwh-qYI,25202
-shinestacker/gui/menu_manager.py,sha256=legmYEpQxuzEQoDhxMUWiwCcYTXwd-uRfAju-Nymy8g,11664
-shinestacker/gui/new_project.py,sha256=z8e3EhRMB-KtoPwYQSiKLSOQ2dS0-Okm7zVw21B7zy8,16391
-shinestacker/gui/project_controller.py,sha256=7vSyoxepplJrf0VsbPrZkMqtHW6rtPgEOZgdPsOPVoQ,16490
+shinestacker/gui/main_window.py,sha256=0G-ZjSVKY_rCK_DmstRn3wxOdvS5i3Ba3FBR2ijxpe0,25220
+shinestacker/gui/menu_manager.py,sha256=q4m3cBSxUR68gexpwfIROVRKJ86zp-XPZVrohh1PfQU,11786
+shinestacker/gui/new_project.py,sha256=XMv1ttYrkuqaN9629anXtVSn1bxosgyJpxSFPjlVryU,16437
+shinestacker/gui/project_controller.py,sha256=MYv8QJNXUdc7r1K5D6LnBbds9YalCKSAo_CaO6b0TO8,16636
 shinestacker/gui/project_converter.py,sha256=Gmna0HwbvACcXiX74TaQYumif8ZV8sZ2APLTMM-L1mU,7436
 shinestacker/gui/project_editor.py,sha256=lSgQ42IoaobHs-NQQWT88Qhg5l7nu5ejxAO5VgIupr8,25498
-shinestacker/gui/project_model.py,sha256=eRUmH3QmRzDtPtZoxgT6amKzN8_5XzwjHgEJeL-_JOE,4263
-shinestacker/gui/recent_file_manager.py,sha256=FtatDGUqwmXXchepZdA0YRNzqCRS9Qp4EL9R9Wsg5qE,3731
+shinestacker/gui/project_model.py,sha256=9dId8N-np4YHDpz_wO20Mvd06np3YKlej-0TMWaA_WE,4833
+shinestacker/gui/recent_file_manager.py,sha256=010bciuirKLiVCfOAKs0uFlB3iUjHNBlPX_9K2vH5j0,2916
 shinestacker/gui/select_path_widget.py,sha256=HSwgSr702w5Et4c-6nkRXnIpm1KFqKJetAF5xQNa5zI,1017
 shinestacker/gui/sys_mon.py,sha256=zU41YYVeqQ1-v6oGIh2_BFzQWq87keN-398Wdm59-Nk,3526
 shinestacker/gui/tab_widget.py,sha256=VgRmuktWXCgbXbV7c1Tho0--W5_EmmzXPfzRZgwhGfg,2965
@@ -71,35 +75,36 @@ shinestacker/gui/img/forward-button-icon.png,sha256=lNw86T4TOEd_uokHYF8myGSGUXzd
 shinestacker/gui/img/play-button-round-icon.png,sha256=9j6Ks9mOGa-2cXyRFpimepAAvSaHzqJKBfxShRb4_dE,4595
 shinestacker/gui/img/plus-round-line-icon.png,sha256=LS068Hlu-CeBvJuB3dwwdJg1lZq6D5MUIv53lu1yKJA,7534
 shinestacker/retouch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shinestacker/retouch/base_filter.py,sha256=zpedVvTpof8BsENWdDeu9PDul7Uw0UAXUSsyLZjbcpg,11265
+shinestacker/retouch/base_filter.py,sha256=ObrAcwZv9YJbIhWMHcryHEEj41oAk9hfHmE4phEd1gE,11263
 shinestacker/retouch/brush.py,sha256=dzD2FzSpBIPdJRmTZobcrQ1FrVd3tF__ZPnUplNE72s,357
 shinestacker/retouch/brush_gradient.py,sha256=F5SFhyzl8YTMqjJU3jK8BrIlLCYLUvITd5wz3cQE4xk,1453
 shinestacker/retouch/brush_preview.py,sha256=cOFVMCbEsgR_alzmr_-LLghtGU_unrE-hAjLHcvrZAY,5484
 shinestacker/retouch/brush_tool.py,sha256=8uVncTA375uC3Nhp2YM0eZjpOR-nN47i2eGjN8tJzOU,8714
 shinestacker/retouch/denoise_filter.py,sha256=UpNKbFs7uArdglEej8AUHan7oCVYV5E7HNzkovj7XMQ,571
-shinestacker/retouch/display_manager.py,sha256=vRmaSfHP47rYQrqvJ3flx_GgMJnMZDfQO4PXTfKcpqE,8505
+shinestacker/retouch/display_manager.py,sha256=fTZTGbvmX5DXagexuvbNgOF5GiH2Vv-stLUQQwoglp8,10181
 shinestacker/retouch/exif_data.py,sha256=LF-fRXW-reMq-xJ_QRE5j8DC2LVGKIlC6MR3QbC1cdg,1896
 shinestacker/retouch/file_loader.py,sha256=z02-A8_uDZxayI1NFTxT2GVUvEBWStchX9hlN1o5-0U,4784
 shinestacker/retouch/filter_manager.py,sha256=tOGIWj5HjViL1-iXHkd91X-sZ1c1G531pDmLO0x6zx0,866
 shinestacker/retouch/icon_container.py,sha256=6gw1HO1bC2FrdB4dc_iH81DQuLjzuvRGksZ2hKLT9yA,585
-shinestacker/retouch/image_editor_ui.py,sha256=-UVWeFSnXyHOG7XEIl9wNhiCjH5R0UFeM2VOg5R6ozs,33435
-shinestacker/retouch/image_view_status.py,sha256=bdIhsXiYXm7eyjkTGWkw5PRShzaF_by-g7daqgmhwjM,1858
-shinestacker/retouch/image_viewer.py,sha256=H8w-ORug1aKf7X3FeSX4lQV-a0IewZ9OVG1-50BK4cE,4452
-shinestacker/retouch/io_gui_handler.py,sha256=UOnrFT00s0075Ng_yJACJX9TP8UT9mQOWXwQwNAfpMw,12079
-shinestacker/retouch/io_manager.py,sha256=JUAA--AK0mVa1PTErJTnBFjaXIle5Qs7Ow0Wkd8at0o,2437
-shinestacker/retouch/layer_collection.py,sha256=fZlGrkm9-Ycc7AOzFSpImhafiTieBeCZRk-UlvlFHbo,5819
-shinestacker/retouch/overlaid_view.py,sha256=KBwuzC2OQsK7rdtFAKrSvXrHrEV1SiOoZhxPCQLGkvg,6734
+shinestacker/retouch/image_editor_ui.py,sha256=r2S4Fgyi3xQi2XeqlVYTUxZ9YlPZe2rMaIpvIak8Aog,33181
+shinestacker/retouch/image_view_status.py,sha256=2rWi2ugdyjMhWCtRJkwOnb7-tCtVfnGfCY_54qpZhwM,1970
+shinestacker/retouch/image_viewer.py,sha256=xf1vYZRPb9ClCQbqrqAFhPubdqIIpku7DgcY8O5bvYU,4694
+shinestacker/retouch/io_gui_handler.py,sha256=tyHMmR6_uE_IEI-CIcJibVhupxarKYHzX2fuhnesHaI,14616
+shinestacker/retouch/io_threads.py,sha256=r0X4it2PfwnmiAU7eStniIfcHhPvuaqdqf5VlnvjZ-4,2832
+shinestacker/retouch/layer_collection.py,sha256=xx8INSLCXIeTQn_nxfCo4QljAmQK1qukSYO1Zk4rqqo,6183
+shinestacker/retouch/overlaid_view.py,sha256=QTTdegUWs99YBZZPlIRdPI5O80U3t_c3HnyegbRqNbA,7029
+shinestacker/retouch/paint_area_manager.py,sha256=ilK6uQT7lzNyvdc8uNv4xTHHHAbk5hGEClJRNmiA4P8,894
 shinestacker/retouch/shortcuts_help.py,sha256=BFWTT5QvodqMhqa_9LI25hZqjICfckgyWG4fGrGzvnM,4283
-shinestacker/retouch/sidebyside_view.py,sha256=Ipx5ckaAuEv6fnxg4RpENj00ew6-M2jLsnTKUcYKcAk,18055
-shinestacker/retouch/transformation_manager.py,sha256=NSHGUF-JFv4Y81gSvizjQCTp49TLo1so7c0WoUElO08,1812
-shinestacker/retouch/undo_manager.py,sha256=cKUkqnJtnJ-Hq-LQs5Bv49FC6qkG6XSw9oCVySJ8jS0,4312
+shinestacker/retouch/sidebyside_view.py,sha256=4sNa_IUMbNH18iECO7eDO9S_ls3v2ENwP1AWrBFhofI,18907
+shinestacker/retouch/transformation_manager.py,sha256=QFYCL-l9V6qlhw3y7tcs0saWWClNPsh7F9pTBkfPbRU,1711
+shinestacker/retouch/undo_manager.py,sha256=J4hEAnv9bKLQ0N1wllWswjJBhgRgasCnBoMT5LEw-dM,4453
 shinestacker/retouch/unsharp_mask_filter.py,sha256=Iapc8UmSVpj3V0LcJq_38P5qerRqTevMynbbk5Rk6iE,3634
-shinestacker/retouch/view_strategy.py,sha256=u9oOB-fxap_ijNJ3O3Ev5OMLH-bDZNGj4hyBkJUDeeo,27993
+shinestacker/retouch/view_strategy.py,sha256=jZxB_vX3_0notH0ClxKkLzbdtx4is3vQiYoIP-sDv3M,30216
 shinestacker/retouch/vignetting_filter.py,sha256=JhFr6OVIripQzSJrZEG4lxq7wBsmpofLqJQ-aP2bKw8,3789
 shinestacker/retouch/white_balance_filter.py,sha256=UaH4yxG3fU4vPutBAkV5oTXIQyUTN09x0uTywAzv3sY,8286
-shinestacker-1.5.4.dist-info/licenses/LICENSE,sha256=pWgb-bBdsU2Gd2kwAXxketnm5W_2u8_fIeWEgojfrxs,7651
-shinestacker-1.5.4.dist-info/METADATA,sha256=1cFUICQsSTKF1T8L7sNiT7XQ_UkwXlIMRr64bym9TvA,6978
-shinestacker-1.5.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shinestacker-1.5.4.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
-shinestacker-1.5.4.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
-shinestacker-1.5.4.dist-info/RECORD,,
+shinestacker-1.6.1.dist-info/licenses/LICENSE,sha256=pWgb-bBdsU2Gd2kwAXxketnm5W_2u8_fIeWEgojfrxs,7651
+shinestacker-1.6.1.dist-info/METADATA,sha256=9sevPHbXS-yaj-wYc-42q28V34PNOdnPlntqNzlsgOo,6978
+shinestacker-1.6.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shinestacker-1.6.1.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
+shinestacker-1.6.1.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
+shinestacker-1.6.1.dist-info/RECORD,,

shinestacker/retouch/io_manager.py

@@ -1,69 +0,0 @@
-# pylint: disable=E1101, C0114, C0115, C0116, E0611, W0718, R0903
-import traceback
-import cv2
-from PySide6.QtCore import QThread, Signal
-from .. algorithms.utils import read_img, validate_image, get_img_metadata
-from .. algorithms.exif import get_exif, write_image_with_exif_data
-from .. algorithms.multilayer import write_multilayer_tiff_from_images
-from .layer_collection import LayerCollectionHandler
-
-
-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 IOManager(LayerCollectionHandler):
-    def __init__(self, layer_collection):
-        super().__init__(layer_collection)
-        self.exif_path = ''
-        self.exif_data = None
-
-    def import_frames(self, file_paths):
-        stack = []
-        labels = []
-        master = None
-        shape, dtype = get_img_metadata(self.master_layer())
-        for path in file_paths:
-            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
-                i = 0
-                while label_x in labels:
-                    i += 1
-                    label_x = f"{label} ({i})"
-                labels.append(label_x)
-                stack.append(img)
-                if master is None:
-                    master = img.copy()
-            except Exception as e:
-                raise RuntimeError(f"Error loading file: {path}.\n{str(e)}") from e
-        return stack, labels, master
-
-    def save_master(self, path):
-        img = cv2.cvtColor(self.master_layer(), cv2.COLOR_RGB2BGR)
-        write_image_with_exif_data(self.exif_data, img, path)
-
-    def set_exif_data(self, path):
-        self.exif_path = path
-        self.exif_data = get_exif(path)