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

shinestacker/retouch/display_manager.py

@@ -1,6 +1,7 @@
-# pylint: disable=C0114, C0115, C0116, E0611, R0903, R0913, R0917, E1121
+# pylint: disable=C0114, C0115, C0116, E0611, R0903, R0913, R0917, E1121, R0902
 import numpy as np
-from PySide6.QtWidgets import QWidget, QListWidgetItem, QVBoxLayout, QLabel, QInputDialog
+from PySide6.QtWidgets import (QWidget, QListWidgetItem, QVBoxLayout, QLabel, QInputDialog,
+                               QAbstractItemView)
 from PySide6.QtGui import QPixmap, QImage
 from PySide6.QtCore import Qt, QObject, QTimer, QSize, Signal
 from .. config.gui_constants import gui_constants
@@ -39,6 +40,7 @@ class DisplayManager(QObject, LayerCollectionHandler):
         self.update_timer = QTimer()
         self.update_timer.setInterval(gui_constants.PAINT_REFRESH_TIMER)
         self.update_timer.timeout.connect(self.process_pending_updates)
+        self.thumbnail_highlight = gui_constants.THUMB_LO_COLOR
 
     def process_pending_updates(self):
         if self.needs_update:
@@ -64,15 +66,15 @@ class DisplayManager(QObject, LayerCollectionHandler):
             self.display_master_layer()
 
     def create_thumbnail(self, layer):
