shinestacker 1.0.2__tar.gz → 1.0.4__tar.gz

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

@@ -2,6 +2,27 @@
 
 This page reports the main releases only and the main changes therein.
 
+## [v1.0.4] - 2025-08-26
+**Bug fixes**
+
+### Changes
+
+* extensions are treated in lower case (e.g.: both jpg and JPG)
+* added retouch menu action: import frames from current project
+
+---
+## [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.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.0.2
+Version: 1.0.4
 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.4}/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.4/src/shinestacker/_version.py

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

{shinestacker-1.0.2 → shinestacker-1.0.4}/src/shinestacker/algorithms/exif.py

@@ -10,7 +10,7 @@ from PIL.TiffImagePlugin import IFDRational
 from PIL.ExifTags import TAGS
 import tifffile
 from .. config.constants import constants
-from .utils import write_img
+from .utils import write_img, extension_jpg, extension_tif, extension_png
 
 IMAGEWIDTH = 256
 IMAGELENGTH = 257
@@ -48,11 +48,10 @@ def extract_enclosed_data_for_jpg(data, head, foot):
 def get_exif(exif_filename):
     if not os.path.isfile(exif_filename):
         raise RuntimeError(f"File does not exist: {exif_filename}")
-    ext = exif_filename.split(".")[-1]
     image = Image.open(exif_filename)
-    if ext in ('tif', 'tiff'):
+    if extension_tif(exif_filename):
         return image.tag_v2 if hasattr(image, 'tag_v2') else image.getexif()
-    if ext in ('jpeg', 'jpg'):
+    if extension_jpg(exif_filename):
         exif_data = image.getexif()
         with open(exif_filename, 'rb') as f:
             data = extract_enclosed_data_for_jpg(f.read(), b'<?xpacket', b'<?xpacket end="w"?>')
@@ -158,42 +157,40 @@ def write_image_with_exif_data(exif, image, out_filename, verbose=False):
     if exif is None:
         write_img(out_filename, image)
         return None
-    ext = out_filename.split(".")[-1]
     if verbose:
         print_exif(exif)
-    if ext in ('jpeg', 'jpg'):
+    if extension_jpg(out_filename):
         cv2.imwrite(out_filename, image, [int(cv2.IMWRITE_JPEG_QUALITY), 100])
         add_exif_data_to_jpg_file(exif, out_filename, out_filename, verbose)
-    elif ext in ('tiff', 'tif'):
+    elif extension_tif(out_filename):
         metadata = {"description": f"image generated with {constants.APP_STRING} package"}
         extra_tags, exif_tags = exif_extra_tags_for_tif(exif)
         tifffile.imwrite(out_filename, image, metadata=metadata, compression='adobe_deflate',
                          extratags=extra_tags, **exif_tags)
-    elif ext == 'png':
+    elif extension_png(out_filename):
         image.save(out_filename, 'PNG', exif=exif, quality=100)
     return exif
 
 
 def save_exif_data(exif, in_filename, out_filename=None, verbose=False):
-    ext = in_filename.split(".")[-1]
     if out_filename is None:
         out_filename = in_filename
     if exif is None:
         raise RuntimeError('No exif data provided.')
     if verbose:
         print_exif(exif)
-    if ext in ('tiff', 'tif'):
+    if extension_tif(in_filename):
         image_new = tifffile.imread(in_filename)
     else:
         image_new = Image.open(in_filename)
-    if ext in ('jpeg', 'jpg'):
+    if extension_jpg(in_filename):
         add_exif_data_to_jpg_file(exif, in_filename, out_filename, verbose)
-    elif ext in ('tiff', 'tif'):
+    elif extension_tif(in_filename):
         metadata = {"description": f"image generated with {constants.APP_STRING} package"}
         extra_tags, exif_tags = exif_extra_tags_for_tif(exif)
         tifffile.imwrite(out_filename, image_new, metadata=metadata, compression='adobe_deflate',
                          extratags=extra_tags, **exif_tags)
-    elif ext == 'png':
+    elif extension_png(in_filename):
         image_new.save(out_filename, 'PNG', exif=exif, quality=100)
     return exif
 

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

@@ -13,6 +13,7 @@ from .. config.constants import constants
 from .. config.config import config
 from .. core.colors import color_str
 from .. core.framework import JobBase
+from .utils import EXTENSIONS_TIF, EXTENSIONS_JPG, EXTENSIONS_PNG
 from .stack_framework import FrameMultiDirectory
 from .exif import exif_extra_tags_for_tif, get_exif
 
