shinestacker 1.0.2__tar.gz → 1.0.3__tar.gz

{shinestacker-1.0.2 → shinestacker-1.0.3}/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 This page reports the main releases only and the main changes therein.
 
+## [v1.0.3] - 2025-08-26
+**Bug fixes**
+
+### Changes
+
+* fixed menu text
+* fixed crash multilayer module
+* fixed multilayer module
+* code cleanup
+
+---
+
 ## [v1.0.2] - 2025-08-25
 **Bug fixes**
 

{shinestacker-1.0.2/src/shinestacker.egg-info → shinestacker-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.0.2
+Version: 1.0.3
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0
@@ -87,6 +87,7 @@ Pyramid methods in image processing
 # License
 
 <img src="https://www.gnu.org/graphics/lgplv3-147x51.png" alt="LGPL 3 logo">
+
 - **Code**: The software is provided as is under the [GNU Lesser General Public License v3.0](https://www.gnu.org/licenses/lgpl-3.0.en.html). See [LICENSE](https://github.com/lucalista/shinestacker/blob/main/LICENSE) for details.
 <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/src/shinestacker/gui/ico/shinestacker.png' width="150" referrerpolicy="no-referrer" alt="Shine Stacker Logo">
 

{shinestacker-1.0.2 → shinestacker-1.0.3}/README.md

@@ -56,6 +56,7 @@ Pyramid methods in image processing
 # License
 
 <img src="https://www.gnu.org/graphics/lgplv3-147x51.png" alt="LGPL 3 logo">
+
 - **Code**: The software is provided as is under the [GNU Lesser General Public License v3.0](https://www.gnu.org/licenses/lgpl-3.0.en.html). See [LICENSE](https://github.com/lucalista/shinestacker/blob/main/LICENSE) for details.
 <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/src/shinestacker/gui/ico/shinestacker.png' width="150" referrerpolicy="no-referrer" alt="Shine Stacker Logo">
 

shinestacker-1.0.3/src/shinestacker/_version.py

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

{shinestacker-1.0.2 → shinestacker-1.0.3}/src/shinestacker/algorithms/multilayer.py

@@ -177,7 +177,7 @@ class MultiLayer(JobBase, FrameMultiDirectory):
             raise RuntimeError("input_path option must contain a path or an array of paths")
         if len(paths) == 0:
             self.print_message(color_str("no input paths specified",
-                                         constants.LOG_COLOR_LEVEL_ALERT),
+                                         constants.LOG_COLOR_ALERT),
                                level=logging.WARNING)
             return
         files = self.folder_filelist()
@@ -186,7 +186,7 @@ class MultiLayer(JobBase, FrameMultiDirectory):
                 color_str(f"no input in {len(paths)} specified path" +
                           ('s' if len(paths) > 1 else '') + ": "
                           ", ".join([f"'{p}'" for p in paths]),
-                          constants.LOG_COLOR_LEVEL_ALERT),
+                          constants.LOG_COLOR_ALERT),
                 level=logging.WARNING)
             return
         self.print_message(color_str("merging frames in " + self.folder_list_str(),

{shinestacker-1.0.2 → shinestacker-1.0.3}/src/shinestacker/algorithms/stack_framework.py

@@ -92,7 +92,7 @@ class FramePaths:
                 ('' if self.working_path[-1] == '/' else '/') + self.plot_path
             if not os.path.exists(self.plot_path):
                 os.makedirs(self.plot_path)
-        if self.input_path == '':
+        if self.input_path in ['', []]:
             if len(job.paths) == 0:
                 raise RuntimeError(f"Job {job.name} does not have any configured path")
             self.input_path = job.paths[-1]

{shinestacker-1.0.2 → shinestacker-1.0.3}/src/shinestacker/gui/main_window.py

@@ -278,7 +278,7 @@ class MainWindow(QMainWindow, LogManager):
         current_action = None
         if item:
             index = self.job_list().row(item)
-            current_action = self.get_job_at(index)
+            current_action = self.project_editor.get_job_at(index)
             self.set_current_job(index)
         item = self.action_list().itemAt(self.action_list().viewport().mapFrom(self, event.pos()))
         if item:
@@ -328,7 +328,7 @@ class MainWindow(QMainWindow, LogManager):
                 self.current_action_output_path = f"{self.current_action_working_path}/{op}"
                 if os.path.exists(self.current_action_output_path):
                     action_name = "Browse Output Path" + (f" > {name}" if name != '' else '')
-                    n_files = len(next(os.walk(op))[2])
+                    n_files = len(next(os.walk(self.current_action_output_path))[2])
                     s = "" if n_files == 1 else "s"
                     action_name += f" ({n_files} file{s})"
                     self.browse_output_path_action = QAction(action_name)

{shinestacker-1.0.2 → shinestacker-1.0.3}/src/shinestacker/gui/project_controller.py

@@ -204,11 +204,12 @@ class ProjectController(QObject):
                     input_path.append("focus-stack-depth-map")
                 if dialog.get_bunch_stack():
                     input_path.append("bunches")
-                else:
-                    input_path.append(input_path)
-                multi_layer = ActionConfig(constants.ACTION_MULTILAYER,
-                                           {'name': 'multi-layer',
-                                            'input_path': ','.join(input_path)})
+                multi_layer = ActionConfig(
+                    constants.ACTION_MULTILAYER,
+                    {
+                        'name': 'multi-layer',
+                        'input_path': constants.PATH_SEPARATOR.join(input_path)
+                    })
                 job.add_sub_action(multi_layer)
             self.add_job_to_project(job)
             self.mark_as_modified(True)

{shinestacker-1.0.2 → shinestacker-1.0.3}/src/shinestacker/retouch/image_editor_ui.py

@@ -330,9 +330,8 @@ class ImageEditorUI(QMainWindow, LayerCollectionHandler):
         view_individual_action.setShortcut("L")
         view_individual_action.triggered.connect(self.set_view_individual)
         view_menu.addAction(view_individual_action)
-        view_menu.addSeparator()
 
-        toggle_view_master_individual_action = QAction("View Individual", self)
+        toggle_view_master_individual_action = QAction("Toggle Master/Individual", self)
         toggle_view_master_individual_action.setShortcut("T")
         toggle_view_master_individual_action.triggered.connect(self.toggle_view_master_individual)
         view_menu.addAction(toggle_view_master_individual_action)

{shinestacker-1.0.2 → shinestacker-1.0.3}/src/shinestacker/retouch/io_gui_handler.py

@@ -57,7 +57,7 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         self.undo_manager.reset()
         self.blank_layer = np.zeros(master_layer.shape[:2])
         self.finish_loading_setup(
-            stack, None, master_layer, False,
+            stack, None, master_layer,
             f"Loaded: {self.current_file_path()}")
 
     def on_file_error(self, error_msg):
@@ -137,26 +137,25 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             msg.setText(str(e))
             msg.exec()
             return
+        if self.layer_stack() is None and len(stack) > 0:
+            self.set_layer_stack(np.array(stack))
+            if labels is None:
+                labels = self.layer_labels()
+            else:
+                self.set_layer_labels(labels)
+            self.set_master_layer(master)
+            self.blank_layer = np.zeros(master.shape[:2])
+        else:
+            if labels is None:
+                labels = self.layer_labels()
+            for img, label in zip(stack, labels):
+                self.add_layer_label(label)
+                self.add_layer(img)
         self.finish_loading_setup(
-            stack, labels, master, True,
+            stack, labels, master,
             "Selected frames imported")
 
-    def finish_loading_setup(self, stack, labels, master, add_layers, message):
-        if add_layers:
-            if self.layer_stack() is None and len(stack) > 0:
-                self.set_layer_stack(np.array(stack))
-                if labels is None:
-                    labels = self.layer_labels()
-                else:
-                    self.set_layer_labels(labels)
-                self.set_master_layer(master)
-                self.blank_layer = np.zeros(master.shape[:2])
-            else:
-                if labels is None:
-                    labels = self.layer_labels()
-                for img, label in zip(stack, labels):
-                    self.add_layer_label(label)
-                    self.add_layer(img)
+    def finish_loading_setup(self, stack, labels, master, message):
         self.display_manager.update_thumbnails()
         self.mark_as_modified_requested.emit(True)
         self.change_layer_requested.emit(0)

{shinestacker-1.0.2 → shinestacker-1.0.3/src/shinestacker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.0.2
+Version: 1.0.3
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0
@@ -87,6 +87,7 @@ Pyramid methods in image processing
 # License
 
 <img src="https://www.gnu.org/graphics/lgplv3-147x51.png" alt="LGPL 3 logo">
+
 - **Code**: The software is provided as is under the [GNU Lesser General Public License v3.0](https://www.gnu.org/licenses/lgpl-3.0.en.html). See [LICENSE](https://github.com/lucalista/shinestacker/blob/main/LICENSE) for details.
 <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/src/shinestacker/gui/ico/shinestacker.png' width="150" referrerpolicy="no-referrer" alt="Shine Stacker Logo">
 

shinestacker-1.0.2/src/shinestacker/_version.py

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