shinestacker 1.1.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

shinestacker/gui/base_form_dialog.py

@@ -3,16 +3,21 @@ from PySide6.QtWidgets import QFormLayout, QDialog
 from PySide6.QtCore import Qt
 
 
+def create_form_layout(parent):
+    layout = QFormLayout(parent)
+    layout.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
+    layout.setRowWrapPolicy(QFormLayout.DontWrapRows)
+    layout.setFormAlignment(Qt.AlignLeft | Qt.AlignTop)
+    layout.setLabelAlignment(Qt.AlignLeft)
+    return layout
+
+
 class BaseFormDialog(QDialog):
     def __init__(self, title, parent=None):
         super().__init__(parent)
         self.setWindowTitle(title)
         self.resize(500, self.height())
-        self.layout = QFormLayout(self)
-        self.layout.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
-        self.layout.setRowWrapPolicy(QFormLayout.DontWrapRows)
-        self.layout.setFormAlignment(Qt.AlignLeft | Qt.AlignTop)
-        self.layout.setLabelAlignment(Qt.AlignLeft)
+        self.form_layout = create_form_layout(self)
 
     def add_row_to_layout(self, item):
-        self.layout.addRow(item)
+        self.form_layout.addRow(item)

shinestacker/gui/main_window.py

@@ -135,6 +135,8 @@ class MainWindow(QMainWindow, LogManager):
         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.undo_action.setEnabled)
         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)
@@ -407,13 +409,12 @@ class MainWindow(QMainWindow, LogManager):
             self.menu_manager.add_action_entry_action.setEnabled(False)
             self.menu_manager.action_selector.setEnabled(False)
             self.menu_manager.run_job_action.setEnabled(False)
-            self.menu_manager.run_all_jobs_action.setEnabled(False)
         else:
             self.menu_manager.add_action_entry_action.setEnabled(True)
             self.menu_manager.action_selector.setEnabled(True)
             self.menu_manager.delete_element_action.setEnabled(True)
             self.menu_manager.run_job_action.setEnabled(True)
-            self.menu_manager.run_all_jobs_action.setEnabled(True)
+        self.menu_manager.set_enabled_run_all_jobs(self.job_list_count() > 1)
 
     def quit(self):
         if self.project_controller.check_unsaved_changes():

shinestacker/gui/menu_manager.py

@@ -82,7 +82,10 @@ class MenuManager:
 
     def add_edit_menu(self):
         menu = self.menubar.addMenu("&Edit")
-        for name in ["&Undo", "&Cut", "Cop&y", "&Paste", "Duplicate"]:
+        self.undo_action = self.action("&Undo")
+        self.undo_action.setEnabled(False)
+        menu.addAction(self.undo_action)
+        for name in ["&Cut", "Cop&y", "&Paste", "Duplicate"]:
             menu.addAction(self.action(name))
         self.delete_element_action = self.action("Delete")
         self.delete_element_action.setEnabled(False)
@@ -113,7 +116,7 @@ class MenuManager:
         self.run_job_action.setEnabled(False)
         menu.addAction(self.run_job_action)
         self.run_all_jobs_action = self.action("Run All Jobs")
-        self.run_all_jobs_action.setEnabled(False)
+        self.set_enabled_run_all_jobs(False)
         menu.addAction(self.run_all_jobs_action)
 
     def add_actions_menu(self):
@@ -234,3 +237,10 @@ class MenuManager:
         self.sub_action_selector.setEnabled(enabled)
         for a in self.sub_action_menu_entries:
             a.setEnabled(enabled)
+
+    def set_enabled_run_all_jobs(self, enabled):
+        tooltip = self.tooltips["Run All Jobs"]
+        self.run_all_jobs_action.setEnabled(enabled)
+        if not enabled:
+            tooltip += " (requires more tha one job)"
+        self.run_all_jobs_action.setToolTip(tooltip)

shinestacker/gui/new_project.py

@@ -36,11 +36,11 @@ class NewProjectDialog(BaseFormDialog):
     def add_bold_label(self, label):
         label = QLabel(label)
         label.setStyleSheet("font-weight: bold")
-        self.layout.addRow(label)
+        self.form_layout.addRow(label)
 
     def add_label(self, label):
         label = QLabel(label)
-        self.layout.addRow(label)
+        self.form_layout.addRow(label)
 
     def create_form(self):
         icon_path = f"{os.path.dirname(__file__)}/ico/shinestacker.png"
@@ -49,10 +49,10 @@ class NewProjectDialog(BaseFormDialog):
         icon_label = QLabel()
         icon_label.setPixmap(icon_pixmap)
         icon_label.setAlignment(Qt.AlignCenter)
-        self.layout.addRow(icon_label)
+        self.form_layout.addRow(icon_label)
         spacer = QLabel("")
         spacer.setFixedHeight(10)
-        self.layout.addRow(spacer)
+        self.form_layout.addRow(spacer)
 
         self.input_folder, container = create_select_file_paths_widget(
             '', 'input files folder', 'input files folder')
@@ -92,26 +92,26 @@ class NewProjectDialog(BaseFormDialog):
         self.multi_layer.setChecked(gui_constants.NEW_PROJECT_MULTI_LAYER)
 
         self.add_bold_label("1️⃣ Select input folder, all images therein will be merged. ")