@@ -27,13 +28,13 @@ def write_multilayer_tiff(input_files, output_file, labels=None, exif_path='', c
         msg = ", ".join(extensions)
         raise RuntimeError("All input files must have the same extension. "
                            f"Input list has the following extensions: {msg}.")
-    extension = extensions[0]
-    if extension in ('tif', 'tiff'):
+    extension = extensions[0].lower()
+    if extension in EXTENSIONS_TIF:
         images = [tifffile.imread(p) for p in input_files]
-    elif extension in ('jpg', 'jpeg'):
+    elif extension in EXTENSIONS_JPG:
         images = [cv2.imread(p) for p in input_files]
         images = [cv2.cvtColor(i, cv2.COLOR_BGR2RGB) for i in images]
-    elif extension == 'png':
+    elif extension in EXTENSIONS_PNG:
         images = [cv2.imread(p, cv2.IMREAD_UNCHANGED) for p in input_files]
         images = [cv2.cvtColor(i, cv2.COLOR_BGR2RGB) for i in images]
     if labels is None:
@@ -177,7 +178,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 +187,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.4}/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.4}/src/shinestacker/algorithms/utils.py

@@ -8,25 +8,65 @@ from .. config.config import config
 from .. core.exceptions import ShapeError, BitDepthError
 
 
+def get_path_extension(path):
+    return os.path.splitext(path)[1].lstrip('.')
+
+
+EXTENSIONS_TIF = ['tif', 'tiff']
+EXTENSIONS_JPG = ['jpg', 'jpeg']
+EXTENSIONS_PNG = ['png']
+EXTENSIONS_PDF = ['pdf']
+
+
+def extension_in(path, exts):
+    return get_path_extension(path).lower() in exts
+
+
+def extension_tif(path):
+    return extension_in(path, EXTENSIONS_TIF)
+
+
+def extension_jpg(path):
+    return extension_in(path, EXTENSIONS_JPG)
+
+
+def extension_png(path):
+    return extension_in(path, EXTENSIONS_PNG)
+
+
+def extension_pdf(path):
+    return extension_in(path, EXTENSIONS_PDF)
+
+
+def extension_tif_jpg(path):
+    return extension_in(path, EXTENSIONS_TIF + EXTENSIONS_JPG)
+
+
+def extension_tif_png(path):
+    return extension_in(path, EXTENSIONS_TIF + EXTENSIONS_PNG)
+
+
+def extension_jpg_png(path):
+    return extension_in(path, EXTENSIONS_JPG + EXTENSIONS_PNG)
+
+
 def read_img(file_path):
     if not os.path.isfile(file_path):
         raise RuntimeError("File does not exist: " + file_path)
-    ext = file_path.split(".")[-1]
     img = None
-    if ext in ['jpeg', 'jpg']:
+    if extension_jpg(file_path):
         img = cv2.imread(file_path)
-    elif ext in ['tiff', 'tif', 'png']:
+    elif extension_tif_png(file_path):
         img = cv2.imread(file_path, cv2.IMREAD_UNCHANGED)
     return img
 
 
 def write_img(file_path, img):
-    ext = file_path.split(".")[-1]
-    if ext in ['jpeg', 'jpg']:
+    if extension_jpg(file_path):
         cv2.imwrite(file_path, img, [int(cv2.IMWRITE_JPEG_QUALITY), 100])
-    elif ext in ['tiff', 'tif']:
+    elif extension_tif(file_path):
         cv2.imwrite(file_path, img, [int(cv2.IMWRITE_TIFF_COMPRESSION), 1])
-    elif ext == 'png':
+    elif extension_png(file_path):
         cv2.imwrite(file_path, img)
 
 

{shinestacker-1.0.2 → shinestacker-1.0.4}/src/shinestacker/app/main.py

@@ -6,9 +6,10 @@ import argparse
 import matplotlib
 import matplotlib.backends.backend_pdf
 matplotlib.use('agg')
-from PySide6.QtWidgets import QApplication, QMainWindow, QStackedWidget, QMenu
+from PySide6.QtWidgets import (QApplication, QMainWindow, QVBoxLayout, QHBoxLayout, QStackedWidget,
+                               QMenu, QMessageBox, QDialog, QLabel, QListWidget, QPushButton)
 from PySide6.QtGui import QAction, QIcon, QGuiApplication
-from PySide6.QtCore import Qt, QEvent, QTimer
+from PySide6.QtCore import Qt, QEvent, QTimer, Signal
 from shinestacker.config.config import config
 config.init(DISABLE_TQDM=True, COMBINED_APP=True, DONT_USE_NATIVE_MENU=True)
 from shinestacker.config.constants import constants
@@ -20,6 +21,59 @@ from shinestacker.app.help_menu import add_help_action
 from shinestacker.app.open_frames import open_frames
 
 
