shinestacker 1.2.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

shinestacker/gui/new_project.py

@@ -1,15 +1,15 @@
-# pylint: disable=C0114, C0115, C0116, E0611, R0915, R0902
+# pylint: disable=C0114, C0115, C0116, E0611, R0915, R0902, R0914, R0911, R0912, R0904
 import os
 import numpy as np
 from PySide6.QtWidgets import (QHBoxLayout, QPushButton, QLabel, QCheckBox, QSpinBox,
-                               QMessageBox)
+                               QMessageBox, QGroupBox, QVBoxLayout, QFormLayout, QSizePolicy)
 from PySide6.QtGui import QIcon
 from PySide6.QtCore import Qt
 from .. config.gui_constants import gui_constants
 from .. config.constants import constants
 from .. algorithms.utils import read_img, extension_tif_jpg
 from .. algorithms.stack import get_bunches
-from .select_path_widget import create_select_file_paths_widget
+from .folder_file_selection import FolderFileSelectionWidget
 from .base_form_dialog import BaseFormDialog
 
 DEFAULT_NO_COUNT_LABEL = " - "
@@ -17,18 +17,18 @@ DEFAULT_NO_COUNT_LABEL = " - "
 
 class NewProjectDialog(BaseFormDialog):
     def __init__(self, parent=None):
-        super().__init__("New Project", parent)
+        super().__init__("New Project", 600, parent)
         self.create_form()
         button_box = QHBoxLayout()
-        ok_button = QPushButton("OK")
-        ok_button.setFocus()
+        self.ok_button = QPushButton("OK")
         cancel_button = QPushButton("Cancel")
-        button_box.addWidget(ok_button)
+        button_box.addWidget(self.ok_button)
         button_box.addWidget(cancel_button)
         self.add_row_to_layout(button_box)
-        ok_button.clicked.connect(self.accept)
+        self.ok_button.clicked.connect(self.accept)
         cancel_button.clicked.connect(self.reject)
         self.n_image_files = 0
+        self.selected_filenames = []
 
     def expert(self):
         return self.parent().expert_options
@@ -43,20 +43,8 @@ class NewProjectDialog(BaseFormDialog):
         self.form_layout.addRow(label)
 
     def create_form(self):
-        icon_path = f"{os.path.dirname(__file__)}/ico/shinestacker.png"
-        app_icon = QIcon(icon_path)
-        icon_pixmap = app_icon.pixmap(128, 128)
-        icon_label = QLabel()
-        icon_label.setPixmap(icon_pixmap)
-        icon_label.setAlignment(Qt.AlignCenter)
-        self.form_layout.addRow(icon_label)
-        spacer = QLabel("")
-        spacer.setFixedHeight(10)
-        self.form_layout.addRow(spacer)
-
-        self.input_folder, container = create_select_file_paths_widget(
-            '', 'input files folder', 'input files folder')
-        self.input_folder.textChanged.connect(self.update_bunches_label)
+        self.input_widget = FolderFileSelectionWidget()
+        self.input_widget.text_changed_connect(self.input_submitted)
         self.noise_detection = QCheckBox()
         self.noise_detection.setChecked(gui_constants.NEW_PROJECT_NOISE_DETECTION)
         self.vignetting_correction = QCheckBox()
@@ -65,7 +53,6 @@ class NewProjectDialog(BaseFormDialog):
         self.align_frames.setChecked(gui_constants.NEW_PROJECT_ALIGN_FRAMES)
         self.balance_frames = QCheckBox()
         self.balance_frames.setChecked(gui_constants.NEW_PROJECT_BALANCE_FRAMES)
-
         self.bunch_stack = QCheckBox()
         self.bunch_stack.setChecked(gui_constants.NEW_PROJECT_BUNCH_STACK)
         self.bunch_frames = QSpinBox()
@@ -78,46 +65,121 @@ class NewProjectDialog(BaseFormDialog):
         self.bunch_overlap.setValue(constants.DEFAULT_OVERLAP)
         self.bunches_label = QLabel(DEFAULT_NO_COUNT_LABEL)
         self.frames_label = QLabel(DEFAULT_NO_COUNT_LABEL)
