shinestacker 1.5.0__tar.gz → 1.5.1__tar.gz

{shinestacker-1.5.0 → shinestacker-1.5.1}/CHANGELOG.md

@@ -2,20 +2,36 @@
 
 This page reports the main releases only and the main changes therein.
 
+## [V1.5.1] - 2025-09-20
+**Several bug fixes**
+
+### Added
+- new command-line parameters -v1, -v2, -v3, allow different view modes at startup
+
+### Fixed
+- consistent and restyled cursor for current layer view
+- fixed ghost cursors in side-by-side views
+- fixed cursor shift at startup
+- fixed brush preview at image borders
+- fixed lower/upper case GUI labels
+- improved help and description text
+
+---
+
 ## [v1.5.0] - 2025-09-16
-**GUI updates and fixes**
+**GUI improvements and fixes**
 
 ### Added
 - implemented image rotation
-- dotted cursor in secondary two-image view
 
 ### Fixed
-- fixed zoom in wheel events for side-by-side view
+- fixed zoom in wheel events for side-by-side views
 - restored standard cursor in empty retouch views
 - lower/upper case GUI labels
 
 ### Changed
 - code refactoring and cleanup
+- dotted cursor in secondary two-image view
 
 ---
 
@@ -369,5 +385,4 @@ This release is equivalent to v0.3.2, but resolves a problem for PyPI distributi
 - several stability improvements
 - several bug fixes
 
-
 ---

{shinestacker-1.5.0/src/shinestacker.egg-info → shinestacker-1.5.1}/PKG-INFO

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

shinestacker-1.5.1/src/shinestacker/_version.py

@@ -0,0 +1 @@
+__version__ = '1.5.1'

shinestacker-1.5.1/src/shinestacker/app/args.py

@@ -0,0 +1,23 @@
+# pylint: disable=C0114, C0116
+
+def add_project_arguments(parser):
+    parser.add_argument('-x', '--expert', action='store_true', help='''
+expert options are visible by default.
+''')
+
+
+def add_retouch_arguments(parser):
+    parser.add_argument('-p', '--path', nargs='?', help='''
+import frames from one or more directories.
+Multiple directories can be specified separated by ';'.
+''')
+    view_group = parser.add_mutually_exclusive_group()
+    view_group.add_argument('-v1', '--view-overlaid', action='store_true', help='''
+set overlaid view.
+''')
+    view_group.add_argument('-v2', '--view-side-by-side', action='store_true', help='''
+set side-by-side view.
+''')
+    view_group.add_argument('-v3', '--view-top-bottom', action='store_true', help='''
+set top-bottom view.
+''')

{shinestacker-1.5.0 → shinestacker-1.5.1}/src/shinestacker/app/main.py

@@ -1,4 +1,4 @@
-# pylint: disable=C0114, C0115, C0116, C0413, E0611, R0903, E1121, W0201
+# pylint: disable=C0114, C0115, C0116, C0413, E0611, R0903, E1121, W0201, R0915, R0912
 import sys
 import os
 import logging
@@ -20,6 +20,7 @@ from shinestacker.app.gui_utils import (
     disable_macos_special_menu_items, fill_app_menu, set_css_style)
 from shinestacker.app.help_menu import add_help_action
 from shinestacker.app.open_frames import open_frames
+from .args import add_project_arguments, add_retouch_arguments
 
 
 class SelectionDialog(QDialog):
@@ -211,19 +212,21 @@ if a single file is specified, it can be either a project or an image.
 Multiple frames can be specified as a list of files.
 Multiple files can be specified separated by ';'.
 ''')
-    parser.add_argument('-p', '--path', nargs='?', help='''
-import frames from one or more directories.
-Multiple directories can be specified separated by ';'.
+    app_group = parser.add_mutually_exclusive_group()
+    app_group.add_argument('-j', '--project', action='store_true', help='''
+open project window at startup instead of project windows (default).
 ''')
