shinestacker 1.5.2__py3-none-any.whl → 1.5.3__py3-none-any.whl

shinestacker/_version.py

@@ -1 +1 @@
-__version__ = '1.5.2'
+__version__ = '1.5.3'

shinestacker/app/main.py

@@ -20,7 +20,7 @@ from shinestacker.app.gui_utils import (
     disable_macos_special_menu_items, fill_app_menu, set_css_style)
 from shinestacker.app.help_menu import add_help_action
 from shinestacker.app.open_frames import open_frames
-from .args import add_project_arguments, add_retouch_arguments
+from shinestacker.app.args_parser_opts import add_project_arguments, add_retouch_arguments
 
 
 class SelectionDialog(QDialog):

shinestacker/app/project.py

@@ -17,7 +17,7 @@ from shinestacker.gui.main_window import MainWindow
 from shinestacker.app.gui_utils import (
     disable_macos_special_menu_items, fill_app_menu, set_css_style)
 from shinestacker.app.help_menu import add_help_action
-from .args import add_project_arguments
+from shinestacker.app.args_parser_opts import add_project_arguments
 
 
 class ProjectApp(MainWindow):

shinestacker/app/retouch.py

@@ -13,7 +13,7 @@ from shinestacker.app.gui_utils import (
     disable_macos_special_menu_items, fill_app_menu, set_css_style)
 from shinestacker.app.help_menu import add_help_action
 from shinestacker.app.open_frames import open_frames
-from .args import add_retouch_arguments
+from shinestacker.app.args_parser_opts import add_retouch_arguments
 
 
 class RetouchApp(ImageEditorUI):

shinestacker/config/gui_constants.py

@@ -26,7 +26,7 @@ class _GuiConstants:
         'outer': (255, 0, 0, 200),
         'inner': (255, 0, 0, 150),
         'gradient_end': (255, 0, 0, 0),
-        'pen': (255, 0, 0, 200),
+        'pen': (255, 255, 255, 200),
         'preview': (255, 180, 180),
         'cursor_inner': (255, 0, 0, 120),
         'preview_inner': (255, 255, 255, 150)

shinestacker/retouch/sidebyside_view.py

@@ -1,4 +1,5 @@
 # pylint: disable=C0114, C0115, C0116, R0904, R0915, E0611, R0902, R0911, R0914, E1003
+import time
 from PySide6.QtCore import Qt, Signal, QEvent, QRectF
 from PySide6.QtGui import QCursor
 from PySide6.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout, QFrame
@@ -58,6 +59,7 @@ class DoubleViewBase(ViewStrategy, QWidget, ViewSignals):
         self.current_view.setFocusPolicy(Qt.NoFocus)
         self.master_view.setFocusPolicy(Qt.NoFocus)
         self.current_brush_cursor = None
+        self.last_color_update_time_current = 0
 
     def setup_layout(self):
         raise NotImplementedError("Subclasses must implement setup_layout")
@@ -311,9 +313,11 @@ class DoubleViewBase(ViewStrategy, QWidget, ViewSignals):
             radius = size / 2
             self.current_brush_cursor.setRect(
                 scene_pos.x() - radius, scene_pos.y() - radius, size, size)
+            self.update_current_cursor_color()
             self.current_brush_cursor.show()
             self.brush_cursor.setRect(
                 scene_pos.x() - radius, scene_pos.y() - radius, size, size)
+            self.update_master_cursor_color()
             self.brush_cursor.show()
         else:
             self.brush_cursor.hide()
@@ -321,6 +325,19 @@ class DoubleViewBase(ViewStrategy, QWidget, ViewSignals):
             self.master_view.setCursor(Qt.ArrowCursor)
             self.current_view.setCursor(Qt.ArrowCursor)
 
+    def update_current_cursor_color(self):
+        self.update_cursor_color_based_on_background(
+            self.current_brush_cursor, self.current_layer(),
+            self.get_visible_current_image_region, self.get_current_pixmap,
+            self.update_color_time_current)
+
+    def update_color_time_current(self):
+        current_time = time.time()
+        if current_time - self.last_color_update_time_current < 0.2:
+            return False
+        self.last_color_update_time_current = current_time
+        return True
+
     def handle_master_mouse_press(self, event):
         self.setFocus()
         self.mouse_press_event(event)
@@ -425,6 +442,7 @@ class DoubleViewBase(ViewStrategy, QWidget, ViewSignals):
             scene_pos.x() - radius, scene_pos.y() - radius,
             size, size)
         if self.brush_cursor.isVisible():
