shinestacker 1.4.0__tar.gz → 1.5.0__tar.gz

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

@@ -2,6 +2,23 @@
 
 This page reports the main releases only and the main changes therein.
 
+## [v1.5.0] - 2025-09-16
+**GUI updates and fixes**
+
+### Added
+- implemented image rotation
+- dotted cursor in secondary two-image view
+
+### Fixed
+- fixed zoom in wheel events for side-by-side view
+- restored standard cursor in empty retouch views
+- lower/upper case GUI labels
+
+### Changed
+- code refactoring and cleanup
+
+---
+
 ## [v1.4.0] - 2025-09-14
 **GUI improvements**
 
@@ -11,7 +28,7 @@ This page reports the main releases only and the main changes therein.
 - expert options can be shown with a checkbox in each dialog
 - optional summary plots for alignment transformation parameters
 
-## Fixed
+### Fixed
 - fixed bug in plot generation
 - fixes warning due to missing glyph in PDF generation on macOS
 - safer parallel plot generation using a thread locks
@@ -19,15 +36,11 @@ This page reports the main releases only and the main changes therein.
 ### Changed
 - code refactoring in various areas
 
----
-
-### Changed
-- code cleanup
 
 ## [v1.3.1] - 2025-09-08
 **Fixes and optimizations**
 
-## Fixed
+### Fixed
 - fixed input folder widget in job configuration
 - better management of patological alignments
 - restored alignment match plots

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.4.0
+Version: 1.5.0
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0
@@ -70,11 +70,11 @@ The GUI has two main working areas:
 
 <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/gui-retouch.png' width="600" referrerpolicy="no-referrer">
 
