pygpt-net 2.6.67__py3-none-any.whl → 2.7.1__py3-none-any.whl

pygpt_net/ui/main.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.05 18:00:00                  #
+# Updated Date: 2025.12.28 00:00:00                  #
 # ================================================== #
 
 import os
@@ -335,6 +335,8 @@ class MainWindow(QMainWindow, QtStyleTools):
         self.controller.plugins.save_all()
         print("Saving tools...")
         self.tools.on_exit()
+        print("Closing clients...")
+        self.controller.kernel.close_clients()
         print("Saving layout state...")
         self.controller.layout.save()
         print("Stopping timers...")

pygpt_net/ui/widget/calendar/select.py

@@ -6,7 +6,7 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.08.24 23:00:00                  #
+# Updated Date: 2025.12.27 23:00:00                  #
 # ================================================== #
 
 from typing import Tuple
@@ -98,10 +98,10 @@ class CalendarSelect(QCalendarWidget):
         if theme != self._theme_cached:
             self._theme_cached = theme
             if isinstance(theme, str) and theme.startswith('dark'):
-                self._counter_bg = QColor(40, 40, 40)
+                self._counter_bg = QColor(70, 70, 70)
                 self._counter_font = QColor(255, 255, 255)
             else:
-                self._counter_bg = QColor(240, 240, 240)
+                self._counter_bg = QColor(200, 200, 200)
                 self._counter_font = QColor(0, 0, 0)
 
     def paintCell(self, painter, rect, date: QDate):

pygpt_net/ui/widget/draw/painter.py

@@ -6,12 +6,13 @@
 # GitHub:  https://github.com/szczyglis-dev/py-gpt   #
 # MIT License                                        #
 # Created By  : Marcin Szczygliński                  #
-# Updated Date: 2025.09.26 12:00:00                  #
+# Updated Date: 2025.12.28 14:30:00                  #
 # ================================================== #
 
 import datetime
 import os
 import bisect
+import math
 from collections import deque
 
 from PySide6.QtCore import Qt, QPoint, QPointF, QRect, QSize, QSaveFile, QIODevice, QTimer, Signal
@@ -42,6 +43,9 @@ class PainterWidget(QWidget):
         self._zoomSteps = [0.10, 0.25, 0.50, 0.75, 1.00, 1.50, 2.00, 5.00, 10.00]
         self._zoomResizeInProgress = False  # guard used during display-size updates caused by zoom
 
+        # Guard to mark an explicit logical canvas resize (controller-driven)
+        self._canvasResizeInProgress = False
+
         # Final composited image (canvas-sized). Kept for API compatibility.
         self.image = QImage(self._canvasSize, QImage.Format_RGB32)
 
@@ -152,6 +156,9 @@ class PainterWidget(QWidget):
         self._ctx_menu.addAction(self._act_save)
         self._ctx_menu.addAction(self._act_clear)
 
+        # Composite state: mark when self.image is out-of-date relative to layers
+        self._compositeDirty = True  # True => recomposition needed before exporting/copying
+
         # Allocate initial buffers
         self._ensure_layers()
         self._recompose()
@@ -166,6 +173,43 @@ class PainterWidget(QWidget):
         """
         self.tab = tab
 
+    # ---------- Canvas public API (explicit, zoom-independent) ----------
+
+    def set_canvas_size_pixels(self, width: int, height: int):
+        """
+        Explicitly set logical canvas size in pixels.
+        This never depends on view zoom and never uses parent/layout resizes.
+
+        :param width: canvas width in pixels
+        :param height: canvas height in pixels
+        """
+        w = max(1, int(width))
+        h = max(1, int(height))
+
+        if self._canvasSize.width() == w and self._canvasSize.height() == h:
+            # Keep display size consistent with current zoom
+            self._update_widget_size_from_zoom()
+            return
+
+        old_canvas = QSize(self._canvasSize)
+        self._canvasSize = QSize(w, h)
+
+        self._canvasResizeInProgress = True
+        try:
+            self._handle_canvas_resized(old_canvas, self._canvasSize)
+            # After logical resize, update the displayed size according to zoom
+            self._update_widget_size_from_zoom()
+        finally:
+            self._canvasResizeInProgress = False
+
+    def get_canvas_size(self) -> QSize:
+        """
+        Return current logical canvas size (pixels).
+
+        :return: QSize of canvas
+        """
+        return QSize(self._canvasSize)
+
     # ---------- Zoom public API ----------
 
     def on_zoom_combo_changed(self, text: str):
@@ -371,6 +415,26 @@ class PainterWidget(QWidget):
         h = int(round(rc.height() * self.zoom))
         return QRect(x, y, w, h)
 
+    def _widget_rect_to_canvas_rect(self, rc: QRect) -> QRect:
+        """
+        Map a widget rect (in display pixels) to a canvas rect (in canvas pixels).
+        Uses floor/ceil to ensure coverage and clamps to canvas bounds.
+        """
+        if rc.isNull() or rc.width() <= 0 or rc.height() <= 0:
+            return QRect()
+        inv = 1.0 / max(1e-6, self.zoom)
+        x1 = int(math.floor(rc.x() * inv))
+        y1 = int(math.floor(rc.y() * inv))
+        x2 = int(math.ceil((rc.x() + rc.width()) * inv))
+        y2 = int(math.ceil((rc.y() + rc.height()) * inv))
+        x1 = max(0, min(self._canvasSize.width(), x1))
+        y1 = max(0, min(self._canvasSize.height(), y1))
+        x2 = max(0, min(self._canvasSize.width(), x2))
+        y2 = max(0, min(self._canvasSize.height(), y2))
+        w = max(0, x2 - x1)
+        h = max(0, y2 - y1)
+        return QRect(x1, y1, w, h)
+
     def _parse_percent(self, text: str) -> int | None:
         """
         Parse '150%' -> 150.
@@ -392,6 +456,19 @@ class PainterWidget(QWidget):
 
     # ---------- Layer & composition helpers ----------
 
+    def _mark_composite_dirty(self):
+        """Mark the composited image cache as dirty."""
+        self._compositeDirty = True
+
+    def _ensure_composited_image(self):
+        """
+        Ensure that self.image reflects current baseCanvas + drawingLayer.
+        This is used for exporting/copying, not for on-screen painting.
+        """
+        if self._compositeDirty:
+            self._recompose()
+            self._compositeDirty = False
+
     def _ensure_layers(self):
         """Ensure baseCanvas, drawingLayer, and image are allocated to current canvas size."""
         sz = self._canvasSize
@@ -401,14 +478,17 @@ class PainterWidget(QWidget):
         if self.baseCanvas is None or self.baseCanvas.size() != sz:
             self.baseCanvas = QImage(sz, QImage.Format_RGB32)
             self.baseCanvas.fill(Qt.white)
+            self._mark_composite_dirty()
 
         if self.drawingLayer is None or self.drawingLayer.size() != sz:
             self.drawingLayer = QImage(sz, QImage.Format_ARGB32_Premultiplied)
             self.drawingLayer.fill(Qt.transparent)
+            self._mark_composite_dirty()
 
         if self.image.size() != sz:
             self.image = QImage(sz, QImage.Format_RGB32)
             self.image.fill(Qt.white)
+            self._mark_composite_dirty()
 
     def _rescale_base_from_source(self):
         """Rebuild baseCanvas from sourceImageOriginal to fit current canvas, preserving aspect ratio."""
@@ -416,6 +496,7 @@ class PainterWidget(QWidget):
         self.baseCanvas.fill(Qt.white)
         self.baseTargetRect = QRect()
         if self.sourceImageOriginal is None or self.sourceImageOriginal.isNull():
+            self._mark_composite_dirty()
             return
 
         canvas_size = self._canvasSize
