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

shinestacker/_version.py

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

shinestacker/gui/project_controller.py

@@ -0,0 +1,353 @@
+# pylint: disable=C0114, C0115, C0116, E0611, R0913, R0917, R0914, R0912, R0904, R0915, W0718
+import os
+import os.path
+import traceback
+import json
+import jsonpickle
+from PySide6.QtCore import Signal, QObject
+from PySide6.QtWidgets import QMessageBox, QFileDialog, QDialog
+from .. config.constants import constants
+from .. core.core_utils import get_app_base_path
+from .project_model import ActionConfig
+from .new_project import NewProjectDialog
+from .project_model import Project
+from .project_editor import ProjectEditor
+
+
+class ProjectController(QObject):
+    update_title_requested = Signal()
+    refresh_ui_requested = Signal(int, int)
+    activate_window_requested = Signal()
+    enable_save_actions_requested = Signal(bool)
+
+    def __init__(self, parent):
+        super().__init__(parent)
+        self.parent = parent
+        self.project_editor = ProjectEditor(parent)
+
+    def refresh_ui(self, job_row=-1, action_row=-1):
+        self.refresh_ui_requested.emit(job_row, action_row)
+
+    def mark_as_modified(self, modified=True):
+        self.project_editor.mark_as_modified(modified)
+
+    def modified(self):
+        return self.project_editor.modified()
+
+    def set_project(self, project):
+        self.project_editor.set_project(project)
+
+    def project(self):
+        return self.project_editor.project()
+
+    def project_jobs(self):
+        return self.project_editor.project_jobs()
+
+    def project_job(self, i):
+        return self.project_editor.project_job(i)
+
+    def add_job_to_project(self, job):
+        self.project_editor.add_job_to_project(job)
+
+    def num_project_jobs(self):
+        return self.project_editor.num_project_jobs()
+
+    def save_actions_set_enabled(self, enabled):
+        self.enable_save_actions_requested.emit(enabled)
+
+    def current_file_path(self):
+        return self.project_editor.current_file_path()
+
+    def current_file_directory(self):
+        return self.project_editor.current_file_directory()
+
+    def current_file_name(self):
+        return self.project_editor.current_file_name()
+
+    def set_current_file_path(self, path):
+        self.project_editor.set_current_file_path(path)
+
+    def job_list(self):
+        return self.project_editor.job_list()
+
+    def action_list(self):
+        return self.project_editor.action_list()
+
+    def current_job_index(self):
+        return self.project_editor.current_job_index()
+
+    def current_action_index(self):
+        return self.project_editor.current_action_index()
+
+    def set_current_job(self, index):
+        return self.project_editor.set_current_job(index)
+
+    def set_current_action(self, index):
+        return self.project_editor.set_current_action(index)
+
+    def job_list_count(self):
+        return self.project_editor.job_list_count()
+
+    def action_list_count(self):
+        return self.project_editor.action_list_count()
+
+    def job_list_item(self, index):
+        return self.project_editor.job_list_item(index)
+
+    def action_list_item(self, index):
+        return self.project_editor.action_list_item(index)
+
+    def job_list_has_focus(self):
+        return self.project_editor.job_list_has_focus()
+
+    def action_list_has_focus(self):
+        return self.project_editor.action_list_has_focus()
+
+    def clear_job_list(self):
+        self.project_editor.clear_job_list()
+
+    def clear_action_list(self):
+        self.project_editor.clear_action_list()
+
+    def num_selected_jobs(self):
+        return self.project_editor.num_selected_jobs()
+
+    def num_selected_actions(self):
+        return self.project_editor.num_selected_actions()
+
+    def get_current_action_at(self, job, action_index):
+        return self.project_editor.get_current_action_at(job, action_index)
+
+    def action_config_dialog(self, action):
+        return self.project_editor.action_config_dialog(action)
+
+    def on_job_selected(self, index):
+        return self.project_editor.on_job_selected(index)
+
+    def update_title(self):
+        self.update_title_requested.emit()
+
+    def close_project(self):
+        if self.check_unsaved_changes():
+            self.set_project(Project())
+            self.set_current_file_path('')
+            self.update_title()
+            self.clear_job_list()
+            self.clear_action_list()
+            self.mark_as_modified(False)
+
+    def new_project(self):
+        if not self.check_unsaved_changes():
+            return
+        os.chdir(get_app_base_path())
+        self.set_current_file_path('')
+        self.mark_as_modified(False)
+        self.update_title()
+        self.clear_job_list()
+        self.clear_action_list()
+        self.set_project(Project())
+        self.save_actions_set_enabled(False)
+        dialog = NewProjectDialog(self.parent)
+        if dialog.exec() == QDialog.Accepted:
+            self.save_actions_set_enabled(True)
+            input_folder = dialog.get_input_folder().split('/')
+            working_path = '/'.join(input_folder[:-1])
+            input_path = input_folder[-1]
+            if dialog.get_noise_detection():
+                job_noise = ActionConfig(constants.ACTION_JOB,
+                                         {'name': 'detect-noise', 'working_path': working_path,
+                                          'input_path': input_path})
+                noise_detection = ActionConfig(constants.ACTION_NOISEDETECTION,
+                                               {'name': 'detect-noise'})
+                job_noise.add_sub_action(noise_detection)
+                self.add_job_to_project(job_noise)
+            job = ActionConfig(constants.ACTION_JOB,
+                               {'name': 'focus-stack', 'working_path': working_path,
+                                'input_path': input_path})
+            if dialog.get_noise_detection() or dialog.get_vignetting_correction() or \
+               dialog.get_align_frames() or dialog.get_balance_frames():
+                combo_action = ActionConfig(constants.ACTION_COMBO, {'name': 'align'})
+                if dialog.get_noise_detection():
+                    mask_noise = ActionConfig(constants.ACTION_MASKNOISE, {'name': 'mask-noise'})
+                    combo_action.add_sub_action(mask_noise)
+                if dialog.get_vignetting_correction():
+                    vignetting = ActionConfig(constants.ACTION_VIGNETTING, {'name': 'vignetting'})
+                    combo_action.add_sub_action(vignetting)
+                if dialog.get_align_frames():
+                    align = ActionConfig(constants.ACTION_ALIGNFRAMES, {'name': 'align'})
+                    combo_action.add_sub_action(align)
+                if dialog.get_balance_frames():
+                    balance = ActionConfig(constants.ACTION_BALANCEFRAMES, {'name': 'balance'})
+                    combo_action.add_sub_action(balance)
+                job.add_sub_action(combo_action)
+            if dialog.get_bunch_stack():
+                bunch_stack = ActionConfig(constants.ACTION_FOCUSSTACKBUNCH,
+                                           {'name': 'bunches', 'frames': dialog.get_bunch_frames(),
+                                            'overlap': dialog.get_bunch_overlap()})
+                job.add_sub_action(bunch_stack)
+            if dialog.get_focus_stack_pyramid():
+                focus_pyramid = ActionConfig(constants.ACTION_FOCUSSTACK,
+                                             {'name': 'focus-stack-pyramid',
+                                              'stacker': constants.STACK_ALGO_PYRAMID})
+                job.add_sub_action(focus_pyramid)
+            if dialog.get_focus_stack_depth_map():
+                focus_depth_map = ActionConfig(constants.ACTION_FOCUSSTACK,
+                                               {'name': 'focus-stack-depth-map',
+                                                'stacker': constants.STACK_ALGO_DEPTH_MAP})
+                job.add_sub_action(focus_depth_map)
+            if dialog.get_multi_layer():
+                input_path = []
+                if dialog.get_focus_stack_pyramid():
+                    input_path.append("focus-stack-pyramid")
+                if dialog.get_focus_stack_depth_map():
+                    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)})
+                job.add_sub_action(multi_layer)
+            self.add_job_to_project(job)
+            self.mark_as_modified(True)
+            self.refresh_ui(0, -1)
+
+    def open_project(self, file_path=False):
+        if not self.check_unsaved_changes():
+            return
+        if file_path is False:
+            file_path, _ = QFileDialog.getOpenFileName(
+                self.parent, "Open Project", "", "Project Files (*.fsp);;All Files (*)")
+        if file_path:
+            try:
+                self.set_current_file_path(file_path)
+                with open(self.current_file_path(), 'r', encoding="utf-8") as file:
+                    json_obj = json.load(file)
+                project = Project.from_dict(json_obj['project'])
+                if project is None:
+                    raise RuntimeError(f"Project from file {file_path} produced a null project.")
+                self.set_project(project)
+                self.mark_as_modified(False)
+                self.refresh_ui(0, -1)
+                if self.job_list_count() > 0:
+                    self.set_current_job(0)
+            except Exception as e:
+                traceback.print_tb(e.__traceback__)
+                QMessageBox.critical(
+                    self.parent, "Error", f"Cannot open file {file_path}:\n{str(e)}")
+            if self.num_project_jobs() > 0:
+                self.set_current_job(0)
+                self.activate_window_requested.emit()
+                self.save_actions_set_enabled(True)
+            for job in self.project_jobs():
+                if 'working_path' in job.params.keys():
+                    working_path = job.params['working_path']
+                    if not os.path.isdir(working_path):
+                        QMessageBox.warning(
+                            self.parent, "Working path not found",
+                            f'''The working path specified in the project file for the job:
+                                "{job.params['name']}"
+                                was not found.\n
+                                Please, select a valid working path.''')
+                        self.edit_action(job)
+                for action in job.sub_actions:
+                    if 'working_path' in job.params.keys():
+                        working_path = job.params['working_path']
+                        if working_path != '' and not os.path.isdir(working_path):
+                            QMessageBox.warning(
+                                self.parent, "Working path not found",
+                                f'''The working path specified in the project file for the job:
+                                "{job.params['name']}"
+                                was not found.\n
+                                Please, select a valid working path.''')
+                            self.edit_action(action)
+
+    def save_project(self):
+        path = self.current_file_path()
+        if path:
+            self.do_save(path)
+        else:
+            self.save_project_as()
+
+    def save_project_as(self):
+        file_path, _ = QFileDialog.getSaveFileName(
+            self.parent, "Save Project As", "", "Project Files (*.fsp);;All Files (*)")
+        if file_path:
+            if not file_path.endswith('.fsp'):
+                file_path += '.fsp'
+            self.do_save(file_path)
+            self.set_current_file_path(file_path)
+            os.chdir(os.path.dirname(file_path))
+
+    def do_save(self, file_path):
+        try:
+            json_obj = jsonpickle.encode({
+                'project': self.project().to_dict(), 'version': 1
+            })
+            with open(file_path, 'w', encoding="utf-8") as f:
+                f.write(json_obj)
+            self.mark_as_modified(False)
+        except Exception as e:
+            QMessageBox.critical(self.parent, "Error", f"Cannot save file:\n{str(e)}")
+
+    def check_unsaved_changes(self) -> bool:
+        if self.modified():
+            reply = QMessageBox.question(
+                self.parent, "Unsaved Changes",
+                "The project has unsaved changes. Do you want to continue?",
+                QMessageBox.Save | QMessageBox.Discard | QMessageBox.Cancel
+            )
+            if reply == QMessageBox.Save:
+                self.save_project()
+                return True
+            return reply == QMessageBox.Discard
+        return True
+
+    def on_job_edit(self, item):
+        index = self.job_list().row(item)
+        if 0 <= index < self.num_project_jobs():
+            job = self.project_job(index)
+            dialog = self.action_config_dialog(job)
+            if dialog.exec() == QDialog.Accepted:
+                current_row = self.current_job_index()
+                if current_row >= 0:
+                    self.job_list_item(current_row).setText(job.params['name'])
+                self.refresh_ui()
+
+    def on_action_edit(self, item):
+        job_index = self.current_job_index()
+        if 0 <= job_index < self.num_project_jobs():
+            job = self.project_job(job_index)
+            action_index = self.action_list().row(item)
+            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(
+                        current_action.type_name == constants.ACTION_COMBO)
+                dialog = self.action_config_dialog(current_action)
+                if dialog.exec() == QDialog.Accepted:
+                    self.on_job_selected(job_index)
+                    self.refresh_ui()
+                    self.set_current_job(job_index)
+                    self.set_current_action(action_index)
+
+    def edit_current_action(self):
+        current_action = None
+        job_row = self.current_job_index()
+        if 0 <= job_row < self.num_project_jobs():
+            job = self.project_job(job_row)
+            if self.job_list_has_focus():
+                current_action = job
+            elif self.action_list_has_focus():
+                job_row, _action_row, pos = self.get_current_action()
+                if pos.actions is not None:
+                    current_action = pos.action if not pos.is_sub_action else pos.sub_action
+        if current_action is not None:
+            self.edit_action(current_action)
+
+    def edit_action(self, action):
+        dialog = self.action_config_dialog(action)
+        if dialog.exec() == QDialog.Accepted:
+            self.on_job_selected(self.current_job_index())
+            self.mark_as_modified()

