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

shinestacker/_version.py

@@ -1 +1 @@
-__version__ = '1.4.0'
+__version__ = '1.5.1'

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/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):
@@ -102,7 +103,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:
@@ -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/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/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/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
@@ -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/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/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/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,7 @@ 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()

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'