-    parser.add_argument('-r', '--retouch', action='store_true', help='''
+    app_group.add_argument('-r', '--retouch', action='store_true', help='''
 open retouch window at startup instead of project windows.
 ''')
-    parser.add_argument('-x', '--expert', action='store_true', help='''
-expert options are visible by default.
-''')
+    add_project_arguments(parser)
+    add_retouch_arguments(parser)
     args = vars(parser.parse_args(sys.argv[1:]))
     filename = args['filename']
     path = args['path']
+    if filename and path:
+        print("can't specify both arguments --filename and --path", file=sys.stderr)
+        sys.exit(1)
     setup_logging(console_level=logging.DEBUG, file_level=logging.DEBUG, disable_console=True)
     app = Application(sys.argv)
     if config.DONT_USE_NATIVE_MENU:
@@ -239,6 +242,12 @@ expert options are visible by default.
     main_app.activateWindow()
     if args['expert']:
         main_app.project_window.set_expert_options()
+    if args['view_overlaid']:
+        main_app.retouch_window.set_strategy('overlaid')
+    elif args['view_side_by_side']:
+        main_app.retouch_window.set_strategy('sidebyside')
+    elif args['view_top_bottom']:
+        main_app.retouch_window.set_strategy('topbottom')
     if filename:
         filenames = filename.split(';')
         filename = filenames[0]

{shinestacker-1.5.0 → shinestacker-1.5.1}/src/shinestacker/app/project.py

@@ -17,6 +17,7 @@ from shinestacker.gui.main_window import MainWindow
 from shinestacker.app.gui_utils import (
     disable_macos_special_menu_items, fill_app_menu, set_css_style)
 from shinestacker.app.help_menu import add_help_action
+from .args import add_project_arguments
 
 
 class ProjectApp(MainWindow):
@@ -52,9 +53,7 @@ def main():
     parser.add_argument('-f', '--filename', nargs='?', help='''
 project filename.
 ''')
-    parser.add_argument('-x', '--expert', action='store_true', help='''
-expert options are visible by default.
-''')
+    add_project_arguments(parser)
     args = vars(parser.parse_args(sys.argv[1:]))
     setup_logging(console_level=logging.DEBUG, file_level=logging.DEBUG, disable_console=True)
     app = Application(sys.argv)

{shinestacker-1.5.0 → shinestacker-1.5.1}/src/shinestacker/app/retouch.py

@@ -13,6 +13,7 @@ from shinestacker.app.gui_utils import (
     disable_macos_special_menu_items, fill_app_menu, set_css_style)
 from shinestacker.app.help_menu import add_help_action
 from shinestacker.app.open_frames import open_frames
+from .args import add_retouch_arguments
 
 
 class RetouchApp(ImageEditorUI):
@@ -44,10 +45,7 @@ def main():
 import frames from files.
 Multiple files can be specified separated by ';'.
 ''')
-    parser.add_argument('-p', '--path', nargs='?', help='''
-import frames from one or more directories.
-Multiple directories can be specified separated by ';'.
-''')
+    add_retouch_arguments(parser)
     args = vars(parser.parse_args(sys.argv[1:]))
     filename = args['filename']
     path = args['path']
@@ -65,6 +63,12 @@ Multiple directories can be specified separated by ';'.
     editor = RetouchApp()
     app.editor = editor
     editor.show()
+    if args['view_overlaid']:
+        editor.set_strategy('overlaid')
+    elif args['view_side_by_side']:
+        editor.set_strategy('sidebyside')
+    elif args['view_top_bottom']:
+        editor.set_strategy('topbottom')
     open_frames(editor, filename, path)
     sys.exit(app.exec())
 

{shinestacker-1.5.0 → shinestacker-1.5.1}/src/shinestacker/config/gui_constants.py

@@ -26,7 +26,7 @@ class _GuiConstants:
         'outer': (255, 0, 0, 200),
         'inner': (255, 0, 0, 150),
         'gradient_end': (255, 0, 0, 0),
-        'pen': (255, 0, 0, 150),
+        'pen': (255, 0, 0, 200),
         'preview': (255, 180, 180),
         'cursor_inner': (255, 0, 0, 120),
         'preview_inner': (255, 255, 255, 150)