-        if layer.dtype == np.uint16:
-            layer = (layer // 256).astype(np.uint8)
-        height, width = layer.shape[:2]
-        if layer.ndim == 3 and layer.shape[-1] == 3:
-            qimg = QImage(layer.data, width, height, 3 * width, QImage.Format_RGB888)
+        source_layer = (layer // 256).astype(np.uint8) if layer.dtype == np.uint16 else layer
+        height, width = source_layer.shape[:2]
+        if layer.ndim == 3 and source_layer.shape[-1] == 3:
+            qimg = QImage(source_layer.data, width, height, 3 * width, QImage.Format_RGB888)
         else:
-            qimg = QImage(layer.data, width, height, width, QImage.Format_Grayscale8)
+            qimg = QImage(source_layer.data, width, height, width, QImage.Format_Grayscale8)
         return QPixmap.fromImage(
-            qimg.scaled(*gui_constants.UI_SIZES['thumbnail'], Qt.KeepAspectRatio))
+            qimg.scaledToWidth(
+                gui_constants.UI_SIZES['thumbnail_width'], Qt.SmoothTransformation))
 
     def update_thumbnails(self):
         self.update_master_thumbnail()
@@ -103,17 +105,22 @@ class DisplayManager(QObject, LayerCollectionHandler):
         self.master_thumbnail_label.setPixmap(pixmap)
 
     def add_thumbnail_item(self, thumbnail, label, i, is_current):
-        item_widget = QWidget()
-        layout = QVBoxLayout(item_widget)
-        layout.setContentsMargins(0, 0, 0, 0)
-        layout.setSpacing(0)
-
+        container = QWidget()
+        container.setFixedWidth(gui_constants.UI_SIZES['thumbnail_width'] + 4)
+        container.setObjectName("thumbnailContainer")
+        container_layout = QVBoxLayout(container)
+        container_layout.setContentsMargins(2, 2, 2, 2)
+        container_layout.setSpacing(0)
+        content_widget = QWidget()
+        content_layout = QVBoxLayout(content_widget)
+        content_layout.setContentsMargins(0, 0, 0, 0)
+        content_layout.setSpacing(0)
         thumbnail_label = QLabel()
         thumbnail_label.setPixmap(thumbnail)
         thumbnail_label.setAlignment(Qt.AlignCenter)
-        layout.addWidget(thumbnail_label)
-
+        content_layout.addWidget(thumbnail_label)
         label_widget = ClickableLabel(label)
+        label_widget.setFixedHeight(gui_constants.UI_SIZES['label_height'])
         label_widget.setAlignment(Qt.AlignCenter)
 
         def rename_label(label_widget, old_label, i):
@@ -124,21 +131,45 @@ class DisplayManager(QObject, LayerCollectionHandler):
                 self.set_layer_labels(i, new_label)
 
         label_widget.double_clicked.connect(lambda: rename_label(label_widget, label, i))
-        layout.addWidget(label_widget)
+        content_layout.addWidget(label_widget)
+        container_layout.addWidget(content_widget)
+        if is_current:
+            container.setStyleSheet(
+                f"#thumbnailContainer{{ border: 2px solid {self.thumbnail_highlight}; }}")
+        else:
+            container.setStyleSheet("#thumbnailContainer{ border: 2px solid transparent; }")
         item = QListWidgetItem()
-        item.setSizeHint(QSize(gui_constants.IMG_WIDTH, gui_constants.IMG_HEIGHT))
+        item.setSizeHint(QSize(gui_constants.UI_SIZES['thumbnail_width'] + 4,
+                               thumbnail.height() + label_widget.height() + 4))
         self.thumbnail_list.addItem(item)
-        self.thumbnail_list.setItemWidget(item, item_widget)
-
+        self.thumbnail_list.setItemWidget(item, container)
         if is_current:
             self.thumbnail_list.setCurrentItem(item)
 
+    def highlight_thumbnail(self, index):
+        for i in range(self.thumbnail_list.count()):
+            item = self.thumbnail_list.item(i)
+            widget = self.thumbnail_list.itemWidget(item)
+            if widget:
+                widget.setStyleSheet("#thumbnailContainer{ border: 2px solid transparent; }")
+        current_item = self.thumbnail_list.item(index)
+        if current_item:
+            widget = self.thumbnail_list.itemWidget(current_item)
+            if widget:
+                widget.setStyleSheet(
+                    f"#thumbnailContainer{{ border: 2px solid {self.thumbnail_highlight}; }}")
+        self.thumbnail_list.setCurrentRow(index)
+        self.thumbnail_list.scrollToItem(
+            self.thumbnail_list.item(index), QAbstractItemView.PositionAtCenter)
+
     def set_view_master(self):
         if self.has_no_master_layer():
             return
         self.view_mode = 'master'
         self.temp_view_individual = False
         self.display_master_layer()
+        self.thumbnail_highlight = gui_constants.THUMB_LO_COLOR
+        self.highlight_thumbnail(self.current_layer_idx())
         self.status_message_requested.emit("View mode: Master")
         self.cursor_preview_state_changed.emit(True)  # True = allow preview
 
@@ -148,6 +179,8 @@ class DisplayManager(QObject, LayerCollectionHandler):
         self.view_mode = 'individual'
         self.temp_view_individual = False
         self.display_current_layer()
+        self.thumbnail_highlight = gui_constants.THUMB_HI_COLOR
+        self.highlight_thumbnail(self.current_layer_idx())
         self.status_message_requested.emit("View mode: Individual layers")
         self.cursor_preview_state_changed.emit(False)  # False = no preview
 
@@ -155,6 +188,8 @@ class DisplayManager(QObject, LayerCollectionHandler):
         if not self.temp_view_individual and self.view_mode == 'master':
             self.temp_view_individual = True
             self.image_viewer.update_brush_cursor()
+            self.thumbnail_highlight = gui_constants.THUMB_HI_COLOR
+            self.highlight_thumbnail(self.current_layer_idx())
             self.display_current_layer()
             self.status_message_requested.emit("Temporary view: Individual layer (hold X)")
 
@@ -162,6 +197,8 @@ class DisplayManager(QObject, LayerCollectionHandler):
         if self.temp_view_individual:
             self.temp_view_individual = False
             self.image_viewer.update_brush_cursor()
+            self.thumbnail_highlight = gui_constants.THUMB_LO_COLOR
+            self.highlight_thumbnail(self.current_layer_idx())
             self.display_master_layer()
             self.status_message_requested.emit("View mode: Master")
             self.cursor_preview_state_changed.emit(True)  # Restore preview

shinestacker/retouch/exif_data.py

@@ -1,28 +1,25 @@
 # pylint: disable=C0114, C0115, C0116, E0611
 from PIL.TiffImagePlugin import IFDRational
-from PySide6.QtWidgets import QFormLayout, QHBoxLayout, QPushButton, QDialog, QLabel
+from PySide6.QtWidgets import QWidget, QHBoxLayout, QPushButton, QLabel
 from PySide6.QtCore import Qt
 from .. algorithms.exif import exif_dict
 from .icon_container import icon_container
+from .. gui.base_form_dialog import BaseFormDialog
 
 
-class ExifData(QDialog):
+class ExifData(BaseFormDialog):
     def __init__(self, exif, parent=None):
-        super().__init__(parent)
+        super().__init__("EXIF data", parent)
         self.exif = exif
-        self.setWindowTitle("EXIF data")
-        self.resize(500, self.height())
-        self.layout = QFormLayout(self)
-        self.layout.setFieldGrowthPolicy(QFormLayout.AllNonFixedFieldsGrow)
-        self.layout.setRowWrapPolicy(QFormLayout.DontWrapRows)
-        self.layout.setFormAlignment(Qt.AlignLeft | Qt.AlignTop)
-        self.layout.setLabelAlignment(Qt.AlignLeft)
         self.create_form()
-        button_box = QHBoxLayout()
+        button_container = QWidget()
+        button_layout = QHBoxLayout(button_container)
+        button_layout.setAlignment(Qt.AlignCenter)
         ok_button = QPushButton("OK")
+        ok_button.setFixedWidth(100)
         ok_button.setFocus()
-        button_box.addWidget(ok_button)
-        self.layout.addRow(button_box)
+        button_layout.addWidget(ok_button)
+        self.add_row_to_layout(button_container)
         ok_button.clicked.connect(self.accept)
 
     def add_bold_label(self, label):

shinestacker/retouch/file_loader.py

@@ -42,7 +42,7 @@ class FileLoader(QThread):
                 current_labels = [f"Layer {i + 1}" for i in range(len(current_stack))]
             self.finished.emit(current_stack, current_labels, master_layer)
         except Exception as e:
-            traceback.print_tb(e.__traceback__)
+            # traceback.print_tb(e.__traceback__)
             self.error.emit(f"Error loading file:\n{str(e)}")
 
     def load_stack(self, path):

shinestacker/retouch/filter_manager.py

@@ -5,10 +5,7 @@ class FilterManager:
         self.filters = {}
 
     def register_filter(self, name, filter_class):
-        self.filters[name] = filter_class(self.editor)
-
-    def get_filter(self, name):
-        return self.filters.get(name)
+        self.filters[name] = filter_class(name, self.editor)
 
     def apply(self, name, **kwargs):
         if name in self.filters: