shinestacker 1.0.1__py3-none-any.whl → 1.0.3__py3-none-any.whl

shinestacker/_version.py

@@ -1 +1 @@
-__version__ = '1.0.1'
+__version__ = '1.0.3'

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/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/gui/gui_run.py

@@ -133,11 +133,11 @@ class RunWindow(QTextEditLogger):
         def find_parent(widget, class_name):
             current = widget
             while current is not None:
-                if current.__class__.__name__ == class_name:
+                if current.objectName() == class_name:
                     return current
                 current = current.parent()
             return None
-        parent = find_parent(self, "MainWindow")
+        parent = find_parent(self, "mainWindow")
         if parent:
             parent.retouch_callback(path[1])
         else:

shinestacker/gui/main_window.py

@@ -52,6 +52,7 @@ class MainWindow(QMainWindow, LogManager):
     def __init__(self):
         QMainWindow.__init__(self)
         LogManager.__init__(self)
+        self.setObjectName("mainWindow")
         self.project_controller = ProjectController(self)
         self.project_editor = self.project_controller.project_editor
         actions = {
@@ -139,6 +140,8 @@ class MainWindow(QMainWindow, LogManager):
         self.project_controller.activate_window_requested.connect(self.activateWindow)
         self.project_controller.enable_save_actions_requested.connect(
             self.menu_manager.save_actions_set_enabled)
+        self.project_controller.enable_sub_actions_requested.connect(
+            self.menu_manager.set_enabled_sub_actions_gui)
 
     def modified(self):
         return self.project_editor.modified()
@@ -275,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:
@@ -286,9 +289,9 @@ class MainWindow(QMainWindow, LogManager):
         if current_action:
             menu = QMenu(self)
             if current_action.enabled():
-                menu.addAction(self.disable_action)
+                menu.addAction(self.menu_manager.disable_action)
             else:
-                menu.addAction(self.enable_action)
+                menu.addAction(self.menu_manager.enable_action)
             edit_config_action = QAction("Edit configuration")
             edit_config_action.triggered.connect(self.edit_current_action)
             menu.addAction(edit_config_action)
@@ -325,15 +328,15 @@ 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)
                     self.browse_output_path_action.triggered.connect(self.browse_output_path)
                     menu.addAction(self.browse_output_path_action)
             menu.addSeparator()
-            menu.addAction(self.run_job_action)
-            menu.addAction(self.run_all_jobs_action)
+            menu.addAction(self.menu_manager.run_job_action)
+            menu.addAction(self.menu_manager.run_all_jobs_action)
             if current_action.type_name == constants.ACTION_JOB:
                 retouch_path = self.get_retouch_path(current_action)
                 if len(retouch_path) > 0:

shinestacker/gui/project_controller.py

@@ -19,6 +19,7 @@ class ProjectController(QObject):
     refresh_ui_requested = Signal(int, int)
     activate_window_requested = Signal()
     enable_save_actions_requested = Signal(bool)
+    enable_sub_actions_requested = Signal(bool)
 
     def __init__(self, parent):
         super().__init__(parent)