-
         self.update_bunch_options(gui_constants.NEW_PROJECT_BUNCH_STACK)
         self.bunch_stack.toggled.connect(self.update_bunch_options)
         self.bunch_frames.valueChanged.connect(self.update_bunches_label)
         self.bunch_overlap.valueChanged.connect(self.update_bunches_label)
-
         self.focus_stack_pyramid = QCheckBox()
         self.focus_stack_pyramid.setChecked(gui_constants.NEW_PROJECT_FOCUS_STACK_PYRAMID)
         self.focus_stack_depth_map = QCheckBox()
         self.focus_stack_depth_map.setChecked(gui_constants.NEW_PROJECT_FOCUS_STACK_DEPTH_MAP)
         self.multi_layer = QCheckBox()
         self.multi_layer.setChecked(gui_constants.NEW_PROJECT_MULTI_LAYER)
-
-        self.add_bold_label("1️⃣ Select input folder, all images therein will be merged. ")
-        self.form_layout.addRow("Input folder:", container)
-        self.form_layout.addRow("Number of frames: ", self.frames_label)
-        self.add_label("")
-        self.add_bold_label("2️⃣ Select basic options.")
+        step1_group = QGroupBox("1️⃣ Select Input")
+        step1_layout = QVBoxLayout()
+        step1_layout.setContentsMargins(15, 0, 15, 15)
+        step1_layout.addWidget(
+            QLabel("Select a folder containing "
+                   "all your images, or specific image files."))
+        input_form = QFormLayout()
+        input_form.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
+        input_form.setFormAlignment(Qt.AlignLeft)
+        input_form.setLabelAlignment(Qt.AlignLeft)
+        self.input_widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
+        self.frames_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
+        input_form.addRow("Input:", self.input_widget)
+        input_form.addRow("Number of frames: ", self.frames_label)
+        step1_layout.addLayout(input_form)
+        step1_group.setLayout(step1_layout)
+        self.form_layout.addRow(step1_group)
+        step2_group = QGroupBox("2️⃣ Basic Options")
+        step2_layout = QFormLayout()
+        step2_layout.setContentsMargins(15, 0, 15, 15)
+        step2_layout.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
+        step2_layout.setFormAlignment(Qt.AlignLeft)
+        step2_layout.setLabelAlignment(Qt.AlignLeft)
+        for widget in [self.noise_detection, self.vignetting_correction, self.align_frames,
+                       self.balance_frames, self.bunch_stack, self.bunch_frames,
+                       self.bunch_overlap, self.focus_stack_pyramid,
+                       self.focus_stack_depth_map, self.multi_layer]:
+            widget.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
         if self.expert():
-            self.form_layout.addRow("Automatic noise detection:", self.noise_detection)
-            self.form_layout.addRow("Vignetting correction:", self.vignetting_correction)
-        self.form_layout.addRow("Align layers:", self.align_frames)
-        self.form_layout.addRow("Balance layers:", self.balance_frames)
-        self.form_layout.addRow("Bunch stack:", self.bunch_stack)
-        self.form_layout.addRow("Bunch frames:", self.bunch_frames)
-        self.form_layout.addRow("Bunch overlap:", self.bunch_overlap)
-        self.form_layout.addRow("Number of bunches: ", self.bunches_label)
+            step2_layout.addRow("Automatic noise detection:", self.noise_detection)
+            step2_layout.addRow("Vignetting correction:", self.vignetting_correction)
+        step2_layout.addRow(
+            # f" {constants.ACTION_ICONS[constants.ACTION_ALIGNFRAMES]} "
+            "Align layers:", self.align_frames)
+        step2_layout.addRow(
+            # f" {constants.ACTION_ICONS[constants.ACTION_BALANCEFRAMES]} "
+            "Balance layers:", self.balance_frames)
+        step2_layout.addRow(
+            # f" {constants.ACTION_ICONS[constants.ACTION_FOCUSSTACKBUNCH]} "
+            "Bunch stack:", self.bunch_stack)
+        step2_layout.addRow("Bunch frames:", self.bunch_frames)
+        step2_layout.addRow("Bunch overlap:", self.bunch_overlap)
+        self.bunches_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
+        step2_layout.addRow("Number of bunches: ", self.bunches_label)
         if self.expert():
