shinestacker 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

shinestacker/retouch/image_viewer.py

@@ -1,26 +1,10 @@
 import math
 from PySide6.QtWidgets import QGraphicsView, QGraphicsScene, QGraphicsPixmapItem
-from PySide6.QtGui import QPixmap, QPainter, QColor, QPen, QBrush, QCursor, QShortcut, QKeySequence, QRadialGradient
-from PySide6.QtCore import Qt, QRectF, QTime, QPoint, Signal
+from PySide6.QtGui import QPixmap, QPainter, QColor, QPen, QBrush, QCursor, QShortcut, QKeySequence
+from PySide6.QtCore import Qt, QRectF, QTime, QPoint, QPointF, Signal
 from .. config.gui_constants import gui_constants
 from .brush_preview import BrushPreviewItem
-
-
-def create_brush_gradient(center_x, center_y, radius, hardness, inner_color=None, outer_color=None, opacity=100):
-    gradient = QRadialGradient(center_x, center_y, float(radius))
-    inner = inner_color if inner_color is not None else QColor(*gui_constants.BRUSH_COLORS['inner'])
-    outer = outer_color if outer_color is not None else QColor(*gui_constants.BRUSH_COLORS['gradient_end'])
-    inner_with_opacity = QColor(inner)
-    inner_with_opacity.setAlpha(int(float(inner.alpha()) * float(opacity) / 100.0))
-    if hardness < 100:
-        hardness_normalized = float(hardness) / 100.0
-        gradient.setColorAt(0.0, inner_with_opacity)
-        gradient.setColorAt(hardness_normalized, inner_with_opacity)
-        gradient.setColorAt(1.0, outer)
-    else:
-        gradient.setColorAt(0.0, inner_with_opacity)
-        gradient.setColorAt(1.0, inner_with_opacity)
-    return gradient
+from .brush_gradient import create_brush_gradient
 
 
 class ImageViewer(QGraphicsView):
@@ -74,6 +58,8 @@ class ImageViewer(QGraphicsView):
         self.empty = False
         self.setFocus()
         self.activateWindow()
+        self.brush_preview.layer_collection = self.image_editor.layer_collection
+        self.brush_preview.brush = self.brush
 
     def clear_image(self):
         self.scene.clear()
@@ -123,7 +109,7 @@ class ImageViewer(QGraphicsView):
     def mousePressEvent(self, event):
         if self.empty:
             return
-        if event.button() == Qt.LeftButton and self.image_editor.master_layer is not None:
+        if event.button() == Qt.LeftButton and self.image_editor.layer_collection.master_layer is not None:
             if self.space_pressed:
                 self.scrolling = True
                 self.last_mouse_pos = event.position()
@@ -245,7 +231,13 @@ class ImageViewer(QGraphicsView):
         if self.cursor_style == 'preview' and allow_cursor_preview:
             self._setup_outline_style()
             self.brush_cursor.hide()
-            self.brush_preview.update(self.image_editor, QCursor.pos(), int(size))
+            pos = QCursor.pos()
+            if isinstance(pos, QPointF):
+                scene_pos = pos
+            else:
+                cursor_pos = self.image_editor.image_viewer.mapFromGlobal(pos)
+                scene_pos = self.image_editor.image_viewer.mapToScene(cursor_pos)
+            self.brush_preview.update(scene_pos, int(size))
         else:
             self.brush_preview.hide()
             if self.cursor_style == 'outline' or not allow_cursor_preview:

shinestacker/retouch/io_manager.py