-# Resources
+## Resources
 
  🌍 [Website on WordPress](https://shinestacker.wordpress.com) • 📖 [Main documentation](https://shinestacker.readthedocs.io) • 📝 [Changelog](https://github.com/lucalista/shinestacker/blob/main/CHANGELOG.md) 
 
-# Note for macOS users
+## Note for macOS users
 
 **The following note is only relevant if you download the application as compressed archive from the [release page](https://github.com/lucalista/shinestacker/releases).**
 
@@ -93,17 +93,17 @@ xattr -cr ~/Downloads/shinestacker/shinestacker.app
 
 macOS adds a quarantine flag to all files downloaded from the internet. The above command removes that flag while preserving all other application functionality.
 
-# Credits
+## Credits
 
 The first version of the core focus stack algorithm was initially inspired by the [Laplacian pyramids method](https://github.com/sjawhar/focus-stacking) implementation by Sami Jawhar that was used under permission of the author. The implementation in the latest releases was rewritten from the original code.
 
-# Resources
+## Resources
 
 * [Pyramid Methods in Image Processing](https://www.researchgate.net/publication/246727904_Pyramid_Methods_in_Image_Processing), E. H. Adelson, C. H. Anderson,  J. R. Bergen, P. J. Burt, J. M. Ogden, RCA Engineer, 29-6, Nov/Dec 1984
 Pyramid methods in image processing
 * [A Multi-focus Image Fusion Method Based on Laplacian Pyramid](http://www.jcomputers.us/vol6/jcp0612-07.pdf), Wencheng Wang, Faliang Chang, Journal of Computers 6 (12), 2559, December 2011
 
-# License
+## License
 
 <img src="https://www.gnu.org/graphics/lgplv3-147x51.png" alt="LGPL 3 logo">
 
@@ -112,7 +112,7 @@ Pyramid methods in image processing
 
 - **Logo**: The Shine Stacker logo was designed by [Alessandro Lista](https://linktr.ee/alelista). Copyright © Alessandro Lista. All rights reserved. The logo is not covered by the LGPL-3.0 license of this project.
 
-# Attribution request
+## Attribution request
 📸 If you publish images created with Shine Stacker, please consider adding a note such as:
 
 *Created with Shine Stacker – https://github.com/lucalista/shinestacker*

{shinestacker-1.4.0 → shinestacker-1.5.0}/README.md

@@ -38,11 +38,11 @@ The GUI has two main working areas:
 
 <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/gui-retouch.png' width="600" referrerpolicy="no-referrer">
 
-# Resources
+## Resources
 
  🌍 [Website on WordPress](https://shinestacker.wordpress.com) • 📖 [Main documentation](https://shinestacker.readthedocs.io) • 📝 [Changelog](https://github.com/lucalista/shinestacker/blob/main/CHANGELOG.md) 
 
-# Note for macOS users
+## Note for macOS users
 
 **The following note is only relevant if you download the application as compressed archive from the [release page](https://github.com/lucalista/shinestacker/releases).**
 
@@ -61,17 +61,17 @@ xattr -cr ~/Downloads/shinestacker/shinestacker.app
 
 macOS adds a quarantine flag to all files downloaded from the internet. The above command removes that flag while preserving all other application functionality.
 
-# Credits
+## Credits
 
 The first version of the core focus stack algorithm was initially inspired by the [Laplacian pyramids method](https://github.com/sjawhar/focus-stacking) implementation by Sami Jawhar that was used under permission of the author. The implementation in the latest releases was rewritten from the original code.
 
-# Resources
+## Resources
 
 * [Pyramid Methods in Image Processing](https://www.researchgate.net/publication/246727904_Pyramid_Methods_in_Image_Processing), E. H. Adelson, C. H. Anderson,  J. R. Bergen, P. J. Burt, J. M. Ogden, RCA Engineer, 29-6, Nov/Dec 1984
 Pyramid methods in image processing
 * [A Multi-focus Image Fusion Method Based on Laplacian Pyramid](http://www.jcomputers.us/vol6/jcp0612-07.pdf), Wencheng Wang, Faliang Chang, Journal of Computers 6 (12), 2559, December 2011
 
-# License
+## License
 
 <img src="https://www.gnu.org/graphics/lgplv3-147x51.png" alt="LGPL 3 logo">
 
@@ -80,7 +80,7 @@ Pyramid methods in image processing
 
 - **Logo**: The Shine Stacker logo was designed by [Alessandro Lista](https://linktr.ee/alelista). Copyright © Alessandro Lista. All rights reserved. The logo is not covered by the LGPL-3.0 license of this project.
 
-# Attribution request
+## Attribution request
 📸 If you publish images created with Shine Stacker, please consider adding a note such as:
 
 *Created with Shine Stacker – https://github.com/lucalista/shinestacker*

shinestacker-1.5.0/src/shinestacker/_version.py

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

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

@@ -102,7 +102,7 @@ class MainApp(QMainWindow):
                 file_menu = action.menu()
                 break
         if file_menu is not None:
-            import_action = QAction("Import From Current Project", self)
+            import_action = QAction("Import from Current Project", self)
             import_action.triggered.connect(self.import_from_project)
             file_menu.addAction(import_action)
         else:

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

@@ -66,6 +66,11 @@ class _GuiConstants:
     ZOOM_IN_FACTOR = 1.10
     ZOOM_OUT_FACTOR = 1 / ZOOM_IN_FACTOR
 
+    ROTATE_LABEL = "Rotate"
+    ROTATE_90_CW_LABEL = f"{ROTATE_LABEL} 90° Clockwise"
+    ROTATE_90_CCW_LABEL = f"{ROTATE_LABEL} 90° Anticlockwise"
+    ROTATE_180_LABEL = f"{ROTATE_LABEL} 180°"
+
     def calculate_gamma(self):
         if self.BRUSH_SIZES['mid'] <= self.BRUSH_SIZES['min'] or self.BRUSH_SIZES['max'] <= 0:
             return 1.0

{shinestacker-1.4.0 → shinestacker-1.5.0}/src/shinestacker/retouch/base_filter.py

@@ -34,7 +34,6 @@ class BaseFilter(ABC):
     def run_with_preview(self, **kwargs):
         if self.editor.has_no_master_layer():
             return
-
         self.editor.copy_master_layer()
         dlg = QDialog(self.editor)
         layout = QVBoxLayout(dlg)
@@ -143,15 +142,14 @@ class BaseFilter(ABC):
                 h, w = self.editor.master_layer().shape[:2]
             except Exception:
                 h, w = self.editor.master_layer_copy().shape[:2]
-            if hasattr(self.editor, "undo_manager"):
-                try:
-                    self.editor.undo_manager.extend_undo_area(0, 0, w, h)
-                    self.editor.undo_manager.save_undo_state(
-                        self.editor.master_layer_copy(),
-                        self.name
-                    )
-                except Exception:
-                    pass
+            try:
+                self.editor.undo_manager.extend_undo_area(0, 0, w, h)
+                self.editor.undo_manager.save_undo_state(
+                    self.editor.master_layer_copy(),
+                    self.name
+                )
+            except Exception:
+                pass
             final_img = self.apply(self.editor.master_layer_copy(), *params)
             self.editor.set_master_layer(final_img)
             self.editor.copy_master_layer()

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

@@ -113,7 +113,6 @@ class BrushPreviewItem(QGraphicsPixmapItem, LayerCollectionHandler):
             self.setPixmap(final_pixmap)
             x_start, y_start = max(0, x), max(0, y)
             self.setPos(x_start, y_start)
-            self.show()
         except Exception:
             traceback.print_exc()
             self.hide()

{shinestacker-1.4.0 → shinestacker-1.5.0}/src/shinestacker/retouch/display_manager.py

@@ -25,7 +25,6 @@ class ClickableLabel(QLabel):
 
 class DisplayManager(QObject, LayerCollectionHandler):
     status_message_requested = Signal(str)
-    cursor_preview_state_changed = Signal(bool)
 
     def __init__(self, layer_collection, image_viewer, master_thumbnail_label,
                  thumbnail_list, parent=None):
@@ -35,7 +34,6 @@ class DisplayManager(QObject, LayerCollectionHandler):
         self.master_thumbnail_label = master_thumbnail_label
         self.thumbnail_list = thumbnail_list
         self.view_mode = 'master'
-        self.temp_view_individual = False
         self.needs_update = False
         self.update_timer = QTimer()
         self.update_timer.setInterval(gui_constants.PAINT_REFRESH_TIMER)
@@ -47,21 +45,10 @@ class DisplayManager(QObject, LayerCollectionHandler):
             self.refresh_master_view()
             self.needs_update = False
 
-    def refresh_master_view(self):
-        if self.has_no_master_layer():
-            return
-        self.image_viewer.update_master_display()
-        self.update_master_thumbnail()
-        self.image_viewer.refresh_display()
-
-    def refresh_current_view(self):
-        if self.number_of_layers() == 0:
-            return
-        self.image_viewer.update_current_display()
-        self.image_viewer.refresh_display()
-
     def create_thumbnail(self, layer):
         source_layer = (layer // 256).astype(np.uint8) if layer.dtype == np.uint16 else layer
+        if not source_layer.flags.c_contiguous:
+            source_layer = np.ascontiguousarray(source_layer)
         height, width = source_layer.shape[:2]
         if layer.ndim == 3 and source_layer.shape[-1] == 3:
             qimg = QImage(source_layer.data, width, height, 3 * width, QImage.Format_RGB888)
@@ -157,48 +144,61 @@ class DisplayManager(QObject, LayerCollectionHandler):
         self.thumbnail_list.scrollToItem(
             self.thumbnail_list.item(index), QAbstractItemView.PositionAtCenter)
 
+    def _master_refresh_and_thumb(self):
+        self.image_viewer.show_master()
+        self.refresh_master_view()
+        self.thumbnail_highlight = gui_constants.THUMB_LO_COLOR
+        self.highlight_thumbnail(self.current_layer_idx())
+
+    def _current_refresh_and_thumb(self):
+        self.image_viewer.show_current()
+        self.refresh_current_view()
+        self.thumbnail_highlight = gui_constants.THUMB_HI_COLOR
+        self.highlight_thumbnail(self.current_layer_idx())
+
     def set_view_master(self):
         if self.has_no_master_layer():
             return
         self.view_mode = 'master'
-        self.temp_view_individual = False
-        self.refresh_master_view()
-        self.thumbnail_highlight = gui_constants.THUMB_LO_COLOR
-        self.highlight_thumbnail(self.current_layer_idx())
+        self._master_refresh_and_thumb()
         self.status_message_requested.emit("View mode: Master")
-        self.cursor_preview_state_changed.emit(True)
 
     def set_view_individual(self):
         if self.has_no_master_layer():
             return
         self.view_mode = 'individual'
-        self.temp_view_individual = False
-        self.refresh_current_view()
-        self.thumbnail_highlight = gui_constants.THUMB_HI_COLOR
-        self.highlight_thumbnail(self.current_layer_idx())
+        self._current_refresh_and_thumb()
         self.status_message_requested.emit("View mode: Individual layers")
-        self.cursor_preview_state_changed.emit(False)
+
+    def refresh_master_view(self):
+        if self.has_no_master_layer():
+            return
+        self.image_viewer.update_master_display()
+        self.image_viewer.refresh_display()
+        self.update_master_thumbnail()
+
+    def refresh_current_view(self):
+        if self.number_of_layers() == 0:
+            return
+        self.image_viewer.update_current_display()
+        self.image_viewer.refresh_display()
 
     def start_temp_view(self):
-        if not self.temp_view_individual and self.view_mode == 'master':
-            self.temp_view_individual = True
-            self.image_viewer.update_brush_cursor()
-            self.thumbnail_highlight = gui_constants.THUMB_HI_COLOR
-            self.highlight_thumbnail(self.current_layer_idx())
-            self.image_viewer.show_current()
-            self.refresh_current_view()
-            self.status_message_requested.emit("Temporary view: Individual layer (hold X)")
+        if self.view_mode == 'master':
+            self._current_refresh_and_thumb()
+            self.status_message_requested.emit("Temporary view: Individual layer")
+        else:
+            self._master_refresh_and_thumb()
+            self.image_viewer.strategy.brush_preview.hide()
+            self.status_message_requested.emit("Temporary view: Master")
 
     def end_temp_view(self):
-        if self.temp_view_individual:
-            self.temp_view_individual = False
-            self.image_viewer.update_brush_cursor()
-            self.thumbnail_highlight = gui_constants.THUMB_LO_COLOR
-            self.highlight_thumbnail(self.current_layer_idx())
-            self.image_viewer.show_master()
-            self.refresh_master_view()
+        if self.view_mode == 'master':
+            self._master_refresh_and_thumb()
             self.status_message_requested.emit("View mode: Master")
-            self.cursor_preview_state_changed.emit(True)
+        else:
+            self._current_refresh_and_thumb()
+            self.status_message_requested.emit("View: Individual layer")
 
     def allow_cursor_preview(self):
-        return self.view_mode == 'master' and not self.temp_view_individual
+        return self.view_mode == 'master'

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

@@ -1,4 +1,4 @@
-# pylint: disable=C0114, C0115, C0116, E0611, R0902, R0914, R0915, R0904
+# pylint: disable=C0114, C0115, C0116, E0611, R0902, R0914, R0915, R0904, W0108
 from functools import partial
 import numpy as np
 from PySide6.QtWidgets import (QWidget, QVBoxLayout, QHBoxLayout, QFrame, QLabel, QMenu,
@@ -8,6 +8,7 @@ from PySide6.QtCore import Qt
 from PySide6.QtGui import QGuiApplication
 from .. config.constants import constants
 from .. config.gui_constants import gui_constants
+from .. gui.recent_file_manager import RecentFileManager
 from .image_viewer import ImageViewer
 from .shortcuts_help import ShortcutsHelp
 from .brush import Brush
@@ -22,7 +23,7 @@ from .denoise_filter import DenoiseFilter
 from .unsharp_mask_filter import UnsharpMaskFilter
 from .white_balance_filter import WhiteBalanceFilter
 from .vignetting_filter import VignettingFilter
-from .. gui.recent_file_manager import RecentFileManager
+from .transformation_manager import TransfromationManager
 
 
 class ImageEditorUI(QMainWindow, LayerCollectionHandler):
@@ -31,16 +32,17 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         LayerCollectionHandler.__init__(self, LayerCollection())
         self._recent_file_manager = RecentFileManager("shinestacker-recent-images-files.txt")
         self.thumbnail_highlight = gui_constants.THUMB_MASTER_HI_COLOR
-        self.undo_manager = UndoManager()
-        self.undo_action = None
-        self.redo_action = None
-        self.undo_manager.stack_changed.connect(self.update_undo_redo_actions)
         self.io_gui_handler = None
         self.display_manager = None
         self.brush = Brush()
         self.brush_tool = BrushTool()
         self.modified = False
         self.mask_layer = None
+        self.transformation_manager = TransfromationManager(self)
+        self.undo_manager = UndoManager(self.transformation_manager)
+        self.undo_action = None
+        self.redo_action = None
+        self.undo_manager.stack_changed.connect(self.update_undo_redo_actions)
         self.filter_manager = FilterManager(self)
         self.filter_manager.register_filter("Denoise", DenoiseFilter)
         self.filter_manager.register_filter("Unsharp Mask", UnsharpMaskFilter)
@@ -238,8 +240,6 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
             self.master_thumbnail_label, self.thumbnail_list, parent=self)
         self.io_gui_handler = IOGuiHandler(self.layer_collection, self.undo_manager, parent=self)
         self.display_manager.status_message_requested.connect(self.show_status_message)
-        self.display_manager.cursor_preview_state_changed.connect(
-            self.image_viewer.set_allow_cursor_preview)
         self.io_gui_handler.status_message_requested.connect(self.show_status_message)
         self.io_gui_handler.update_title_requested.connect(self.update_title)
         self.io_gui_handler.mark_as_modified_requested.connect(self.mark_as_modified)
@@ -277,8 +277,8 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
 
         file_menu.addAction("&Close", self.close_file, "Ctrl+W")
         file_menu.addSeparator()
-        file_menu.addAction("&Import frames", self.io_gui_handler.import_frames)
-        file_menu.addAction("Import &EXIF data", self.io_gui_handler.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)
@@ -293,7 +293,21 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         edit_menu.addAction(self.redo_action)
         edit_menu.addSeparator()
 
-        copy_action = QAction("Copy Layer to Master", self)
+        transf_menu = QMenu("&Transform")
+        rotate_90_cw_action = QAction(gui_constants.ROTATE_90_CW_LABEL, self)
+        transf_menu.addAction(rotate_90_cw_action)
+        rotate_90_cw_action.triggered.connect(lambda: self.transformation_manager.rotate_90_cw())
+        rotate_90_ccw_action = QAction(gui_constants.ROTATE_90_CCW_LABEL, self)
+        transf_menu.addAction(rotate_90_ccw_action)
+        rotate_90_ccw_action.triggered.connect(lambda: self.transformation_manager.rotate_90_ccw())
+        rotate_180_action = QAction(gui_constants.ROTATE_180_LABEL, self)
+        rotate_180_action.triggered.connect(lambda: self.transformation_manager.rotate_180())
+        transf_menu.addAction(rotate_180_action)
+        edit_menu.addMenu(transf_menu)
+
+        edit_menu.addSeparator()
+
+        copy_action = QAction("Copy Current Layer to Master", self)
         copy_action.setShortcut("Ctrl+M")
         copy_action.triggered.connect(self.copy_layer_to_master)
         edit_menu.addAction(copy_action)
@@ -310,22 +324,22 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
 
         view_strategy_menu = QMenu("View &Mode", view_menu)
 
-        self.view_action_modes = {
+        self.view_mode_actions = {
             'overlaid': QAction("Overlaid", self),
-            'sidebyside': QAction("Side By Side", self),
+            'sidebyside': QAction("Side by Side", self),
             'topbottom': QAction("Top-Bottom", self)
         }
-        overlaid_mode = self.view_action_modes['overlaid']
+        overlaid_mode = self.view_mode_actions['overlaid']
         overlaid_mode.setShortcut("Ctrl+1")
         overlaid_mode.setCheckable(True)
         overlaid_mode.triggered.connect(lambda: set_strategy('overlaid'))
         view_strategy_menu.addAction(overlaid_mode)
-        side_by_side_mode = self.view_action_modes['sidebyside']
+        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'))
         view_strategy_menu.addAction(side_by_side_mode)
-        side_by_side_mode = self.view_action_modes['topbottom']
+        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'))
@@ -338,31 +352,40 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
             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_action_modes.items():
+            for label, mode in self.view_mode_actions.items():
                 mode.setEnabled(label != strategy)
                 mode.setChecked(label == strategy)
 
         cursor_menu = view_menu.addMenu("Cursor Style")
 
-        cursor_stype = self.image_viewer.get_cursor_style()
-        brush_action = QAction("Simple Brush", self)
+        self.cursor_style_actions = {
+            'brush': QAction("Simple Brush", self),
+            'preview': QAction("Brush Preview", self),
+            'outline': QAction("Outline Only", self)
+        }
+        brush_action = self.cursor_style_actions['brush']
         brush_action.setCheckable(True)
-        brush_action.setChecked(cursor_stype == 'brush')
-        brush_action.triggered.connect(lambda: self.image_viewer.set_cursor_style('brush'))
+        brush_action.triggered.connect(lambda: set_cursor_style('brush'))
         cursor_menu.addAction(brush_action)
 
-        preview_action = QAction("Brush Preview", self)
+        preview_action = self.cursor_style_actions['preview']
         preview_action.setCheckable(True)
-        preview_action.setChecked(cursor_stype == 'preview')
-        preview_action.triggered.connect(lambda: self.image_viewer.set_cursor_style('preview'))
+        preview_action.triggered.connect(lambda: set_cursor_style('preview'))
         cursor_menu.addAction(preview_action)
 
-        outline_action = QAction("Outline Only", self)
+        outline_action = self.cursor_style_actions['outline']
         outline_action.setCheckable(True)
-        outline_action.setChecked(cursor_stype == 'outline')
-        outline_action.triggered.connect(lambda: self.image_viewer.set_cursor_style('outline'))
+        outline_action.triggered.connect(lambda: set_cursor_style('outline'))
         cursor_menu.addAction(outline_action)
 
+        def set_cursor_style(cursor_style):
+            self.image_viewer.set_cursor_style(cursor_style)
+            for label, style in self.cursor_style_actions.items():
+                style.setEnabled(label != cursor_style)
+                style.setChecked(label == cursor_style)
+
+        set_cursor_style(self.image_viewer.get_cursor_style())
+
         cursor_group = QActionGroup(self)
         cursor_group.addAction(preview_action)
         cursor_group.addAction(outline_action)
@@ -432,13 +455,13 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         white_balance_action = QAction("White Balance", self)
         white_balance_action.triggered.connect(self.white_balance)
         filter_menu.addAction(white_balance_action)
-        vignetting_action = QAction("Vignetting correction", self)
+        vignetting_action = QAction("Vignetting Correction", self)
         vignetting_action.triggered.connect(self.vignetting_correction)
         filter_menu.addAction(vignetting_action)
 
         help_menu = menubar.addMenu("&Help")
         help_menu.setObjectName("Help")
-        shortcuts_help_action = QAction("Shortcuts and mouse", self)
+        shortcuts_help_action = QAction("Shortcuts and Mouse", self)
 
         def shortcuts_help():
             self.shortcuts_help_dialog = ShortcutsHelp(self)
@@ -693,13 +716,11 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
 
     def set_view_master(self):
         self.display_manager.set_view_master()
-        self.display_manager.refresh_master_view()
         self.thumbnail_highlight = gui_constants.THUMB_MASTER_HI_COLOR
         self.highlight_master_thumbnail()
 
     def set_view_individual(self):
         self.display_manager.set_view_individual()
-        self.display_manager.refresh_current_view()
         self.thumbnail_highlight = gui_constants.THUMB_MASTER_LO_COLOR
         self.highlight_master_thumbnail()
 

{shinestacker-1.4.0 → shinestacker-1.5.0}/src/shinestacker/retouch/image_view_status.py

@@ -59,3 +59,7 @@ class ImageViewStatus(QObject):
 
     def set_max_scale(self, min_scale):
         self.max_scale = min_scale
+
+    def set_scroll(self, h_scroll, v_scroll):
+        self.h_scroll = h_scroll
+        self.v_scroll = v_scroll

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

@@ -35,8 +35,14 @@ class ImageViewer(QWidget):
         self.strategy.show()
         self.strategy.resize(self.size())
         if not self.strategy.empty():
+            self.strategy.cleanup_brush_preview()
             self.strategy.update_master_display()
             self.strategy.update_current_display()
+            self.strategy.setup_brush_cursor()
+            self.strategy.update_brush_cursor()
+            self.strategy.show_master()
+            self.strategy.setFocus()
+            self.strategy.activateWindow()
 
     def empty(self):
         return self.strategy.empty()

{shinestacker-1.4.0 → shinestacker-1.5.0}/src/shinestacker/retouch/layer_collection.py

@@ -143,6 +143,9 @@ class LayerCollectionHandler:
     def has_master_layer(self):
         return self.layer_collection.has_master_layer()
 
+    def set_layer(self, idx, img):
+        self.layer_collection.layer_stack[idx] = img
+
     def set_layer_stack(self, stk):
         self.layer_collection.set_layer_stack(stk)