@@ -55,7 +55,7 @@ class _GuiConstants:
     DEFAULT_BRUSH_OPACITY = 100
     DEFAULT_BRUSH_FLOW = 100
     BRUSH_SIZES = {
-        'default': 50,
+        'default': 100,
         'min': 5,
         'mid': 50,
         'max': 1000

{shinestacker-1.5.0 → shinestacker-1.5.1}/src/shinestacker/gui/new_project.py

@@ -108,17 +108,19 @@ class NewProjectDialog(BaseFormDialog):
             step2_layout.addRow("Vignetting correction:", self.vignetting_correction)
         step2_layout.addRow(
             # f" {constants.ACTION_ICONS[constants.ACTION_ALIGNFRAMES]} "
-            "Align layers:", self.align_frames)
+            "Align frames:", self.align_frames)
         step2_layout.addRow(
             # f" {constants.ACTION_ICONS[constants.ACTION_BALANCEFRAMES]} "
-            "Balance layers:", self.balance_frames)
+            "Balance frames:", self.balance_frames)
         step2_layout.addRow(
             # f" {constants.ACTION_ICONS[constants.ACTION_FOCUSSTACKBUNCH]} "
-            "Bunch stack:", self.bunch_stack)
-        step2_layout.addRow("Bunch frames:", self.bunch_frames)
-        step2_layout.addRow("Bunch overlap:", self.bunch_overlap)
+            "Create bunches:", self.bunch_stack)
+        self.bunch_stack.setToolTip("Combine multiple frames into fewer, high-quality "
+                                    "composite frames for easier retouching")
+        step2_layout.addRow("Frames per bunch:", self.bunch_frames)
+        step2_layout.addRow("Overlap between bunches:", self.bunch_overlap)
         self.bunches_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
-        step2_layout.addRow("Number of bunches: ", self.bunches_label)
+        step2_layout.addRow("Number of resulting bunches: ", self.bunches_label)
         if self.expert():
             step2_layout.addRow(
                 f" {constants.ACTION_ICONS[constants.ACTION_FOCUSSTACK]} "
@@ -133,14 +135,14 @@ class NewProjectDialog(BaseFormDialog):
         if self.expert():
             step2_layout.addRow(
                 f" {constants.ACTION_ICONS[constants.ACTION_MULTILAYER]} "
-                "Save multi layer TIFF:", self.multi_layer)
+                "Export as multilayer TIFF:", self.multi_layer)
         step2_group.setLayout(step2_layout)
         self.form_layout.addRow(step2_group)
         step3_group = QGroupBox("3) Confirm")
         step3_layout = QVBoxLayout()
         step3_layout.setContentsMargins(15, 0, 15, 15)
         step3_layout.addWidget(
-            QLabel("Click 🆗 to confirm and prepare the job."))
+            QLabel("Click 🆗 to create project with these settings."))
         step3_layout.addWidget(
             QLabel("Select: <b>View</b> > <b>Expert options</b> for advanced configuration."))
         step3_group.setLayout(step3_layout)
@@ -149,6 +151,7 @@ class NewProjectDialog(BaseFormDialog):
         step4_layout = QHBoxLayout()
         step4_layout.setContentsMargins(15, 0, 15, 15)
         step4_layout.addWidget(QLabel("Press ▶️ to run your job."))
+        step4_layout.addStretch()
         icon_path = f"{os.path.dirname(__file__)}/ico/shinestacker.png"
         app_icon = QIcon(icon_path)
         icon_pixmap = app_icon.pixmap(80, 80)
@@ -293,12 +296,12 @@ class NewProjectDialog(BaseFormDialog):
                             "Processing may require a significant amount "
                             "of memory or I/O buffering.\n\n"
                             "Continue anyway?")
