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

shinestacker/gui/colors.py

@@ -16,6 +16,7 @@ class ColorPalette:
     BLACK = ColorEntry(0, 0, 0)
     WHITE = ColorEntry(255, 255, 255)
     LIGHT_BLUE = ColorEntry(210, 210, 240)
+    LIGHT_GREEN = ColorEntry(210, 240, 210)
     LIGHT_RED = ColorEntry(240, 210, 210)
     DARK_BLUE = ColorEntry(0, 0, 160)
     DARK_RED = ColorEntry(160, 0, 0)

shinestacker/gui/folder_file_selection.py

@@ -58,6 +58,7 @@ class FolderFileSelectionWidget(QWidget):
             # self.path_edit.setPlaceholderText("input files")
 
     def handle_browse(self):
+        self.path_edit.setText('')
         if self.selection_mode == 'folder':
             self.browse_folder()
         else:
@@ -80,6 +81,7 @@ class FolderFileSelectionWidget(QWidget):
                 self.selected_files = files
                 self.path_edit.setText(parent_dir)
             else:
+                self.selected_files = []
                 QMessageBox.warning(
                     self, "Invalid Selection",
                     "All files must be in the same directory."
@@ -91,6 +93,9 @@ class FolderFileSelectionWidget(QWidget):
     def get_selected_files(self):
         return self.selected_files
 
+    def num_selected_files(self):
+        return len(self.selected_files)
+
     def get_selected_filenames(self):
         return [os.path.basename(file_path) for file_path in self.selected_files]
 

shinestacker/gui/gui_run.py

@@ -9,7 +9,7 @@ from PySide6.QtCore import Signal, Slot
 from .. config.constants import constants
 from .. config.gui_constants import gui_constants
 from .colors import RED_BUTTON_STYLE, BLUE_BUTTON_STYLE, BLUE_COMBO_STYLE
-from .. algorithms.utils import extension_tif_jpg, extension_pdf
+from .. algorithms.utils import extension_jpg_tif_png, extension_pdf
 from .gui_logging import LogWorker, QTextEditLogger
 from .gui_images import GuiPdfView, GuiImageView, GuiOpenApp
 from .colors import (
@@ -209,7 +209,7 @@ class RunWindow(QTextEditLogger):
         try:
             if extension_pdf(path):
                 image_view = GuiPdfView(path, self)
-            elif extension_tif_jpg(path):
+            elif extension_jpg_tif_png(path):
                 image_view = GuiImageView(path, self)
             else:
                 raise RuntimeError(f"Can't visualize file type {os.path.splitext(path)[1]}.")

shinestacker/gui/main_window.py

@@ -134,19 +134,28 @@ class MainWindow(QMainWindow, LogManager):
             self.update_title()
 
         self.project_editor.modified_signal.connect(handle_modified)
-        self.project_editor.select_signal.connect(self.update_delete_action_state)
-        self.project_editor.refresh_ui_signal.connect(self.refresh_ui)
+        self.project_editor.select_signal.connect(
+            self.update_delete_action_state)
+        self.project_editor.refresh_ui_signal.connect(
+            self.refresh_ui)
         self.project_editor.enable_delete_action_signal.connect(
             self.menu_manager.delete_element_action.setEnabled)
         self.project_editor.undo_manager.set_enabled_undo_action_requested.connect(
             self.menu_manager.set_enabled_undo_action)
-        self.project_controller.update_title_requested.connect(self.update_title)
-        self.project_controller.refresh_ui_requested.connect(self.refresh_ui)
-        self.project_controller.activate_window_requested.connect(self.activateWindow)
+        self.project_controller.update_title_requested.connect(
+            self.update_title)
+        self.project_controller.refresh_ui_requested.connect(
+            self.refresh_ui)
+        self.project_controller.activate_window_requested.connect(
+            self.activateWindow)
         self.project_controller.enable_save_actions_requested.connect(
             self.menu_manager.save_actions_set_enabled)
         self.project_controller.enable_sub_actions_requested.connect(
             self.menu_manager.set_enabled_sub_actions_gui)
+        self.project_controller.add_recent_file_requested.connect(
+            self.menu_manager.add_recent_file)
+        self.menu_manager.open_file_requested.connect(
+            self.project_controller.open_project)
 
     def modified(self):
         return self.project_editor.modified()
@@ -301,6 +310,9 @@ class MainWindow(QMainWindow, LogManager):
             edit_config_action.triggered.connect(self.edit_current_action)
             menu.addAction(edit_config_action)
             menu.addSeparator()
+            menu.addAction(self.menu_manager.run_job_action)
+            menu.addAction(self.menu_manager.run_all_jobs_action)
+            menu.addSeparator()
             self.current_action_working_path, name = get_action_working_path(current_action)
             if self.current_action_working_path != '' and \
                     os.path.exists(self.current_action_working_path):
@@ -339,9 +351,6 @@ class MainWindow(QMainWindow, LogManager):
                     self.browse_output_path_action = QAction(action_name)
                     self.browse_output_path_action.triggered.connect(self.browse_output_path)
                     menu.addAction(self.browse_output_path_action)
-            menu.addSeparator()
-            menu.addAction(self.menu_manager.run_job_action)
-            menu.addAction(self.menu_manager.run_all_jobs_action)
             if current_action.type_name == constants.ACTION_JOB:
                 retouch_path = self.get_retouch_path(current_action)
                 if len(retouch_path) > 0:
@@ -533,7 +542,7 @@ class MainWindow(QMainWindow, LogManager):
             r = self.get_retouch_path(job)
             if len(r) > 0:
                 retouch_paths.append((job.params["name"], r))
-        new_window, id_str = self.create_new_window(f"{project_name} [Project 📚]",
+        new_window, id_str = self.create_new_window(f"{project_name} [Project]",
                                                     labels, retouch_paths)
         worker = ProjectLogWorker(self.project(), id_str)
         self.connect_worker_signals(worker, new_window)

shinestacker/gui/menu_manager.py

@@ -1,13 +1,20 @@
 # pylint: disable=C0114, C0115, C0116, R0904, E0611, R0902, W0201
 import os
+from functools import partial
+from PySide6.QtCore import Signal, QObject
 from PySide6.QtGui import QAction, QIcon
 from PySide6.QtWidgets import QMenu, QComboBox
 from .. config.constants import constants
+from .recent_file_manager import RecentFileManager
 
 
-class MenuManager:
+class MenuManager(QObject):
+    open_file_requested = Signal(str)
+
     def __init__(self, menubar, actions, project_editor, parent):
+        super().__init__(parent)
         self.script_dir = os.path.dirname(__file__)
+        self._recent_file_manager = RecentFileManager("shinestacker-recent-project-files.txt")
         self.project_editor = project_editor
         self.parent = parent
         self.menubar = menubar
@@ -69,10 +76,27 @@ class MenuManager:
             action.triggered.connect(action_fun)
         return action
 
+    def update_recent_files(self):
+        self.recent_files_menu.clear()
+        recent_files = self._recent_file_manager.get_files_with_display_names()
+        for file_path, display_name in recent_files.items():
+            action = self.recent_files_menu.addAction(display_name)
+            action.setData(file_path)
+            action.triggered.connect(partial(self.open_file_requested.emit, file_path))
+        self.recent_files_menu.setEnabled(len(recent_files) > 0)
+
+    def add_recent_file(self, file_path):
+        self._recent_file_manager.add_file(file_path)
+        self.update_recent_files()
+
     def add_file_menu(self):
         menu = self.menubar.addMenu("&File")
-        for name in ["&New...", "&Open...", "&Close"]:
+        for name in ["&New...", "&Open..."]:
             menu.addAction(self.action(name))
+        self.recent_files_menu = QMenu("Open &Recent", menu)
+        menu.addMenu(self.recent_files_menu)
+        self.update_recent_files()
+        menu.addAction(self.action("&Close"))
         menu.addSeparator()
         self.save_action = self.action("&Save")
         menu.addAction(self.save_action)

shinestacker/gui/new_project.py

@@ -75,7 +75,7 @@ class NewProjectDialog(BaseFormDialog):
         self.focus_stack_depth_map.setChecked(gui_constants.NEW_PROJECT_FOCUS_STACK_DEPTH_MAP)
         self.multi_layer = QCheckBox()
         self.multi_layer.setChecked(gui_constants.NEW_PROJECT_MULTI_LAYER)
-        step1_group = QGroupBox("1️⃣ Select Input")
+        step1_group = QGroupBox("1) Select Input")
         step1_layout = QVBoxLayout()
         step1_layout.setContentsMargins(15, 0, 15, 15)
         step1_layout.addWidget(
@@ -92,7 +92,7 @@ class NewProjectDialog(BaseFormDialog):
         step1_layout.addLayout(input_form)
         step1_group.setLayout(step1_layout)
         self.form_layout.addRow(step1_group)
-        step2_group = QGroupBox("2️⃣ Basic Options")
+        step2_group = QGroupBox("2) Basic Options")
         step2_layout = QFormLayout()
         step2_layout.setContentsMargins(15, 0, 15, 15)
         step2_layout.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
@@ -136,7 +136,7 @@ class NewProjectDialog(BaseFormDialog):
                 "Save multi layer TIFF:", self.multi_layer)
         step2_group.setLayout(step2_layout)
         self.form_layout.addRow(step2_group)
-        step3_group = QGroupBox("3️⃣ Confirmation")
+        step3_group = QGroupBox("3) Confirm")
         step3_layout = QVBoxLayout()
         step3_layout.setContentsMargins(15, 0, 15, 15)
         step3_layout.addWidget(
@@ -145,7 +145,7 @@ class NewProjectDialog(BaseFormDialog):
             QLabel("Select: <b>View</b> > <b>Expert options</b> for advanced configuration."))
         step3_group.setLayout(step3_layout)
         self.form_layout.addRow(step3_group)
-        step4_group = QGroupBox("4️⃣ Execution")
+        step4_group = QGroupBox("4) Execute")
         step4_layout = QHBoxLayout()
         step4_layout.setContentsMargins(15, 0, 15, 15)
         step4_layout.addWidget(QLabel("Press ▶️ to run your job."))
@@ -200,7 +200,7 @@ class NewProjectDialog(BaseFormDialog):
             return count
         if self.input_widget.get_selection_mode() == 'files' and \
                 self.input_widget.get_selected_files():
-            self.n_image_files = len(self.input_widget.get_selected_files())
+            self.n_image_files = self.input_widget.num_selected_files()
             self.selected_filenames = self.input_widget.get_selected_filenames()
         else:
             self.n_image_files = count_image_files(self.input_widget.get_path())

shinestacker/gui/project_controller.py

@@ -20,6 +20,7 @@ class ProjectController(QObject):
     activate_window_requested = Signal()
     enable_save_actions_requested = Signal(bool)
     enable_sub_actions_requested = Signal(bool)
+    add_recent_file_requested = Signal(str)
 
     def __init__(self, parent):
         super().__init__(parent)
@@ -242,6 +243,7 @@ class ProjectController(QObject):
                 self.parent, "Open Project", "", "Project Files (*.fsp);;All Files (*)")
         if file_path:
             try:
+                abs_file_path = os.path.abspath(file_path)
                 self.set_current_file_path(file_path)
                 with open(self.current_file_path(), 'r', encoding="utf-8") as file:
                     json_obj = json.load(file)
@@ -250,6 +252,7 @@ class ProjectController(QObject):
                     raise RuntimeError(f"Project from file {file_path} produced a null project.")
                 self.set_project(project)
                 self.mark_as_modified(False)
+                self.add_recent_file_requested.emit(abs_file_path)
                 self.project_editor.reset_undo()
                 self.refresh_ui(0, -1)
                 if self.job_list_count() > 0:
@@ -311,6 +314,7 @@ class ProjectController(QObject):
                 f.write(json_obj)
             self.mark_as_modified(False)
             self.update_title_requested.emit()
+            self.add_recent_file_requested.emit(file_path)
         except Exception as e:
             QMessageBox.critical(self.parent, "Error", f"Cannot save file:\n{str(e)}")
 

shinestacker/gui/project_editor.py

@@ -268,7 +268,7 @@ class ProjectEditor(QObject):
         if os.path.isabs(in_path):
             in_path = ".../" + os.path.basename(in_path)
         ico = constants.ACTION_ICONS[constants.ACTION_JOB]
-        return txt + (f" [{ico}Job: 📁 {in_path} → 📂 ...]" if long_name else "")
+        return txt + (f" [{ico}Job] - 📁 {in_path} → 📂 ..." if long_name else "")
 
     def action_text(self, action, is_sub_action=False, indent=True, long_name=False, html=False):
         ico = constants.ACTION_ICONS.get(action.type_name, '')
@@ -285,9 +285,9 @@ class ProjectEditor(QObject):
             in_path = ".../" + os.path.basename(in_path)
         if os.path.isabs(out_path):
             out_path = ".../" + os.path.basename(out_path)
-        return f"{txt} [{ico}{action.type_name}" + \
-               (f": 📁 <i>{in_path}</i> → 📂 <i>{out_path}</i>]"
-                if long_name and not is_sub_action else "]")
+        return f"{txt} [{ico}{action.type_name}]" + \
+               (f" - 📁 <i>{in_path}</i> → 📂 <i>{out_path}</i>"
+                if long_name and not is_sub_action else "")
 
     def get_job_at(self, index):
         return None if index < 0 else self.project_job(index)
@@ -495,6 +495,8 @@ class ProjectEditor(QObject):
             text = self.action_text(action, long_name=True, html=True, is_sub_action=is_sub_action)
         item = QListWidgetItem()
         item.setText('')
+        item.setToolTip("<b>Double-click:</b> configure parameters<br>"
+                        "<b>Right-click:</b> show menu")
         item.setData(Qt.ItemDataRole.UserRole, True)
         widget_list.addItem(item)
         html_text = f"✅ <span style='color:#{ColorPalette.DARK_BLUE.hex()};'>{text}</span>" \

shinestacker/gui/recent_file_manager.py

@@ -0,0 +1,93 @@
+# pylint: disable=C0114, C0115, C0116, E0611
+import os
+from PySide6.QtCore import QStandardPaths
+
+
+class RecentFileManager:
+    def __init__(self, filename, max_entries=10):
+        self.filename = filename
+        self.max_entries = max_entries
+        self._config_dir = None
+
+    def get_config_dir(self):
+        if self._config_dir is None:
+            config_dir = QStandardPaths.writableLocation(QStandardPaths.AppConfigLocation)
+            if not config_dir:
+                if os.name == 'nt':  # Windows
+                    config_dir = os.path.join(os.environ.get('APPDATA', ''), 'ShineStacker')
+                elif os.name == 'posix':  # macOS and Linux
+                    config_dir = os.path.expanduser('~/.config/shinestacker')
+                else:
+                    config_dir = os.path.join(os.path.expanduser('~'), '.shinestacker')
+            os.makedirs(config_dir, exist_ok=True)
+            self._config_dir = config_dir
+        return self._config_dir
+
+    def get_file_path(self):
+        return os.path.join(self.get_config_dir(), self.filename)
+
+    def get_files(self):
+        file_path = self.get_file_path()
+        try:
+            with open(file_path, 'r', encoding='utf-8') as f:
+                files = [line.strip() for line in f.readlines()]
+                return [f for f in files if f and os.path.exists(f)]
+        except (FileNotFoundError, IOError):
+            return []
+
+    def get_files_with_display_names(self):
+        files = self.get_files()
+        basename_count = {}
+        for file_path in files:
+            basename = os.path.basename(file_path)
+            basename_count[basename] = basename_count.get(basename, 0) + 1
+        result = {}
+        for file_path in files:
+            basename = os.path.basename(file_path)
+            if basename_count[basename] == 1:
+                result[file_path] = basename
+            else:
+                parent_dir = os.path.basename(os.path.dirname(file_path))
+                result[file_path] = f"{basename} ({parent_dir})"
+                if list(result.values()).count(result[file_path]) > 1:
+                    path_components = file_path.split(os.sep)
+                    for i in range(2, min(5, len(path_components))):
+                        display_name = os.sep.join(path_components[-i:])
+                        if sum(1 for f in files
+                                if os.sep.join(os.path.normpath(f).split(os.sep)[-i:]) ==
+                                display_name) == 1:
+                            result[file_path] = display_name
+                            break
+                    else:
+                        if len(file_path) > 50:
+                            result[file_path] = "..." + file_path[-47:]
+                        else:
+                            result[file_path] = file_path
+        return result
+
+    def add_file(self, file_path):
+        file_path = os.path.abspath(file_path)
+        recent_files = self.get_files()
+        if file_path in recent_files:
+            recent_files.remove(file_path)
+        recent_files.insert(0, file_path)
+        recent_files = recent_files[:self.max_entries]
+        self._save_files(recent_files)
+
+    def remove_file(self, file_path):
+        file_path = os.path.normpath(file_path)
+        recent_files = self.get_files()
+        if file_path in recent_files:
+            recent_files.remove(file_path)
+        self._save_files(recent_files)
+
+    def _save_files(self, files):
+        file_path = self.get_file_path()
+        try:
+            with open(file_path, 'w', encoding='utf-8') as f:
+                f.write('\n'.join(files))
+        except IOError as e:
+            raise e
+
+    def clear(self):
+        self._save_files([])

shinestacker/gui/sys_mon.py

@@ -2,6 +2,7 @@
 import psutil
 from PySide6.QtWidgets import QWidget, QHBoxLayout, QLabel, QProgressBar, QSizePolicy
 from PySide6.QtCore import QTimer, Qt
+from .colors import ColorPalette
 
 
 class StatusBarSystemMonitor(QWidget):
@@ -13,7 +14,7 @@ class StatusBarSystemMonitor(QWidget):
 
     def setup_ui(self):
         bar_width = 100
-        bar_height = 20
+        bar_height = 22
         layout = QHBoxLayout()
         layout.setSpacing(10)
         layout.setContentsMargins(0, 2, 0, 0)
@@ -25,27 +26,27 @@ class StatusBarSystemMonitor(QWidget):
         self.cpu_bar.setRange(0, 100)
         self.cpu_bar.setTextVisible(False)
         self.cpu_bar.setGeometry(0, 0, bar_width, bar_height)
-        self.cpu_bar.setStyleSheet("""
-            QProgressBar {
+        self.cpu_bar.setStyleSheet(f"""
+            QProgressBar {{
                 border: 1px solid #cccccc;
                 border-radius: 5px;
-                background: #f0f0f0;
-            }
-            QProgressBar::chunk {
-                background-color: #3498db;
+                background: #F0F0F0;
+            }}
+            QProgressBar::chunk {{
+                background-color: #{ColorPalette.LIGHT_BLUE.hex()};
                 border-radius: 5px;
-            }
+            }}
         """)
         self.cpu_label = QLabel("CPU: --%", cpu_widget)
         self.cpu_label.setAlignment(Qt.AlignCenter)
         self.cpu_label.setGeometry(0, 0, bar_width, bar_height)
-        self.cpu_label.setStyleSheet("""
-            QLabel {
-                color: #2c3e50;
+        self.cpu_label.setStyleSheet(f"""
+            QLabel {{
+                color: #{ColorPalette.DARK_BLUE.hex()};
                 font-weight: bold;
                 background: transparent;
                 font-size: 12px;
-            }
+            }}
         """)
         mem_widget = QWidget()
         mem_widget.setFixedSize(bar_width, bar_height)
@@ -53,27 +54,27 @@ class StatusBarSystemMonitor(QWidget):
         self.mem_bar.setRange(0, 100)
         self.mem_bar.setTextVisible(False)
         self.mem_bar.setGeometry(0, 0, bar_width, bar_height)
-        self.mem_bar.setStyleSheet("""
-            QProgressBar {
-                border: 1px solid #cccccc;
+        self.mem_bar.setStyleSheet(f"""
+            QProgressBar {{
+                border: 1px solid #CCCCCC;
                 border-radius: 5px;
                 background: #f0f0f0;
-            }
-            QProgressBar::chunk {
-                background-color: #2ecc71;
+            }}
+            QProgressBar::chunk {{
+                background-color: #{ColorPalette.LIGHT_GREEN.hex()};
                 border-radius: 5px;
-            }
+            }}
         """)
         self.mem_label = QLabel("MEM: --%", mem_widget)
         self.mem_label.setAlignment(Qt.AlignCenter)
         self.mem_label.setGeometry(0, 0, bar_width, bar_height)
-        self.mem_label.setStyleSheet("""
-            QLabel {
-                color: #2c3e50;
+        self.mem_label.setStyleSheet(f"""
+            QLabel {{
+                color: #{ColorPalette.DARK_BLUE.hex()};
                 font-weight: bold;
                 background: transparent;
                 font-size: 12px;
-            }
+            }}
         """)
         layout.addWidget(cpu_widget)
         layout.addWidget(mem_widget)

shinestacker/retouch/base_filter.py

@@ -48,7 +48,7 @@ class BaseFilter(ABC):
             nonlocal active_worker, dialog_closed  # noqa
             dialog_closed = True
             self.editor.restore_master_layer()
-            self.editor.display_manager.display_master_layer()
+            self.editor.image_viewer.update_master_display()
             if active_worker and active_worker.isRunning():
                 active_worker.wait()
             initial_timer.stop()
@@ -62,10 +62,10 @@ class BaseFilter(ABC):
                 current_region = self.editor.image_viewer.get_visible_image_portion()[1]
                 if current_region == region:
                     self.editor.set_master_layer(img)
-                    self.editor.display_manager.display_master_layer()
+                    self.editor.image_viewer.update_master_display()
             else:
                 self.editor.set_master_layer(img)
-                self.editor.display_manager.display_master_layer()
+                self.editor.image_viewer.update_master_display()
             try:
                 dlg.activateWindow()
             except Exception:
@@ -125,7 +125,7 @@ class BaseFilter(ABC):
 
         def restore_original():
             self.editor.restore_master_layer()
-            self.editor.display_manager.display_master_layer()
+            self.editor.image_viewer.update_master_display()
             try:
                 dlg.activateWindow()
             except Exception:
@@ -155,7 +155,7 @@ class BaseFilter(ABC):
             final_img = self.apply(self.editor.master_layer_copy(), *params)
             self.editor.set_master_layer(final_img)
             self.editor.copy_master_layer()
-            self.editor.display_manager.display_master_layer()
+            self.editor.image_viewer.update_master_display()
             self.editor.display_manager.update_master_thumbnail()
             self.editor.mark_as_modified()
         else:

shinestacker/retouch/brush_preview.py

@@ -41,6 +41,7 @@ class BrushPreviewItem(QGraphicsPixmapItem, LayerCollectionHandler):
         self.setVisible(False)
         self.setZValue(500)
         self.setTransformationMode(Qt.SmoothTransformation)
+        self.brush = None
 
     def get_layer_area(self, layer, x, y, w, h):
         if not isinstance(layer, np.ndarray):
@@ -64,6 +65,8 @@ class BrushPreviewItem(QGraphicsPixmapItem, LayerCollectionHandler):
         raise RuntimeError("Bitmas is neither 8 bit nor 16, but of type " + area.dtype)
 
     def update(self, scene_pos, size):
+        if self.brush is None:
+            return
         try:
             if self.layer_collection is None or self.number_of_layers() == 0 or size <= 0:
                 self.hide()

shinestacker/retouch/brush_tool.py

@@ -12,7 +12,7 @@ from .brush_preview import create_brush_mask
 class BrushTool:
     def __init__(self):
         self.brush = None
-        self.brush_preview = None
+        self.brush_preview_widget = None
         self.image_viewer = None
         self.size_slider = None
         self.hardness_slider = None
@@ -21,11 +21,11 @@ class BrushTool:
         self._brush_mask_cache = {}
         self.brush_text = None
 
-    def setup_ui(self, brush, brush_preview, image_viewer, size_slider, hardness_slider,
+    def setup_ui(self, brush, brush_preview_widget, image_viewer, size_slider, hardness_slider,
                  opacity_slider, flow_slider):
         self.brush = brush
-        self.brush_preview = brush_preview
-        self.brush_text = QLabel(brush_preview.parent())
+        self.brush_preview_widget = brush_preview_widget
+        self.brush_text = QLabel(brush_preview_widget.parent())
         self.brush_text.setStyleSheet("color: navy; background: transparent;")
         self.brush_text.setAlignment(Qt.AlignLeft | Qt.AlignTop)
         self.brush_text.raise_()
@@ -96,13 +96,13 @@ class BrushTool:
         preview_size = min(self.brush.size, width + 30, height + 30)
         center_x, center_y = width // 2, height // 2
         radius = preview_size // 2
-        if self.image_viewer.cursor_style == 'preview':
+        if self.image_viewer.strategy.cursor_style == 'preview':
             gradient = create_default_brush_gradient(center_x, center_y, radius, self.brush)
             painter.setBrush(QBrush(gradient))
             painter.setPen(
                 QPen(QColor(*gui_constants.BRUSH_COLORS['outer']),
                      gui_constants.BRUSH_PREVIEW_LINE_WIDTH))
-        elif self.image_viewer.cursor_style == 'outline':
+        elif self.image_viewer.strategy.cursor_style == 'outline':
             painter.setBrush(Qt.NoBrush)
             painter.setPen(
                 QPen(QColor(*gui_constants.BRUSH_COLORS['outer']),
@@ -113,7 +113,7 @@ class BrushTool:
                 QPen(QColor(*gui_constants.BRUSH_COLORS['pen']),
                      gui_constants.BRUSH_PREVIEW_LINE_WIDTH))
         painter.drawEllipse(QPoint(center_x, center_y), radius, radius)
-        if self.image_viewer.cursor_style == 'preview':
+        if self.image_viewer.strategy.cursor_style == 'preview':
             painter.setPen(QPen(QColor(0, 0, 160)))
             font = QApplication.font()
             painter.setFont(font)
@@ -126,13 +126,13 @@ class BrushTool:
                 f"Flow: {self.brush.flow}%"
             )
             self.brush_text.adjustSize()
-            self.brush_text.move(10, self.brush_preview.height() // 2 + 125)
+            self.brush_text.move(10, self.brush_preview_widget.height() // 2 + 125)
             self.brush_text.show()
         else:
             self.brush_text.hide()
         painter.end()
-        self.brush_preview.setPixmap(pixmap)
-        self.image_viewer.update_brush_cursor()
+        self.brush_preview_widget.setPixmap(pixmap)
+        self.image_viewer.strategy.update_brush_cursor()
 
     def apply_brush_operation(self, master_layer, source_layer, dest_layer, mask_layer,
                               view_pos):
@@ -140,7 +140,7 @@ class BrushTool:
             return False
         if dest_layer is None:
             dest_layer = master_layer
-        scene_pos = self.image_viewer.mapToScene(view_pos)
+        scene_pos = self.image_viewer.strategy.map_to_scene(view_pos)
         x_center = int(round(scene_pos.x()))
         y_center = int(round(scene_pos.y()))
         radius = int(round(self.brush.size // 2))