shinestacker 1.7.0__tar.gz → 1.8.0__tar.gz

{shinestacker-1.7.0 → shinestacker-1.8.0}/.github/workflows/release.yml

@@ -40,9 +40,8 @@ jobs:
           pip install -e .[dev]
 
       - name: Build and package release
-        working-directory: scripts
         run: |
-          python build_release.py
+          python scripts/build_release.py
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -52,7 +51,6 @@ jobs:
             ${{ matrix.os == 'windows-latest' && 'dist/shinestacker-release.zip' || '' }}
             ${{ matrix.os == 'windows-latest' && 'dist/*.exe' || '' }}
             ${{ matrix.os == 'ubuntu-latest' && 'dist/shinestacker-release.tar.gz' || '' }}
-            ${{ matrix.os == 'macos-latest' && 'dist/shinestacker-release.tar.gz' || '' }}
             ${{ matrix.os == 'macos-latest' && 'dist/shinestacker-release.dmg' || '' }}
           if-no-files-found: ignore
 
@@ -70,8 +68,7 @@ jobs:
           mkdir -p release_assets
           # Linux
           cp artifacts/shinestacker-ubuntu-latest/shinestacker-release.tar.gz release_assets/shinestacker-ubuntu.tar.gz
-          # macOS - include both formats
-          cp artifacts/shinestacker-macos-latest/shinestacker-release.tar.gz release_assets/shinestacker-macos.tar.gz
+          # macOS
           cp artifacts/shinestacker-macos-latest/shinestacker-release.dmg release_assets/shinestacker-macos.dmg
           # Windows
           cp artifacts/shinestacker-windows-latest/shinestacker-release.zip release_assets/shinestacker-windows.zip
@@ -86,7 +83,6 @@ jobs:
           draft: true
           files: |
             release_assets/shinestacker-ubuntu.tar.gz
-            release_assets/shinestacker-macos.tar.gz
             release_assets/shinestacker-macos.dmg
             release_assets/shinestacker-windows.zip
             release_assets/shinestacker-setup.exe

{shinestacker-1.7.0 → shinestacker-1.8.0}/CHANGELOG.md

@@ -2,8 +2,25 @@
 
 This page reports the main releases only and the main changes therein.
 
+## [v1.8.0] - 2025-10-08
+** Minor improvements and accessibility fix **
+
+### Added
+- temporary disk space can be cleaned up with a new option to scratch output files at the end of a job 
+
+### Fixed
+- new project dialog displays well also with dark background settings
+
+### Changed
+- icons now adapt automatically to light or dark desktop theme
+- additional alignment parameters added to default settings
+- minor GUI stability fix
+- redundant macOS .tar.gz installer removed, replaced by .dmg image
+
+-----
+
 ## [v1.7.0] - 2025-10-04
-** New image adjustment actions and macOS dmg installer **
+** New image adjustment actions and macOS dmg image installer **
 
 ### Added
 - luminosity and contrast adjustment action