@@ -429,6 +510,7 @@ class PainterWidget(QWidget):
         p.setRenderHint(QPainter.SmoothPixmapTransform, True)
         p.drawImage(self.baseTargetRect, src)
         p.end()
+        self._mark_composite_dirty()
 
     def _recompose(self):
         """Compose final canvas image from baseCanvas + drawingLayer."""
@@ -486,49 +568,62 @@ class PainterWidget(QWidget):
             self.sourceImageOriginal = QImage(state['src']) if state['src'] is not None else None
             self.baseTargetRect = QRect(state['baseRect']) if state['baseRect'] is not None else QRect()
 
-            self._recompose()
+            self._mark_composite_dirty()
             self._update_widget_size_from_zoom()
             self.update()
 
     def _is_fit_available(self) -> bool:
         """
         Return True if there are letterbox margins that can be trimmed.
+        Uses lightweight checks to avoid heavy full-image scans during menu opening.
 
         :return: True if fit action is available
         """
-        self._recompose()
-
+        # If the scaled source does not cover the whole canvas, trimming is possible
         if self.baseTargetRect.isValid() and not self.baseTargetRect.isNull():
             if self.baseTargetRect.width() < self._canvasSize.width() or self.baseTargetRect.height() < self._canvasSize.height():
                 return True
 
-        bounds = self._detect_nonwhite_bounds(self.image)
+        # Otherwise, if there is any non-transparent stroke content that doesn't span entire canvas, fit may trim
+        bounds = self._detect_nontransparent_bounds(self.drawingLayer)
         if bounds is not None:
             return bounds.width() < self._canvasSize.width() or bounds.height() < self._canvasSize.height()
         return False
 
-    def action_fit(self):
-        """Trim white letterbox margins and resize canvas to the scaled image area. Undo-safe."""
-        if not self._is_fit_available():
-            return
-
-        self.saveForUndo()
-        self._ensure_layers()
-        self._recompose()
+    def _compute_fit_rect(self) -> QRect | None:
+        """
+        Compute a fit rectangle based on the scaled source rect and drawn content.
+        This avoids recomposing a full image and scanning all pixels in RGB.
+        """
+        if self._canvasSize.isEmpty():
+            return None
+        canvas_rect = QRect(0, 0, self._canvasSize.width(), self._canvasSize.height())
+        result = None
 
-        fit_rect = None
         if self.baseTargetRect.isValid() and not self.baseTargetRect.isNull():
-            canvas_rect = QRect(0, 0, self._canvasSize.width(), self._canvasSize.height())
-            fit_rect = self.baseTargetRect.intersected(canvas_rect)
+            result = self.baseTargetRect.intersected(canvas_rect)
 
-        if fit_rect is None or fit_rect.isNull() or fit_rect.width() <= 0 or fit_rect.height() <= 0:
-            fit_rect = self._detect_nonwhite_bounds(self.image)
-            if fit_rect is None or fit_rect.isNull() or fit_rect.width() <= 0 or fit_rect.height() <= 0:
-                return
+        draw_bounds = self._detect_nontransparent_bounds(self.drawingLayer)
+        if draw_bounds is not None and not draw_bounds.isNull():
+            result = draw_bounds if result is None else result.united(draw_bounds)
+
+        if result is None or result.isNull():
+            return None
+        return result
+
+    def action_fit(self):
+        """Trim white letterbox margins and resize canvas to the scaled image area. Undo-safe."""
+        # Use lightweight fit computation
+        fit_rect = self._compute_fit_rect()
+        if fit_rect is None:
+            return
 
         if fit_rect.width() == self._canvasSize.width() and fit_rect.height() == self._canvasSize.height():
             return
 
+        self.saveForUndo()
+        self._ensure_layers()
+
         new_base = self.baseCanvas.copy(fit_rect)
         new_draw = self.drawingLayer.copy(fit_rect)
 
@@ -536,6 +631,7 @@ class PainterWidget(QWidget):
             'base': QImage(new_base),
             'draw': QImage(new_draw),
         }
+        self._mark_composite_dirty()
 
         self.window.controller.painter.common.change_canvas_size(f"{fit_rect.width()}x{fit_rect.height()}")
         self.update()
@@ -611,6 +707,61 @@ class PainterWidget(QWidget):
 
         return QRect(left, top, right - left + 1, bottom - top + 1)
 
+    def _detect_nontransparent_bounds(self, img: QImage) -> QRect | None:
+        """
+        Fast bounds detection for drawing layer: scans alpha channel only.
+
+        :param img: ARGB image
+        :return: QRect of non-transparent content or None
+        """
+        if img is None or img.isNull():
+            return None
+        w, h = img.width(), img.height()
+        if w <= 0 or h <= 0:
+            return None
+
+        left = -1
+        for x in range(w):
+            for y in range(h):
+                if img.pixelColor(x, y).alpha() > 0:
+                    left = x
+                    break
+            if left != -1:
+                break
+        if left == -1:
+            return None
+
+        right = -1
+        for x in range(w - 1, -1, -1):
+            for y in range(h):
+                if img.pixelColor(x, y).alpha() > 0:
+                    right = x
+                    break
+            if right != -1:
+                break
+
+        top = -1
+        for y in range(h):
+            for x in range(left, right + 1):
+                if img.pixelColor(x, y).alpha() > 0:
+                    top = y
+                    break
+            if top != -1:
+                break
+
+        bottom = -1
+        for y in range(h - 1, -1, -1):
+            for x in range(left, right + 1):
+                if img.pixelColor(x, y).alpha() > 0:
+                    bottom = y
+                    break
+            if bottom != -1:
+                break
+
+        if right < left or bottom < top:
+            return None
+        return QRect(left, top, right - left + 1, bottom - top + 1)
+
     # ---------- Public API (clipboard, file, actions) ----------
 
     def handle_paste(self):
@@ -624,7 +775,7 @@ class PainterWidget(QWidget):
 
     def handle_copy(self):
         """Handle clipboard copy"""
-        self._recompose()
+        self._ensure_composited_image()
         clipboard = QApplication.clipboard()
         clipboard.setImage(self.image)
 
@@ -636,12 +787,15 @@ class PainterWidget(QWidget):
         """
         self._act_undo.setEnabled(self.has_undo())
         self._act_redo.setEnabled(self.has_redo())
-        self._act_fit.setEnabled(self._is_fit_available())
 
+        # Enable paste based on clipboard; avoid heavy 'fit' checks here to keep menu snappy
         clipboard = QApplication.clipboard()
         mime_data = clipboard.mimeData()
         self._act_paste.setEnabled(bool(mime_data.hasImage()))
 
+        # Keep Fit enabled; the action validates availability when executed
+        self._act_fit.setEnabled(True)
+
         self._ctx_menu.exec(event.globalPos())
 
     def action_open(self):
@@ -662,7 +816,7 @@ class PainterWidget(QWidget):
 
     def action_save(self):
         """Save image to file"""
-        self._recompose()
+        self._ensure_composited_image()
         name = datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S") + ".png"
         path, _ = QFileDialog.getSaveFileName(
             self,
@@ -706,7 +860,7 @@ class PainterWidget(QWidget):
             self._ensure_layers()
             self._rescale_base_from_source()
             self.drawingLayer.fill(Qt.transparent)
-            self._recompose()
+            self._mark_composite_dirty()
         else:
             pass
 
@@ -728,7 +882,7 @@ class PainterWidget(QWidget):
             self._ensure_layers()
             self._rescale_base_from_source()
             self.drawingLayer.fill(Qt.transparent)
-            self._recompose()
+            self._mark_composite_dirty()
         self.update()
 
     def scale_to_fit(self, image):
@@ -744,7 +898,7 @@ class PainterWidget(QWidget):
     def saveForUndo(self):
         """Save current state for undo"""
         self._ensure_layers()
-        self._recompose()
+        self._ensure_composited_image()
         self.undoStack.append(self._snapshot_state())
         self.redoStack.clear()
 
@@ -831,7 +985,7 @@ class PainterWidget(QWidget):
 
             return self._save_image_atomic(result, path)
 
-        self._recompose()
+        self._ensure_composited_image()
         return self._save_image_atomic(self.image, path)
 
     def _save_image_atomic(self, img: QImage, path: str, fmt: str = None, quality: int = -1) -> bool:
@@ -911,7 +1065,7 @@ class PainterWidget(QWidget):
         self.sourceImageOriginal = None
         self.baseCanvas.fill(Qt.white)
         self.drawingLayer.fill(Qt.transparent)
-        self._recompose()
+        self._mark_composite_dirty()
         self.update()
 
     # ---------- Crop tool ----------
@@ -950,6 +1104,7 @@ class PainterWidget(QWidget):
             'base': QImage(new_base),
             'draw': QImage(new_draw),
         }
+        self._mark_composite_dirty()
 
         if self.sourceImageOriginal is not None and not self.baseTargetRect.isNull():
             inter = sel.intersected(self.baseTargetRect)
@@ -1171,6 +1326,20 @@ class PainterWidget(QWidget):
             return
         super().wheelEvent(event)
 
+    def _dirty_canvas_rect_for_point(self, pt_canvas: QPoint, pen_width: int) -> QRect:
+        """Compute dirty canvas rect around a single painted point."""
+        r = max(1, int(math.ceil(pen_width / 2))) + 2
+        return QRect(pt_canvas.x() - r, pt_canvas.y() - r, 2 * r + 1, 2 * r + 1)
+
+    def _dirty_canvas_rect_for_segment(self, a: QPoint, b: QPoint, pen_width: int) -> QRect:
+        """Compute dirty canvas rect for a line segment between two canvas points."""
+        x1 = min(a.x(), b.x())
+        y1 = min(a.y(), b.y())
+        x2 = max(a.x(), b.x())
+        y2 = max(a.y(), b.y())
+        pad = max(1, int(math.ceil(pen_width / 2))) + 2
+        return QRect(x1 - pad, y1 - pad, (x2 - x1) + 2 * pad + 1, (y2 - y1) + 2 * pad + 1)
+
     def mousePressEvent(self, event):
         """
         Mouse press event
@@ -1213,8 +1382,11 @@ class PainterWidget(QWidget):
                 p.setPen(self._pen)
             p.drawPoint(self.lastPointCanvas)
             p.end()
-            self._recompose()
-            self.update()
+            self._mark_composite_dirty()
+
+            # Update only the affected region
+            dirty_canvas = self._dirty_canvas_rect_for_point(self.lastPointCanvas, self.brushSize)
+            self.update(self._from_canvas_rect(dirty_canvas))
 
     def mouseMoveEvent(self, event):
         """
@@ -1248,9 +1420,12 @@ class PainterWidget(QWidget):
                 p.setPen(self._pen)
             p.drawLine(self.lastPointCanvas, cur)
             p.end()
+            self._mark_composite_dirty()
+
+            # Update only the affected region for this segment
+            dirty_canvas = self._dirty_canvas_rect_for_segment(self.lastPointCanvas, cur, self.brushSize)
             self.lastPointCanvas = cur
-            self._recompose()
-            self.update()
+            self.update(self._from_canvas_rect(dirty_canvas))
 
     def mouseReleaseEvent(self, event):
         """
@@ -1293,14 +1468,22 @@ class PainterWidget(QWidget):
 
         :param event: Event
         """
-        if self.image.size() != self._canvasSize:
+        # Ensure layers are valid; avoid recomposing the full image here.
+        if self.baseCanvas is None or self.drawingLayer is None:
             self._ensure_layers()
-            self._rescale_base_from_source()
-            self._recompose()
 
         p = QPainter(self)
-        # Draw composited canvas scaled to display rect
-        p.drawImage(self.rect(), self.image, self.image.rect())
+
+        # Paint only the region requested by Qt; map it to canvas to avoid scaling the whole image.
+        target_rect = event.rect()
+        if not target_rect.isNull():
+            src_rect = self._widget_rect_to_canvas_rect(target_rect)
+            if not src_rect.isNull():
+                # Draw base
+                p.drawImage(target_rect, self.baseCanvas, src_rect)
+                # Draw strokes on top
+                p.setCompositionMode(QPainter.CompositionMode_SourceOver)
+                p.drawImage(target_rect, self.drawingLayer, src_rect)
 
         # Draw crop overlay if active (convert canvas selection to display coords)
         if self.cropping and not self._selectionRect.isNull():
@@ -1322,30 +1505,33 @@ class PainterWidget(QWidget):
             p.drawRect(sel_view.adjusted(0, 0, -1, -1))
 
         p.end()
-        self.originalImage = self.image
+        # Leave self.image stale until explicitly requested; avoids recomposition on every frame.
 
     def resizeEvent(self, event):
         """
-        Update layers on canvas size change; ignore display-only resizes from zoom.
-
-        :param event: Event
+        Update layers on canvas size change; ignore layout/display resizes unless explicitly requested.
+        Only two kinds of resizes are acted upon:
+        - canvas resize requested via set_canvas_size_pixels() -> _canvasResizeInProgress
+        - display-only resizes initiated by zoom -> _zoomResizeInProgress
+        Any other widget/layout resize will be ignored for canvas logic.
         """
         new_widget_size = event.size()
-        expected_display = QSize(max(1, int(round(self._canvasSize.width() * self.zoom))),
-                                 max(1, int(round(self._canvasSize.height() * self.zoom))))
 
-        # External canvas resize (e.g. controller.change_canvas_size -> setFixedSize(canvas))
-        if new_widget_size != expected_display and not self._zoomResizeInProgress:
-            old_canvas = QSize(self._canvasSize)
-            # Adopt widget size as the new logical canvas size
-            self._canvasSize = QSize(new_widget_size)
-            self._handle_canvas_resized(old_canvas, self._canvasSize)
-            # After canvas change, enforce current zoom on the display size
+        # Explicit logical canvas resize requested by controller
+        if self._canvasResizeInProgress:
+            # Already updated _canvasSize in setter; ensure display size is in sync
             self._update_widget_size_from_zoom()
             super().resizeEvent(event)
             return
 
         # Display-only resize caused by zoom update: nothing to do with buffers
+        if self._zoomResizeInProgress:
+            self.update()
+            super().resizeEvent(event)
+            return
+
+        # Ignore stray layout-driven resizes; enforce current display size from zoom
+        self._update_widget_size_from_zoom()
         self.update()
         super().resizeEvent(event)
 
@@ -1390,6 +1576,7 @@ class PainterWidget(QWidget):
 
             self._pendingResizeApply = None
             self.baseTargetRect = QRect(0, 0, self.baseCanvas.width(), self.baseCanvas.height())
+            self._mark_composite_dirty()
         else:
             # Rebuild background from original source
             self._rescale_base_from_source()
@@ -1398,8 +1585,8 @@ class PainterWidget(QWidget):
             if old_size.isValid() and (old_size.width() > 0 and old_size.height() > 0) and \
                     (self.drawingLayer is not None) and (self.drawingLayer.size() != new_size):
                 self.drawingLayer = self.drawingLayer.scaled(new_size, Qt.IgnoreAspectRatio, Qt.SmoothTransformation)
+                self._mark_composite_dirty()
 
-        self._recompose()
         self.update()
 
     def eventFilter(self, source, event):