shinestacker 0.3.0__py3-none-any.whl → 0.3.2__py3-none-any.whl

shinestacker/retouch/image_editor_ui.py

@@ -1,11 +1,12 @@
-from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QFrame, QLabel, QListWidget, QListWidgetItem, QSlider, QInputDialog
+from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QFrame, QLabel, QListWidget, QSlider
 from PySide6.QtGui import QShortcut, QKeySequence, QAction, QActionGroup
-from PySide6.QtCore import Qt, QSize, Signal
+from PySide6.QtCore import Qt
 from PySide6.QtGui import QGuiApplication
 from .. config.gui_constants import gui_constants
 from .image_filters import ImageFilters
 from .image_viewer import ImageViewer
 from .shortcuts_help import ShortcutsHelp
+from .brush import Brush
 
 
 def brush_size_to_slider(size):
@@ -17,22 +18,10 @@ def brush_size_to_slider(size):
     return int(normalized * gui_constants.BRUSH_SIZE_SLIDER_MAX)
 
 
-class ClickableLabel(QLabel):
-    doubleClicked = Signal()
-
-    def __init__(self, text, parent=None):
-        super().__init__(text, parent)
-        self.setMouseTracking(True)
-
-    def mouseDoubleClickEvent(self, event):
-        if event.button() == Qt.LeftButton:
-            self.doubleClicked.emit()
-        super().mouseDoubleClickEvent(event)
-
-
 class ImageEditorUI(ImageFilters):
     def __init__(self):
         super().__init__()
+        self.brush = Brush()
         self.setup_ui()
         self.setup_menu()
         self.setup_shortcuts()
@@ -51,10 +40,12 @@ class ImageEditorUI(ImageFilters):
         central_widget = QWidget()
         self.setCentralWidget(central_widget)
         layout = QHBoxLayout(central_widget)
-        self.image_viewer = ImageViewer()
+        self.image_viewer = ImageViewer(self.layer_collection)
         self.image_viewer.temp_view_requested.connect(self.handle_temp_view)
-        self.image_viewer.image_editor = self
-        self.image_viewer.brush = self.brush_controller.brush
+        self.image_viewer.brush_operation_started.connect(self.begin_copy_brush_area)
+        self.image_viewer.brush_operation_continued.connect(self.continue_copy_brush_area)
+        self.image_viewer.brush_operation_ended.connect(self.end_copy_brush_area)
+        self.image_viewer.brush_size_change_requested.connect(self.handle_brush_size_change)
         self.image_viewer.setFocusPolicy(Qt.StrongFocus)
         side_panel = QWidget()
         side_layout = QVBoxLayout(side_panel)
@@ -75,7 +66,6 @@ class ImageEditorUI(ImageFilters):
         self.brush_size_slider = QSlider(Qt.Horizontal)
         self.brush_size_slider.setRange(0, gui_constants.BRUSH_SIZE_SLIDER_MAX)
         self.brush_size_slider.setValue(brush_size_to_slider(self.brush.size))
-        self.brush_size_slider.valueChanged.connect(self.update_brush_size)
         brush_layout.addWidget(self.brush_size_slider)
 
         hardness_label = QLabel("Brush Hardness")
@@ -84,7 +74,6 @@ class ImageEditorUI(ImageFilters):
         self.hardness_slider = QSlider(Qt.Horizontal)
         self.hardness_slider.setRange(0, 100)
         self.hardness_slider.setValue(self.brush.hardness)
-        self.hardness_slider.valueChanged.connect(self.update_brush_hardness)
         brush_layout.addWidget(self.hardness_slider)
 
         opacity_label = QLabel("Brush Opacity")
@@ -93,7 +82,6 @@ class ImageEditorUI(ImageFilters):
         self.opacity_slider = QSlider(Qt.Horizontal)
         self.opacity_slider.setRange(0, 100)
         self.opacity_slider.setValue(self.brush.opacity)
-        self.opacity_slider.valueChanged.connect(self.update_brush_opacity)
         brush_layout.addWidget(self.opacity_slider)
 
         flow_label = QLabel("Brush Flow")
@@ -102,7 +90,6 @@ class ImageEditorUI(ImageFilters):
         self.flow_slider = QSlider(Qt.Horizontal)
         self.flow_slider.setRange(1, 100)
         self.flow_slider.setValue(self.brush.flow)
-        self.flow_slider.valueChanged.connect(self.update_brush_flow)
         brush_layout.addWidget(self.flow_slider)
 
         side_layout.addWidget(brush_panel)