-        self.layout.addRow("Input folder:", container)
-        self.layout.addRow("Number of frames: ", self.frames_label)
+        self.form_layout.addRow("Input folder:", container)
+        self.form_layout.addRow("Number of frames: ", self.frames_label)
         self.add_label("")
         self.add_bold_label("2️⃣ Select basic options.")
         if self.expert():
-            self.layout.addRow("Automatic noise detection:", self.noise_detection)
-            self.layout.addRow("Vignetting correction:", self.vignetting_correction)
-        self.layout.addRow("Align layers:", self.align_frames)
-        self.layout.addRow("Balance layers:", self.balance_frames)
-        self.layout.addRow("Bunch stack:", self.bunch_stack)
-        self.layout.addRow("Bunch frames:", self.bunch_frames)
-        self.layout.addRow("Bunch overlap:", self.bunch_overlap)
-        self.layout.addRow("Number of bunches: ", self.bunches_label)
+            self.form_layout.addRow("Automatic noise detection:", self.noise_detection)
+            self.form_layout.addRow("Vignetting correction:", self.vignetting_correction)
+        self.form_layout.addRow("Align layers:", self.align_frames)
+        self.form_layout.addRow("Balance layers:", self.balance_frames)
+        self.form_layout.addRow("Bunch stack:", self.bunch_stack)
+        self.form_layout.addRow("Bunch frames:", self.bunch_frames)
+        self.form_layout.addRow("Bunch overlap:", self.bunch_overlap)
+        self.form_layout.addRow("Number of bunches: ", self.bunches_label)
         if self.expert():
-            self.layout.addRow("Focus stack (pyramid):", self.focus_stack_pyramid)
-            self.layout.addRow("Focus stack (depth map):", self.focus_stack_depth_map)
+            self.form_layout.addRow("Focus stack (pyramid):", self.focus_stack_pyramid)
+            self.form_layout.addRow("Focus stack (depth map):", self.focus_stack_depth_map)
         else:
-            self.layout.addRow("Focus stack:", self.focus_stack_pyramid)
+            self.form_layout.addRow("Focus stack:", self.focus_stack_pyramid)
         if self.expert():
-            self.layout.addRow("Save multi layer TIFF:", self.multi_layer)
+            self.form_layout.addRow("Save multi layer TIFF:", self.multi_layer)
         self.add_label("")
         self.add_bold_label("3️⃣ Push 🆗 for further options, then press ▶️ to run.")
         self.add_label("")
@@ -182,8 +182,9 @@ class NewProjectDialog(BaseFormDialog):
             height, width = img.shape[:2]
             n_bytes = 1 if img.dtype == np.uint8 else 2
             n_bits = 8 if img.dtype == np.uint8 else 16