-                msg.setInformativeText("You may consider to split the processing "
-                                       " using a bunch stack to reduce memory usage.\n\n"
-                                       '✅ Check the option "Bunch stack".\n\n'
-                                       "➡️ Check expert options for the stacking algorithm."
-                                       'Go to "View" > "Expert Options".'
-                                       )
+                msg.setInformativeText('You may consider creating "bunches" to reduce '
+                                       "the number of frames for retouching.\n\n"
+                                       '✅ Check "Create bunches" to combine frames '
+                                       "into manageable composites.\n\n"
+                                       "➡️ Check expert options for the stacking algorithm.\n\n"
+                                       'Go to "View" > "Expert Options".')
                 msg.setStandardButtons(QMessageBox.Ok | QMessageBox.Cancel)
                 msg.setDefaultButton(QMessageBox.Cancel)
                 if msg.exec_() != QMessageBox.Ok:

{shinestacker-1.5.0 → shinestacker-1.5.1}/src/shinestacker/retouch/brush_preview.py

@@ -1,4 +1,4 @@
-# pylint: disable=C0114, C0115, C0116, E0611, R0913, R0917, R0914, W0718
+# pylint: disable=C0114, C0115, C0116, E0611, R0913, R0917, R0914, W0718, R0915
 import traceback
 import numpy as np
 from PySide6.QtWidgets import QGraphicsPixmapItem
@@ -72,38 +72,52 @@ class BrushPreviewItem(QGraphicsPixmapItem, LayerCollectionHandler):
                 self.hide()
                 return
             radius = size // 2
-            x = int(scene_pos.x() - radius + 0.5)
-            y = int(scene_pos.y() - radius)
+            x_center = int(scene_pos.x() + 0.5)
+            y_center = int(scene_pos.y() + 0.5)
+            x = x_center - radius
+            y = y_center - radius
             w = h = size
             if not self.valid_current_layer_idx():
                 self.hide()
                 return
-            layer_area = self.get_layer_area(self.current_layer(), x, y, w, h)
-            master_area = self.get_layer_area(self.master_layer(), x, y, w, h)
+            height, width = self.current_layer().shape[:2]
+            visible_x = max(0, x)
+            visible_y = max(0, y)
+            visible_w = min(width, x + w) - visible_x
+            visible_h = min(height, y + h) - visible_y
+            if visible_w <= 0 or visible_h <= 0:
+                self.hide()
+                return
+            layer_area = self.get_layer_area(
+                self.current_layer(), visible_x, visible_y, visible_w, visible_h)
+            master_area = self.get_layer_area(
+                self.master_layer(), visible_x, visible_y, visible_w, visible_h)
             if layer_area is None or master_area is None:
                 self.hide()
                 return
-            height, width = self.current_layer().shape[:2]
             full_mask = create_brush_mask(size=size, hardness_percent=self.brush.hardness,
                                           opacity_percent=self.brush.opacity)[:, :, np.newaxis]
-            mask_x_start = max(0, -x) if x < 0 else 0
-            mask_y_start = max(0, -y) if y < 0 else 0
-            mask_x_end = size - (max(0, (x + w) - width)) if (x + w) > width else size
-            mask_y_end = size - (max(0, (y + h) - height)) if (y + h) > height else size
+            mask_x_start = max(0, -x)
+            mask_y_start = max(0, -y)
+            mask_x_end = mask_x_start + visible_w
+            mask_y_end = mask_y_start + visible_h
             mask_area = full_mask[mask_y_start:mask_y_end, mask_x_start:mask_x_end]
             area = (layer_area * mask_area + master_area * (1 - mask_area)) * 255.0
             area = area.astype(np.uint8)
             qimage = QImage(area.data, area.shape[1], area.shape[0],
                             area.strides[0], QImage.Format_RGB888)
-            mask = QPixmap(w, h)
+            mask = QPixmap(visible_w, visible_h)
             mask.fill(Qt.transparent)
             painter = QPainter(mask)
             painter.setPen(Qt.NoPen)
             painter.setBrush(Qt.black)
-            painter.drawEllipse(0, 0, w, h)
+            center_x_in_visible = x_center - visible_x
+            center_y_in_visible = y_center - visible_y
+            painter.drawEllipse(
+                center_x_in_visible - radius, center_y_in_visible - radius, size, size)
             painter.end()
             pixmap = QPixmap.fromImage(qimage)
