shinestacker 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

shinestacker/_version.py

@@ -1 +1 @@
-__version__ = '0.3.4'
+__version__ = '0.3.6'

shinestacker/algorithms/base_stack_algo.py

@@ -1,6 +1,5 @@
 # pylint: disable=C0114, C0115, C0116, E0602, R0903
 import numpy as np
-from .. core.colors import color_str
 from .. core.exceptions import InvalidOptionError, ImageLoadError
 from .. config.constants import constants
 from .utils import read_img, get_img_metadata, validate_image
@@ -28,7 +27,7 @@ class BaseStackAlgo:
         return self._steps_per_frame
 
     def print_message(self, msg):
-        self.process.sub_message_r(color_str(msg, "light_blue"))
+        self.process.sub_message_r(msg)
 
     def read_image_and_update_metadata(self, img_path, metadata):
         img = read_img(img_path)

shinestacker/algorithms/noise_detection.py

@@ -162,9 +162,6 @@ class MaskNoise(SubAction):
         else:
             raise ImageLoadError(path, "file not found.")
 
-    def end(self):
-        pass
-
     def run_frame(self, _idx, _ref_idx, image):
         self.process.sub_message_r(': mask noisy pixels')
         if len(image.shape) == 3:

shinestacker/algorithms/pyramid.py

@@ -12,7 +12,7 @@ class PyramidBase(BaseStackAlgo):
                  kernel_size=constants.DEFAULT_PY_KERNEL_SIZE,
                  gen_kernel=constants.DEFAULT_PY_GEN_KERNEL,
                  float_type=constants.DEFAULT_PY_FLOAT):
-        super().__init__("pyramid", 1, float_type)
+        super().__init__("pyramid", 2, float_type)
         self.min_size = min_size
         self.kernel_size = kernel_size
         self.pad_amount = (kernel_size - 1) // 2
@@ -151,11 +151,11 @@ class PyramidStack(PyramidBase):
         metadata = None
         all_laplacians = []
         levels = None
+        n = len(filenames)
         for i, img_path in enumerate(filenames):
             self.print_message(f": validating file {img_path.split('/')[-1]}")
 
             img, metadata, updated = self.read_image_and_update_metadata(img_path, metadata)
-
             if updated:
                 self.dtype = metadata[1]
                 self.num_pixel_values = constants.NUM_UINT8 \
@@ -163,14 +163,17 @@ class PyramidStack(PyramidBase):
                 self.max_pixel_value = constants.MAX_UINT8 \
                     if self.dtype == np.uint8 else constants.MAX_UINT16
                 levels = int(np.log2(min(img.shape[:2]) / self.min_size))
-
             if self.do_step_callback:
                 self.process.callback('after_step', self.process.id, self.process.name, i)
             if self.process.callback('check_running', self.process.id, self.process.name) is False:
                 raise RunStopException(self.name)
-        for img_path in filenames:
+        for i, img_path in enumerate(filenames):
             self.print_message(f": processing file {img_path.split('/')[-1]}")
             img = read_img(img_path)
             all_laplacians.append(self.process_single_image(img, levels))
+            if self.do_step_callback:
+                self.process.callback('after_step', self.process.id, self.process.name, i + n)
+            if self.process.callback('check_running', self.process.id, self.process.name) is False:
+                raise RunStopException(self.name)
         stacked_image = self.collapse(self.fuse_pyramids(all_laplacians))
         return stacked_image.astype(self.dtype)

shinestacker/algorithms/stack.py

@@ -2,7 +2,6 @@
 import os
 import numpy as np
 from .. config.constants import constants
-from .. core.colors import color_str
 from .. core.framework import JobBase
 from .. core.exceptions import InvalidOptionError
 from .utils import write_img
@@ -92,7 +91,7 @@ class FocusStackBunch(ActionList, FocusStackBase):
         ActionList.end(self)
 
     def run_step(self):
-        self.print_message_r(color_str(f"fusing bunch: {self.count}", "blue"))
+        self.print_message_r(f"fusing bunch: {self.count}")
         self.focus_stack(self._chunks[self.count - 1])
         self.callback('after_step', self.id, self.name, self.count)
 

shinestacker/algorithms/stack_framework.py

@@ -237,6 +237,12 @@ class SubAction:
     def __init__(self, enabled=True):
         self.enabled = enabled
 
+    def begin(self, process):
+        pass
+
+    def end(self):
+        pass
+
 
 class CombinedActions(FramesRefActions):
     def __init__(self, name, actions=[], enabled=True, **kwargs):
@@ -255,10 +261,10 @@ class CombinedActions(FramesRefActions):
         filename = self.filenames[idx]
         img = read_img((self.output_dir
                         if self.step_process else self.input_full_path) + f"/{filename}")
-        self.dtype = img.dtype
-        self.shape = img.shape
         if img is None:
             raise RuntimeError(f"Invalid file: {self.input_full_path}/{filename}")
+        self.dtype = img.dtype
+        self.shape = img.shape
         return img
 
     def run_frame(self, idx, ref_idx):

shinestacker/algorithms/vignetting.py

@@ -59,7 +59,8 @@ class Vignetting(SubAction):
         i_valid, r_valid = intensities[valid_mask], radii[valid_mask]
         try:
             res = curve_fit(Vignetting.sigmoid, r_valid, i_valid,
-                            p0=[np.max(i_valid), 0.01, np.median(r_valid)])[0]
+                            p0=[np.max(i_valid), 0.01, np.median(r_valid)],
+                            bounds=([0, 0, 0], ['inf', 'inf', 'inf']))[0]
         except Exception:
             self.process.sub_message(
                 color_str(": could not find vignetting model", "red"),
@@ -83,7 +84,7 @@ class Vignetting(SubAction):
                        if image.dtype == np.uint8 else 65535).astype(image.dtype)
 
     def run_frame(self, idx, _ref_idx, img_0):
-        self.process.sub_message_r(color_str(": compute vignetting", "light_blue"))
+        self.process.sub_message_r(": compute vignetting")
         img = cv2.cvtColor(img_8bit(img_0), cv2.COLOR_BGR2GRAY)
         radii, intensities = self.radial_mean_intensity(img)
         pars = self.fit_sigmoid(radii, intensities)
@@ -92,7 +93,7 @@ class Vignetting(SubAction):
         self.v0 = Vignetting.sigmoid(0, *pars)
         i0_fit, k_fit, r0_fit = pars
         self.process.sub_message(
-            f": fit parameters: i0={i0_fit:.4f}, k={k_fit:.4f}, r0={r0_fit:.4f}",
+            f": vignetting model parameters: i0={i0_fit:.4f}, k={k_fit:.4f}, r0={r0_fit:.4f}",
             level=logging.DEBUG)
         if self.plot_correction:
             plt.figure(figsize=(10, 5))
@@ -116,7 +117,7 @@ class Vignetting(SubAction):
             self.corrections[i][idx] = fsolve(lambda x: Vignetting.sigmoid(x, *pars) /
                                               self.v0 - p, r0_fit)[0]
         if self.apply_correction:
-            self.process.sub_message_r(color_str(": correct vignetting", "light_blue"))
+            self.process.sub_message_r(": correct vignetting")
             return self.correct_vignetting(img_0, pars)
         return img_0
 

shinestacker/app/app_config.py

@@ -1,28 +1,15 @@
 # pylint: disable=C0114, C0115, C0116, C0103, W0201
-class _AppConfig:
-    _initialized = False
-    _instance = None
+from .. config.config import _ConfigBase
 
+
+class _AppConfig(_ConfigBase):
     def __new__(cls):
-        if cls._instance is None:
-            cls._instance = super().__new__(cls)
-            cls._instance._init_defaults()
-        return cls._instance
+        return _ConfigBase.__new__(cls)
 
     def _init_defaults(self):
         self._DONT_USE_NATIVE_MENU = True
         self._COMBINED_APP = False
 
-    def init(self, **kwargs):
-        if self._initialized:
-            raise RuntimeError("Config already initialized")
-        for k, v in kwargs.items():
-            if hasattr(self, f"_{k}"):
-                setattr(self, f"_{k}", v)
-            else:
-                raise AttributeError(f"Invalid config key: {k}")
-        self._initialized = True
-
     @property
     def DONT_USE_NATIVE_MENU(self):
         return self._DONT_USE_NATIVE_MENU
@@ -31,10 +18,5 @@ class _AppConfig:
     def COMBINED_APP(self):
         return self._COMBINED_APP
 
-    def __setattr__(self, name, value):
-        if self._initialized and name.startswith('_'):
-            raise AttributeError("Can't change config after initialization")
-        super().__setattr__(name, value)
-
 
 app_config = _AppConfig()

shinestacker/app/help_menu.py

@@ -14,4 +14,4 @@ def add_help_action(app):
 
 
 def browse_website():
-    webbrowser.open("https://github.com/lucalista/shinestacker/blob/main/README.md")
+    webbrowser.open("https://github.com/lucalista/shinestacker/blob/main/docs/gui.md")

shinestacker/config/config.py

@@ -1,5 +1,5 @@
 # pylint: disable=C0114, C0115, C0116, C0103, R0903, W0718, W0104, W0201, E0602
-class _Config:
+class _ConfigBase:
     _initialized = False
     _instance = None
 
@@ -9,16 +9,6 @@ class _Config:
             cls._instance._init_defaults()
         return cls._instance
 
-    def _init_defaults(self):
-        self._DISABLE_TQDM = False
-        self._COMBINED_APP = False
-        self._DONT_USE_NATIVE_MENU = True
-        try:
-            __IPYTHON__ # noqa
-            self._JUPYTER_NOTEBOOK = True
-        except Exception:
-            self._JUPYTER_NOTEBOOK = False
-
     def init(self, **kwargs):
         if self._initialized:
             raise RuntimeError("Config already initialized")
@@ -29,6 +19,26 @@ class _Config:
                 raise AttributeError(f"Invalid config key: {k}")
         self._initialized = True
 
+    def __setattr__(self, name, value):
+        if self._initialized and name.startswith('_'):
+            raise AttributeError("Can't change config after initialization")
+        super().__setattr__(name, value)
+
+class _Config(_ConfigBase):
+
+    def __new__(cls):
+        return _ConfigBase.__new__(cls)
+
+    def _init_defaults(self):
+        self._DISABLE_TQDM = False
+        self._COMBINED_APP = False
+        self._DONT_USE_NATIVE_MENU = True
+        try:
+            __IPYTHON__ # noqa
+            self._JUPYTER_NOTEBOOK = True
+        except Exception:
+            self._JUPYTER_NOTEBOOK = False
+
     @property
     def DISABLE_TQDM(self):
         return self._DISABLE_TQDM
@@ -45,10 +55,5 @@ class _Config:
     def COMBINED_APP(self):
         return self._COMBINED_APP
 
-    def __setattr__(self, name, value):
-        if self._initialized and name.startswith('_'):
-            raise AttributeError("Can't change config after initialization")
-        super().__setattr__(name, value)
-
 
 config = _Config()

shinestacker/gui/action_config.py

@@ -10,8 +10,10 @@ from PySide6.QtWidgets import (QWidget, QPushButton, QHBoxLayout, QFileDialog, Q
                                QAbstractItemView, QListView)
 from PySide6.QtCore import Qt, QTimer
 from .. config.constants import constants
-from .project_model import ActionConfig
 from .. algorithms.align import validate_align_config
+from .project_model import ActionConfig
+from .select_path_widget import (create_select_file_paths_widget, create_layout_widget_no_margins,
+                                 create_layout_widget_and_connect)
 
 FIELD_TEXT = 'text'
 FIELD_ABS_PATH = 'abs_path'
@@ -200,25 +202,11 @@ class FieldBuilder:
         return edit
 
     def create_abs_path_field(self, tag, **kwargs):
-        value = self.action.params.get(tag, '')
-        edit = QLineEdit(value)
-        edit.setPlaceholderText(kwargs.get('placeholder', ''))
-        button = QPushButton("Browse...")
-
-        def browse():
-            path = QFileDialog.getExistingDirectory(None, f"Select {tag.replace('_', ' ')}")
-            if path:
-                edit.setText(path)
-        button.clicked.connect(browse)
-        button.setAutoDefault(False)
-        layout = QHBoxLayout()
-        layout.addWidget(edit)
-        layout.addWidget(button)
-        layout.setContentsMargins(0, 0, 0, 0)
-        container = QWidget()
-        container.setLayout(layout)
-        container.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
-        return container
+        return create_select_file_paths_widget(
+            self.action.params.get(tag, ''),
+            kwargs.get('placeholder', ''),
+            tag.replace('_', ' ')
+        )
 
     def create_rel_path_field(self, tag, **kwargs):
         value = self.action.params.get(tag, kwargs.get('default', ''))
@@ -326,17 +314,8 @@ class FieldBuilder:
                     except ValueError as e:
                         traceback.print_tb(e.__traceback__)
                         QMessageBox.warning(None, "Error", "Could not compute relative path")
+        return create_layout_widget_and_connect(button, edit, browse)
 
-        button.clicked.connect(browse)
-        button.setAutoDefault(False)
-        layout = QHBoxLayout()
-        layout.addWidget(edit)
-        layout.addWidget(button)
-        layout.setContentsMargins(0, 0, 0, 0)
-        container = QWidget()
-        container.setLayout(layout)
-        container.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
-        return container
 
     def create_float_field(self, tag, default=0.0, min_val=0.0, max_val=1.0,
                            step=0.1, decimals=2):
@@ -369,11 +348,7 @@ class FieldBuilder:
             layout.addWidget(label)
             layout.addWidget(spin)
             layout.setStretch(layout.count() - 1, 1)
-        layout.setContentsMargins(0, 0, 0, 0)
-        container = QWidget()
-        container.setLayout(layout)
-        container.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
-        return container
+        return create_layout_widget_no_margins(layout)
 
     def create_combo_field(self, tag, options=None, default=None, **kwargs):
         options = options or []

shinestacker/gui/actions_window.py

@@ -1,14 +1,13 @@
 # pylint: disable=C0114, C0115, C0116, E0611, R0914, R0912, R0915, W0718
 import os.path
 import os
-import traceback
+# import traceback
 import json
 import jsonpickle
 from PySide6.QtWidgets import QMessageBox, QFileDialog, QDialog
 from .. core.core_utils import get_app_base_path
 from .. config.constants import constants
 from .project_model import ActionConfig
-from .action_config import ActionConfigDialog
 from .project_editor import ProjectEditor
 from .new_project import NewProjectDialog
 from .project_model import Project
@@ -17,15 +16,13 @@ from .project_model import Project
 class ActionsWindow(ProjectEditor):
     def __init__(self):
         super().__init__()
-        self._current_file = None
-        self._current_file_wd = ''
-        self._modified_project = False
         self.update_title()
 
     def update_title(self):
         title = constants.APP_TITLE
-        if self._current_file:
-            title += f" - {os.path.basename(self._current_file)}"
+        file_name = self.current_file_name()
+        if file_name:
+            title += f" - {file_name}"
             if self._modified_project:
                 title += " *"
         self.window().setWindowTitle(title)
@@ -38,7 +35,7 @@ class ActionsWindow(ProjectEditor):
     def close_project(self):
         if self._check_unsaved_changes():
             self.set_project(Project())
-            self._current_file = None
+            self.set_current_file_path('')
             self.update_title()
             self.job_list.clear()
             self.action_list.clear()
@@ -48,17 +45,17 @@ class ActionsWindow(ProjectEditor):
         if not self._check_unsaved_changes():
             return
         os.chdir(get_app_base_path())
-        self._current_file = None
+        self.set_current_file_path('')
         self._modified_project = False
         self.update_title()
         self.job_list.clear()
         self.action_list.clear()
+        self.set_project(Project())
         dialog = NewProjectDialog(self)
         if dialog.exec() == QDialog.Accepted:
             input_folder = dialog.get_input_folder().split('/')
             working_path = '/'.join(input_folder[:-1])
             input_path = input_folder[-1]
-            project = Project()
             if dialog.get_noise_detection():
                 job_noise = ActionConfig(constants.ACTION_JOB,
                                          {'name': 'detect-noise', 'working_path': working_path,
@@ -66,7 +63,7 @@ class ActionsWindow(ProjectEditor):
                 noise_detection = ActionConfig(constants.ACTION_NOISEDETECTION,
                                                {'name': 'detect-noise'})
                 job_noise.add_sub_action(noise_detection)
-                project.jobs.append(job_noise)
+                self.project.jobs.append(job_noise)
             job = ActionConfig(constants.ACTION_JOB,
                                {'name': 'focus-stack', 'working_path': working_path,
                                 'input_path': input_path})
@@ -115,8 +112,7 @@ class ActionsWindow(ProjectEditor):
                                            {'name': 'multi-layer',
                                             'input_path': ','.join(input_path)})
                 job.add_sub_action(multi_layer)
-            project.jobs.append(job)
-            self.set_project(project)
+            self.project.jobs.append(job)
             self._modified_project = True
             self.refresh_ui(0, -1)
 
@@ -128,17 +124,9 @@ class ActionsWindow(ProjectEditor):
                 self, "Open Project", "", "Project Files (*.fsp);;All Files (*)")
         if file_path:
             try:
-                self._current_file = file_path
-                self._current_file_wd = '' if os.path.isabs(file_path) \
-                    else os.path.dirname(file_path)
-                if not os.path.isabs(self._current_file_wd):
-                    self._current_file_wd = os.path.abspath(self._current_file_wd)
-                    self._current_file = os.path.basename(self._current_file)
-                with open(file_path, 'r', encoding="utf-8") as file:
+                self.set_current_file_path(file_path)
+                with open(self.current_file_path(), 'r', encoding="utf-8") as file:
                     json_obj = json.load(file)
-                pp = file_path.split('/')
-                if len(pp) > 1:
-                    os.chdir('/'.join(pp[:-1]))
                 project = Project.from_dict(json_obj['project'])
                 if project is None:
                     raise RuntimeError(f"Project from file {file_path} produced a null project.")
@@ -149,7 +137,7 @@ class ActionsWindow(ProjectEditor):
                 if self.job_list.count() > 0:
                     self.job_list.setCurrentRow(0)
             except Exception as e:
-                traceback.print_tb(e.__traceback__)
+                # traceback.print_tb(e.__traceback__)
                 QMessageBox.critical(self, "Error", f"Cannot open file {file_path}:\n{str(e)}")
             if len(self.project.jobs) > 0:
                 self.job_list.setCurrentRow(0)
@@ -177,12 +165,10 @@ class ActionsWindow(ProjectEditor):
                                 Please, select a valid working path.''')
                             self.edit_action(action)
 
-    def current_file_name(self):
-        return os.path.basename(self._current_file) if self._current_file else ''
-
     def save_project(self):
-        if self._current_file:
-            self.do_save(self._current_file)
+        path = self.current_file_path()
+        if path:
+            self.do_save(path)
         else:
             self.save_project_as()
 
@@ -192,11 +178,11 @@ class ActionsWindow(ProjectEditor):
         if file_path:
             if not file_path.endswith('.fsp'):
                 file_path += '.fsp'
-            self._current_file_wd = ''
             self.do_save(file_path)
-            self._current_file = file_path
+            self.set_current_file_path(file_path)
             self._modified_project = False
             self.update_title()
+            os.chdir(os.path.dirname(file_path))
 
     def do_save(self, file_path):
         try:
@@ -204,9 +190,7 @@ class ActionsWindow(ProjectEditor):
                 'project': self.project.to_dict(),
                 'version': 1
             })
-            path = f"{self._current_file_wd}/{file_path}" \
-                if self._current_file_wd != '' else file_path
-            with open(path, 'w', encoding="utf-8") as f:
+            with open(file_path, 'w', encoding="utf-8") as f:
                 f.write(json_obj)
             self._modified_project = False
         except Exception as e:
@@ -229,7 +213,7 @@ class ActionsWindow(ProjectEditor):
         index = self.job_list.row(item)
         if 0 <= index < len(self.project.jobs):
             job = self.project.jobs[index]
-            dialog = ActionConfigDialog(job, self._current_file_wd, self)
+            dialog = self.action_config_dialog(job)
             if dialog.exec() == QDialog.Accepted:
                 current_row = self.job_list.currentRow()
                 if current_row >= 0:
@@ -241,28 +225,12 @@ class ActionsWindow(ProjectEditor):
         if 0 <= job_index < len(self.project.jobs):
             job = self.project.jobs[job_index]
             action_index = self.action_list.row(item)
-            action_counter = -1
-            current_action = None
-            is_sub_action = False
-            for action in job.sub_actions:
-                action_counter += 1
-                if action_counter == action_index:
-                    current_action = action
-                    break
-                if len(action.type_name) > 0:
-                    for sub_action in action.sub_actions:
-                        action_counter += 1
-                        if action_counter == action_index:
-                            current_action = sub_action
-                            is_sub_action = True
-                            break
-                    if current_action:
-                        break
+            current_action, is_sub_action = self.get_current_action_at(job, action_index)
             if current_action:
                 if not is_sub_action:
                     self.set_enabled_sub_actions_gui(
                         current_action.type_name == constants.ACTION_COMBO)
-                dialog = ActionConfigDialog(current_action, self._current_file_wd, self)
+                dialog = self.action_config_dialog(current_action)
                 if dialog.exec() == QDialog.Accepted:
                     self.on_job_selected(job_index)
                     self.refresh_ui()
@@ -284,7 +252,7 @@ class ActionsWindow(ProjectEditor):
             self.edit_action(current_action)
 
     def edit_action(self, action):
-        dialog = ActionConfigDialog(action, self._current_file_wd, self)
+        dialog = self.action_config_dialog(action)
         if dialog.exec() == QDialog.Accepted:
             self.on_job_selected(self.job_list.currentRow())
             self.mark_as_modified()

shinestacker/gui/new_project.py

@@ -1,13 +1,13 @@
 # pylint: disable=C0114, C0115, C0116, E0611, R0915, R0902
 import os
-from PySide6.QtWidgets import (QWidget, QLineEdit, QFormLayout, QHBoxLayout, QPushButton,
-                               QDialog, QSizePolicy, QFileDialog, QLabel, QCheckBox,
-                               QSpinBox, QMessageBox)
+from PySide6.QtWidgets import (QFormLayout, QHBoxLayout, QPushButton,
+                               QDialog, QLabel, QCheckBox, QSpinBox, QMessageBox)
 from PySide6.QtGui import QIcon
 from PySide6.QtCore import Qt
 from .. config.gui_constants import gui_constants
 from .. config.constants import constants
 from .. algorithms.stack import get_bunches
+from .select_path_widget import create_select_file_paths_widget
 
 
 class NewProjectDialog(QDialog):
@@ -50,25 +50,8 @@ class NewProjectDialog(QDialog):
         spacer = QLabel("")
         spacer.setFixedHeight(10)
         self.layout.addRow(spacer)
-        self.input_folder = QLineEdit()
-        self.input_folder .setPlaceholderText('input files folder')
-        self.input_folder.textChanged.connect(self.update_bunches_label)
-        button = QPushButton("Browse...")
-
-        def browse():
-            path = QFileDialog.getExistingDirectory(None, "Select input files folder")
-            if path:
-                self.input_folder.setText(path)
-
-        button.clicked.connect(browse)
-        button.setAutoDefault(False)
-        layout = QHBoxLayout()
-        layout.addWidget(self.input_folder)
-        layout.addWidget(button)
-        layout.setContentsMargins(0, 0, 0, 0)
-        container = QWidget()
-        container.setLayout(layout)
-        container.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+
+        container = create_select_file_paths_widget('', 'input files folder', 'input files folder')
 
         self.noise_detection = QCheckBox()
         self.noise_detection.setChecked(gui_constants.NEW_PROJECT_NOISE_DETECTION)

shinestacker/gui/project_editor.py

@@ -89,6 +89,27 @@ class ProjectEditor(QMainWindow):
         self.expert_options = False
         self.script_dir = os.path.dirname(__file__)
         self.dialog = None
+        self._current_file_path = ''
+        self._modified_project = False
+
+    def current_file_path(self):
+        return self._current_file_path
+
+    def current_file_directory(self):
+        if os.path.isdir(self._current_file_path):
+            return self._current_file_path
+        return os.path.dirname(self._current_file_path)
+
+    def current_file_name(self):
+        if os.path.isfile(self._current_file_path):
+            return os.path.basename(self._current_file_path)
+        return ''
+
+    def set_current_file_path(self, path):
+        if path and not os.path.exists(path):
+            raise RuntimeError(f"Path: {path} does not exist.")
+        self._current_file_path = os.path.abspath(path)
+        os.chdir(self.current_file_directory())
 
     def set_project(self, project):
         self.project = project
@@ -300,9 +321,12 @@ class ProjectEditor(QMainWindow):
             self.delete_element_action.setEnabled(True)
         return element
 
+    def action_config_dialog(self, action):
+        return ActionConfigDialog(action, self.current_file_directory(), self)
+
     def add_job(self):
         job_action = ActionConfig("Job")
-        self.dialog = ActionConfigDialog(job_action, self)
+        self.dialog = self.action_config_dialog(job_action)
         if self.dialog.exec() == QDialog.Accepted:
             self.mark_as_modified()
             self.project.jobs.append(job_action)
@@ -323,7 +347,7 @@ class ProjectEditor(QMainWindow):
             type_name = self.action_selector.currentText()
         action = ActionConfig(type_name)
         action.parent = self.get_current_job()
-        self.dialog = ActionConfigDialog(action, self)
+        self.dialog = self.action_config_dialog(action)
         if self.dialog.exec() == QDialog.Accepted:
             self.mark_as_modified()
             self.project.jobs[current_index].add_sub_action(action)
@@ -365,7 +389,7 @@ class ProjectEditor(QMainWindow):
         if type_name is False:
             type_name = self.sub_action_selector.currentText()
         sub_action = ActionConfig(type_name)
-        self.dialog = ActionConfigDialog(sub_action, self)
+        self.dialog = self.action_config_dialog(sub_action)
         if self.dialog.exec() == QDialog.Accepted:
             self.mark_as_modified()
             action.add_sub_action(sub_action)
@@ -493,6 +517,27 @@ class ProjectEditor(QMainWindow):
                         self.add_list_item(self.action_list, sub_action, True)
             self.update_delete_action_state()
 
+    def get_current_action_at(self, job, action_index):
+        action_counter = -1
+        current_action = None
+        is_sub_action = False
+        for action in job.sub_actions:
+            action_counter += 1
+            if action_counter == action_index:
+                current_action = action
+                break
+            if len(action.sub_actions) > 0:
+                for sub_action in action.sub_actions:
+                    action_counter += 1
+                    if action_counter == action_index:
+                        current_action = sub_action
+                        is_sub_action = True
+                        break
+                if current_action:
+                    break
+
+        return current_action, is_sub_action
+
     def update_delete_action_state(self):
         has_job_selected = len(self.job_list.selectedItems()) > 0
         has_action_selected = len(self.action_list.selectedItems()) > 0
@@ -504,23 +549,7 @@ class ProjectEditor(QMainWindow):
             action_index = self.action_list.currentRow()
             if job_index >= 0:
                 job = self.project.jobs[job_index]
-                action_counter = -1
-                current_action = None
-                is_sub_action = False
-                for action in job.sub_actions:
-                    action_counter += 1
-                    if action_counter == action_index:
-                        current_action = action
-                        break
-                    if len(action.sub_actions) > 0:
-                        for sub_action in action.sub_actions:
-                            action_counter += 1
-                            if action_counter == action_index:
-                                current_action = sub_action
-                                is_sub_action = True
-                                break
-                        if current_action:
-                            break
+                current_action, is_sub_action = self.get_current_action_at(job, action_index)
                 enable_sub_actions = current_action is not None and \
                     not is_sub_action and current_action.type_name == constants.ACTION_COMBO
                 self.set_enabled_sub_actions_gui(enable_sub_actions)

shinestacker/gui/select_path_widget.py

@@ -0,0 +1,30 @@
+# pylint: disable=C0114, C0116, E0611
+from PySide6.QtWidgets import QWidget, QPushButton, QHBoxLayout, QFileDialog, QSizePolicy, QLineEdit
+
+
+def create_layout_widget_no_margins(layout):
+    layout.setContentsMargins(0, 0, 0, 0)
+    container = QWidget()
+    container.setLayout(layout)
+    container.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
+    return container
+
+def create_layout_widget_and_connect(button, edit, browse):
+    button.clicked.connect(browse)
+    button.setAutoDefault(False)
+    layout = QHBoxLayout()
+    layout.addWidget(edit)
+    layout.addWidget(button)
+    return create_layout_widget_no_margins(layout)
+
+def create_select_file_paths_widget(value, placeholder, tag):
+    edit = QLineEdit(value)
+    edit.setPlaceholderText(placeholder)
+    button = QPushButton("Browse...")
+
+    def browse():
+        path = QFileDialog.getExistingDirectory(None, f"Select {tag}")
+        if path:
+            edit.setText(path)
+
+    return create_layout_widget_and_connect(button, edit, browse)

shinestacker/retouch/base_filter.py

@@ -2,7 +2,7 @@
 import traceback
 from abc import ABC, abstractmethod
 import numpy as np
-from PySide6.QtWidgets import QDialog, QVBoxLayout
+from PySide6.QtWidgets import QDialog, QVBoxLayout, QCheckBox, QDialogButtonBox
 from PySide6.QtCore import Signal, QThread, QTimer
 
 
@@ -98,6 +98,17 @@ class BaseFilter(ABC):
         else:
             restore_original()
 
+    def create_base_widgets(self, layout, buttons, preview_latency):
+        preview_check = QCheckBox("Preview")
+        preview_check.setChecked(True)
+        layout.addWidget(preview_check)
+        button_box = QDialogButtonBox(buttons)
+        layout.addWidget(button_box)
+        preview_timer = QTimer()
+        preview_timer.setSingleShot(True)
+        preview_timer.setInterval(preview_latency)
+        return preview_check, preview_timer, button_box
+
     class PreviewWorker(QThread):
         finished = Signal(np.ndarray, int)
 

shinestacker/retouch/denoise_filter.py

@@ -1,6 +1,6 @@
 # pylint: disable=C0114, C0115, C0116, E0611, W0221
-from PySide6.QtWidgets import QHBoxLayout, QLabel, QSlider, QCheckBox, QDialogButtonBox
-from PySide6.QtCore import Qt, QTimer
+from PySide6.QtWidgets import QHBoxLayout, QLabel, QSlider, QDialogButtonBox
+from PySide6.QtCore import Qt
 from .base_filter import BaseFilter
 from .. algorithms.denoise import denoise
 
@@ -24,14 +24,8 @@ class DenoiseFilter(BaseFilter):
         value_label = QLabel(f"{self.max_value:.2f}")
         slider_layout.addWidget(value_label)
         layout.addLayout(slider_layout)
-        preview_check = QCheckBox("Preview")
-        preview_check.setChecked(True)
-        layout.addWidget(preview_check)
-        button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
-        layout.addWidget(button_box)
-        preview_timer = QTimer()
-        preview_timer.setSingleShot(True)
-        preview_timer.setInterval(200)
+        preview_check, preview_timer, button_box = self.create_base_widgets(
+            layout, QDialogButtonBox.Ok | QDialogButtonBox.Cancel, 200)
 
         def do_preview_delayed():
             preview_timer.start()

shinestacker/retouch/exif_data.py

@@ -1,10 +1,9 @@
 # pylint: disable=C0114, C0115, C0116, E0611
-import os
 from PIL.TiffImagePlugin import IFDRational
 from PySide6.QtWidgets import QFormLayout, QHBoxLayout, QPushButton, QDialog, QLabel
-from PySide6.QtGui import QIcon
 from PySide6.QtCore import Qt
 from .. algorithms.exif import exif_dict
+from .icon_container import icon_container
 
 
 class ExifData(QDialog):
@@ -32,13 +31,8 @@ class ExifData(QDialog):
         self.layout.addRow(label)
 
     def create_form(self):
-        icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
-        app_icon = QIcon(icon_path)
-        icon_pixmap = app_icon.pixmap(128, 128)
-        icon_label = QLabel()
-        icon_label.setPixmap(icon_pixmap)
-        icon_label.setAlignment(Qt.AlignCenter)
-        self.layout.addRow(icon_label)
+        self.layout.addRow(icon_container())
+
         spacer = QLabel("")
         spacer.setFixedHeight(10)
         self.layout.addRow(spacer)

shinestacker/retouch/icon_container.py

@@ -0,0 +1,19 @@
+# pylint: disable=C0114, C0115, C0116, E0611
+import os
+from PySide6.QtWidgets import QHBoxLayout, QLabel, QWidget
+from PySide6.QtGui import QIcon
+from PySide6.QtCore import Qt
+
+
+def icon_container():
+    icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
+    app_icon = QIcon(icon_path)
+    pixmap = app_icon.pixmap(128, 128)
+    label = QLabel()
+    label.setPixmap(pixmap)
+    label.setAlignment(Qt.AlignCenter)
+    container = QWidget()
+    layout = QHBoxLayout(container)
+    layout.addWidget(label)
+    layout.setAlignment(Qt.AlignCenter)
+    return container

shinestacker/retouch/shortcuts_help.py

@@ -1,9 +1,8 @@
 # pylint: disable=C0114, C0115, C0116, E0611
-import os
 from PySide6.QtWidgets import (QFormLayout, QHBoxLayout, QPushButton, QDialog,
                                QLabel, QVBoxLayout, QWidget)
-from PySide6.QtGui import QIcon
 from PySide6.QtCore import Qt
+from .icon_container import icon_container
 
 
 class ShortcutsHelp(QDialog):
@@ -44,17 +43,7 @@ class ShortcutsHelp(QDialog):
         layout.addRow(label)
 
     def create_form(self, left_layout, right_layout):
-        icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
-        app_icon = QIcon(icon_path)
-        icon_pixmap = app_icon.pixmap(128, 128)
-        icon_label = QLabel()
-        icon_label.setPixmap(icon_pixmap)
-        icon_label.setAlignment(Qt.AlignCenter)
-        icon_container = QWidget()
-        icon_container_layout = QHBoxLayout(icon_container)
-        icon_container_layout.addWidget(icon_label)
-        icon_container_layout.setAlignment(Qt.AlignCenter)
-        self.layout.insertWidget(0, icon_container)
+        self.layout.insertWidget(0, icon_container())
 
         shortcuts = {
             "M": "show master layer",

shinestacker/retouch/unsharp_mask_filter.py

@@ -1,5 +1,5 @@
 # pylint: disable=C0114, C0115, C0116, E0611, W0221, R0902, R0914
-from PySide6.QtWidgets import QHBoxLayout, QLabel, QSlider, QCheckBox, QDialogButtonBox
+from PySide6.QtWidgets import QHBoxLayout, QLabel, QSlider, QDialogButtonBox
 from PySide6.QtCore import Qt, QTimer
 from .. algorithms.sharpen import unsharp_mask
 from .base_filter import BaseFilter
@@ -46,15 +46,8 @@ class UnsharpMaskFilter(BaseFilter):
             elif name == "Threshold":
                 self.threshold_slider = slider
             value_labels[name] = value_label
-
-        preview_check = QCheckBox("Preview")
-        preview_check.setChecked(True)
-        layout.addWidget(preview_check)
-        button_box = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
-        layout.addWidget(button_box)
-        preview_timer = QTimer()
-        preview_timer.setSingleShot(True)
-        preview_timer.setInterval(200)
+        preview_check, preview_timer, button_box = self.create_base_widgets(
+            layout, QDialogButtonBox.Ok | QDialogButtonBox.Cancel, 200)
 
         def update_value(name, value, max_val, fmt):
             float_value = max_val * value / self.max_range

shinestacker/retouch/white_balance_filter.py

@@ -1,6 +1,6 @@
 # pylint: disable=C0114, C0115, C0116, E0611, W0221, R0913, R0914, R0917
 from PySide6.QtWidgets import (QHBoxLayout, QPushButton, QFrame, QVBoxLayout, QLabel, QDialog,
-                               QApplication, QSlider, QCheckBox, QDialogButtonBox)
+                               QApplication, QSlider, QDialogButtonBox)
 from PySide6.QtCore import Qt, QTimer
 from PySide6.QtGui import QCursor
 from .. algorithms.white_balance import white_balance_from_rgb
@@ -47,18 +47,10 @@ class WhiteBalanceFilter(BaseFilter):
         layout.addLayout(row_layout)
         pick_button = QPushButton("Pick Color")
         layout.addWidget(pick_button)
-        preview_check = QCheckBox("Preview")
-        preview_check.setChecked(True)
-        layout.addWidget(preview_check)
-        button_box = QDialogButtonBox(
-            QDialogButtonBox.Ok |
-            QDialogButtonBox.Reset |
-            QDialogButtonBox.Cancel
-        )
-        layout.addWidget(button_box)
-        self.preview_timer = QTimer()
-        self.preview_timer.setSingleShot(True)
-        self.preview_timer.setInterval(200)
+        preview_check, self.preview_timer, button_box = self.create_base_widgets(
+            layout,
+            QDialogButtonBox.Ok | QDialogButtonBox.Reset | QDialogButtonBox.Cancel,
+            200)
         for slider in self.sliders.values():
             slider.valueChanged.connect(self.on_slider_change)
         self.preview_timer.timeout.connect(do_preview)

{shinestacker-0.3.4.dist-info → shinestacker-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 0.3.4
+Version: 0.3.6
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0
@@ -37,25 +37,22 @@ Dynamic: license-file
 [![PyPI version](https://img.shields.io/pypi/v/shinestacker?color=success)](https://pypi.org/project/shinestacker/)
 [![Python Versions](https://img.shields.io/pypi/pyversions/shinestacker)](https://pypi.org/project/shinestacker/)
 [![Qt Versions](https://img.shields.io/badge/Qt-6-blue.svg?&logo=Qt&logoWidth=18&logoColor=white)](https://www.qt.io/qt-for-python)
-[![codecov](https://codecov.io/github/lucalista/shinestacker/graph/badge.svg?token=Y5NKW6VH5G)](https://codecov.io/github/lucalista/shinestacker)
 [![pylint](https://img.shields.io/badge/PyLint-9.98-yellow?logo=python&logoColor=white)](https://github.com/lucalista/shinestacker/blob/main/.github/workflows/pylint.yml)
+[![codecov](https://codecov.io/github/lucalista/shinestacker/graph/badge.svg?token=Y5NKW6VH5G)](https://codecov.io/github/lucalista/shinestacker)
 [![Documentation Status](https://readthedocs.org/projects/shinestacker/badge/?version=latest)](https://shinestacker.readthedocs.io/en/latest/?badge=latest)
 
 
-
 <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies.gif' width="400" referrerpolicy="no-referrer">  <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies_stack.jpg' width="400" referrerpolicy="no-referrer">
 
 <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/coffee.gif' width="400" referrerpolicy="no-referrer">  <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/coffee_stack.jpg' width="400" referrerpolicy="no-referrer">
 
-<img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/coins.gif' width="400" referrerpolicy="no-referrer">  <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/coins_stack.jpg' width="400" referrerpolicy="no-referrer">
 > **Focus stacking** for microscopy, macro photography, and computational imaging
 
 ## Key Features
 - 🚀 **Batch Processing**: Align, balance, and stack hundreds of images
-- 🎨 **Hybrid Workflows**: Combine Python scripting with GUI refinement
 - 🧩 **Modular Architecture**: Mix-and-match processing modules
 - 🖌️ **Retouch Editing**: Final interactive retouch of stacked image from individual frames
-- 📊 **Jupyter Integration**: Reproducible research notebooks
+- 📊 **Jupyter Integration**: Image processing python notebooks
 
 ## Interactive GUI
 
@@ -76,16 +73,21 @@ The GUI has two main working areas:
 
 # Credits
 
-The main pyramid 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 for initial versions of this package. The implementation in the latest releases was rewritten from the original code.
+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
 
 * [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
-* Another [original implementation on GitHub](https://github.com/bznick98/Focus_Stacking) by Zongnan Bao
 
 # License
 
 The software is provided as is under the [GNU Lesser General Public License v3.0](https://choosealicense.com/licenses/lgpl-3.0/).
 
+# 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*
+
+This is not mandatory, but highly appreciated.

{shinestacker-0.3.4.dist-info → shinestacker-0.3.6.dist-info}/RECORD

@@ -1,33 +1,32 @@
 shinestacker/__init__.py,sha256=uq2fjAw2z_6TpH3mOcWFZ98GoEPRsNhTAK8N0MMm_e8,448
-shinestacker/_version.py,sha256=SH0xuWVUkyLHZJwWBZ8GJoeliTeYFcqA6TWJgrkLv-U,21
+shinestacker/_version.py,sha256=IbpUPwvtjLOqowcOFsWQ6LKq-FH6cI19IpvfQlxufq0,21
 shinestacker/algorithms/__init__.py,sha256=c4kRrdTLlVI70Q16XkI1RSmz5MD7npDqIpO_02jTG6g,747
 shinestacker/algorithms/align.py,sha256=1CAnVhxaYO-SUd86Mmj7lTmaqlrmUWlF-HEM5341gcs,17166
 shinestacker/algorithms/balance.py,sha256=ZBcw2Ck-CfuobIG1FxFsGVjnLvD1rtVNrTO-GrFbi3Q,16441
-shinestacker/algorithms/base_stack_algo.py,sha256=GeUASZ92bjo_YYpWYmFfoPDJBo-SgCpSTYLFH3gjnSw,1415
-shinestacker/algorithms/core_utils.py,sha256=XJyHDUFXmN4JhbOjJqhP4dJW75B69oZaaWQrSXHUk5o,575
+shinestacker/algorithms/base_stack_algo.py,sha256=EAdVcO2UDq6UwqWZwGZFF7XXJvysyxqqVoswz4PLCdo,1353
 shinestacker/algorithms/denoise.py,sha256=GL3Z4_6MHxSa7Wo4ZzQECZS87tHBFqO0sIVF_jPuYQU,426
 shinestacker/algorithms/depth_map.py,sha256=b88GqbRXEU3wCXBxMcStlgZ4sFJicoiZfJMD30Z4b98,7364
 shinestacker/algorithms/exif.py,sha256=gY9s6Cd4g4swo5qEjSbzuVIvl1GImCYu6ytOO9WrV0I,9435
 shinestacker/algorithms/multilayer.py,sha256=4Y6XlNJHFW74iNDFIeq_zdVtwLBnrieeMd708zJX-lo,8994
-shinestacker/algorithms/noise_detection.py,sha256=5PZ3sucWiSK5f4PKY2SW1CIzTtgs_o7g48b6JlM3tTc,8597
-shinestacker/algorithms/pyramid.py,sha256=zQdN2cr26M2iIywjr_xtknY9XvA2cc6wjMmiNOJf3Wc,8288
+shinestacker/algorithms/noise_detection.py,sha256=PmscQWi2v3ERTSf8SejkkSZXmTixKvh4NV9CtfuoUfM,8564
+shinestacker/algorithms/pyramid.py,sha256=_Pk19lRQ21b3W3aHQ6DgAe9VVOfbsi2a9jrynF0qFVw,8610
 shinestacker/algorithms/sharpen.py,sha256=h7PMJBYxucg194Usp_6pvItPUMFYbT-ebAc_-7XBFUw,949
-shinestacker/algorithms/stack.py,sha256=KTtoPGZYocSYqK4zqvhbMyk6M69L2HhNSDG9ayomASo,4852
-shinestacker/algorithms/stack_framework.py,sha256=8hRvAjoFyx4vT34pq1XZAh-62kw__ycI3fLiHgODMe0,12216
+shinestacker/algorithms/stack.py,sha256=IAa24rPMXl7F5yfcy0nw-fjsgGPpUkxqeKMqLHqvee8,4796
+shinestacker/algorithms/stack_framework.py,sha256=WZLudhjk6piQz2JULShxcoC3-3mSD-Bgh4_VT7JeG7c,12293
 shinestacker/algorithms/utils.py,sha256=VLm6eZmcAk2QPvomT4d1q56laJSYfbCQmiwI2Rmuu_s,2171
-shinestacker/algorithms/vignetting.py,sha256=Z6OB5ahgQCvE4J8Gy7EhtHHoPXoM2_3jnisWM1x_r6c,7436
+shinestacker/algorithms/vignetting.py,sha256=wFwi20ob1O3Memav1XQrtrOHgOtKRiK1RV4E-ex69r8,7470
 shinestacker/algorithms/white_balance.py,sha256=PMKsBtxOSn5aRr_Gkx1StHS4eN6kBN2EhNnhg4UG24g,501
 shinestacker/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shinestacker/app/about_dialog.py,sha256=QzZgTcLvkSP3_FhmPOUnwQ_YSxwJdeFrU2IAVYKDgeg,1050
-shinestacker/app/app_config.py,sha256=Rde_EKfM0tAs6a1qtiNkr6Bkodg5hZc6XW4hmQoQoac,1169
+shinestacker/app/app_config.py,sha256=eTIRxp0t7Wic46jMTe_oY3kz7ktZbdM43C3bjshVDKg,494
 shinestacker/app/gui_utils.py,sha256=ptbUKjv5atbx5vW912_j8BVmDZpovAqZDEC48d0R2vA,2331
-shinestacker/app/help_menu.py,sha256=T6_L3CGOkJs5fvFf3XLkIehk2khrdTE-nXo5Aj8VR94,514
+shinestacker/app/help_menu.py,sha256=UOlabEY_EKV2Q1BoiU2JAM1udSSBAwXlL7d58bqxKe0,516
 shinestacker/app/main.py,sha256=RAf9WiCipYLK1rrwnXyL1sWq_28zDl9Z_eipfrdtSuY,6421
 shinestacker/app/open_frames.py,sha256=bsu32iJSYJQLe_tQQbvAU5DuMDVX6MRuNdE7B5lojZc,1488
 shinestacker/app/project.py,sha256=ir98-zogYmvx2QYvFbAaBUqLL03qWYkoMOIvLvmQy_w,2736
 shinestacker/app/retouch.py,sha256=ZQ-nRKnHo6xurcP34RNqaAWkmuGBjJ5jE05hTQ_ycis,2482
 shinestacker/config/__init__.py,sha256=aXxi-LmAvXd0daIFrVnTHE5OCaYeK1uf1BKMr7oaXQs,197
-shinestacker/config/config.py,sha256=BmcY79Ng3bN7HvYK7DzkGlrk2kTfV5R4gKTln87tfWs,1539
+shinestacker/config/config.py,sha256=BshNb20Dx5HqdlpsTQbx4p-LnQ5uBP2q-h9v3pl84ss,1635
 shinestacker/config/constants.py,sha256=79bOcE44MZ0WuAVPjDwwhvNrsQTlHGyIOwmqwlLOfMU,5776
 shinestacker/config/gui_constants.py,sha256=002r96jtxV4Acel7q5NgECrcsDJzW-kOStEHqam-5Gg,2492
 shinestacker/core/__init__.py,sha256=IUEIx6SQ3DygDEHN3_E6uKpHjHtUa4a_U_1dLd_8yEU,484
@@ -37,17 +36,18 @@ shinestacker/core/exceptions.py,sha256=2-noG-ORAGdvDhL8jBQFs0xxZS4fI6UIkMqrWekgk
 shinestacker/core/framework.py,sha256=3Q3zalyZeCiUHXYbBiYadWNdtyD_3j3dcymk5_3NajM,7063
 shinestacker/core/logging.py,sha256=9SuSSy9Usbh7zqmLYMqkmy-VBkOJW000lwqAR0XQs30,3067
 shinestacker/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shinestacker/gui/action_config.py,sha256=z5rztJDmOIyXUm3CiRoXFLn1AWHqHDYkcUkLGK5mzbE,49539
-shinestacker/gui/actions_window.py,sha256=W9XNjiTbsBJ-ZFdb5wo1eGD8OlSBpsuqyuJsKdWq_hI,13522
+shinestacker/gui/action_config.py,sha256=RpUHjq8lmiGJQPnp55O1yd3ZPiLQG3R7jZ52m1VmiQc,48678
+shinestacker/gui/actions_window.py,sha256=-ehMkGshsH22HSnn33ThAMXy7tR_cqWr14mEnXDTfXk,12025
 shinestacker/gui/colors.py,sha256=zgLRcC3fAzklx7zzyjLEsMX2i64YTxGUmQM2woYBZuw,1344
 shinestacker/gui/gui_images.py,sha256=e0KAXSPruZoRHrajfdlmOKBYoRJJQBDan1jgs7YFltY,5678
 shinestacker/gui/gui_logging.py,sha256=ESlk1EAQMdoT8pCZDFsvtU1UtF4h2GKv3wAhxJYxNis,8213
 shinestacker/gui/gui_run.py,sha256=bYXX4N__Ez7JMIJtVcTmLF2PJ3y9bCd-uvlOHsV-4gg,16230
 shinestacker/gui/main_window.py,sha256=z14PWRVDRbuySM05YCCFrn1DPU3U96xwQHy730oiLkw,28577
-shinestacker/gui/new_project.py,sha256=nr05vfmMH-LsKiLL_qOanSr35-6AZwv7q_CXAXXEFFc,8443
+shinestacker/gui/new_project.py,sha256=cs3641RW3Uiy2VfwxeM-k254rH4BNykJyojmwxzrEi8,7758
 shinestacker/gui/project_converter.py,sha256=v-oldaw77VLsywhQcl5uhTtPD7GbGFeJo33JJRl3aG4,7453
-shinestacker/gui/project_editor.py,sha256=5A2CmIfLKoRSGfxgyYEzVNDdrwXyc65de-pzlYPAUKo,21296
+shinestacker/gui/project_editor.py,sha256=zwmj7PFs7X06GY4tkoDBcOL4Tl0IGo4Mf13n2qGwaJY,22245
 shinestacker/gui/project_model.py,sha256=89L0IDSAqRK2mvU1EVIrcsJas8CU-aTzUIjdL1Cv0mw,4421
+shinestacker/gui/select_path_widget.py,sha256=JAxAkbQukPwBc27-EdeobxxJBG4IBfooiV-JZq3ttsY,1015
 shinestacker/gui/ico/focus_stack_bkg.png,sha256=Q86TgqvKEi_IzKI8m6aZB2a3T40UkDtexf2PdeBM9XE,163151
 shinestacker/gui/ico/shinestacker.icns,sha256=m_6WQBx8sE9jQKwIRa_B5oa7_VcNn6e2TyijeQXPjwM,337563
 shinestacker/gui/ico/shinestacker.ico,sha256=yO0NaBWA0uFov_GqHuHQbymoqLtQKt5DPWpGGmRKie0,186277
@@ -57,16 +57,17 @@ shinestacker/gui/img/forward-button-icon.png,sha256=lNw86T4TOEd_uokHYF8myGSGUXzd
 shinestacker/gui/img/play-button-round-icon.png,sha256=9j6Ks9mOGa-2cXyRFpimepAAvSaHzqJKBfxShRb4_dE,4595
 shinestacker/gui/img/plus-round-line-icon.png,sha256=LS068Hlu-CeBvJuB3dwwdJg1lZq6D5MUIv53lu1yKJA,7534
 shinestacker/retouch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-shinestacker/retouch/base_filter.py,sha256=sU2reqQpC3b-Q1iiTk2fWTtruakQvhZWC2MTRt74fFM,4228
+shinestacker/retouch/base_filter.py,sha256=74GmzLjpPtn0Um0YOS8qLC1ZvhbvQX4L_AEDk-5H5nE,4717
 shinestacker/retouch/brush.py,sha256=dzD2FzSpBIPdJRmTZobcrQ1FrVd3tF__ZPnUplNE72s,357
 shinestacker/retouch/brush_gradient.py,sha256=F5SFhyzl8YTMqjJU3jK8BrIlLCYLUvITd5wz3cQE4xk,1453
 shinestacker/retouch/brush_preview.py,sha256=KlUOqA1uvLZRsz2peJ9NgsukyzsppJUw3XXr0NFCuhQ,5181
 shinestacker/retouch/brush_tool.py,sha256=kwX58_gC_Fep6zowDqOs3nG2wCIc8wrJdokDADGm6K0,8016
-shinestacker/retouch/denoise_filter.py,sha256=Z6oG5YVG172t1titu1KOgnKFSW8My2vzlTOSf5Ey5jY,2212
+shinestacker/retouch/denoise_filter.py,sha256=eO0Cxo9xwsuiE6-JiWCFB5jf6U1kf2N3ftsDAEQ5sek,1982
 shinestacker/retouch/display_manager.py,sha256=54NRdlyVj_7GzJ7hmKf8Hnf3lJJx2jVSSpWedj-5pIc,7298
-shinestacker/retouch/exif_data.py,sha256=UB_CwoVN5mMLU6PfJCRaZOfarFR77a11mVaxbYZ4v-Y,2301
+shinestacker/retouch/exif_data.py,sha256=uA9ck9skp8ztSUdX1SFrApgtqmxrHtfWW3vsry82H94,2026
 shinestacker/retouch/file_loader.py,sha256=723A_2w3cjn4rhvAzCq-__SWFelDRsMhkazgnb2h7Ig,4810
 shinestacker/retouch/filter_manager.py,sha256=SkioWTr6iFFpugUgZLg0a3m5b9EHdZAeyNFy39qk0z8,453
+shinestacker/retouch/icon_container.py,sha256=6gw1HO1bC2FrdB4dc_iH81DQuLjzuvRGksZ2hKLT9yA,585
 shinestacker/retouch/image_editor.py,sha256=co5zUufgeb1WrD3aF1RVPh1MbcC9-92HSUa2iROnKk4,8503
 shinestacker/retouch/image_editor_ui.py,sha256=vfBALDuHtqSWIPmyfUirkygM1guwQG-gHo0AH0x8_jU,15712
 shinestacker/retouch/image_filters.py,sha256=JF2a7VATO3CGQr5_OOIPi2k7b9HvHzrhhWS73x32t-A,2883
@@ -74,13 +75,13 @@ shinestacker/retouch/image_viewer.py,sha256=oqBgaanPXWjzIaox5KSRhYOHoGvoYnWm7sqW
 shinestacker/retouch/io_gui_handler.py,sha256=2jkbPXew95rMKO2aC9hwZJGtZRg3wCCtXI0SFFiNHUI,9089
 shinestacker/retouch/io_manager.py,sha256=sNcZVEttiVdxNBVs39ZvexqOcvtjl2CvJs6BVqmGvOM,2148
 shinestacker/retouch/layer_collection.py,sha256=j1NiGGtLZ3OwrftBVNT4rb0Kq0CfWAB3t2bUrqHx1Sk,5608
-shinestacker/retouch/shortcuts_help.py,sha256=wjCw2TiUBaPx1OqpdZlRPsLbyLhIZkoffz9wcODtQnA,3794
+shinestacker/retouch/shortcuts_help.py,sha256=dlt7OSAr9thYuoEPlirTU_YRzv5xP9vy2-9mZO7GVAA,3308
 shinestacker/retouch/undo_manager.py,sha256=_ekbcOLcPbQLY7t-o8wf-b1uA6OPY9rRyLM-KqMlQRo,3257
-shinestacker/retouch/unsharp_mask_filter.py,sha256=u6QDAebzAUqRvJtXyMLdXy-G0zEGb-43LzaKkK4kQ2A,3704
-shinestacker/retouch/white_balance_filter.py,sha256=odS_QTTLBzuN0gzhGqCC3T5mNRwE-epxPXraKhj5VQM,5132
-shinestacker-0.3.4.dist-info/licenses/LICENSE,sha256=cBN0P3F6BWFkfOabkhuTxwJnK1B0v50jmmzZJjGGous,80
-shinestacker-0.3.4.dist-info/METADATA,sha256=vR3xbqQFRJErmGEx0k0Mhnsamt_iHlYeuwghqdbcmus,5136
-shinestacker-0.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shinestacker-0.3.4.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
-shinestacker-0.3.4.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
-shinestacker-0.3.4.dist-info/RECORD,,
+shinestacker/retouch/unsharp_mask_filter.py,sha256=hNJlqXYjf9Nd8KlVy09fd4TxrHa9Ofef0ZLSMHjLL6I,3481
+shinestacker/retouch/white_balance_filter.py,sha256=2krwdz0X6qLWuCIEQcPtSQA_txfAsl7QUzfdsOLBrBU,4878
+shinestacker-0.3.6.dist-info/licenses/LICENSE,sha256=cBN0P3F6BWFkfOabkhuTxwJnK1B0v50jmmzZJjGGous,80
+shinestacker-0.3.6.dist-info/METADATA,sha256=1xiC2Bgn2sR8bqwuapC0QNodFy9fOO9p8ybGpqvHOwc,4915
+shinestacker-0.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shinestacker-0.3.6.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
+shinestacker-0.3.6.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
+shinestacker-0.3.6.dist-info/RECORD,,

shinestacker/algorithms/core_utils.py

@@ -1,22 +0,0 @@
-# pylint: disable=C0114, C0116
-import os
-from ..config.config import config
-
-if not config.DISABLE_TQDM:
-    from tqdm import tqdm
-    from tqdm.notebook import tqdm_notebook
-
-
-def check_path_exists(path):
-    if not os.path.exists(path):
-        raise RuntimeError('Path does not exist: ' + path)
-
-
-def make_tqdm_bar(name, size, ncols=80):
-    if not config.DISABLE_TQDM:
-        if config.JUPYTER_NOTEBOOK:
-            tbar = tqdm_notebook(desc=name, total=size)
-        else:
-            tbar = tqdm(desc=name, total=size, ncols=ncols)
-        return tbar
-    return None