-            self.form_layout.addRow("Focus stack (pyramid):", self.focus_stack_pyramid)
-            self.form_layout.addRow("Focus stack (depth map):", self.focus_stack_depth_map)
+            step2_layout.addRow(
+                f" {constants.ACTION_ICONS[constants.ACTION_FOCUSSTACK]} "
+                "Focus stack (pyramid):", self.focus_stack_pyramid)
+            step2_layout.addRow(
+                f" {constants.ACTION_ICONS[constants.ACTION_FOCUSSTACK]} "
+                "Focus stack (depth map):", self.focus_stack_depth_map)
         else:
-            self.form_layout.addRow("Focus stack:", self.focus_stack_pyramid)
+            step2_layout.addRow(
+                f" {constants.ACTION_ICONS[constants.ACTION_FOCUSSTACK]} "
+                "Focus stack:", self.focus_stack_pyramid)
         if self.expert():
-            self.form_layout.addRow("Save multi layer TIFF:", self.multi_layer)
-        self.add_label("")
-        self.add_bold_label("3️⃣ Push 🆗 for further options, then press ▶️ to run.")
-        self.add_label("")
-        self.add_label("4️⃣ "
-                       "Select: <b>View</b> > <b>Expert options</b> "
-                       "to unlock advanced configuration.")
+            step2_layout.addRow(
+                f" {constants.ACTION_ICONS[constants.ACTION_MULTILAYER]} "
+                "Save multi layer TIFF:", self.multi_layer)
+        step2_group.setLayout(step2_layout)
+        self.form_layout.addRow(step2_group)
+        step3_group = QGroupBox("3️⃣ Confirmation")
+        step3_layout = QVBoxLayout()
+        step3_layout.setContentsMargins(15, 0, 15, 15)
+        step3_layout.addWidget(
+            QLabel("Click 🆗 to confirm and prepare the job."))
+        step3_layout.addWidget(
+            QLabel("Select: <b>View</b> > <b>Expert options</b> for advanced configuration."))
+        step3_group.setLayout(step3_layout)
+        self.form_layout.addRow(step3_group)
+        step4_group = QGroupBox("4️⃣ Execution")
+        step4_layout = QHBoxLayout()
+        step4_layout.setContentsMargins(15, 0, 15, 15)
+        step4_layout.addWidget(QLabel("Press ▶️ to run your job."))
+        icon_path = f"{os.path.dirname(__file__)}/ico/shinestacker.png"
+        app_icon = QIcon(icon_path)
+        icon_pixmap = app_icon.pixmap(80, 80)
+        icon_label = QLabel()
+        icon_label.setPixmap(icon_pixmap)
+        icon_label.setAlignment(Qt.AlignRight)
+        step4_layout.addWidget(icon_label)
+        step4_group.setLayout(step4_layout)
+        self.form_layout.addRow(step4_group)
+        group_style = """
+            QGroupBox {
+                font-weight: bold;
+                border: 2px solid #cccccc;
+                border-radius: 5px;
+                margin-top: 10px;
+                padding-top: 15px;
+                background-color: #f8f8f8;
+            }
+            QGroupBox::title {
+                subcontrol-origin: margin;
+                left: 10px;
+                padding: 0 5px 0 5px;
+                background-color: #f8f8f8;
+            }
+        """
+        for group in [step1_group, step2_group, step3_group, step4_group]:
+            group.setStyleSheet(group_style)
+            group.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
+        self.form_layout.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
+        self.form_layout.setFormAlignment(Qt.AlignLeft)
+        self.form_layout.setLabelAlignment(Qt.AlignLeft)
 
     def update_bunch_options(self, checked):
         self.bunch_frames.setEnabled(checked)
@@ -125,7 +187,7 @@ class NewProjectDialog(BaseFormDialog):
         self.update_bunches_label()
 
     def update_bunches_label(self):
-        if not self.input_folder.text():
+        if not self.input_widget.get_path():
             return
 
         def count_image_files(path):
@@ -136,8 +198,13 @@ class NewProjectDialog(BaseFormDialog):
                 if extension_tif_jpg(filename):
                     count += 1
             return count