-            final_pixmap = QPixmap(w, h)
+            final_pixmap = QPixmap(visible_w, visible_h)
             final_pixmap.fill(Qt.transparent)
             painter = QPainter(final_pixmap)
             painter.drawPixmap(0, 0, pixmap)
@@ -111,8 +125,8 @@ class BrushPreviewItem(QGraphicsPixmapItem, LayerCollectionHandler):
             painter.drawPixmap(0, 0, mask)
             painter.end()
             self.setPixmap(final_pixmap)
-            x_start, y_start = max(0, x), max(0, y)
-            self.setPos(x_start, y_start)
+            self.setPos(visible_x, visible_y)
+            self.show()
         except Exception:
             traceback.print_exc()
             self.hide()

{shinestacker-1.5.0 → shinestacker-1.5.1}/src/shinestacker/retouch/image_editor_ui.py

@@ -49,7 +49,6 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         self.filter_manager.register_filter("White Balance", WhiteBalanceFilter)
         self.filter_manager.register_filter("Vignetting Correction", VignettingFilter)
         self.shortcuts_help_dialog = None
-
         self.update_title()
         self.resize(1400, 900)
         center = QGuiApplication.primaryScreen().geometry().center()
@@ -68,18 +67,15 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         side_layout = QVBoxLayout(side_panel)
         side_layout.setContentsMargins(0, 0, 0, 0)
         side_layout.setSpacing(2)
-
         brush_panel = QFrame()
         brush_panel.setFrameShape(QFrame.StyledPanel)
         brush_panel.setContentsMargins(0, 0, 0, 0)
         brush_layout = QVBoxLayout(brush_panel)
         brush_layout.setContentsMargins(0, 0, 0, 0)
         brush_layout.setSpacing(2)
-
         brush_label = QLabel("Brush Size")
         brush_label.setAlignment(Qt.AlignCenter)
         brush_layout.addWidget(brush_label)
-
         self.brush_size_slider = QSlider(Qt.Horizontal)
         self.brush_size_slider.setRange(0, gui_constants.BRUSH_SIZE_SLIDER_MAX)
 
@@ -94,7 +90,6 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
 
         self.brush_size_slider.setValue(brush_size_to_slider(self.brush.size))
         brush_layout.addWidget(self.brush_size_slider)
-
         hardness_label = QLabel("Brush Hardness")
         hardness_label.setAlignment(Qt.AlignCenter)
         brush_layout.addWidget(hardness_label)
@@ -102,7 +97,6 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         self.hardness_slider.setRange(0, 100)
         self.hardness_slider.setValue(self.brush.hardness)
         brush_layout.addWidget(self.hardness_slider)
-
         opacity_label = QLabel("Brush Opacity")
         opacity_label.setAlignment(Qt.AlignCenter)
         brush_layout.addWidget(opacity_label)
@@ -110,7 +104,6 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         self.opacity_slider.setRange(0, 100)
         self.opacity_slider.setValue(self.brush.opacity)
         brush_layout.addWidget(self.opacity_slider)
-
         flow_label = QLabel("Brush Flow")
         flow_label.setAlignment(Qt.AlignCenter)
         brush_layout.addWidget(flow_label)
@@ -118,7 +111,6 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         self.flow_slider.setRange(1, 100)
         self.flow_slider.setValue(self.brush.flow)
         brush_layout.addWidget(self.flow_slider)
-
         side_layout.addWidget(brush_panel)
         self.brush_preview_widget = QLabel()
         self.brush_preview_widget.setContentsMargins(0, 0, 0, 0)
@@ -135,7 +127,6 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         self.brush_preview_widget.setFixedHeight(100)
         brush_layout.addWidget(self.brush_preview_widget)
         side_layout.addWidget(brush_panel)