+class SelectionDialog(QDialog):
+    selection_made = Signal(str, bool)
+
+    def __init__(self, title, message, items, parent=None):
+        super().__init__(parent)
+        self.setWindowTitle(title)
+        self.setModal(True)
+        self.selected_item = ""
+        self.setup_ui(message, items)
+        self.setMinimumSize(300, 300)
+
+    def setup_ui(self, message, items):
+        layout = QVBoxLayout(self)
+        if message:
+            label = QLabel(message)
+            layout.addWidget(label)
+        self.list_widget = QListWidget()
+        self.list_widget.addItems(items)
+        self.list_widget.itemSelectionChanged.connect(self.on_selection_changed)
+        layout.addWidget(self.list_widget)
+        button_layout = QHBoxLayout()
+        self.ok_button = QPushButton("OK")
+        self.ok_button.clicked.connect(self.accept)
+        self.ok_button.setEnabled(False)
+        button_layout.addWidget(self.ok_button)
+        cancel_button = QPushButton("Cancel")
+        cancel_button.clicked.connect(self.reject)
+        button_layout.addWidget(cancel_button)
+        layout.addLayout(button_layout)
+
+    def on_selection_changed(self):
+        selected_items = self.list_widget.selectedItems()
+        self.ok_button.setEnabled(len(selected_items) > 0)
+
+    def accept(self):
+        selected_items = self.list_widget.selectedItems()
+        if selected_items:
+            self.selected_item = selected_items[0].text()
+            self.selection_made.emit(self.selected_item, True)
+            super().accept()
+
+    def reject(self):
+        self.selected_item = ""
+        self.selection_made.emit("", False)
+        super().reject()
+
+    @staticmethod
+    def get_selection(title, message, items, parent=None):
+        dialog = SelectionDialog(title, message, items, parent)
+        result = dialog.exec()
+        return dialog.selected_item if result == QDialog.Accepted else ""
+
+
 class MainApp(QMainWindow):
     def __init__(self):
         super().__init__()
@@ -41,6 +95,17 @@ class MainApp(QMainWindow):
             self.retouch_window.menuBar().actions()[0], self.app_menu)
         add_help_action(self.project_window)
         add_help_action(self.retouch_window)
+        file_menu = None
+        for action in self.retouch_window.menuBar().actions():
+            if action.text() == "&File":
+                file_menu = action.menu()
+                break
+        if file_menu is not None:
+            import_action = QAction("Import From Current Project", self)
+            import_action.triggered.connect(self.import_from_project)
+            file_menu.addAction(import_action)
+        else:
+            raise RuntimeError("File menu not found!")
 
     def switch_to_project(self):
         self.switch_app(0)
@@ -91,6 +156,38 @@ class MainApp(QMainWindow):
         else:
             self.retouch_window.io_gui_handler.open_file(filename)
 
+    def import_from_project(self):
+        project = self.project_window.project()
+        if project is None:
+            QMessageBox.warning(self.parent(),
+                                "No Active Project", "No project has been created or opened.")
+            return
+        if len(project.jobs) == 0:
+            QMessageBox.warning(self.parent(),
+                                "No Jobs In Project", "The current project has no job. "
+                                "Create and run a job first.")
+            return
+        if len(project.jobs) > 1:
+            job_names = [job.params['name'] for job in project.jobs]
+            job_name = SelectionDialog.get_selection(
+                "Job Selection",
+                "Please select one of the active jobs:",
+                job_names
+            )
+            job = None
+            for job in project.jobs:
+                if job.params['name'] == job_name:
+                    break
+            if job is None:
+                return
+        else:
+            job = project.jobs[0]
+        retouch_path = self.project_window.get_retouch_path(job)
+        if isinstance(retouch_path, list):
+            open_frames(self.retouch_window, None, ";".join(retouch_path))
+        else:
+            self.retouch_window.io_gui_handler.open_file(retouch_path)
+
 
 class Application(QApplication):
     def event(self, event):

{shinestacker-1.0.2 → shinestacker-1.0.4}/src/shinestacker/gui/gui_run.py

@@ -1,4 +1,5 @@
 # pylint: disable=C0114, C0115, C0116, E0611, R0903, R0915, R0914, R0917, R0913, R0902
+import os
 from PySide6.QtWidgets import (QWidget, QPushButton, QVBoxLayout, QHBoxLayout,
                                QMessageBox, QScrollArea, QSizePolicy, QFrame, QLabel, QComboBox)
 from PySide6.QtGui import QColor