-
-        self.n_image_files = count_image_files(self.input_folder.text())
+        if self.input_widget.get_selection_mode() == 'files' and \
+                self.input_widget.get_selected_files():
+            self.n_image_files = len(self.input_widget.get_selected_files())
+            self.selected_filenames = self.input_widget.get_selected_filenames()
+        else:
+            self.n_image_files = count_image_files(self.input_widget.get_path())
+            self.selected_filenames = []
         if self.n_image_files == 0:
             self.bunches_label.setText(DEFAULT_NO_COUNT_LABEL)
             self.frames_label.setText(DEFAULT_NO_COUNT_LABEL)
@@ -147,43 +214,64 @@ class NewProjectDialog(BaseFormDialog):
             bunches = get_bunches(list(range(self.n_image_files)),
                                   self.bunch_frames.value(),
                                   self.bunch_overlap.value())
-            self.bunches_label.setText(f"{len(bunches)}")
+            self.bunches_label.setText(f"{max(1, len(bunches))}")
         else:
             self.bunches_label.setText(DEFAULT_NO_COUNT_LABEL)
 
+    def input_submitted(self):
+        self.update_bunches_label()
+        self.ok_button.setFocus()
+
     def accept(self):
-        input_folder = self.input_folder.text()
-        if not input_folder:
-            QMessageBox.warning(self, "Input Required", "Please select an input folder")
-            return
-        if not os.path.exists(input_folder):
-            QMessageBox.warning(self, "Invalid Path", "The specified folder does not exist")
+        input_path = self.input_widget.get_path()
+        selection_mode = self.input_widget.get_selection_mode()
+        selected_files = self.input_widget.get_selected_files()
+        if not input_path:
+            QMessageBox.warning(self, "Input Required", "Please select an input folder or files")
             return
-        if not os.path.isdir(input_folder):
-            QMessageBox.warning(self, "Invalid Path", "The specified path is not a folder")
-            return
-        if len(input_folder.split('/')) < 2:
+        if selection_mode == 'files':
+            if not selected_files:
+                QMessageBox.warning(self, "Invalid Selection", "No files selected")
+                return
+            for file_path in selected_files:
+                if not os.path.exists(file_path):
+                    QMessageBox.warning(self, "Invalid Path",
+                                        f"The file {file_path} does not exist")
+                    return
+        else:
+            if not os.path.exists(input_path):
+                QMessageBox.warning(self, "Invalid Path", "The specified folder does not exist")
+                return
+            if not os.path.isdir(input_path):
+                QMessageBox.warning(self, "Invalid Path", "The specified path is not a folder")
+                return
+        parent_dir = os.path.dirname(input_path)
+        if not parent_dir:
+            parent_dir = input_path
+        if len(parent_dir.split('/')) < 2:
             QMessageBox.warning(self, "Invalid Path", "The path must have a parent folder")
             return
         if self.n_image_files > 0 and not self.bunch_stack.isChecked():
-            path = self.input_folder.text()
-            files = os.listdir(path)
-            file_path = None
-            for filename in files:
-                full_path = os.path.join(path, filename)
-                if extension_tif_jpg(full_path):
-                    file_path = full_path
-                    break
+            if selection_mode == 'files' and selected_files:
+                file_path = selected_files[0]
+            else:
+                path = self.input_widget.get_path()
+                files = os.listdir(path)
+                file_path = None
+                for filename in files:
+                    full_path = os.path.join(path, filename)
+                    if extension_tif_jpg(full_path):
+                        file_path = full_path
+                        break
             if file_path is None:
                 QMessageBox.warning(
-                    self, "Invalid input", "Could not find images now in the selected path")
+                    self, "Invalid input", "Could not find images in the selected path")
                 return
             img = read_img(file_path)
             height, width = img.shape[:2]
             n_bytes = 1 if img.dtype == np.uint8 else 2
             n_bits = 8 if img.dtype == np.uint8 else 16
             n_gbytes = float(n_bytes * height * width * self.n_image_files) / constants.ONE_GIGA