{shinestacker-1.7.0/src/shinestacker.egg-info → shinestacker-1.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.7.0
+Version: 1.8.0
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0
@@ -85,11 +85,11 @@ In order to prevent this, follow the instructions below:
 1. Download the compressed archive ```shinestacker-macos.tar.gz``` in your ```Download``` folder.
 2. Double-click the archive to uncompress it. You will find a new folder ```shinestacker```.
 3. Open a terminal (*Applications > Utilities > Terminal*)
-4. Type the folliwng command on the terminal (assuming you have expanded the ```tar.gz``` under ```Downloads```):
+4. Type the folliwng command on the terminal (assuming you installed the app from the ```dmg``` image under ```Applications```):
 ```bash
-xattr -cr ~/Downloads/shinestacker/shinestacker.app
+xattr -cr /Applications/shinestacker/shinestacker.app
 ```
-5. Now you can double-click the Sine Stacker icon app in the ```shiestacker``` folder and it should run.
+5. Now you can double-click the Sine Stacker icon app and it should run.
 
 macOS adds a quarantine flag to all files downloaded from the internet. The above command removes that flag while preserving all other application functionality.
 

{shinestacker-1.7.0 → shinestacker-1.8.0}/README.md

@@ -53,11 +53,11 @@ In order to prevent this, follow the instructions below:
 1. Download the compressed archive ```shinestacker-macos.tar.gz``` in your ```Download``` folder.
 2. Double-click the archive to uncompress it. You will find a new folder ```shinestacker```.
 3. Open a terminal (*Applications > Utilities > Terminal*)
-4. Type the folliwng command on the terminal (assuming you have expanded the ```tar.gz``` under ```Downloads```):
+4. Type the folliwng command on the terminal (assuming you installed the app from the ```dmg``` image under ```Applications```):
 ```bash
-xattr -cr ~/Downloads/shinestacker/shinestacker.app
+xattr -cr /Applications/shinestacker/shinestacker.app
 ```
-5. Now you can double-click the Sine Stacker icon app in the ```shiestacker``` folder and it should run.
+5. Now you can double-click the Sine Stacker icon app and it should run.
 
 macOS adds a quarantine flag to all files downloaded from the internet. The above command removes that flag while preserving all other application functionality.
 

{shinestacker-1.7.0 → shinestacker-1.8.0}/scripts/build_release.py

@@ -7,7 +7,6 @@ import platform
 
 
 def setup_environment():
-    os.chdir("../")
     project_root = Path(__file__).resolve().parent.parent
     dist_dir = project_root / "dist"
     project_name = "shinestacker"
@@ -119,10 +118,6 @@ def package_macos(dist_dir, app_name, project_root):
         except subprocess.CalledProcessError as e:
             print(f"Could not set custom icon: {e}")
     shutil.rmtree(dmg_temp_dir)
-    archive_path = dist_dir / "shinestacker-release.tar.gz"
-    with tarfile.open(archive_path, "w:gz") as tar:
-        tar.add(app_bundle, arcname=app_bundle.name, recursive=True)
-    print(f"Created tar.gz: {archive_path.name}")
 
 
 def package_linux(dist_dir, app_name):

shinestacker-1.8.0/src/shinestacker/_version.py

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

{shinestacker-1.7.0 → shinestacker-1.8.0}/src/shinestacker/algorithms/stack.py

@@ -65,6 +65,9 @@ class FocusStackBase(TaskBase, ImageSequenceManager):
         if self.exif_path != '':
             self.exif_path = os.path.join(working_path, self.exif_path)
 
+    def end_job(self):
+        ImageSequenceManager.end_job(self)
+
 
 def get_bunches(collection, n_frames, n_overlap):
     bunches = [collection[x:x + n_frames]
@@ -100,6 +103,9 @@ class FocusStackBunch(SequentialTask, FocusStackBase):
     def end(self):
         SequentialTask.end(self)
 
+    def end_job(self):
+        FocusStackBase.end_job(self)
+
     def run_step(self, action_count=-1):
         self.print_message(
             color_str(f"fusing bunch: {action_count + 1}/{self.total_action_counts}",
@@ -126,3 +132,6 @@ class FocusStack(FocusStackBase):
 
     def init(self, job, _working_path=''):
         FocusStackBase.init(self, job, self.working_path)
+
+    def end_job(self):
+        FocusStackBase.end_job(self)

{shinestacker-1.7.0 → shinestacker-1.8.0}/src/shinestacker/algorithms/stack_framework.py

@@ -46,7 +46,8 @@ class StackJob(Job):
 class ImageSequenceManager:
     def __init__(self, name, input_path='', output_path='', working_path='',
                  plot_path=constants.DEFAULT_PLOTS_PATH,
-                 scratch_output_dir=True, resample=1,
+                 scratch_output_dir=True, delete_output_at_end=False,
+                 resample=1,
                  reverse_order=constants.DEFAULT_FILE_REVERSE_ORDER, **_kwargs):
         self.name = name
         self.working_path = working_path
@@ -56,6 +57,7 @@ class ImageSequenceManager:
         self._resample = resample
         self.reverse_order = reverse_order
         self.scratch_output_dir = scratch_output_dir
+        self.delete_output_at_end = delete_output_at_end
         self.enabled = None
         self.base_message = ''
         self._input_full_path = None
@@ -122,6 +124,24 @@ class ImageSequenceManager:
                                      constants.LOG_COLOR_LEVEL_2))
         self.base_message = color_str(self.name, constants.LOG_COLOR_LEVEL_1, "bold")
 
+    def scratch_outout_folder(self):
+        if self.enabled:
+            output_dir = self.output_full_path()
+            list_dir = os.listdir(output_dir)
+            n_files = len(list_dir)
+            if n_files > 0:
+                for filename in list_dir:
+                    file_path = os.path.join(output_dir, filename)
+                    if os.path.isfile(file_path):
+                        os.remove(file_path)
+            self.print_message(
+                color_str(f"output directory {self.output_path} content erased",
+                          'yellow'))
+        else:
+            self.print_message(
+                color_str(f"module disabled, output directory {self.output_path}"
+                          " not scratched", 'yellow'))
+
     def init(self, job):
         if self.working_path == '':
             self.working_path = job.working_path
@@ -130,22 +150,10 @@ class ImageSequenceManager:
         if not os.path.exists(output_dir):
             os.makedirs(output_dir)
         else:
-            list_dir = os.listdir(output_dir)
-            if len(list_dir) > 0:
+            if len(os.listdir(output_dir)):
                 if self.scratch_output_dir:
-                    if self.enabled:
-                        for filename in list_dir:
-                            file_path = os.path.join(output_dir, filename)
-                            if os.path.isfile(file_path):
-                                os.remove(file_path)
-                        self.print_message(
-                            color_str(f": output directory {self.output_path} content erased",
-                                      'yellow'))
-                    else:
-                        self.print_message(
-                            color_str(f": module disabled, output directory {self.output_path}"
-                                      " not scratched", 'yellow'))
-                else:
+                    self.scratch_outout_folder()
+                elif self.enabled:
                     self.print_message(
                         color_str(
                             f": output directory {self.output_path} not empty, "
@@ -168,6 +176,11 @@ class ImageSequenceManager:
                     self._input_filepaths.append(filepath)
         job.add_action_path(self.output_path)
 
+    def end_job(self):
+        if self.delete_output_at_end:
+            self.scratch_outout_folder()
+            os.rmdir(self.output_full_path())
+
     def folder_list_str(self):
         if isinstance(self.input_full_path(), list):
             file_list = ", ".join(
@@ -206,6 +219,9 @@ class ReferenceFrameTask(SequentialTask, ImageSequenceManager):
     def end(self):
         SequentialTask.end(self)
 
+    def end_job(self):
+        ImageSequenceManager.end_job(self)
+
     def run_frame(self, _idx, _ref_idx):
         return None
 
@@ -323,6 +339,9 @@ class CombinedActions(ReferenceFrameTask):
             if a.enabled:
                 a.end()
 
+    def end_job(self):
+        ReferenceFrameTask.end_job(self)
+
     def sequential_processing(self):
         for a in self._actions:
             if a.sequential_processing():

{shinestacker-1.7.0 → shinestacker-1.8.0}/src/shinestacker/algorithms/utils.py

@@ -140,8 +140,12 @@ def save_plot(filename, fig=None):
         if not os.path.isdir(dir_path):
             os.makedirs(dir_path)
         if fig is None:
+            logging_level = logging.getLogger().level
+            logger = logging.getLogger()
+            logger.setLevel(logging.WARNING)
             fig = plt.gcf()
-        fig.savefig(filename, dpi=150)
+            fig.savefig(filename, dpi=150)
+            logger.setLevel(logging_level)
         if config.JUPYTER_NOTEBOOK:
             plt.show()
         plt.close(fig)

{shinestacker-1.7.0 → shinestacker-1.8.0}/src/shinestacker/app/settings_dialog.py

@@ -1,23 +1,28 @@
 # pylint: disable=C0114, C0115, C0116, E0611, W0718, R0903, E0611, R0902
 from PySide6.QtCore import Signal
 from PySide6.QtWidgets import QFrame, QLabel, QCheckBox, QComboBox, QDoubleSpinBox, QSpinBox
-from .. gui.config_dialog import ConfigDialog
 from .. config.settings import Settings
 from .. config.constants import constants
 from .. config.gui_constants import gui_constants
+from .. gui.config_dialog import ConfigDialog
+from .. gui.action_config_dialog import AlignFramesConfigBase
 
 
-class SettingsDialog(ConfigDialog):
+class SettingsDialog(ConfigDialog, AlignFramesConfigBase):
     update_project_config_requested = Signal()
     update_retouch_config_requested = Signal()
 
     def __init__(self, parent=None, project_settings=True, retouch_settings=True):
+        AlignFramesConfigBase.__init__(self)
         self.project_settings = project_settings
         self.retouch_settings = retouch_settings
         self.settings = Settings.instance()
         self.expert_options = None
         self.combined_actions_max_threads = None
         self.align_frames_max_threads = None
+        self.detector = None
+        self.descriptor = None
+        self.matching_method = None
         self.focus_stack_max_threads = None
         self.view_strategy = None
         self.min_mouse_step_brush_fraction = None
@@ -58,6 +63,32 @@ class SettingsDialog(ConfigDialog):
         self.container_layout.addRow("Max num. of cores, align frames:",
                                      self.align_frames_max_threads)
 
+        def change_match_config():
+            self.change_match_config(
+                self.detector, self.descriptor,
+                self. matching_method, self.show_info)
+
+        self.detector = QComboBox()
+        self.detector.addItems(constants.VALID_DETECTORS)
+        self.descriptor = QComboBox()
+        self.descriptor.addItems(constants.VALID_DESCRIPTORS)
+        self.matching_method = QComboBox()
+        self.info_label = QLabel()
+        self.info_label.setStyleSheet("color: orange; font-style: italic;")
+        self.matching_method = QComboBox()
+        for k, v in zip(self.MATCHING_METHOD_OPTIONS, constants.VALID_MATCHING_METHODS):
+            self.matching_method.addItem(k, v)
+        self.detector.setToolTip(self.DETECTOR_DESCRIPTOR_TOOLTIPS['detector'])
+        self.descriptor.setToolTip(self.DETECTOR_DESCRIPTOR_TOOLTIPS['descriptor'])
+        self.matching_method.setToolTip(self.DETECTOR_DESCRIPTOR_TOOLTIPS['match_method'])
+        self.detector.currentIndexChanged.connect(change_match_config)
+        self.descriptor.currentIndexChanged.connect(change_match_config)
+        self.matching_method.currentIndexChanged.connect(change_match_config)
+        self.container_layout.addRow('Detector:', self.detector)
+        self.container_layout.addRow('Descriptor:', self.descriptor)
+        self.container_layout.addRow(self.info_label)
+        self.container_layout.addRow('Match method:', self.matching_method)
+
         self.focus_stack_max_threads = QSpinBox()
         self.focus_stack_max_threads.setRange(0, 64)
         self.focus_stack_max_threads.setValue(
@@ -115,7 +146,14 @@ class SettingsDialog(ConfigDialog):
                 })
             self.settings.set(
                 'align_frames_params', {
-                    'max_threads': self.align_frames_max_threads.value()
+                    'max_threads':
+                        self.align_frames_max_threads.value(),
+                    'detector':
+                        self.descriptor.currentText(),
+                    'descriptor':
+                        self.descriptor.currentText(),
+                    'match_method':
+                        self.matching_method.itemData(self.matching_method.currentIndex())
                 })
             self.settings.set(
                 'focus_stack_params', {
@@ -148,6 +186,11 @@ class SettingsDialog(ConfigDialog):
             self.expert_options.setChecked(constants.DEFAULT_EXPERT_OPTIONS)
             self.combined_actions_max_threads.setValue(constants.DEFAULT_MAX_FWK_THREADS)
             self.align_frames_max_threads.setValue(constants.DEFAULT_ALIGN_MAX_THREADS)
+            self.detector.setCurrentText(constants.DEFAULT_DETECTOR)
+            self.descriptor.setCurrentText(constants.DEFAULT_DESCRIPTOR)
+            idx = self.matching_method.findData(constants.DEFAULT_MATCHING_METHOD)
+            if idx >= 0:
+                self.matching_method.setCurrentIndex(idx)
             self.focus_stack_max_threads.setValue(constants.DEFAULT_PY_MAX_THREADS)
         if self.retouch_settings:
             idx = self.view_strategy.findData(constants.DEFAULT_VIEW_STRATEGY)

{shinestacker-1.7.0 → shinestacker-1.8.0}/src/shinestacker/config/settings.py

@@ -42,7 +42,10 @@ DEFAULT_SETTINGS = {
         'max_threads': constants.DEFAULT_MAX_FWK_THREADS
     },
     'align_frames_params': {
-        'max_threads': constants.DEFAULT_ALIGN_MAX_THREADS
+        'max_threads': constants.DEFAULT_ALIGN_MAX_THREADS,
+        'detector': constants.DEFAULT_DETECTOR,
+        'descriptor': constants.DEFAULT_DESCRIPTOR,
+        'match_method': constants.DEFAULT_MATCHING_METHOD
     },
     'focus_stack_params': {
         'max_threads': constants.DEFAULT_PY_MAX_THREADS

{shinestacker-1.7.0 → shinestacker-1.8.0}/src/shinestacker/core/core_utils.py

@@ -52,4 +52,5 @@ def setup_matplotlib_mode():
         __IPYTHON__ # noqa
     except Exception:
         matplotlib.use('agg')
+    matplotlib.pyplot.set_loglevel("warning")
     matplotlib.rcParams['pdf.fonttype'] = 42

{shinestacker-1.7.0 → shinestacker-1.8.0}/src/shinestacker/core/framework.py

@@ -146,6 +146,9 @@ class TaskBase:
     def sub_message_r(self, msg='', level=logging.INFO):
         self.sub_message(msg, level, self.end_r, self.begin_r, False)
 
+    def end_job(self):
+        pass
+
 
 class Job(TaskBase):
     def __init__(self, name, logger_name=None, log_file='', callbacks=None, **kwargs):
@@ -188,6 +191,8 @@ class Job(TaskBase):
                                  self.id, self.name) is False:
                     raise RunStopException(self.name)
                 a.run()
+        for a in self.__actions:
+            a.end_job()
 
 
 class SequentialTask(TaskBase):
@@ -261,11 +266,11 @@ class SequentialTask(TaskBase):
                 try:
                     result = future.result()
                     if result:
-                        self.print_message(color_str(
+                        self.print_message_r(color_str(
                             f"completed processing step: {self.idx_tot_str(idx)}",
                             constants.LOG_COLOR_LEVEL_1))
                     else:
-                        self.print_message(color_str(
+                        self.print_message_r(color_str(
                             f"failed processing step: {self.idx_tot_str(idx)}",
                             constants.LOG_COLOR_WARNING))
                     self.current_action_count += 1

{shinestacker-1.7.0 → shinestacker-1.8.0}/src/shinestacker/gui/action_config_dialog.py

@@ -1,5 +1,5 @@
 # pylint: disable=C0114, C0115, C0116, E0611, R0913, R0917, R0915, R0912
-# pylint: disable=E0606, W0718, R1702, W0102, W0221, R0914, C0302
+# pylint: disable=E0606, W0718, R1702, W0102, W0221, R0914, C0302, R0903
 import os
 import traceback
 from PySide6.QtCore import QTimer
@@ -214,7 +214,7 @@ class FocusStackBaseConfigurator(DefaultActionConfigurator):
             expert=True,
             placeholder='relative to working path')
         self.add_field_to_layout(
-            layout, 'scratch_output_dir', FIELD_BOOL, 'Scratch output dir.',
+            layout, 'scratch_output_dir', FIELD_BOOL, 'Scratch output folder before run',
             required=False, default=True)
 
     def create_algorithm_tab(self, layout):
@@ -366,6 +366,14 @@ class FocusStackBunchConfigurator(FocusStackBaseConfigurator):
         self.add_field_to_layout(
             self.general_tab_layout, 'overlap', FIELD_INT, 'Overlapping frames', required=False,
             default=constants.DEFAULT_OVERLAP, min_val=0, max_val=100)
+        self.add_field_to_layout(
+            self.general_tab_layout, 'scratch_output_dir', FIELD_BOOL,
+            'Scratch output folder before run',
+            required=False, default=True)
+        self.add_field_to_layout(
+            self.general_tab_layout, 'delete_output_at_end', FIELD_BOOL,
+            'Delete output at end of job',
+            required=False, default=False)
         self.add_field_to_layout(
             self.general_tab_layout, 'plot_stack', FIELD_BOOL, 'Plot stack', required=False,
             default=constants.DEFAULT_PLOT_STACK_BUNCH)
@@ -391,7 +399,7 @@ class MultiLayerConfigurator(DefaultActionConfigurator):
             expert=True,
             placeholder='relative to working path')
         self.add_field(
-            'scratch_output_dir', FIELD_BOOL, 'Scratch output dir.',
+            'scratch_output_dir', FIELD_BOOL, 'Scratch output folder before run',
             required=False, default=True)
         self.add_field(
             'reverse_order', FIELD_BOOL, 'Reverse file order', required=False,
@@ -413,8 +421,11 @@ class CombinedActionsConfigurator(DefaultActionConfigurator):
             expert=True,
             placeholder='relative to working path')
         self.add_field(
-            'scratch_output_dir', FIELD_BOOL, 'Scratch output dir.',
+            'scratch_output_dir', FIELD_BOOL, 'Scratch output folder before run',
             required=False, default=True)
+        self.add_field(
+            'delete_output_at_end', FIELD_BOOL, 'Delete output at end of job',
+            required=False, default=False)
         self.add_field(
             'plot_path', FIELD_REL_PATH, 'Plots path', required=False,
             expert=True,
@@ -490,22 +501,22 @@ class SubsampleActionConfigurator(DefaultActionConfigurator):
             self.subsample_field.currentText() not in constants.FIELD_SUBSAMPLE_OPTIONS[:2])
 
 
-class AlignFramesConfigurator(SubsampleActionConfigurator):
-    BORDER_MODE_OPTIONS = ['Constant', 'Replicate', 'Replicate and blur']
-    TRANSFORM_OPTIONS = ['Rigid', 'Homography']
-    METHOD_OPTIONS = ['Random Sample Consensus (RANSAC)', 'Least Median (LMEDS)']
+class AlignFramesConfigBase:
     MATCHING_METHOD_OPTIONS = ['K-nearest neighbors', 'Hamming distance']
-    MODE_OPTIONS = ['Auto', 'Sequential', 'Parallel']
+    DETECTOR_DESCRIPTOR_TOOLTIPS = {
+        'detector':
+            "SIFT: Requires SIFT descriptor and K-NN matching\n"
+            "ORB/AKAZE: Work best with Hamming distance",
+        'descriptor':
+            "SIFT: Requires K-NN matching\n"
+            "ORB/AKAZE: Require Hamming distance with ORB/AKAZE detectors",
+        'match_method':
+            "Automatically selected based on detector/descriptor combination"
 
-    def __init__(self, expert, current_wd):
-        super().__init__(expert, current_wd)
-        self.matching_method_field = None
+    }
+
+    def __init__(self):
         self.info_label = None
-        self.detector_field = None
-        self.descriptor_field = None
-        self.matching_method_field = None
-        self.tab_widget = None
-        self.current_tab_layout = None
 
     def show_info(self, message, timeout=3000):
         self.info_label.setText(message)
@@ -514,32 +525,50 @@ class AlignFramesConfigurator(SubsampleActionConfigurator):
         timer.timeout.connect(lambda: self.info_label.setText(''))
         timer.start(timeout)
 
-    def change_match_config(self):
-        detector = self.detector_field.currentText()
-        descriptor = self.descriptor_field.currentText()
+    def change_match_config(
+            self, detector_field, descriptor_field, matching_method_field, show_info):
+        detector = detector_field.currentText()
+        descriptor = descriptor_field.currentText()
         match_method = dict(
             zip(self.MATCHING_METHOD_OPTIONS,
-                constants.VALID_MATCHING_METHODS))[self.matching_method_field.currentText()]
+                constants.VALID_MATCHING_METHODS))[matching_method_field.currentText()]
         try:
             validate_align_config(detector, descriptor, match_method)
         except Exception as e:
-            self.show_info(str(e))
+            show_info(str(e))
             if descriptor == constants.DETECTOR_SIFT and \
                match_method == constants.MATCHING_NORM_HAMMING:
-                self.matching_method_field.setCurrentText(self.MATCHING_METHOD_OPTIONS[0])
+                matching_method_field.setCurrentText(self.MATCHING_METHOD_OPTIONS[0])
             if detector == constants.DETECTOR_ORB and descriptor == constants.DESCRIPTOR_AKAZE and \
                     match_method == constants.MATCHING_NORM_HAMMING:
-                self.matching_method_field.setCurrentText(constants.MATCHING_NORM_HAMMING)
+                matching_method_field.setCurrentText(constants.MATCHING_NORM_HAMMING)
             if detector == constants.DETECTOR_BRISK and descriptor == constants.DESCRIPTOR_AKAZE:
-                self.descriptor_field.setCurrentText('BRISK')
+                descriptor_field.setCurrentText('BRISK')
             if detector == constants.DETECTOR_SURF and descriptor == constants.DESCRIPTOR_AKAZE:
-                self.descriptor_field.setCurrentText('SIFT')
+                descriptor_field.setCurrentText('SIFT')
             if detector == constants.DETECTOR_SIFT and descriptor != constants.DESCRIPTOR_SIFT:
-                self.descriptor_field.setCurrentText('SIFT')
+                descriptor_field.setCurrentText('SIFT')
             if detector in constants.NOKNN_METHODS['detectors'] and \
                descriptor in constants.NOKNN_METHODS['descriptors']:
                 if match_method == constants.MATCHING_KNN:
-                    self.matching_method_field.setCurrentText(self.MATCHING_METHOD_OPTIONS[1])
+                    matching_method_field.setCurrentText(self.MATCHING_METHOD_OPTIONS[1])
+
+
+class AlignFramesConfigurator(SubsampleActionConfigurator, AlignFramesConfigBase):
+    BORDER_MODE_OPTIONS = ['Constant', 'Replicate', 'Replicate and blur']
+    TRANSFORM_OPTIONS = ['Rigid', 'Homography']
+    METHOD_OPTIONS = ['Random Sample Consensus (RANSAC)', 'Least Median (LMEDS)']
+    MODE_OPTIONS = ['Auto', 'Sequential', 'Parallel']
+
+    def __init__(self, expert, current_wd):
+        SubsampleActionConfigurator.__init__(self, expert, current_wd)
+        AlignFramesConfigBase.__init__(self)
+        self.matching_method_field = None
+        self.detector_field = None
+        self.descriptor_field = None
+        self.matching_method_field = None
+        self.tab_widget = None
+        self.current_tab_layout = None
 
     def create_form(self, layout, action):
         super().create_form(layout, action)
@@ -557,23 +586,23 @@ class AlignFramesConfigurator(SubsampleActionConfigurator):
         self.create_miscellanea_tab(misc_layout)
 
     def create_feature_tab(self, layout):
+
+        def change_match_config():
+            self.change_match_config(
+                self.detector_field, self.descriptor_field,
+                self. matching_method_field, self.show_info)
+
         self.add_bold_label_to_layout(layout, "Feature identification:")
         self.detector_field = self.add_field_to_layout(
             layout, 'detector', FIELD_COMBO, 'Detector', required=False,
-            options=constants.VALID_DETECTORS, default=constants.DEFAULT_DETECTOR)
+            options=constants.VALID_DETECTORS, default=AppConfig.get('detector'))
         self.descriptor_field = self.add_field_to_layout(
             layout, 'descriptor', FIELD_COMBO, 'Descriptor', required=False,
-            options=constants.VALID_DESCRIPTORS, default=constants.DEFAULT_DESCRIPTOR)
-        self.detector_field.setToolTip(
-            "SIFT: Requires SIFT descriptor and K-NN matching\n"
-            "ORB/AKAZE: Work best with Hamming distance"
-        )
-        self.descriptor_field.setToolTip(
-            "SIFT: Requires K-NN matching\n"
-            "ORB/AKAZE: Require Hamming distance with ORB/AKAZE detectors"
-        )
-        self.detector_field.currentIndexChanged.connect(self.change_match_config)
-        self.descriptor_field.currentIndexChanged.connect(self.change_match_config)
+            options=constants.VALID_DESCRIPTORS, default=AppConfig.get('descriptor'))
+        self.detector_field.setToolTip(self.DETECTOR_DESCRIPTOR_TOOLTIPS['detector'])
+        self.descriptor_field.setToolTip(self.DETECTOR_DESCRIPTOR_TOOLTIPS['descriptor'])
+        self.detector_field.currentIndexChanged.connect(change_match_config)
+        self.descriptor_field.currentIndexChanged.connect(change_match_config)
         self.info_label = QLabel()
         self.info_label.setStyleSheet("color: orange; font-style: italic;")
         layout.addRow(self.info_label)
@@ -581,11 +610,9 @@ class AlignFramesConfigurator(SubsampleActionConfigurator):
         self.matching_method_field = self.add_field_to_layout(
             layout, 'match_method', FIELD_COMBO, 'Match method', required=False,
             options=self.MATCHING_METHOD_OPTIONS, values=constants.VALID_MATCHING_METHODS,
-            default=constants.DEFAULT_MATCHING_METHOD)
-        self.matching_method_field.setToolTip(
-            "Automatically selected based on detector/descriptor combination"
-        )
-        self.matching_method_field.currentIndexChanged.connect(self.change_match_config)
+            default=AppConfig.get('match_method'))
+        self.matching_method_field.setToolTip(self.DETECTOR_DESCRIPTOR_TOOLTIPS['match_method'])
+        self.matching_method_field.currentIndexChanged.connect(change_match_config)
         self.add_field_to_layout(
             layout, 'flann_idx_kdtree', FIELD_INT, 'Flann idx kdtree', required=False,
             expert=True,

{shinestacker-1.7.0 → shinestacker-1.8.0}/src/shinestacker/gui/gui_run.py

@@ -215,8 +215,7 @@ class RunWindow(QTextEditLogger):
                 raise RuntimeError(f"Can't visualize file type {os.path.splitext(path)[1]}.")
             self.image_views.append(image_view)
             self.image_layout.addWidget(image_view)
-            max_width = max(pv.size().width() for pv in self.image_views) if self.image_views else 0
-            needed_width = max_width + 20
+            needed_width = gui_constants.GUI_IMG_WIDTH + 20
             self.right_area.setFixedWidth(needed_width)
             self.image_area_widget.setFixedWidth(needed_width)
             self.right_area.updateGeometry()