@@ -119,7 +106,6 @@ class ImageEditorUI(ImageFilters):
         """)
         self.brush_preview.setAlignment(Qt.AlignCenter)
         self.brush_preview.setFixedHeight(100)
-        self.update_brush_thumb()
         brush_layout.addWidget(self.brush_preview)
         side_layout.addWidget(brush_panel)
 
@@ -172,7 +158,12 @@ class ImageEditorUI(ImageFilters):
         self.thumbnail_list.setFixedWidth(gui_constants.THUMB_WIDTH)
         self.thumbnail_list.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         self.thumbnail_list.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
-        self.thumbnail_list.itemClicked.connect(self.change_layer_item)
+
+        def change_layer_item(item):
+            layer_idx = self.thumbnail_list.row(item)
+            self.change_layer(layer_idx)
+
+        self.thumbnail_list.itemClicked.connect(change_layer_item)
         self.thumbnail_list.setStyleSheet("""
             QListWidget {
                 background-color: #f5f5f5;
@@ -205,33 +196,34 @@ class ImageEditorUI(ImageFilters):
         layout.addWidget(control_panel, 0)
         layout.setContentsMargins(0, 0, 0, 0)
         layout.setSpacing(2)
+        super().setup_ui()
 
     def setup_menu(self):
         menubar = self.menuBar()
         file_menu = menubar.addMenu("&File")
-        file_menu.addAction("&Open...", self.open_file, "Ctrl+O")
-        file_menu.addAction("&Save", self.save_file, "Ctrl+S")
-        file_menu.addAction("Save &As...", self.save_file_as, "Ctrl+Shift+S")
+        file_menu.addAction("&Open...", self.io_gui_handler.open_file, "Ctrl+O")
+        file_menu.addAction("&Save", self.io_gui_handler.save_file, "Ctrl+S")
+        file_menu.addAction("Save &As...", self.io_gui_handler.save_file_as, "Ctrl+Shift+S")
         self.save_master_only = QAction("Save Master &Only", self)
         self.save_master_only.setCheckable(True)
         self.save_master_only.setChecked(True)
         file_menu.addAction(self.save_master_only)
 
-        file_menu.addAction("&Close", self.close_file, "Ctrl+W")
+        file_menu.addAction("&Close", self.io_gui_handler.close_file, "Ctrl+W")
         file_menu.addSeparator()
-        file_menu.addAction("&Import frames", self.import_frames)
-        file_menu.addAction("Import &EXIF data", self.select_exif_path)
+        file_menu.addAction("&Import frames", self.io_gui_handler.import_frames)
+        file_menu.addAction("Import &EXIF data", self.io_gui_handler.select_exif_path)
 
         edit_menu = menubar.addMenu("&Edit")
         self.undo_action = QAction("Undo", self)
         self.undo_action.setEnabled(False)
         self.undo_action.setShortcut("Ctrl+Z")
-        self.undo_action.triggered.connect(self.undo_last_brush)
+        self.undo_action.triggered.connect(self.undo)
         edit_menu.addAction(self.undo_action)
         self.redo_action = QAction("Redo", self)
         self.redo_action.setEnabled(False)
         self.redo_action.setShortcut("Ctrl+Y")
-        self.redo_action.triggered.connect(self.redo_last_brush)
+        self.redo_action.triggered.connect(self.redo)
         edit_menu.addAction(self.redo_action)
         edit_menu.addSeparator()
 
@@ -273,12 +265,12 @@ class ImageEditorUI(ImageFilters):
 
         view_master_action = QAction("View Master", self)
         view_master_action.setShortcut("M")
-        view_master_action.triggered.connect(self.set_view_master)
+        view_master_action.triggered.connect(self.display_manager.set_view_master)
         view_menu.addAction(view_master_action)
 
         view_individual_action = QAction("View Individual", self)
         view_individual_action.setShortcut("L")
-        view_individual_action.triggered.connect(self.set_view_individual)
+        view_individual_action.triggered.connect(self.display_manager.set_view_individual)
         view_menu.addAction(view_individual_action)
         view_menu.addSeparator()
 
@@ -350,53 +342,28 @@ class ImageEditorUI(ImageFilters):
         if self._check_unsaved_changes():
             self.close()
 
-    def _add_thumbnail_item(self, thumbnail, label, i, is_current):
-        item_widget = QWidget()
-        layout = QVBoxLayout(item_widget)
-        layout.setContentsMargins(0, 0, 0, 0)
-        layout.setSpacing(0)
-
-        thumbnail_label = QLabel()
-        thumbnail_label.setPixmap(thumbnail)
-        thumbnail_label.setAlignment(Qt.AlignCenter)
-        layout.addWidget(thumbnail_label)
-
-        label_widget = ClickableLabel(label)
-        label_widget.setAlignment(Qt.AlignCenter)
-        label_widget.doubleClicked.connect(lambda: self._rename_label(label_widget, label, i))
-        layout.addWidget(label_widget)
-
-        item = QListWidgetItem()
-        item.setSizeHint(QSize(gui_constants.IMG_WIDTH, gui_constants.IMG_HEIGHT))
-        self.thumbnail_list.addItem(item)
-        self.thumbnail_list.setItemWidget(item, item_widget)
-
-        if is_current:
-            self.thumbnail_list.setCurrentItem(item)
-
-    def _rename_label(self, label_widget, old_label, i):
-        new_label, ok = QInputDialog.getText(self.thumbnail_list, "Rename Label", "New label name:", text=old_label)
-        if ok and new_label and new_label != old_label:
-            label_widget.setText(new_label)
-            self._update_label_in_data(old_label, new_label, i)
-
-    def _update_label_in_data(self, old_label, new_label, i):
-        self.current_labels[i] = new_label
-
-    def undo_last_brush(self):
-        if self.undo_manager.undo(self.master_layer):
-            self.display_current_view()
+    def undo(self):
+        if self.undo_manager.undo(self.master_layer()):
+            self.display_manager.display_current_view()
+            self.display_manager.update_master_thumbnail()
             self.mark_as_modified()
             self.statusBar().showMessage("Undo applied", 2000)
 
-    def redo_last_brush(self):
-        if self.undo_manager.redo(self.master_layer):
-            self.display_current_view()
+    def redo(self):
+        if self.undo_manager.redo(self.master_layer()):
+            self.display_manager.display_current_view()
+            self.display_manager.update_master_thumbnail()
             self.mark_as_modified()
             self.statusBar().showMessage("Redo applied", 2000)
 
     def handle_temp_view(self, start):
         if start:
-            self.start_temp_view()
+            self.display_manager.start_temp_view()
+        else:
+            self.display_manager.end_temp_view()
+
+    def handle_brush_size_change(self, delta):
+        if delta > 0:
+            self.brush_tool.increase_brush_size()
         else:
-            self.end_temp_view()
+            self.brush_tool.decrease_brush_size()