@@ -203,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)
@@ -323,7 +325,7 @@ class ProjectController(QObject):
             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(
+                    self.enable_sub_actions_requested.emit(
                         current_action.type_name == constants.ACTION_COMBO)
                 dialog = self.action_config_dialog(current_action)
                 if dialog.exec() == QDialog.Accepted:

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/retouch/io_gui_handler.py

@@ -56,8 +56,9 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         self.set_master_layer(master_layer)
         self.undo_manager.reset()
         self.blank_layer = np.zeros(master_layer.shape[:2])
-        self.finish_loading_setup(stack, None, master_layer,
-                                  f"Loaded: {self.current_file_path()}")
+        self.finish_loading_setup(
+            stack, None, master_layer,
+            f"Loaded: {self.current_file_path()}")
 
     def on_file_error(self, error_msg):
         QApplication.restoreOverrideCursor()
@@ -136,9 +137,6 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             msg.setText(str(e))
             msg.exec()
             return
-        self.finish_loading_setup(stack, labels, master, "Selected frames imported")
-
-    def finish_loading_setup(self, stack, labels, master, message):
         if self.layer_stack() is None and len(stack) > 0:
             self.set_layer_stack(np.array(stack))
             if labels is None:
@@ -153,6 +151,11 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             for img, label in zip(stack, labels):
                 self.add_layer_label(label)
                 self.add_layer(img)
+        self.finish_loading_setup(
+            stack, labels, master,
+            "Selected frames imported")
+
+    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.1.dist-info → shinestacker-1.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.0.1
+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.1.dist-info → shinestacker-1.0.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 shinestacker/__init__.py,sha256=uq2fjAw2z_6TpH3mOcWFZ98GoEPRsNhTAK8N0MMm_e8,448
-shinestacker/_version.py,sha256=bMIenWosteoeUs51RbaWVZetIuzRhWymuyy-n0rfK0I,21
+shinestacker/_version.py,sha256=MpVHFFoITiYyPltTb_qFrdeX2entdTm4x0PczXi3txY,21
 shinestacker/algorithms/__init__.py,sha256=c4kRrdTLlVI70Q16XkI1RSmz5MD7npDqIpO_02jTG6g,747
 shinestacker/algorithms/align.py,sha256=XT4DJoD5ZvpkC1-J3W3GWmWRsXJg3qJ-3zr9erT8oW0,17514
 shinestacker/algorithms/balance.py,sha256=iSjO-pl0vQv58iEQ077EUcDTAExMKDBdtXmJXbMhazk,16721
@@ -7,12 +7,12 @@ shinestacker/algorithms/base_stack_algo.py,sha256=AFV2QkcFNaTcnISpsWHuAVy2De9hha
 shinestacker/algorithms/denoise.py,sha256=GL3Z4_6MHxSa7Wo4ZzQECZS87tHBFqO0sIVF_jPuYQU,426
 shinestacker/algorithms/depth_map.py,sha256=FOR5M0brO5-9NnXDY7TWpc3OtKKSuzrOSoBMe0cP6Ho,6076
 shinestacker/algorithms/exif.py,sha256=gY9s6Cd4g4swo5qEjSbzuVIvl1GImCYu6ytOO9WrV0I,9435
-shinestacker/algorithms/multilayer.py,sha256=5JA6TW8oO_R3mu6cOvPno9by4md8q5sXUb8ZfsRRpmY,9259
+shinestacker/algorithms/multilayer.py,sha256=MJqU_9LpcCi-0quJNszaFHOqna68ZqmImZQ50njOBio,9247
 shinestacker/algorithms/noise_detection.py,sha256=CDnN8pglxufY5Y-dT3mVooD4zPySdSq9CMgtDGMXBnA,8970
 shinestacker/algorithms/pyramid.py,sha256=_Pk19lRQ21b3W3aHQ6DgAe9VVOfbsi2a9jrynF0qFVw,8610
 shinestacker/algorithms/sharpen.py,sha256=h7PMJBYxucg194Usp_6pvItPUMFYbT-ebAc_-7XBFUw,949
 shinestacker/algorithms/stack.py,sha256=FCU89Of-s6C_DuMleG06c8V6fnIm9MFInvkkKtTsGBo,4906
-shinestacker/algorithms/stack_framework.py,sha256=frw7sbc9qOfVBYP3ZOFZEaIn9O27Wms8j_mxSW79uI0,12460
+shinestacker/algorithms/stack_framework.py,sha256=peAlUUl7y8OcquhjQoXpiwsEhZw6zgZnzwt1IDpf4aU,12466
 shinestacker/algorithms/utils.py,sha256=2XFa16Q8JVq4C2iXZFOvv98GVKqxceFG73yFZNHJSqI,2475
 shinestacker/algorithms/vignetting.py,sha256=yW-1TF4tesLWfKQOS0XxRkOEN82U-YDmMaj09C9cH4M,9552
 shinestacker/algorithms/white_balance.py,sha256=PMKsBtxOSn5aRr_Gkx1StHS4eN6kBN2EhNnhg4UG24g,501
@@ -41,11 +41,11 @@ shinestacker/gui/base_form_dialog.py,sha256=yYqMee1mzw9VBx8siBS0jDk1qqsTIKJUgdjh
 shinestacker/gui/colors.py,sha256=m0pQQ-uvtIN1xmb_-N06BvC7pZYZZnq59ZSEJwutHuk,1432
 shinestacker/gui/gui_images.py,sha256=e0KAXSPruZoRHrajfdlmOKBYoRJJQBDan1jgs7YFltY,5678
 shinestacker/gui/gui_logging.py,sha256=kiZcrC2AFYCWgPZo0O5SKw-E5cFrezwf4anS3HjPuNw,8168
-shinestacker/gui/gui_run.py,sha256=jGrtXNT3Gn53qMPSU74aEY6PP7UQfc85SD3XIesWLuY,15147
-shinestacker/gui/main_window.py,sha256=6zGFZkgBh3_UNWjCfNzciPeiCvBsZnjJiPy62U4ldAw,23988
+shinestacker/gui/gui_run.py,sha256=G9jKIMCEdrCwRvicRykY0r_x2Vya-9EMn4HpZL8ydRI,15141
+shinestacker/gui/main_window.py,sha256=l5iMk5aIi5nXPccnibB1tswc0agatrYgXULVkXo7OV0,24254
 shinestacker/gui/menu_manager.py,sha256=_L6LOikB3impEYqilqwXc0WJuunishjz57ozZlrBn7Q,9616
 shinestacker/gui/new_project.py,sha256=zHmGrT27L7I6YHM1L8wjt7DzukLFPddFsbVyGVHfJoc,11004
-shinestacker/gui/project_controller.py,sha256=jjM8JuPlIsQohmiqzuV1EndGVvqO4tOEdoMEUJ37SNU,15049
+shinestacker/gui/project_controller.py,sha256=QJSQlwEJeXJyJnkp42D9NSqWBb8q2kLf_GvLfe3pe_c,15076
 shinestacker/gui/project_converter.py,sha256=_AFfU2HYKPX78l6iX6bXJrlKpdjSl63pmKzrc6kQpn8,7348
 shinestacker/gui/project_editor.py,sha256=uouzmUkrqouQlq-dqPOgSO16r1WOnGNV2v8jTcZlRXU,23749
 shinestacker/gui/project_model.py,sha256=eRUmH3QmRzDtPtZoxgT6amKzN8_5XzwjHgEJeL-_JOE,4263
@@ -73,9 +73,9 @@ shinestacker/retouch/exif_data.py,sha256=giqoIaMlhN6H3x8BAd73ghVHODmWIcD_QbSoDym
 shinestacker/retouch/file_loader.py,sha256=x8lzKShlgElcJYLFiDoeszeVEToUUiUbUrozAeF5SMU,4812
 shinestacker/retouch/filter_manager.py,sha256=SdYIZkZBUvuB6wDG0moGWav5sfEvIcB9ioUJR5wJFts,388
 shinestacker/retouch/icon_container.py,sha256=6gw1HO1bC2FrdB4dc_iH81DQuLjzuvRGksZ2hKLT9yA,585
-shinestacker/retouch/image_editor_ui.py,sha256=GNozK_P7orgl8EioemJeyR4e_LLMbKVZi4xhYW9m38U,29893
+shinestacker/retouch/image_editor_ui.py,sha256=cMGiqyPGqJmBaXMAc0WImDPf_hmxO4KiJtaaSpiW9EU,29869
 shinestacker/retouch/image_viewer.py,sha256=3ebrLHTDtGd_EbIT2nNFRUjH836rblmmK7jZ62YcJ2U,19564
-shinestacker/retouch/io_gui_handler.py,sha256=M9rlfqiIaP1wWCm6p-Ew15w0_pH8-DoBXJdEkTUeVCU,11525
+shinestacker/retouch/io_gui_handler.py,sha256=52Wk19DjXtgCBcBWz9t0wUEpt8RS67FohdG44OOnu8c,11541
 shinestacker/retouch/io_manager.py,sha256=JUAA--AK0mVa1PTErJTnBFjaXIle5Qs7Ow0Wkd8at0o,2437
 shinestacker/retouch/layer_collection.py,sha256=Q7zoCYRn__jYkfrEC2lY1uKHWfOUbsJ27xaYHIoKVxo,5730
 shinestacker/retouch/shortcuts_help.py,sha256=SN4vNa_6yRAFaWxt5HpWn8FHgwmHrIs_wYwjl4iyDmg,3769
@@ -83,9 +83,9 @@ shinestacker/retouch/undo_manager.py,sha256=_ekbcOLcPbQLY7t-o8wf-b1uA6OPY9rRyLM-
 shinestacker/retouch/unsharp_mask_filter.py,sha256=uFnth8fpZFGhdIgJCnS8x5v6lBQgJ3hX0CBke9pFXeM,3510
 shinestacker/retouch/vignetting_filter.py,sha256=3WuoF38lQOIaU1MWmqviItuQn8NnbMN0nwV7pM9IJqU,3453
 shinestacker/retouch/white_balance_filter.py,sha256=glMBYlmrF-i_OrB3sGUpjZE6X4FQdyLC4GBy2bWtaFc,6056
-shinestacker-1.0.1.dist-info/licenses/LICENSE,sha256=pWgb-bBdsU2Gd2kwAXxketnm5W_2u8_fIeWEgojfrxs,7651
-shinestacker-1.0.1.dist-info/METADATA,sha256=txWeQBvdot0jMY-eCpwlZTqMataYiQn8MpSZECcxaUw,5902
-shinestacker-1.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shinestacker-1.0.1.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
-shinestacker-1.0.1.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
-shinestacker-1.0.1.dist-info/RECORD,,
+shinestacker-1.0.3.dist-info/licenses/LICENSE,sha256=pWgb-bBdsU2Gd2kwAXxketnm5W_2u8_fIeWEgojfrxs,7651
+shinestacker-1.0.3.dist-info/METADATA,sha256=3iFJO-177VFRPs8m5UnV2LhmiwO9wI5Bf3_x_DzkVbk,5903
+shinestacker-1.0.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shinestacker-1.0.3.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
+shinestacker-1.0.3.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
+shinestacker-1.0.3.dist-info/RECORD,,