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

shinestacker/_version.py

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

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()
@@ -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)
@@ -332,8 +335,8 @@ class MainWindow(QMainWindow, LogManager):
                     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)
@@ -323,7 +324,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/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, False,
+            f"Loaded: {self.current_file_path()}")
 
     def on_file_error(self, error_msg):
         QApplication.restoreOverrideCursor()
@@ -136,23 +137,26 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             msg.setText(str(e))
             msg.exec()
             return
-        self.finish_loading_setup(stack, labels, master, "Selected frames imported")
+        self.finish_loading_setup(
+            stack, labels, master, True,
+            "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:
-                labels = self.layer_labels()
+    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:
-                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)
+                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.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.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.0.1
+Version: 1.0.2
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0

{shinestacker-1.0.1.dist-info → shinestacker-1.0.2.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=C8nyPP5-54GgYCcP38Lbel_pRimOW-Ra4bw6Vzp2lmE,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
@@ -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=1Im8ER-eAYwvLXFp_OyMr3EkdpJ0K1krkmKy-WF3KM8,24210
 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=BbecAO0t15Usir3CYeIBiO9gvdGAmAPwhwLxci5IS7g,15103
 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
@@ -75,7 +75,7 @@ shinestacker/retouch/filter_manager.py,sha256=SdYIZkZBUvuB6wDG0moGWav5sfEvIcB9io
 shinestacker/retouch/icon_container.py,sha256=6gw1HO1bC2FrdB4dc_iH81DQuLjzuvRGksZ2hKLT9yA,585
 shinestacker/retouch/image_editor_ui.py,sha256=GNozK_P7orgl8EioemJeyR4e_LLMbKVZi4xhYW9m38U,29893
 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=DPFEq-29b88xqCpIwEmuwUU5Xn_7UGlFFhCDM1bvMxI,11645
 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.2.dist-info/licenses/LICENSE,sha256=pWgb-bBdsU2Gd2kwAXxketnm5W_2u8_fIeWEgojfrxs,7651
+shinestacker-1.0.2.dist-info/METADATA,sha256=BGQfH5499HQk51ANCTjSdUxjErlNHfiz1kcCf17VKZo,5902
+shinestacker-1.0.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shinestacker-1.0.2.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
+shinestacker-1.0.2.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
+shinestacker-1.0.2.dist-info/RECORD,,