@@ -7,6 +8,7 @@ from PySide6.QtCore import Signal, Slot
 from .. config.constants import constants
 from .. config.gui_constants import gui_constants
 from .colors import RED_BUTTON_STYLE, BLUE_BUTTON_STYLE, BLUE_COMBO_STYLE
+from .. algorithms.utils import extension_tif_jpg, extension_pdf
 from .gui_logging import LogWorker, QTextEditLogger
 from .gui_images import GuiPdfView, GuiImageView, GuiOpenApp
 from .colors import (
@@ -200,13 +202,12 @@ class RunWindow(QTextEditLogger):
         label = QLabel(name, self)
         label.setStyleSheet("QLabel {margin-top: 5px; font-weight: bold;}")
         self.image_layout.addWidget(label)
-        ext = path.split('.')[-1].lower()
-        if ext == 'pdf':
+        if extension_pdf(path):
             image_view = GuiPdfView(path, self)
-        elif ext in ['jpg', 'jpeg', 'tif', 'tiff', 'png']:
+        elif extension_tif_jpg(path):
             image_view = GuiImageView(path, self)
         else:
-            raise RuntimeError("Can't visualize file type {ext}.")
+            raise RuntimeError(f"Can't visualize file type {os.path.splitext(path)[1]}.")
         self.image_views.append(image_view)
         self.image_layout.addWidget(image_view)
         max_width = max(pv.size().width() for pv in self.image_views) if self.image_views else 0

{shinestacker-1.0.2 → shinestacker-1.0.4}/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.4}/src/shinestacker/gui/new_project.py

@@ -7,13 +7,12 @@ 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
+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 .base_form_dialog import BaseFormDialog
 
 DEFAULT_NO_COUNT_LABEL = " - "
-EXTENSIONS = ['jpg', 'jpeg', 'tif', 'tiff']
 
 
 class NewProjectDialog(BaseFormDialog):
@@ -133,10 +132,8 @@ class NewProjectDialog(BaseFormDialog):
                 return 0
             count = 0
             for filename in os.listdir(path):
-                if '.' in filename:
-                    ext = filename.lower().split('.')[-1]
-                    if ext in EXTENSIONS:
-                        count += 1
+                if extension_tif_jpg(filename):
+                    count += 1
             return count
 
         self.n_image_files = count_image_files(self.input_folder.text())
@@ -173,11 +170,9 @@ class NewProjectDialog(BaseFormDialog):
             file_path = None
             for filename in files:
                 full_path = os.path.join(path, filename)
-                if os.path.isfile(full_path):
-                    ext = full_path.split(".")[-1].lower()
-                    if ext in EXTENSIONS:
-                        file_path = full_path
-                        break
+                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")

{shinestacker-1.0.2 → shinestacker-1.0.4}/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.4}/src/shinestacker/retouch/file_loader.py

@@ -5,7 +5,7 @@ import numpy as np
 import cv2
 from psdtags import PsdChannelId
 from PySide6.QtCore import QThread, Signal
-from .. algorithms.utils import read_img
+from .. algorithms.utils import read_img, extension_tif, extension_jpg
 from .. algorithms.multilayer import read_multilayer_tiff
 
 
@@ -50,15 +50,14 @@ class FileLoader(QThread):
             raise RuntimeError(f"Path {path} does not exist.")
         if not os.path.isfile(path):
             raise RuntimeError(f"Path {path} is not a file.")
-        extension = path.split('.')[-1]
-        if extension in ['jpg', 'jpeg']:
+        if extension_jpg(path):
             try:
                 stack = np.array([cv2.cvtColor(read_img(path), cv2.COLOR_BGR2RGB)])
                 return stack, [path.split('/')[-1].split('.')[0]]
             except Exception as e:
                 traceback.print_tb(e.__traceback__)
                 return None, None
-        elif extension in ['tif', 'tiff']:
+        elif extension_tif(path):
             try:
                 psd_data = read_multilayer_tiff(path)
                 layers = []

{shinestacker-1.0.2 → shinestacker-1.0.4}/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.4}/src/shinestacker/retouch/io_gui_handler.py

@@ -56,9 +56,7 @@ 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, False,
-            f"Loaded: {self.current_file_path()}")
+        self.finish_loading_setup(f"Loaded: {self.current_file_path()}")
 
     def on_file_error(self, error_msg):
         QApplication.restoreOverrideCursor()
@@ -137,26 +135,23 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
             msg.setText(str(e))
             msg.exec()
             return
-        self.finish_loading_setup(
-            stack, labels, master, True,
-            "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])
+        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:
-                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.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("Selected frames imported")
+
+    def finish_loading_setup(self, 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.4/src/shinestacker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.0.2
+Version: 1.0.4
 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'