-
         master_label = QLabel("Master")
         master_label.setStyleSheet("""
             QLabel {
@@ -332,30 +323,20 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         overlaid_mode = self.view_mode_actions['overlaid']
         overlaid_mode.setShortcut("Ctrl+1")
         overlaid_mode.setCheckable(True)
-        overlaid_mode.triggered.connect(lambda: set_strategy('overlaid'))
+        overlaid_mode.triggered.connect(lambda: self.set_strategy('overlaid'))
         view_strategy_menu.addAction(overlaid_mode)
         side_by_side_mode = self.view_mode_actions['sidebyside']
         side_by_side_mode.setShortcut("Ctrl+2")
         side_by_side_mode.setCheckable(True)
-        side_by_side_mode.triggered.connect(lambda: set_strategy('sidebyside'))
+        side_by_side_mode.triggered.connect(lambda: self.set_strategy('sidebyside'))
         view_strategy_menu.addAction(side_by_side_mode)
         side_by_side_mode = self.view_mode_actions['topbottom']
         side_by_side_mode.setShortcut("Ctrl+3")
         side_by_side_mode.setCheckable(True)
-        side_by_side_mode.triggered.connect(lambda: set_strategy('topbottom'))
+        side_by_side_mode.triggered.connect(lambda: self.set_strategy('topbottom'))
         view_strategy_menu.addAction(side_by_side_mode)
         view_menu.addMenu(view_strategy_menu)
 
-        def set_strategy(strategy):
-            self.image_viewer.set_strategy(strategy)
-            enable_shortcuts = strategy == 'overlaid'
-            self.view_master_action.setEnabled(enable_shortcuts)
-            self.view_individual_action.setEnabled(enable_shortcuts)
-            self.toggle_view_master_individual_action.setEnabled(enable_shortcuts)
-            for label, mode in self.view_mode_actions.items():
-                mode.setEnabled(label != strategy)
-                mode.setChecked(label == strategy)
-
         cursor_menu = view_menu.addMenu("Cursor Style")
 
         self.cursor_style_actions = {
@@ -432,7 +413,7 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         view_menu.addAction(self.toggle_view_master_individual_action)
         view_menu.addSeparator()
 
-        set_strategy('overlaid')
+        self.set_strategy('overlaid')
 
         sort_asc_action = QAction("Sort Layers A-Z", self)
         sort_asc_action.triggered.connect(lambda: self.sort_layers('asc'))
@@ -463,6 +444,8 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         help_menu.setObjectName("Help")
         shortcuts_help_action = QAction("Shortcuts and Mouse", self)
 
+        self.statusBar().showMessage("Shine Stacker ready.", 2000)
+
         def shortcuts_help():
             self.shortcuts_help_dialog = ShortcutsHelp(self)
             self.shortcuts_help_dialog.exec()
@@ -476,6 +459,16 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         next_layer.activated.connect(self.next_layer)
         self.installEventFilter(self)
 
+    def set_strategy(self, strategy):
+        self.image_viewer.set_strategy(strategy)
+        enable_shortcuts = strategy == 'overlaid'
+        self.view_master_action.setEnabled(enable_shortcuts)
+        self.view_individual_action.setEnabled(enable_shortcuts)
+        self.toggle_view_master_individual_action.setEnabled(enable_shortcuts)
+        for label, mode in self.view_mode_actions.items():
+            mode.setEnabled(label != strategy)
+            mode.setChecked(label == strategy)
+
     def update_title(self):
         title = constants.APP_TITLE
         if self.io_gui_handler is not None:

{shinestacker-1.5.0 → shinestacker-1.5.1}/src/shinestacker/retouch/image_viewer.py

@@ -87,9 +87,6 @@ class ImageViewer(QWidget):
     def set_allow_cursor_preview(self, state):
         self.strategy.set_allow_cursor_preview(state)
 
-    def setup_brush_cursor(self):
-        self.strategy.setup_brush_cursor()
-
     def zoom_in(self):
         self.strategy.zoom_in()
 
@@ -109,7 +106,8 @@ class ImageViewer(QWidget):
         return self.strategy.get_cursor_style()
 
     def set_cursor_style(self, style):
-        self.strategy.set_cursor_style(style)
+        for st in self._strategies.values():
+            st.set_cursor_style(style)
 
     def position_on_image(self, pos):
         return self.strategy.position_on_image(pos)

{shinestacker-1.5.0 → shinestacker-1.5.1}/src/shinestacker/retouch/io_gui_handler.py

@@ -56,8 +56,6 @@ 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.image_viewer.show_master()
-        self.image_viewer.update_master_display()
         self.undo_manager.reset()
         self.blank_layer = np.zeros(master_layer.shape[:2])
         self.finish_loading_setup(f"Loaded: {self.current_file_path()}")
@@ -165,7 +163,6 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         self.display_manager.update_thumbnails()
         self.mark_as_modified_requested.emit(True)
         self.change_layer_requested.emit(0)
-        self.image_viewer.setup_brush_cursor()
         self.status_message_requested.emit(message)
         self.update_title_requested.emit()
         self.add_recent_file_requested.emit(self.current_file_path_master)

{shinestacker-1.5.0 → shinestacker-1.5.1}/src/shinestacker/retouch/overlaid_view.py

@@ -114,27 +114,31 @@ class OverlaidView(ViewStrategy, ImageGraphicsViewBase, ViewSignals):
             return self.handle_gesture_event(event)
         return super().event(event)
 
-    def set_master_image(self, qimage):
-        self.status.set_master_image(qimage)
-        pixmap = self.status.pixmap_master
+    def setup_scene_image(self, pixmap, pixmap_item):
         self.setSceneRect(QRectF(pixmap.rect()))
         img_width, img_height = pixmap.width(), pixmap.height()
         self.set_max_min_scales(img_width, img_height)
-        self.set_zoom_factor(1.0)
+        view_rect = self.viewport().rect()
+        scale_x = view_rect.width() / img_width
+        scale_y = view_rect.height() / img_height
+        scale_factor = min(scale_x, scale_y)
+        scale_factor = max(self.min_scale(), min(scale_factor, self.max_scale()))
+        self.set_zoom_factor(scale_factor)
         self.resetTransform()
-        self.fitInView(self.pixmap_item_master, Qt.KeepAspectRatio)
-        self.set_zoom_factor(self.get_current_scale())
-        self.set_zoom_factor(max(self.min_scale(), min(self.max_scale(), self.zoom_factor())))
-        self.scale(self.zoom_factor(), self.zoom_factor())
-        self.centerOn(self.pixmap_item_master)
+        self.scale(scale_factor, scale_factor)
+        self.centerOn(pixmap_item)
         self.center_image(self)
         self.update_cursor_pen_width()
 
+    def set_master_image(self, qimage):
+        self.status.set_master_image(qimage)
+        self.setup_scene_image(self.status.pixmap_master, self.pixmap_item_master)
+        self.update_master_display()
+
     def set_current_image(self, qimage):
         self.status.set_current_image(qimage)
         if self.empty():
-            self.setSceneRect(QRectF(self.status.pixmap_current.rect()))
-        self.update_cursor_pen_width()
+            self.setup_scene_image(self.status.pixmap_current, self.pixmap_item_current)
 
     def setup_brush_cursor(self):
         super().setup_brush_cursor()
@@ -144,11 +148,19 @@ class OverlaidView(ViewStrategy, ImageGraphicsViewBase, ViewSignals):
         self.pixmap_item_master.setVisible(True)
         self.pixmap_item_current.setVisible(False)
         self.brush_preview.show()
+        if self.brush_cursor:
+            self.scene.removeItem(self.brush_cursor)
+            self.brush_cursor = self.create_circle(self.scene)
+            self.update_brush_cursor()
 
     def show_current(self):
         self.pixmap_item_master.setVisible(False)
         self.pixmap_item_current.setVisible(True)
         self.brush_preview.hide()
+        if self.brush_cursor:
+            self.scene.removeItem(self.brush_cursor)
+            self.brush_cursor = self.create_alt_circle(self.scene)
+            self.update_brush_cursor()
 
     def arrange_images(self):
         if self.empty():