-            n_mbytes = float(n_bytes * height * width * self.n_image_files) / 10**6
-            if n_mbytes > 500 and not self.bunch_stack.isChecked():
+            n_gbytes = float(n_bytes * height * width * self.n_image_files) / constants.ONE_GIGA
+            print("GBytes: ", n_gbytes)
+            if n_gbytes > 1 and not self.bunch_stack.isChecked():
                 msg = QMessageBox()
                 msg.setStyleSheet("""
                     QMessageBox {
@@ -201,11 +202,15 @@ class NewProjectDialog(BaseFormDialog):
                 msg.setWindowTitle("Too many frames")
                 msg.setText(f"You selected {self.n_image_files} images "
                             f"with resolution {width}×{height} pixels, {n_bits} bits depth. "
-                            "Processing may require a significant amount of memory.\n\n"
+                            "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".')
+                                       '✅ Check the option "Bunch stack".\n\n'
+                                       "➡️ Check expert options for the stacking algorithm."
+                                       'Go to "View" > "Expert Options".'
+                                       )
                 msg.setStandardButtons(QMessageBox.Ok | QMessageBox.Cancel)
                 msg.setDefaultButton(QMessageBox.Cancel)
                 if msg.exec_() != QMessageBox.Ok:

shinestacker/gui/project_controller.py

@@ -136,6 +136,7 @@ class ProjectController(QObject):
             self.clear_job_list()
             self.clear_action_list()
             self.mark_as_modified(False)
+            self.project_editor.reset_undo()
 
     def new_project(self):
         if not self.check_unsaved_changes():
@@ -151,65 +152,79 @@ class ProjectController(QObject):
         dialog = NewProjectDialog(self.parent)
         if dialog.exec() == QDialog.Accepted:
             self.save_actions_set_enabled(True)
+            self.project_editor.reset_undo()
             input_folder = dialog.get_input_folder().split('/')
             working_path = '/'.join(input_folder[:-1])
             input_path = input_folder[-1]
             if dialog.get_noise_detection():
-                job_noise = ActionConfig(constants.ACTION_JOB,
-                                         {'name': 'detect-noise', 'working_path': working_path,
-                                          'input_path': input_path})
+                job_noise = ActionConfig(
+                    constants.ACTION_JOB,
+                    {'name': f'{input_path}-detect-noise', 'working_path': working_path,
+                     'input_path': input_path})
                 noise_detection = ActionConfig(constants.ACTION_NOISEDETECTION,
-                                               {'name': 'detect-noise'})
+                                               {'name': f'{input_path}-detect-noise'})
                 job_noise.add_sub_action(noise_detection)
                 self.add_job_to_project(job_noise)
             job = ActionConfig(constants.ACTION_JOB,
-                               {'name': 'focus-stack', 'working_path': working_path,
+                               {'name': f'{input_path}-focus-stack',
+                                'working_path': working_path,
                                 'input_path': input_path})
+            preprocess_name = ''
             if dialog.get_noise_detection() or dialog.get_vignetting_correction() or \
                dialog.get_align_frames() or dialog.get_balance_frames():
-                combo_action = ActionConfig(constants.ACTION_COMBO, {'name': 'align'})
+                preprocess_name = f'{input_path}-preprocess'
+                combo_action = ActionConfig(
+                    constants.ACTION_COMBO, {'name': preprocess_name})
                 if dialog.get_noise_detection():
-                    mask_noise = ActionConfig(constants.ACTION_MASKNOISE, {'name': 'mask-noise'})
+                    mask_noise = ActionConfig(
+                        constants.ACTION_MASKNOISE, {'name': 'mask-noise'})
                     combo_action.add_sub_action(mask_noise)
                 if dialog.get_vignetting_correction():
-                    vignetting = ActionConfig(constants.ACTION_VIGNETTING, {'name': 'vignetting'})
+                    vignetting = ActionConfig(
+                        constants.ACTION_VIGNETTING, {'name': 'vignetting'})
                     combo_action.add_sub_action(vignetting)
                 if dialog.get_align_frames():
-                    align = ActionConfig(constants.ACTION_ALIGNFRAMES, {'name': 'align'})
+                    align = ActionConfig(
+                        constants.ACTION_ALIGNFRAMES, {'name': 'align'})
                     combo_action.add_sub_action(align)
                 if dialog.get_balance_frames():
-                    balance = ActionConfig(constants.ACTION_BALANCEFRAMES, {'name': 'balance'})
+                    balance = ActionConfig(
+                        constants.ACTION_BALANCEFRAMES, {'name': 'balance'})
                     combo_action.add_sub_action(balance)
                 job.add_sub_action(combo_action)
             if dialog.get_bunch_stack():
-                bunch_stack = ActionConfig(constants.ACTION_FOCUSSTACKBUNCH,
-                                           {'name': 'bunches', 'frames': dialog.get_bunch_frames(),
-                                            'overlap': dialog.get_bunch_overlap()})
+                bunch_stack_name = f'{input_path}-bunches'
+                bunch_stack = ActionConfig(
+                    constants.ACTION_FOCUSSTACKBUNCH,
+                    {'name': bunch_stack_name, 'frames': dialog.get_bunch_frames(),
+                     'overlap': dialog.get_bunch_overlap()})
                 job.add_sub_action(bunch_stack)
             if dialog.get_focus_stack_pyramid():
+                focus_pyramid_name = f'{input_path}-focus-stack-pyramid'
                 focus_pyramid = ActionConfig(constants.ACTION_FOCUSSTACK,
-                                             {'name': 'focus-stack-pyramid',
+                                             {'name': focus_pyramid_name,
                                               'stacker': constants.STACK_ALGO_PYRAMID})
                 job.add_sub_action(focus_pyramid)
             if dialog.get_focus_stack_depth_map():
+                focus_depth_map_name = f'{input_path}-focus-stack-depth-map'
                 focus_depth_map = ActionConfig(constants.ACTION_FOCUSSTACK,
-                                               {'name': 'focus-stack-depth-map',
+                                               {'name': focus_depth_map_name,
                                                 'stacker': constants.STACK_ALGO_DEPTH_MAP})
                 job.add_sub_action(focus_depth_map)
             if dialog.get_multi_layer():
-                input_path = []
+                multi_input_path = []
                 if dialog.get_focus_stack_pyramid():
-                    input_path.append("focus-stack-pyramid")
+                    multi_input_path.append(focus_pyramid_name)
                 if dialog.get_focus_stack_depth_map():
-                    input_path.append("focus-stack-depth-map")
+                    multi_input_path.append(focus_depth_map_name)
                 if dialog.get_bunch_stack():
-                    input_path.append("bunches")
+                    multi_input_path.append(bunch_stack_name)
+                elif preprocess_name:
+                    multi_input_path.append(preprocess_name)
                 multi_layer = ActionConfig(
                     constants.ACTION_MULTILAYER,
-                    {
-                        'name': 'multi-layer',
-                        'input_path': constants.PATH_SEPARATOR.join(input_path)
-                    })
+                    {'name': f'{input_path}-multi-layer',
+                        'input_path': constants.PATH_SEPARATOR.join(multi_input_path)})
                 job.add_sub_action(multi_layer)
             self.add_job_to_project(job)
             self.mark_as_modified(True)
@@ -231,6 +246,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.project_editor.reset_undo()
                 self.refresh_ui(0, -1)
                 if self.job_list_count() > 0:
                     self.set_current_job(0)

shinestacker/gui/project_converter.py

@@ -9,8 +9,7 @@ from .. algorithms.vignetting import Vignetting
 from .. algorithms.align import AlignFrames
 from .. algorithms.balance import BalanceFrames
 from .. algorithms.stack import FocusStack, FocusStackBunch
-from .. algorithms.pyramid import PyramidStack
-from .. algorithms.pyramid_tiles import PyramidTilesStack
+from .. algorithms.pyramid_auto import PyramidAutoStack
 from .. algorithms.depth_map import DepthMapStack
 from .. algorithms.multilayer import MultiLayer
 from .project_model import Project, ActionConfig
@@ -107,11 +106,7 @@ class ProjectConverter:
             if stacker == constants.STACK_ALGO_PYRAMID:
                 algo_dict, module_dict = self.filter_dict_keys(
                     action_config.params, 'pyramid_')
-                stack_algo = PyramidStack(**algo_dict)
-            elif stacker == constants.STACK_ALGO_PYRAMID_TILES:
-                algo_dict, module_dict = self.filter_dict_keys(
-                    action_config.params, 'tiles_pyramid_')
-                stack_algo = PyramidTilesStack(**algo_dict)
+                stack_algo = PyramidAutoStack(**algo_dict)
             elif stacker == constants.STACK_ALGO_DEPTH_MAP:
                 algo_dict, module_dict = self.filter_dict_keys(
                     action_config.params, 'depthmap_')
@@ -119,7 +114,6 @@ class ProjectConverter:
             else:
                 raise InvalidOptionError('stacker', stacker, f"valid options are: "
                                          f"{constants.STACK_ALGO_PYRAMID}, "
-                                         f"{constants.STACK_ALGO_PYRAMID_TILES}, "
                                          f"{constants.STACK_ALGO_DEPTH_MAP}")
             if action_config.type_name == constants.ACTION_FOCUSSTACK:
                 return FocusStack(**module_dict, stack_algo=stack_algo)

shinestacker/gui/project_editor.py

@@ -74,19 +74,30 @@ def new_row_after_clone(job, action_row, is_sub_action, cloned):
             for action in job.sub_actions[:job.sub_actions.index(cloned)])
 
 
-class ProjectUndoManager:
-    def __init__(self):
+class ProjectUndoManager(QObject):
+    set_enabled_undo_action_requested = Signal(bool)
+
+    def __init__(self, parent=None):
+        super().__init__(parent)
         self._undo_buffer = []
 
     def add(self, item):
         self._undo_buffer.append(item)
+        self.set_enabled_undo_action_requested.emit(True)
 
     def pop(self):
-        return self._undo_buffer.pop()
+        last = self._undo_buffer.pop()
+        if len(self._undo_buffer) == 0:
+            self.set_enabled_undo_action_requested.emit(False)
+        return last
 
     def filled(self):
         return len(self._undo_buffer) != 0
 
+    def reset(self):
+        self._undo_buffer = []
+        self.set_enabled_undo_action_requested.emit(False)
+
 
 class ProjectEditor(QObject):
     INDENT_SPACE = "   ↪   "
@@ -99,7 +110,7 @@ class ProjectEditor(QObject):
 
     def __init__(self, parent=None):
         super().__init__(parent)
-        self._undo_manager = ProjectUndoManager()
+        self.undo_manager = ProjectUndoManager()
         self._modified = False
         self._project = None
         self._copy_buffer = None
@@ -108,14 +119,17 @@ class ProjectEditor(QObject):
         self._action_list = QListWidget()
         self.dialog = None
 
+    def reset_undo(self):
+        self.undo_manager.reset()
+
     def add_undo(self, item):
-        self._undo_manager.add(item)
+        self.undo_manager.add(item)
 
     def pop_undo(self):
-        return self._undo_manager.pop()
+        return self.undo_manager.pop()
 
     def filled_undo(self):
-        return self._undo_manager.filled()
+        return self.undo_manager.filled()
 
     def mark_as_modified(self, modified=True):
         self._modified = modified

shinestacker/retouch/exif_data.py

@@ -25,14 +25,14 @@ class ExifData(BaseFormDialog):
     def add_bold_label(self, label):
         label = QLabel(label)
         label.setStyleSheet("font-weight: bold")
-        self.layout.addRow(label)
+        self.form_layout.addRow(label)
 
     def create_form(self):
-        self.layout.addRow(icon_container())
+        self.form_layout.addRow(icon_container())
 
         spacer = QLabel("")
         spacer.setFixedHeight(10)
-        self.layout.addRow(spacer)
+        self.form_layout.addRow(spacer)
         self.add_bold_label("EXIF data")
         shortcuts = {}
         if self.exif is None:
@@ -47,6 +47,6 @@ class ExifData(BaseFormDialog):
                 else:
                     d = f"{d}"
                 if "<<<" not in d and k != 'IPTCNAA':
-                    self.layout.addRow(f"<b>{k}:</b>", QLabel(d))
+                    self.form_layout.addRow(f"<b>{k}:</b>", QLabel(d))
         else:
-            self.layout.addRow("-", QLabel("Empty EXIF dictionary"))
+            self.form_layout.addRow("-", QLabel("Empty EXIF dictionary"))

shinestacker/retouch/shortcuts_help.py

@@ -10,7 +10,7 @@ class ShortcutsHelp(QDialog):
         super().__init__(parent)
         self.setWindowTitle("Shortcut Help")
         self.resize(600, self.height())
-        self.layout = QVBoxLayout(self)
+        self.main_layout = QVBoxLayout(self)
         main_widget = QWidget()
         main_layout = QHBoxLayout(main_widget)
         main_layout.setContentsMargins(0, 0, 0, 0)
@@ -28,14 +28,14 @@ class ShortcutsHelp(QDialog):
         right_layout.setLabelAlignment(Qt.AlignLeft)
         main_layout.addWidget(left_column)
         main_layout.addWidget(right_column)
-        self.layout.addWidget(main_widget)
+        self.main_layout.addWidget(main_widget)
         self.create_form(left_layout, right_layout)
         button_box = QHBoxLayout()
         ok_button = QPushButton("OK")
         ok_button.setFixedWidth(100)
         ok_button.setFocus()
         button_box.addWidget(ok_button)
-        self.layout.addLayout(button_box)
+        self.main_layout.addLayout(button_box)
         ok_button.clicked.connect(self.accept)
 
     def add_bold_label(self, layout, label):
@@ -44,7 +44,7 @@ class ShortcutsHelp(QDialog):
         layout.addRow(label)
 
     def create_form(self, left_layout, right_layout):
-        self.layout.insertWidget(0, icon_container())
+        self.main_layout.insertWidget(0, icon_container())
 
         shortcuts = {
             "M": "show master layer",

shinestacker/retouch/vignetting_filter.py

@@ -1,6 +1,6 @@
 # pylint: disable=C0114, C0115, C0116, E0611, W0221, R0902
 from PySide6.QtCore import Qt
-from PySide6.QtWidgets import QSpinBox, QCheckBox, QLabel, QHBoxLayout, QSlider
+from PySide6.QtWidgets import QSpinBox, QCheckBox, QLabel, QHBoxLayout, QSlider, QComboBox
 from .. config.constants import constants
 from .. algorithms.vignetting import correct_vignetting
 from .base_filter import OneSliderBaseFilter
@@ -20,11 +20,15 @@ class VignettingFilter(OneSliderBaseFilter):
         self.threshold_initial_value = constants.DEFAULT_BLACK_THRESHOLD
         self.threshold_format = "{:.1f}"
 
+    def get_subsample_factor(self):
+        return constants.FIELD_SUBSAMPLE_VALUES[
+            constants.FIELD_SUBSAMPLE_OPTIONS.index(self.subsample_box.currentText())]
+
     def apply(self, image, strength):
         return correct_vignetting(image, max_correction=strength,
                                   black_threshold=self.threshold_slider.value(),
                                   r_steps=self.r_steps_box.value(),
-                                  subsample=self.subsample_box.value(),
+                                  subsample=self.get_subsample_factor(),
                                   fast_subsampling=True)
 
     def add_widgets(self, layout, dlg):
@@ -42,11 +46,10 @@ class VignettingFilter(OneSliderBaseFilter):
         layout.addLayout(threshold_layout)
         subsample_layout = QHBoxLayout()
         subsample_label = QLabel("Subsample:")
-        self.subsample_box = QSpinBox()
-        self.subsample_box.setFixedWidth(50)
-        self.subsample_box.setRange(1, 50)
-        self.subsample_box.setValue(constants.DEFAULT_VIGN_SUBSAMPLE)
-        self.subsample_box.valueChanged.connect(self.threshold_changed)
+        self.subsample_box = QComboBox()
+        self.subsample_box.addItems(constants.FIELD_SUBSAMPLE_OPTIONS)
+        self.subsample_box.setFixedWidth(150)
+        self.subsample_box.currentTextChanged.connect(self.threshold_changed)
         self.fast_subsampling_check = QCheckBox("Fast subsampling")
         self.fast_subsampling_check.setChecked(constants.DEFAULT_VIGN_FAST_SUBSAMPLING)
         r_steps_label = QLabel("Radial steps:")
@@ -64,6 +67,7 @@ class VignettingFilter(OneSliderBaseFilter):
         layout.addWidget(self.fast_subsampling_check)
 
     def threshold_changed(self, val):
-        float_val = self.threshold_max_value * float(val) / self.threshold_max_range
+        subsample = self.get_subsample_factor()
+        float_val = self.threshold_max_value * float(subsample) / self.threshold_max_range
         self.threshold_label.setText(self.threshold_format.format(float_val))
         self.param_changed(val)

{shinestacker-1.1.0.dist-info → shinestacker-1.2.0.dist-info}/METADATA

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

{shinestacker-1.1.0.dist-info → shinestacker-1.2.0.dist-info}/RECORD

@@ -1,21 +1,22 @@
 shinestacker/__init__.py,sha256=uq2fjAw2z_6TpH3mOcWFZ98GoEPRsNhTAK8N0MMm_e8,448
-shinestacker/_version.py,sha256=XIz3qAg9G9YysQi3Ryp0CN3rtc_JiecHZ9L2vEzcM6s,21
-shinestacker/algorithms/__init__.py,sha256=c4kRrdTLlVI70Q16XkI1RSmz5MD7npDqIpO_02jTG6g,747
-shinestacker/algorithms/align.py,sha256=EhsV50QtpLSJG0uDMfOJw89u8CGFJvBC2sYuJg5cv6g,17516
-shinestacker/algorithms/balance.py,sha256=iSjO-pl0vQv58iEQ077EUcDTAExMKDBdtXmJXbMhazk,16721
-shinestacker/algorithms/base_stack_algo.py,sha256=O7pDXqLM8MBdLR634Vk3UNV6cEV2q0U7CNcnpC_AOig,2363
+shinestacker/_version.py,sha256=5GblYyMbk8JySosj59Rvi2uzLqfP-DAs77ikwTafXT4,21
+shinestacker/algorithms/__init__.py,sha256=1FwVJ3w9GGbFFkjYJRUedTvcdE4j0ieSgaH9RC9iCY4,877
+shinestacker/algorithms/align.py,sha256=BsE3rp4EfJyWTTbC6U1leQQqURD724YLAmxY-1wM-ok,22558
+shinestacker/algorithms/balance.py,sha256=rz_lmBwnJBYLnYt6yJ30BXWmMwpmmmA3rKUznEWY0eo,23463
+shinestacker/algorithms/base_stack_algo.py,sha256=W-VSrCF0-lE_OOsxsnZvJ3BI0NqRKIRMciQV-ui5t_g,2515
 shinestacker/algorithms/denoise.py,sha256=GL3Z4_6MHxSa7Wo4ZzQECZS87tHBFqO0sIVF_jPuYQU,426
-shinestacker/algorithms/depth_map.py,sha256=KVThrnynPKuijlh-DrenSkdkZ0Qm6TaNMYKhRByhcN4,5682
+shinestacker/algorithms/depth_map.py,sha256=m0_Qm8FLDeSWyQEMNx29PzXp_VFGar7gY3jWxq_10t8,5713
 shinestacker/algorithms/exif.py,sha256=SM4ZDDe8hCJ3xY6053FNndOiwzEStzdp0WrXurlcHVc,9429
-shinestacker/algorithms/multilayer.py,sha256=-pQXDlooSMGKPhMgF-_naXdkGdolclYvSD-RrjwLiyI,9328
-shinestacker/algorithms/noise_detection.py,sha256=CJb57mE7ePJBgrwnsEkeK8xVIl2Hrzti11ZEI6JQczs,9218
-shinestacker/algorithms/pyramid.py,sha256=cxwA6gf02009dFv5-m79NpJkD58-Wbu3im4bfA5HVUc,8822
-shinestacker/algorithms/pyramid_tiles.py,sha256=967L42MfwSOewisqpAzuXivZgVoKZbIjDIQVWP1_rHk,5094
+shinestacker/algorithms/multilayer.py,sha256=5aIaIU2GX1eoZbGL4z-Xo8XiFlCvIcZKRDYnbjjdojI,9906
+shinestacker/algorithms/noise_detection.py,sha256=lP5iJLFA5xWN-tpyNDH9AWuoZsL7rKhrxwDcBBc9nCk,9250
+shinestacker/algorithms/pyramid.py,sha256=lmd-lw4bzrpcfBaLnBXHuOJ9J7-5sWq4dC9p_EejqXA,8881
+shinestacker/algorithms/pyramid_auto.py,sha256=ByDH7Xblqj4YfNwsCWwN3wv2xL6gYp2lFnvpNPSEawM,6161
+shinestacker/algorithms/pyramid_tiles.py,sha256=SzjTSheme8MP8nQXfOu8QHbzrtpuQX2aIsBVr5aM4Mc,12165
 shinestacker/algorithms/sharpen.py,sha256=h7PMJBYxucg194Usp_6pvItPUMFYbT-ebAc_-7XBFUw,949
-shinestacker/algorithms/stack.py,sha256=T1y-qoYUNzcIpnhKcou_4ifiKtGC2ZA1bOZXlfnKB6A,5045
-shinestacker/algorithms/stack_framework.py,sha256=fHdU8uYZquRut6NW_1vHbTCjPD99gQfOhVDdaaLZH34,12334
-shinestacker/algorithms/utils.py,sha256=GSKPUxU98Q8F0k4TgY9ydEgBul1gf2I0ypdmyDm--Mg,3371
-shinestacker/algorithms/vignetting.py,sha256=yW-1TF4tesLWfKQOS0XxRkOEN82U-YDmMaj09C9cH4M,9552
+shinestacker/algorithms/stack.py,sha256=fLDps52QT8bsC3Pz8niU0h7cGc70q9goKsgA8wvu_Bg,5054
+shinestacker/algorithms/stack_framework.py,sha256=YKk-JoLV6IVlTiCbo6e-Hg2dF3hdz4CE6WFIXhMXBy8,12818
+shinestacker/algorithms/utils.py,sha256=jImR2XF73gsLRZMic0kv8cyCuO2Zq21tX4kUhaTcfzI,11301
+shinestacker/algorithms/vignetting.py,sha256=stzrWTxJIIByq_mOI0ofE-7b0bL5MLm9dhlj_E-Kxv0,10165
 shinestacker/algorithms/white_balance.py,sha256=PMKsBtxOSn5aRr_Gkx1StHS4eN6kBN2EhNnhg4UG24g,501
 shinestacker/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shinestacker/app/about_dialog.py,sha256=pkH7nnxUP8yc0D3vRGd1jRb5cwi1nDVbQRk_OC9yLk8,4144
@@ -27,7 +28,7 @@ shinestacker/app/project.py,sha256=W0u715LZne_PNJvg9msSy27ybIjgDXiEAQdJ7_6BjYI,2
 shinestacker/app/retouch.py,sha256=ZQ-nRKnHo6xurcP34RNqaAWkmuGBjJ5jE05hTQ_ycis,2482
 shinestacker/config/__init__.py,sha256=aXxi-LmAvXd0daIFrVnTHE5OCaYeK1uf1BKMr7oaXQs,197
 shinestacker/config/config.py,sha256=eBko2D3ADhLTIm9X6hB_a_WsIjwgfE-qmBVkhP1XSvc,1636
-shinestacker/config/constants.py,sha256=X9e0fXr7ZHN9DCEMiObpanNJfZ5cMgWJdm3Xybmh-Wk,6232
+shinestacker/config/constants.py,sha256=ncuiYyA5NgggkGbazQbccJHGzXJnl37AOyxEB-GLoB0,7116
 shinestacker/config/gui_constants.py,sha256=5DR-ET1oeMMD7lIsjvAwSuln89A7I9wy9VuAeRo2G64,2575
 shinestacker/core/__init__.py,sha256=IUEIx6SQ3DygDEHN3_E6uKpHjHtUa4a_U_1dLd_8yEU,484
 shinestacker/core/colors.py,sha256=kr_tJA1iRsdck2JaYDb2lS-codZ4Ty9gdu3kHfiWvuM,1340
@@ -36,20 +37,20 @@ shinestacker/core/exceptions.py,sha256=2-noG-ORAGdvDhL8jBQFs0xxZS4fI6UIkMqrWekgk
 shinestacker/core/framework.py,sha256=zCnJuQrHNpwEgJW23_BgS7iQrLolRWTAMB1oRp_a7Kk,7447
 shinestacker/core/logging.py,sha256=9SuSSy9Usbh7zqmLYMqkmy-VBkOJW000lwqAR0XQs30,3067
 shinestacker/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shinestacker/gui/action_config.py,sha256=yXNDv0MyONbHk4iUrkvMkLKKaDvpJyzA5Yr0Eikgo0c,16986
-shinestacker/gui/action_config_dialog.py,sha256=Xb8DryEQt9R3VvM2DVoT_SdlJMU_qzJs2Z7NdLeqsgY,34520
-shinestacker/gui/base_form_dialog.py,sha256=yYqMee1mzw9VBx8siBS0jDk1qqsTIKJUgdjh92aprQk,687
+shinestacker/gui/action_config.py,sha256=-J4UCbXHHlIPxRDL0Veglt4brngJP7_zHvrWof9pzsM,16895
+shinestacker/gui/action_config_dialog.py,sha256=USaF2QeQRNXgzLRbkV6hvVRzOMkMVyTtsAzEAMqCr-g,35191
+shinestacker/gui/base_form_dialog.py,sha256=M_BvjpqUWe9YuecKg0pF3vUJ-1mqF24HjKujst2j3BA,753
 shinestacker/gui/colors.py,sha256=m0pQQ-uvtIN1xmb_-N06BvC7pZYZZnq59ZSEJwutHuk,1432
 shinestacker/gui/flow_layout.py,sha256=3yBU_z7VtvHKpx1H97CHVd81eq9pe1Dcja2EZBGGKcI,3791
 shinestacker/gui/gui_images.py,sha256=e0KAXSPruZoRHrajfdlmOKBYoRJJQBDan1jgs7YFltY,5678
 shinestacker/gui/gui_logging.py,sha256=kiZcrC2AFYCWgPZo0O5SKw-E5cFrezwf4anS3HjPuNw,8168
 shinestacker/gui/gui_run.py,sha256=ahbl6xMFR78QrcBbEDMuaQpkxw6DBFtSX8DCMIyr_7I,15439
-shinestacker/gui/main_window.py,sha256=KVr3ApbQSjJgmhHnrcqTjGQNTj1LoTN2PD6bWLBjsh8,24280
-shinestacker/gui/menu_manager.py,sha256=_L6LOikB3impEYqilqwXc0WJuunishjz57ozZlrBn7Q,9616
-shinestacker/gui/new_project.py,sha256=c0y2BjnAVaf5Z88UDmuOGR5rdju0Q72ltqiE7T3QivY,10807
-shinestacker/gui/project_controller.py,sha256=zVMH8kcNJ75dXPjaTa0IQiavqcWxG1URlVVYWnnu1C0,15123
-shinestacker/gui/project_converter.py,sha256=8ko3D4D7x4hhwENxwpTeElnLtEex3lpR51nZbq30Uco,7655
-shinestacker/gui/project_editor.py,sha256=uouzmUkrqouQlq-dqPOgSO16r1WOnGNV2v8jTcZlRXU,23749
+shinestacker/gui/main_window.py,sha256=kgozNZWqiPePZB5oX3Twdj_Z_f1RcdoLT2PFMzT0fRM,24361
+shinestacker/gui/menu_manager.py,sha256=SvYV7Dmz4cqoFQtRrO4JQ0uECZ4rL3EQdQg5jNakV6Y,10015
+shinestacker/gui/new_project.py,sha256=Iu8Gm3oRx6tCokv-Ywm_64wsNNxj_QhU1BsyoeLkJaQ,11211
+shinestacker/gui/project_controller.py,sha256=ooHunFKY2-dRBoyx4r3T8vs7UOpGDZUHHaSSR5V8J_E,15821
+shinestacker/gui/project_converter.py,sha256=bNyC1_D_MjcTOCPlQln6CIIlX818-sw_j2omrfQIGQs,7279
+shinestacker/gui/project_editor.py,sha256=UPXNwjpKJi7lgaohlbtojkTkotXeGY7l_W8pVII-UM0,24208
 shinestacker/gui/project_model.py,sha256=eRUmH3QmRzDtPtZoxgT6amKzN8_5XzwjHgEJeL-_JOE,4263
 shinestacker/gui/select_path_widget.py,sha256=OfQImOmkzbvl5BBshmb7ePWrSGDJQ8VvyaAOypHAGd4,1023
 shinestacker/gui/tab_widget.py,sha256=6iUifK-wu0EzjVFccKHirhA2fENglVi6xREKiD96aaY,2950
@@ -71,7 +72,7 @@ shinestacker/retouch/brush_preview.py,sha256=QKD3pL7n7YJbIibinUFYKv7lkyq_AWLpt6o
 shinestacker/retouch/brush_tool.py,sha256=nxnEuvTioPNw1WeWsT20X1zl-LNZ8i-1ExOcihikEjk,8618
 shinestacker/retouch/denoise_filter.py,sha256=TDUHzhRKlKvCa3D5SCYCZKTpjcl81kGwmONsgSDtO1k,440
 shinestacker/retouch/display_manager.py,sha256=XPbOBmoYc_jNA791WkWkOSaFHb0ztCZechl2p2KSlwQ,9597
-shinestacker/retouch/exif_data.py,sha256=giqoIaMlhN6H3x8BAd73ghVHODmWIcD_QbSoDymQycU,1864
+shinestacker/retouch/exif_data.py,sha256=WF40bTh0bwIqSQLMkGMCycEED06_q35-TqrBNAyaB-k,1889
 shinestacker/retouch/file_loader.py,sha256=z02-A8_uDZxayI1NFTxT2GVUvEBWStchX9hlN1o5-0U,4784
 shinestacker/retouch/filter_manager.py,sha256=SdYIZkZBUvuB6wDG0moGWav5sfEvIcB9ioUJR5wJFts,388
 shinestacker/retouch/icon_container.py,sha256=6gw1HO1bC2FrdB4dc_iH81DQuLjzuvRGksZ2hKLT9yA,585
@@ -80,14 +81,14 @@ shinestacker/retouch/image_viewer.py,sha256=3ebrLHTDtGd_EbIT2nNFRUjH836rblmmK7jZ
 shinestacker/retouch/io_gui_handler.py,sha256=pT-49uP0GROMOjZ70LoMLgXHnqSDq8ieAlAKGw0t1TM,11418
 shinestacker/retouch/io_manager.py,sha256=JUAA--AK0mVa1PTErJTnBFjaXIle5Qs7Ow0Wkd8at0o,2437
 shinestacker/retouch/layer_collection.py,sha256=Q7zoCYRn__jYkfrEC2lY1uKHWfOUbsJ27xaYHIoKVxo,5730
-shinestacker/retouch/shortcuts_help.py,sha256=SN4vNa_6yRAFaWxt5HpWn8FHgwmHrIs_wYwjl4iyDmg,3769
+shinestacker/retouch/shortcuts_help.py,sha256=-beAkhxVia-wyuYMiAn2uQZxnUdSNadmZM77EdReoOk,3789
 shinestacker/retouch/undo_manager.py,sha256=_ekbcOLcPbQLY7t-o8wf-b1uA6OPY9rRyLM-KqMlQRo,3257
 shinestacker/retouch/unsharp_mask_filter.py,sha256=uFnth8fpZFGhdIgJCnS8x5v6lBQgJ3hX0CBke9pFXeM,3510
-shinestacker/retouch/vignetting_filter.py,sha256=3WuoF38lQOIaU1MWmqviItuQn8NnbMN0nwV7pM9IJqU,3453
+shinestacker/retouch/vignetting_filter.py,sha256=MA97rQkSL0D-Nh-n2L4AiPR064RoTROkvza4tw84g9U,3658
 shinestacker/retouch/white_balance_filter.py,sha256=glMBYlmrF-i_OrB3sGUpjZE6X4FQdyLC4GBy2bWtaFc,6056
-shinestacker-1.1.0.dist-info/licenses/LICENSE,sha256=pWgb-bBdsU2Gd2kwAXxketnm5W_2u8_fIeWEgojfrxs,7651
-shinestacker-1.1.0.dist-info/METADATA,sha256=cg9TAx9qmIME39z02b5lLxjbtXhf_sT0aGNsfHh296E,6951
-shinestacker-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shinestacker-1.1.0.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
-shinestacker-1.1.0.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
-shinestacker-1.1.0.dist-info/RECORD,,
+shinestacker-1.2.0.dist-info/licenses/LICENSE,sha256=pWgb-bBdsU2Gd2kwAXxketnm5W_2u8_fIeWEgojfrxs,7651
+shinestacker-1.2.0.dist-info/METADATA,sha256=01kq9TSpVY2_U67ZhjbPIORbMmWTOWpuiiOFty3IM1Y,6951
+shinestacker-1.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shinestacker-1.2.0.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
+shinestacker-1.2.0.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
+shinestacker-1.2.0.dist-info/RECORD,,