{shinestacker-1.0.0.dist-info → shinestacker-1.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.0.0
+Version: 1.0.1
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0
@@ -29,6 +29,8 @@ Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Dynamic: license-file
 
+<img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/src/shinestacker/gui/ico/shinestacker.png' width="150" referrerpolicy="no-referrer" alt="Shine Stacker Logo">
+
 # Shine Stacker
 
 ## Focus Stacking Processing Framework and GUI
@@ -76,14 +78,6 @@ The GUI has two main working areas:
 
 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.
 
-<img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/src/shinestacker/gui/ico/shinestacker.png' width="256" referrerpolicy="no-referrer" alt="Shine Stacker Logo">
-
-## Logo attribution
-
-The Shine Stacker logo was designed by [Alessandro Lista](https://linktr.ee/alelista).  
-Copyright © Alessandro Lista. All rights reserved.  
-The logo is not covered by the LGPL-3.0 license of this project.
-
 # Resources
 
 * [Pyramid Methods in Image Processing](https://www.researchgate.net/publication/246727904_Pyramid_Methods_in_Image_Processing), E. H. Adelson, C. H. Anderson,  J. R. Bergen, P. J. Burt, J. M. Ogden, RCA Engineer, 29-6, Nov/Dec 1984
@@ -92,11 +86,11 @@ Pyramid methods in image processing
 
 # License
 
-- **Code**: <img src="https://www.gnu.org/graphics/lgplv3-147x51.png" alt="LGPL 3 logo">
-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.
-- **Logo**: The Shine Stacker logo was designed by [Alessandro Lista](https://linktr.ee/alelista).  
-  Copyright © Alessandro Lista. All rights reserved.  
-  The logo is not covered by the LGPL-3.0 license of this project.
+<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">
+
+- **Logo**: The Shine Stacker logo was designed by [Alessandro Lista](https://linktr.ee/alelista). Copyright © Alessandro Lista. All rights reserved. The logo is not covered by the LGPL-3.0 license of this project.
 
 # Attribution request
 📸 If you publish images created with Shine Stacker, please consider adding a note such as:

{shinestacker-1.0.0.dist-info → shinestacker-1.0.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 shinestacker/__init__.py,sha256=uq2fjAw2z_6TpH3mOcWFZ98GoEPRsNhTAK8N0MMm_e8,448
-shinestacker/_version.py,sha256=dHuoY6voK7np1A7oRzw1xyBy7CK9_KBAc4FCKW29uRQ,21
+shinestacker/_version.py,sha256=bMIenWosteoeUs51RbaWVZetIuzRhWymuyy-n0rfK0I,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
@@ -45,6 +45,7 @@ shinestacker/gui/gui_run.py,sha256=jGrtXNT3Gn53qMPSU74aEY6PP7UQfc85SD3XIesWLuY,1
 shinestacker/gui/main_window.py,sha256=6zGFZkgBh3_UNWjCfNzciPeiCvBsZnjJiPy62U4ldAw,23988
 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_converter.py,sha256=_AFfU2HYKPX78l6iX6bXJrlKpdjSl63pmKzrc6kQpn8,7348
 shinestacker/gui/project_editor.py,sha256=uouzmUkrqouQlq-dqPOgSO16r1WOnGNV2v8jTcZlRXU,23749
 shinestacker/gui/project_model.py,sha256=eRUmH3QmRzDtPtZoxgT6amKzN8_5XzwjHgEJeL-_JOE,4263
@@ -82,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.0.dist-info/licenses/LICENSE,sha256=pWgb-bBdsU2Gd2kwAXxketnm5W_2u8_fIeWEgojfrxs,7651
-shinestacker-1.0.0.dist-info/METADATA,sha256=600w-Vjn2cDAvudN_Qt4nN3qkxJLmzgNo0a5j6-Hz3E,5957
-shinestacker-1.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shinestacker-1.0.0.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
-shinestacker-1.0.0.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
-shinestacker-1.0.0.dist-info/RECORD,,
+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,,