-            print("GBytes: ", n_gbytes)
             if n_gbytes > 1 and not self.bunch_stack.isChecked():
                 msg = QMessageBox()
                 msg.setStyleSheet("""
@@ -218,7 +306,16 @@ class NewProjectDialog(BaseFormDialog):
         super().accept()
 
     def get_input_folder(self):
-        return self.input_folder.text()
+        return self.input_widget.get_path()
+
+    def get_selected_files(self):
+        return self.input_widget.get_selected_files()
+
+    def get_selected_filenames(self):
+        return self.input_widget.get_selected_filenames()
+
+    def get_selection_mode(self):
+        return self.input_widget.get_selection_mode()
 
     def get_noise_detection(self):
         return self.noise_detection.isChecked()

shinestacker/gui/project_controller.py

@@ -29,8 +29,8 @@ class ProjectController(QObject):
     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 mark_as_modified(self, modified=True, description=''):
+        self.project_editor.mark_as_modified(modified, description)
 
     def modified(self):
         return self.project_editor.modified()
@@ -143,7 +143,6 @@ class ProjectController(QObject):
             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()
@@ -156,6 +155,7 @@ class ProjectController(QObject):
             input_folder = dialog.get_input_folder().split('/')
             working_path = '/'.join(input_folder[:-1])
             input_path = input_folder[-1]
+            selected_filenames = dialog.get_selected_filenames()
             if dialog.get_noise_detection():
                 job_noise = ActionConfig(
                     constants.ACTION_JOB,
@@ -165,10 +165,14 @@ class ProjectController(QObject):
                                                {'name': f'{input_path}-detect-noise'})
                 job_noise.add_sub_action(noise_detection)
                 self.add_job_to_project(job_noise)
-            job = ActionConfig(constants.ACTION_JOB,
-                               {'name': f'{input_path}-focus-stack',
-                                'working_path': working_path,
-                                'input_path': input_path})
+            job_params = {
+                'name': f'{input_path}-focus-stack',
+                'working_path': working_path,
+                'input_path': input_path
+            }
+            if len(selected_filenames) > 0:
+                job_params['input_filepaths'] = selected_filenames
+            job = ActionConfig(constants.ACTION_JOB, job_params)
             preprocess_name = ''
             if dialog.get_noise_detection() or dialog.get_vignetting_correction() or \
                dialog.get_align_frames() or dialog.get_balance_frames():
@@ -227,7 +231,7 @@ class ProjectController(QObject):
                         'input_path': constants.PATH_SEPARATOR.join(multi_input_path)})
                 job.add_sub_action(multi_layer)
             self.add_job_to_project(job)
-            self.mark_as_modified(True)
+            self.project_editor.set_modified(True)
             self.refresh_ui(0, -1)
 
     def open_project(self, file_path=False):
@@ -369,4 +373,4 @@ class ProjectController(QObject):
         dialog = self.action_config_dialog(action)
         if dialog.exec() == QDialog.Accepted:
             self.on_job_selected(self.current_job_index())
-            self.mark_as_modified()
+            # self.mark_as_modified(True. "Edit Action") <-- done by dialog

shinestacker/gui/project_converter.py

@@ -6,7 +6,7 @@ from .. core.exceptions import InvalidOptionError, RunStopException
 from .. algorithms.stack_framework import StackJob, CombinedActions
 from .. algorithms.noise_detection import NoiseDetection, MaskNoise
 from .. algorithms.vignetting import Vignetting
-from .. algorithms.align import AlignFrames
+from .. algorithms.align_auto import AlignFramesAuto
 from .. algorithms.balance import BalanceFrames
 from .. algorithms.stack import FocusStack, FocusStackBunch
 from .. algorithms.pyramid_auto import PyramidAutoStack
@@ -93,7 +93,7 @@ class ProjectConverter:
             return Vignetting(**params)
         if action_config.type_name == constants.ACTION_ALIGNFRAMES:
             params = {k: v for k, v in action_config.params.items() if k != 'name'}
-            return AlignFrames(**params)
+            return AlignFramesAuto(**params)
         if action_config.type_name == constants.ACTION_BALANCEFRAMES:
             params = {k: v for k, v in action_config.params.items() if k != 'name'}
             if 'intensity_interval' in params.keys():
@@ -133,7 +133,9 @@ class ProjectConverter:
             enabled = action_config.params.get('enabled', True)
             working_path = action_config.params.get('working_path', '')
             input_path = action_config.params.get('input_path', '')
+            input_filepaths = action_config.params.get('input_filepaths', [])
             stack_job = StackJob(name, working_path, enabled=enabled, input_path=input_path,
+                                 input_filepaths=input_filepaths,
                                  logger_name=logger_name, callbacks=callbacks)
             for sub in action_config.sub_actions:
                 action = self.action(sub)