ok-script 1.0.141__tar.gz → 1.0.142__tar.gz

{ok_script-1.0.141 → ok_script-1.0.142}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 1.0.141
+Version: 1.0.142
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking

{ok_script-1.0.141 → ok_script-1.0.142}/ok/gui/debug/OverlayWidget.py

@@ -170,6 +170,7 @@ class OverlayWidget(QWidget):
             self.paint_alt_overlay(painter)
             if og.config.get('debug_cover_uid'):
                 self.paint_uid_cover(painter)
+        self.paint_custom(painter)
 
     def set_blur_patches(self, patches):
         images = []
@@ -196,8 +197,18 @@ class OverlayWidget(QWidget):
         for x, y, width, height, image in self.blur_images:
             painter.drawImage(QRectF(x * frame_ratio, y * frame_ratio,
                                      width * frame_ratio, height * frame_ratio), image)
-
-    def paint_alt_overlay(self, painter):
+
+    def paint_custom(self, painter):
+        for key, callback in list(getattr(self, 'custom_painters', {}).items()):
+            painter.save()
+            try:
+                callback(painter, self)
+            except Exception as e:
+                logger.warning(f'custom overlay painter {key} failed: {e}')
+            finally:
+                painter.restore()
+
+    def paint_alt_overlay(self, painter):
         if not getattr(self, '_is_alt_down', False):
             return
             

{ok_script-1.0.141 → ok_script-1.0.142}/ok/gui/overlay/OverlayWindow.py

@@ -16,6 +16,9 @@ class Communicate(QObject):
 
 
 class OverlayWindow(OverlayWidget):
+    custom_draw_requested = Signal(str, object, object)
+    custom_clear_requested = Signal(object)
+
     def __init__(self, hwnd_window: HwndWindow):
         super().__init__()
         self._source_visible = False
@@ -27,6 +30,8 @@ class OverlayWindow(OverlayWidget):
         self._boxes_until = 0
         self._custom_drawing_active = False
         self._custom_drawing_until = 0
+        self.custom_painters = {}
+        self._custom_painter_until = {}
         # Set translucent background
         self.setAttribute(Qt.WA_TranslucentBackground)
 
@@ -39,6 +44,8 @@ class OverlayWindow(OverlayWidget):
         communicate.clear_box.connect(self.clear_drawing)
         communicate.blur_overlay.connect(self.update_blur_patches)
         communicate.clear_blur_overlay.connect(self.clear_blur_overlay)
+        self.custom_draw_requested.connect(self._set_custom_draw, Qt.QueuedConnection)
+        self.custom_clear_requested.connect(self._clear_custom_draw, Qt.QueuedConnection)
 
         # self.update_overlay(hwnd_window.visible, hwnd_window.x, hwnd_window.y, hwnd_window.window_width,
         #                     hwnd_window.window_height, hwnd_window.width, hwnd_window.height, hwnd_window.scaling)
@@ -65,6 +72,46 @@ class OverlayWindow(OverlayWidget):
         self.update()
         QTimer.singleShot(int(duration * 1000) + 10, self.expire_custom_drawing)
 
+    def draw(self, key, callback, duration=None):
+        """Schedule arbitrary painting with callback(QPainter, OverlayWindow)."""
+        if not callable(callback):
+            raise TypeError('callback must be callable')
+        self.custom_draw_requested.emit(str(key), callback, duration)
+
+    def clear_draw(self, key=None):
+        """Remove one custom painter, or all painters when key is None."""
+        self.custom_clear_requested.emit(key)
+
+    def _set_custom_draw(self, key, callback, duration):
+        self.custom_painters[key] = callback
+        if duration is None:
+            self._custom_painter_until.pop(key, None)
+        else:
+            duration = max(0.0, float(duration))
+            self._custom_painter_until[key] = time.monotonic() + duration
+            QTimer.singleShot(int(duration * 1000) + 10, lambda: self._expire_custom_draw(key))
+        self.refresh_visibility()
+        self.update()
+
+    def _clear_custom_draw(self, key):
+        if key is None:
+            self.custom_painters.clear()
+            self._custom_painter_until.clear()
+        else:
+            key = str(key)
+            self.custom_painters.pop(key, None)
+            self._custom_painter_until.pop(key, None)
+        self.refresh_visibility()
+        self.update()
+
+    def _expire_custom_draw(self, key):
+        until = self._custom_painter_until.get(key)
+        if until is not None and time.monotonic() >= until:
+            self.custom_painters.pop(key, None)
+            self._custom_painter_until.pop(key, None)
+            self.refresh_visibility()
+            self.update()
+
     def on_draw_box(self, key, boxes, color, frame, debug):
         if boxes and self._boxes_enabled:
             self._boxes_active = True
@@ -100,7 +147,8 @@ class OverlayWindow(OverlayWidget):
         self.refresh_visibility()
 
     def refresh_visibility(self):
-        required = self._boxes_active or self._custom_drawing_active or bool(self.blur_images)
+        required = (self._boxes_active or self._custom_drawing_active
+                    or bool(self.blur_images) or bool(self.custom_painters))
         if self._source_visible and required and not self.isVisible():
             self.show()
             return

{ok_script-1.0.141 → ok_script-1.0.142}/ok/task/task.py

@@ -118,7 +118,7 @@ class ExecutorOperation:
         self._app.start_controller.start_device()
 
     def get_overlay_view(self):
-        """Return the shared overlay widget when running with the GUI."""
+        """Return the raw shared overlay widget when running with the GUI."""
         if hasattr(self._app, 'get_overlay_view'):
             return self._app.get_overlay_view()
         return None

{ok_script-1.0.141 → ok_script-1.0.142}/ok_script.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 1.0.141
+Version: 1.0.142
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking