shinestacker 0.3.5__tar.gz → 0.3.6__tar.gz

{shinestacker-0.3.5 → shinestacker-0.3.6}/CHANGELOG.md

@@ -4,12 +4,23 @@ This page reports the main releases only and the main changes therein.
 
 ---
 
+## [v-.-.-] - 2025-08-17
+**Unreleased changes, for next release round**
+
+### Changes
+
+* fixed a bug that prevented a complete clean up when "New Project" action is called
+* fixed the management of project file path while loading and saving
+* removed duplicated code, code clean up
+
+---
+
 ## [v0.3.5] - 2025-08-17
 **Bug fixes**
 
 ### Changes
 
-* fixed a bug that prevented to add sub-actoins
+* fixed a bug that prevented to add sub-actions
 * vignetting constrains model parameter in order to prevent searching for dark areas at the center of the image instead of at periphery
 * updated sample images and documentation
 

{shinestacker-0.3.5 → shinestacker-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 0.3.5
+Version: 0.3.6
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0
@@ -38,25 +38,21 @@ Dynamic: license-file
 [![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)
 [![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)
-[![Documentation Status](https://readthedocs.org/projects/shinestacker/badge/?version=latest)](https://shinestacker.readthedocs.io/en/latest/?badge=latest)
-<!--
 [![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
 
@@ -77,7 +73,7 @@ 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
 

{shinestacker-0.3.5 → shinestacker-0.3.6}/README.md

@@ -7,25 +7,21 @@
 [![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)
 [![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)
-[![Documentation Status](https://readthedocs.org/projects/shinestacker/badge/?version=latest)](https://shinestacker.readthedocs.io/en/latest/?badge=latest)
-<!--
 [![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
 
@@ -46,7 +42,7 @@ 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
 

{shinestacker-0.3.5 → shinestacker-0.3.6}/docs/main.md

@@ -6,16 +6,13 @@
 
 <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
-- 🖌️ **Non-Destructive Editing**: Save multilayer TIFFs for retouching
-- 📊 **Jupyter Integration**: Reproducible research notebooks
+- 🖌️ **Retouch Editing**: Final interactive retouch of stacked image from individual frames
+- 📊 **Jupyter Integration**: Image processing python notebooks
 
 
 ## Quick start

shinestacker-0.3.6/src/shinestacker/_version.py

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

{shinestacker-0.3.5 → shinestacker-0.3.6}/src/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-0.3.6/src/shinestacker/app/app_config.py

@@ -0,0 +1,22 @@
+# pylint: disable=C0114, C0115, C0116, C0103, W0201
+from .. config.config import _ConfigBase
+
+
+class _AppConfig(_ConfigBase):
+    def __new__(cls):
+        return _ConfigBase.__new__(cls)
+
+    def _init_defaults(self):
+        self._DONT_USE_NATIVE_MENU = True
+        self._COMBINED_APP = False
+
+    @property
+    def DONT_USE_NATIVE_MENU(self):
+        return self._DONT_USE_NATIVE_MENU
+
+    @property
+    def COMBINED_APP(self):
+        return self._COMBINED_APP
+
+
+app_config = _AppConfig()

{shinestacker-0.3.5 → shinestacker-0.3.6}/src/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-0.3.5 → shinestacker-0.3.6}/src/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-0.3.5 → shinestacker-0.3.6}/src/shinestacker/gui/actions_window.py

@@ -1,7 +1,7 @@
 # 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
@@ -20,8 +20,9 @@ class ActionsWindow(ProjectEditor):
 
     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)
@@ -34,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()
@@ -44,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,
@@ -62,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})
@@ -111,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)
 
@@ -124,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.")
@@ -145,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)
@@ -173,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()
 
@@ -188,9 +178,8 @@ 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))
@@ -201,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:
@@ -238,23 +225,7 @@ 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(

{shinestacker-0.3.5 → shinestacker-0.3.6}/src/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-0.3.5 → shinestacker-0.3.6}/src/shinestacker/gui/project_editor.py

@@ -89,10 +89,28 @@ class ProjectEditor(QMainWindow):
         self.expert_options = False
         self.script_dir = os.path.dirname(__file__)
         self.dialog = None
-        self._current_file = None
-        self._current_file_wd = ''
+        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
 
@@ -304,7 +322,7 @@ class ProjectEditor(QMainWindow):
         return element
 
     def action_config_dialog(self, action):
-        return ActionConfigDialog(action, self._current_file_wd, self)
+        return ActionConfigDialog(action, self.current_file_directory(), self)
 
     def add_job(self):
         job_action = ActionConfig("Job")
@@ -499,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
@@ -510,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-0.3.6/src/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)