@@ -0,0 +1,57 @@
+import cv2
+from .. core.exceptions import ShapeError, BitDepthError
+from .. algorithms.utils import read_img, validate_image, get_img_metadata
+from .. algorithms.exif import get_exif, write_image_with_exif_data
+from .. algorithms.multilayer import write_multilayer_tiff_from_images
+
+
+class IOManager:
+    def __init__(self, layer_collection):
+        self.layer_collection = layer_collection
+        self.current_file_path = ''
+        self.exif_path = ''
+        self.exif_data = None
+
+    def import_frames(self, file_paths):
+        stack = []
+        labels = []
+        master = None
+        shape, dtype = get_img_metadata(self.layer_collection.master_layer)
+        for path in file_paths:
+            try:
+                label = path.split("/")[-1].split(".")[0]
+                img = cv2.cvtColor(read_img(path), cv2.COLOR_BGR2RGB)
+                if shape is not None and dtype is not None:
+                    validate_image(img, shape, dtype)
+                else:
+                    shape, dtype = get_img_metadata(img)
+                label_x = label
+                i = 0
+                while label_x in labels:
+                    i += 1
+                    label_x = f"{label} ({i})"
+                labels.append(label_x)
+                stack.append(img)
+                if master is None:
+                    master = img.copy()
+            except ShapeError as e:
+                raise ShapeError(f"All files must have the same shape.\n{str(e)}")
+            except BitDepthError as e:
+                raise BitDepthError(f"All files must have the same bit depth.\n{str(e)}")
+            except Exception as e:
+                raise RuntimeError(f"Error loading file: {path}.\n{str(e)}")
+        return stack, labels, master
+
+    def save_multilayer(self, path):
+        master_layer = {'Master': self.layer_collection.master_layer}
+        individual_layers = {label: image for label, image in zip(
+            self.layer_collection.layer_labels, self.layer_collection.layer_stack)}
+        write_multilayer_tiff_from_images({**master_layer, **individual_layers}, path, exif_path=self.exif_path)
+
+    def save_master(self, path):
+        img = cv2.cvtColor(self.layer_collection.master_layer, cv2.COLOR_RGB2BGR)
+        write_image_with_exif_data(self.exif_data, img, path)
+
+    def set_exif_data(self, path):
+        self.exif_path = path
+        self.exif_data = get_exif(path)

shinestacker/retouch/layer_collection.py

@@ -0,0 +1,54 @@
+import numpy as np
+
+
+class LayerCollection:
+    def __init__(self):
+        self.master_layer = None
+        self.master_layer_copy = None
+        self.layer_stack = None
+        self.layer_labels = None
+        self.current_layer_idx = 0
+
+    def number_of_layers(self):
+        return len(self.layer_stack)
+
+    def valid_current_layer_idx(self):
+        return 0 <= self.current_layer_idx < self.number_of_layers()
+
+    def current_layer(self):
+        if self.layer_stack is not None and self.valid_current_layer_idx():
+            return self.layer_stack[self.current_layer_idx]
+        return None
+
+    def copy_master_layer(self):
+        self.master_layer_copy = self.master_layer.copy()
+
+    def sort_layers(self, order):
+        master_index = -1
+        master_label = None
+        master_layer = None
+        for i, label in enumerate(self.layer_labels):
+            if label.lower() == "master":
+                master_index = i
+                master_label = self.layer_labels.pop(i)
+                master_layer = self.layer_stack[i]
+                self.layer_stack = np.delete(self.layer_stack, i, axis=0)
+                break
+        if order == 'asc':
+            self.sorted_indices = sorted(range(len(self.layer_labels)),
+                                         key=lambda i: self.layer_labels[i].lower())
+        elif order == 'desc':
+            self.sorted_indices = sorted(range(len(self.layer_labels)),
+                                         key=lambda i: self.layer_labels[i].lower(),
+                                         reverse=True)
+        else:
+            raise ValueError(f"Invalid sorting order: {order}")
+        self.layer_labels = [self.layer_labels[i] for i in self.sorted_indices]
+        self.layer_stack = self.layer_stack[self.sorted_indices]
+        if master_index != -1:
+            self.layer_labels.insert(0, master_label)
+            self.layer_stack = np.insert(self.layer_stack, 0, master_layer, axis=0)
+            self.master_layer = master_layer.copy()
+            self.master_layer.setflags(write=True)
+        if self.current_layer_idx >= self.number_of_layers():
+            self.current_layer_idx = self.number_of_layers() - 1

{shinestacker-0.3.0.dist-info → shinestacker-0.3.1.dist-info}/METADATA

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

{shinestacker-0.3.0.dist-info → shinestacker-0.3.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 shinestacker/__init__.py,sha256=sxG9J11a6Qpu_VcqsARRqGSPByHtDvQqR5ozWYjHfZU,387
-shinestacker/_version.py,sha256=gTggO06fb2c9XKEwlQYUSPlUfy82yVlM9pzLMOUqVcY,21
+shinestacker/_version.py,sha256=2KwowXhmiT6-Bln7VPq9d9sRpAzJq9qLyclhp2KWmjA,21
 shinestacker/algorithms/__init__.py,sha256=X9nwToaB13GAACoaE-K0o9R1Jt7g9xSzeJI8Ra2GcL8,722
 shinestacker/algorithms/align.py,sha256=As7MIfjoJc_1vJ058iwP7b_PnDnfYsBQ1JNZ4GX5ZU4,16529
 shinestacker/algorithms/balance.py,sha256=UOmyUPJVBswUYWvYIB8WdlfTAxUAahZrnxQUSrYJ3I4,15649
@@ -13,8 +13,9 @@ shinestacker/algorithms/pyramid.py,sha256=iUbgRI0p0uzEXcZetAm3hgzwiXhF4mIaNxYMUU
 shinestacker/algorithms/sharpen.py,sha256=KtTDIytJW7z4Oj-E1FcxKvhzz27xLX2CCSwJAG_QRUY,911
 shinestacker/algorithms/stack.py,sha256=EZm2SIuoh8c7hgySB2tQGydKYQjJa2hEqR8YNzIeRuQ,5194
 shinestacker/algorithms/stack_framework.py,sha256=aJBjkQFxiPNjnsnZyoF8lXKR17tm0rTO7puEu_ZvASU,10928
-shinestacker/algorithms/utils.py,sha256=TV3NaGe6_2JTgGdFe4kKNzgihjt6vcK-SLy-HHnbts0,2054
+shinestacker/algorithms/utils.py,sha256=Z81_tHTjzH_8oJ44UmgukHtm1Wbbm8g3YTCy4jBYrWo,2164
 shinestacker/algorithms/vignetting.py,sha256=EiD4O8GJPGOqByjDAfFj-de4cb64Qf685RujqlBgvX0,6774
+shinestacker/algorithms/white_balance.py,sha256=AN33zegS8hMJK7I-7UZVmjaOg5PXy9wTnDei12EnPWg,470
 shinestacker/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shinestacker/app/about_dialog.py,sha256=G_2hRQFpo96q0H8z02fMZ0Jl_2-PpnwNxqISY7Xn5Kg,885
 shinestacker/app/app_config.py,sha256=tQ1JBTG2gtHO1UbJYJjjYUBCakmtZpafvMUTHb5OyUo,1117
@@ -42,7 +43,7 @@ shinestacker/gui/gui_images.py,sha256=3HySCrldbYhUyxO0B1ckC2TLVg5nq94bBXjqsQzCyC
 shinestacker/gui/gui_logging.py,sha256=sN82OsGhMcZdgFMY4z-VbUYiRIsReN-ICaxi31M1J6E,8147
 shinestacker/gui/gui_run.py,sha256=LpBi1V91NrJpVpgS098lSgLtiege0aqcWIGwSbB8cL4,15701
 shinestacker/gui/main_window.py,sha256=KtMe6Hm74xk-lP3qcUsWAw0dzT7CynpdbZA_H651XN0,27203
-shinestacker/gui/new_project.py,sha256=kGTt8zf24w5o8wUOc0QgXVDbvi4XcM4ia0CZftUImOc,7002
+shinestacker/gui/new_project.py,sha256=0bcFg8iB8yxSom0itiO1f9bIcKrCAEgT8aSgUUKyomQ,7075
 shinestacker/gui/project_converter.py,sha256=d66pbBzaBgANpudJLW0tGUSfSy0PXNhs1M6R2o_Fd5E,7390
 shinestacker/gui/project_editor.py,sha256=s0IU3l3xO_JGovazOHhKkT1rraUWNVzyAua1dsUqJyg,21657
 shinestacker/gui/project_model.py,sha256=buzpxppLuoNWao7M2_FOPVpCBex2WgEcvqyq9dxvrz8,4524
@@ -57,18 +58,21 @@ shinestacker/gui/img/plus-round-line-icon.png,sha256=LS068Hlu-CeBvJuB3dwwdJg1lZq
 shinestacker/retouch/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shinestacker/retouch/brush.py,sha256=49YNdZp1dbfowh6HmLfxuHKz7Py9wkFQsN9-pH38P7Q,319
 shinestacker/retouch/brush_controller.py,sha256=R_pWs7Cf_5sC07TkkqqHnX3L_vV5j9CP8S3TkoxYbvs,2945
-shinestacker/retouch/brush_preview.py,sha256=ePyoZPdSY4ytK4uXV-eByQgfsqvhHJqXpleycSxshDg,5247
+shinestacker/retouch/brush_gradient.py,sha256=b7vEnluGkdUVXn7AIECEhQUh1OYbBFIv2UbW8exBRWg,1014
+shinestacker/retouch/brush_preview.py,sha256=3GL8FC6Z3zJ1hxfC4Wt3NkZ2AhwSHY_SAjFT2-cMRnM,5018
 shinestacker/retouch/exif_data.py,sha256=cYl0ZAAEOmimh2O0REtY0fU_1Y_4uIUtk9orpVLyQKY,2234
 shinestacker/retouch/file_loader.py,sha256=TbPjiD9Vv-i3LCsPVcumYJ2DxgnLmQA6xYCiLCqbEcg,4565
-shinestacker/retouch/image_editor.py,sha256=j-IMm8vWrUgI8XROWgGWDpeQ2HKK5MgrC_BPIr4uijI,28461
-shinestacker/retouch/image_editor_ui.py,sha256=-N_ZSuzC6AjDgf0t04un-WStBQcH3c3-C-6uJjHsXCw,16723
-shinestacker/retouch/image_filters.py,sha256=un1CxlMdfzlBEQ1x7RHPLrb5iDsyUihDYel2uyk40qA,19129
-shinestacker/retouch/image_viewer.py,sha256=5t7JRNoNwSgS7btn7zWmSXPPzXvZKbWBiZMm-YA7Xhg,14827
+shinestacker/retouch/image_editor.py,sha256=uUSMTN8C0MOXK-g0P43gtiQo_lZfeymsV_gIuqThSAk,24027
+shinestacker/retouch/image_editor_ui.py,sha256=klPE328IW9ykZFxlHHaWnsxa2kPjnv83Dt8pTFcPVSs,16943
+shinestacker/retouch/image_filters.py,sha256=6X1Y-GvaYxswJBgT0mcQukmXZsgvLxmS2cd6tqb-LJs,16667
+shinestacker/retouch/image_viewer.py,sha256=oisEnpX2gxneFJ1RqAsQQm9rooty1hhZHWWd2F7C5sQ,14385
+shinestacker/retouch/io_manager.py,sha256=PxB_VLfhuCzGHu-lr41hMmsF_jr9PujLU5i5k_JZcBo,2405
+shinestacker/retouch/layer_collection.py,sha256=xUhRBWpo03or9PKNM5oRIA3VKLUcboWe8SAbtvFfulc,2193
 shinestacker/retouch/shortcuts_help.py,sha256=iYwD7YGV2epNDwOBVDc99zqB9bbxLR_IUtanMJ-abPQ,3749
 shinestacker/retouch/undo_manager.py,sha256=5jWPsaERSh7TuWV5EbvqL6EsRS88Ct6VmM7FHxYzufs,3042
-shinestacker-0.3.0.dist-info/licenses/LICENSE,sha256=cBN0P3F6BWFkfOabkhuTxwJnK1B0v50jmmzZJjGGous,80
-shinestacker-0.3.0.dist-info/METADATA,sha256=lqCr530LfhBtToLsuwCNx2LUN37n0pq4QMDgI4LbETE,4219
-shinestacker-0.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shinestacker-0.3.0.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
-shinestacker-0.3.0.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
-shinestacker-0.3.0.dist-info/RECORD,,
+shinestacker-0.3.1.dist-info/licenses/LICENSE,sha256=cBN0P3F6BWFkfOabkhuTxwJnK1B0v50jmmzZJjGGous,80
+shinestacker-0.3.1.dist-info/METADATA,sha256=7K0Xd0y_bZtCbSIs3cKcGfswt2sePqDygGRjb9CkRDs,4219
+shinestacker-0.3.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shinestacker-0.3.1.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
+shinestacker-0.3.1.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
+shinestacker-0.3.1.dist-info/RECORD,,