+            self.update_current_cursor_color()
             self.current_brush_cursor.show()
         else:
             self.current_brush_cursor.hide()

shinestacker/retouch/view_strategy.py

@@ -1,5 +1,6 @@
 # pylint: disable=C0114, C0115, C0116, E0611, R0904, R0903, R0902, E1101, R0914, R0913, R0917
 import math
+import time
 from abc import abstractmethod
 import numpy as np
 from PySide6.QtCore import Qt, QPointF, QTime, QPoint, Signal, QRectF
@@ -116,6 +117,7 @@ class ViewStrategy(LayerCollectionHandler):
         self.last_brush_pos = None
         self.last_mouse_pos = None
         self.last_update_time = QTime.currentTime()
+        self.last_color_update_time = 0
 
     @abstractmethod
     def create_pixmaps(self):
@@ -236,6 +238,8 @@ class ViewStrategy(LayerCollectionHandler):
 
     def set_cursor_style(self, style):
         self.cursor_style = style
+        if style == 'preview':
+            self.show_brush_preview()
         self.update_brush_cursor()
 
     def get_cursor_style(self):
@@ -402,9 +406,12 @@ class ViewStrategy(LayerCollectionHandler):
         self.update_cursor_pen_width()
 
     def setup_simple_brush_style(self, center_x, center_y, radius):
+        if self.brush_cursor:
+            pen = self.brush_cursor.pen()
+        else:
+            pen = QPen(QColor(*gui_constants.BRUSH_COLORS['pen']), self.current_line_width())
         gradient = create_default_brush_gradient(center_x, center_y, radius, self.brush)
-        self.brush_cursor.setPen(QPen(QColor(*gui_constants.BRUSH_COLORS['pen']),
-                                      self.current_line_width()))
+        self.brush_cursor.setPen(pen)
         self.brush_cursor.setBrush(QBrush(gradient))
 
     def create_circle(self, scene, line_style=Qt.SolidLine):
@@ -469,10 +476,58 @@ class ViewStrategy(LayerCollectionHandler):
                 self.brush_preview.update(scene_pos, int(size))
         else:
             self.hide_brush_preview()
-            if self.cursor_style != 'outline':
-                self.setup_simple_brush_style(scene_pos.x(), scene_pos.y(), radius)
+        self.update_master_cursor_color()
+        if self.cursor_style == 'brush':
+            self.setup_simple_brush_style(scene_pos.x(), scene_pos.y(), radius)
         self.show_brush_cursor()
 
+    def update_color_time(self):
+        current_time = time.time()
+        if current_time - self.last_color_update_time < 0.2:
+            return False
+        self.last_color_update_time = current_time
+        return True
+
+    def update_master_cursor_color(self):
+        self.update_cursor_color_based_on_background(
+            self.brush_cursor, self.master_layer(),
+            self.get_visible_image_region, self.get_master_pixmap,
+            self.update_color_time)
+
+    def update_cursor_color_based_on_background(
+            self, cursor, layer,
+            visible_region, get_pixmap, update_timer):
+        if not update_timer():
+            return
+        cursor_rect = cursor.rect()
+        image_region = visible_region()
+        if image_region and cursor_rect.intersects(image_region):
+            intersect_rect = cursor_rect.intersected(image_region)
+            top_left = get_pixmap().mapFromScene(intersect_rect.topLeft())
+            bottom_right = get_pixmap().mapFromScene(intersect_rect.bottomRight())
+            x1, y1 = max(0, int(top_left.x())), max(0, int(top_left.y()))
+            x2, y2 = min(layer.shape[1], int(bottom_right.x())), \
+                min(layer.shape[0], int(bottom_right.y()))
+            if x2 > x1 and y2 > y1:
+                region = layer[y1:y2, x1:x2]
+                if region.size > 10000:
+                    step = int(math.sqrt(region.size / 100))
+                    region = region[::step, ::step]
+                if region.ndim == 3:
+                    luminosity = np.dot(region[..., :3], [0.299, 0.587, 0.114])
+                    avg_luminosity = np.mean(luminosity)
+                else:
+                    avg_luminosity = np.mean(region)
+                if region.dtype == np.uint16:
+                    avg_luminosity /= 256.0
+                if avg_luminosity < 128:
+                    new_color = QColor(255, 255, 255)
+                else:
+                    new_color = QColor(0, 0, 0)
+                current_pen = cursor.pen()
+                current_pen.setColor(new_color)
+                cursor.setPen(current_pen)
+
     def position_on_image(self, pos):
         master_view = self.get_master_view()
         pixmap = self.get_master_pixmap()
@@ -485,11 +540,20 @@ class ViewStrategy(LayerCollectionHandler):
             return None
         master_view = self.get_master_view()
         master_pixmap = self.get_master_pixmap()
-        pixmap = self.get_master_pixmap()
         view_rect = master_view.viewport().rect()
         scene_rect = master_view.mapToScene(view_rect).boundingRect()
         image_rect = master_pixmap.mapFromScene(scene_rect).boundingRect().toRect()
-        return image_rect.intersected(pixmap.boundingRect().toRect())
+        return image_rect.intersected(master_pixmap.boundingRect().toRect())
+
+    def get_visible_current_image_region(self):
+        if self.empty():
+            return None
+        current_view = self.get_current_view()
+        current_pixmap = self.get_current_pixmap()
+        view_rect = current_view.viewport().rect()
+        scene_rect = current_view.mapToScene(view_rect).boundingRect()
+        image_rect = current_pixmap.mapFromScene(scene_rect).boundingRect().toRect()
+        return image_rect.intersected(current_pixmap.boundingRect().toRect())
 
     def get_visible_image_portion(self):
         if self.has_no_master_layer():

{shinestacker-1.5.2.dist-info → shinestacker-1.5.3.dist-info}/METADATA

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

{shinestacker-1.5.2.dist-info → shinestacker-1.5.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 shinestacker/__init__.py,sha256=uq2fjAw2z_6TpH3mOcWFZ98GoEPRsNhTAK8N0MMm_e8,448
-shinestacker/_version.py,sha256=7jrl0OaiREGeLqi1Vco5z6ma0w6Mxq8kDBXuswywlc8,21
+shinestacker/_version.py,sha256=zG2cd7WLo5fIizFwE9xNzjpfZPff6uzTZIgsxS6ri_g,21
 shinestacker/algorithms/__init__.py,sha256=1FwVJ3w9GGbFFkjYJRUedTvcdE4j0ieSgaH9RC9iCY4,877
 shinestacker/algorithms/align.py,sha256=mb44u-YxZI1TTSHz81nRpX_2c8awlOhnGrK0LyfTQeQ,33543
 shinestacker/algorithms/align_auto.py,sha256=pJetw6zZEWQLouzcelkI8gD4cPiOp887ePXzVbm0E6Q,3800
@@ -22,17 +22,17 @@ shinestacker/algorithms/vignetting.py,sha256=gJOv-FN3GnTgaVn70W_6d-qbw3WmqinDiO9
 shinestacker/algorithms/white_balance.py,sha256=PMKsBtxOSn5aRr_Gkx1StHS4eN6kBN2EhNnhg4UG24g,501
 shinestacker/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shinestacker/app/about_dialog.py,sha256=pkH7nnxUP8yc0D3vRGd1jRb5cwi1nDVbQRk_OC9yLk8,4144
-shinestacker/app/args.py,sha256=TlfMR5GBd6Zz9wZNrN7CGJ1_hm1FnLZn5EoP5mkRHrk,776
+shinestacker/app/args_parser_opts.py,sha256=TlfMR5GBd6Zz9wZNrN7CGJ1_hm1FnLZn5EoP5mkRHrk,776
 shinestacker/app/gui_utils.py,sha256=fSpkwPXTON_l676UHdAnJNrGq7BPbSlPOiHpOF_LZaI,2519
 shinestacker/app/help_menu.py,sha256=g8lKG_xZmXtNQaC3SIRzyROKVWva_PLEgZsQWh6zUcQ,499
-shinestacker/app/main.py,sha256=dcitc5vwIIyIXeDfZwQnC7KHRCdd3FaVJWyaU8mK86c,10935
+shinestacker/app/main.py,sha256=UkWz4jvaBPH4Fs-arHe8H0NqKVTA4B_1e9BRn9S5oFo,10963
 shinestacker/app/open_frames.py,sha256=bsu32iJSYJQLe_tQQbvAU5DuMDVX6MRuNdE7B5lojZc,1488
-shinestacker/app/project.py,sha256=X98pK_mMtE_NefTUZfebEaP1YCsVY97hcQD4bSxuNyY,2777
-shinestacker/app/retouch.py,sha256=wlk-tHaei5YAFinGZWyzBopUhUqyxMT6jSH-4DMEwo8,2659
+shinestacker/app/project.py,sha256=_kopeyb8e5JAA3XjNXoCshlYBfT5Avw-kTqiJN4GVlo,2805
+shinestacker/app/retouch.py,sha256=On2oV2QonfMziQAvRkO6qw-h6E6wWQE0svKzZQKHeyg,2687
 shinestacker/config/__init__.py,sha256=aXxi-LmAvXd0daIFrVnTHE5OCaYeK1uf1BKMr7oaXQs,197
 shinestacker/config/config.py,sha256=eBko2D3ADhLTIm9X6hB_a_WsIjwgfE-qmBVkhP1XSvc,1636
 shinestacker/config/constants.py,sha256=EEdr7pZg4JpbIjUWaP7kJQfTuBB85FN739myDNAfn8A,8301
-shinestacker/config/gui_constants.py,sha256=Aqan-AdUjtlARXpsefQvWW2uKVv1tvwc0gfKyo7xud4,2787
+shinestacker/config/gui_constants.py,sha256=55Qr0KzrTx8eQHCkT-EVabSiD59VvLZIh5o2cA9028s,2791
 shinestacker/core/__init__.py,sha256=IUEIx6SQ3DygDEHN3_E6uKpHjHtUa4a_U_1dLd_8yEU,484
 shinestacker/core/colors.py,sha256=kr_tJA1iRsdck2JaYDb2lS-codZ4Ty9gdu3kHfiWvuM,1340
 shinestacker/core/core_utils.py,sha256=1LYj19Dfc9jZN9-4dlf1paximDH5WZYa7DXvKr7R7QY,1719
@@ -90,16 +90,16 @@ shinestacker/retouch/io_manager.py,sha256=JUAA--AK0mVa1PTErJTnBFjaXIle5Qs7Ow0Wkd
 shinestacker/retouch/layer_collection.py,sha256=fZlGrkm9-Ycc7AOzFSpImhafiTieBeCZRk-UlvlFHbo,5819
 shinestacker/retouch/overlaid_view.py,sha256=uIMolD1984uQPWXpd27tMvGBTcSrYT-4vxO0pWVlEO4,8686
 shinestacker/retouch/shortcuts_help.py,sha256=BFWTT5QvodqMhqa_9LI25hZqjICfckgyWG4fGrGzvnM,4283
-shinestacker/retouch/sidebyside_view.py,sha256=dN5uDG0ioFvYcbmZbx97slh4cOLmJ2T14jtTshg5F9w,17918
+shinestacker/retouch/sidebyside_view.py,sha256=2BrIrr38FxYJ522GLpHomScwbJgAczO9LiPwTAIlPUE,18647
 shinestacker/retouch/transformation_manager.py,sha256=NSHGUF-JFv4Y81gSvizjQCTp49TLo1so7c0WoUElO08,1812
 shinestacker/retouch/undo_manager.py,sha256=cKUkqnJtnJ-Hq-LQs5Bv49FC6qkG6XSw9oCVySJ8jS0,4312
 shinestacker/retouch/unsharp_mask_filter.py,sha256=Iapc8UmSVpj3V0LcJq_38P5qerRqTevMynbbk5Rk6iE,3634
-shinestacker/retouch/view_strategy.py,sha256=_Zo-SU2hlVVSv1g5eWgp72njcmfMpAlkkPggd89XJFo,23326
+shinestacker/retouch/view_strategy.py,sha256=Di0iaYwTMI58pheF51d9MBJ0eLDvJog1DnmBLNMMMRs,26100
 shinestacker/retouch/vignetting_filter.py,sha256=JhFr6OVIripQzSJrZEG4lxq7wBsmpofLqJQ-aP2bKw8,3789
 shinestacker/retouch/white_balance_filter.py,sha256=QlMnzWmBYqUQqckY8XTH3dWPdqo7mz4gTwTZafxldPw,8237
-shinestacker-1.5.2.dist-info/licenses/LICENSE,sha256=pWgb-bBdsU2Gd2kwAXxketnm5W_2u8_fIeWEgojfrxs,7651
-shinestacker-1.5.2.dist-info/METADATA,sha256=AuETmZdF7h5LSior9SUBcdWaiSmCxenl_9bECasvSLk,6978
-shinestacker-1.5.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shinestacker-1.5.2.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
-shinestacker-1.5.2.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
-shinestacker-1.5.2.dist-info/RECORD,,
+shinestacker-1.5.3.dist-info/licenses/LICENSE,sha256=pWgb-bBdsU2Gd2kwAXxketnm5W_2u8_fIeWEgojfrxs,7651
+shinestacker-1.5.3.dist-info/METADATA,sha256=8-9HAKfGrk6TEYj1rr_O6habe-0YlUGpHrrlhmQvRwY,6978
+shinestacker-1.5.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shinestacker-1.5.3.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
+shinestacker-1.5.3.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
+shinestacker-1.5.3.dist-info/RECORD,,