CreativePython 1.1.4__tar.gz → 1.1.6__tar.gz

{creativepython-1.1.4/src/CreativePython.egg-info → creativepython-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CreativePython
-Version: 1.1.4
+Version: 1.1.6
 Summary: A Python-based software environment for developing algorithmic art projects.
 Author-email: "Dr. Bill Manaris" <manaris@cofc.edu>, Taj Ballinger <ballingertj@g.cofc.edu>, Trevor Ritchie <ritchiets@g.cofc.edu>
 License: MIT License

{creativepython-1.1.4 → creativepython-1.1.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "CreativePython"
-version = "1.1.4"
+version = "1.1.6"
 description = "A Python-based software environment for developing algorithmic art projects."
 readme = "README.md"
 license = { file = "LICENSE" }

{creativepython-1.1.4 → creativepython-1.1.6}/src/CreativePython/GuiHandler.py

@@ -86,11 +86,20 @@ def _launchRenderer(childCommandConnection, childPriorityConnection, parentPrior
 
    parentPriorityConnection.close()   # child must not hold the parent end open
 
-   # Redirect stderr (fd 2) to a log file so both Python tracebacks and C-level
-   # output from Qt/Cocoa/XPC are captured for diagnostics.
-   # The log is removed on clean exit if nothing was written to it.
-   _logPath = os.path.join(os.getcwd(), "PENCIL_debug.log")
-   _logFile = open(_logPath, "w")
+   # Set to True to redirect stderr to PENCIL_debug.log for diagnostics.
+   # When False, stderr is silenced (sent to /dev/null) to suppress Qt/Cocoa noise.
+   _DEBUG_LOG = False
+
+   if _DEBUG_LOG:
+      # Redirect stderr (fd 2) to a log file so both Python tracebacks and C-level
+      # output from Qt/Cocoa/XPC are captured for diagnostics.
+      # The log is removed on clean exit if nothing was written to it.
+      _logPath = os.path.join(os.getcwd(), "PENCIL_debug.log")
+      _logFile = open(_logPath, "w")
+   else:
+      _logPath = None
+      _logFile = open(os.devnull, "w")
+
    os.dup2(_logFile.fileno(), 2)
    sys.stderr = _logFile
 
@@ -103,7 +112,7 @@ def _launchRenderer(childCommandConnection, childPriorityConnection, parentPrior
       raise
    finally:
       _logFile.flush()
-      if os.path.getsize(_logPath) == 0:
+      if _DEBUG_LOG and _logPath and os.path.getsize(_logPath) == 0:
          try:
             _logFile.close()
             os.unlink(_logPath)

{creativepython-1.1.4 → creativepython-1.1.6}/src/CreativePython/GuiRenderer.py

@@ -549,9 +549,10 @@ class _QtGraphicsItemEventMixin:
       pos  = event.scenePos()
       args = [int(pos.x()), int(pos.y())]
       self._send('mouseDown', args)
-      # register this item for drag delivery during subsequent mouse moves
+      # register this item for release and drag delivery during subsequent mouse events
       view = self._qtview()
       if view is not None:
+         view._pressedItems.append(self._mirror.objectId)   # track for manual release delivery (see QtView.mouseReleaseEvent)
          if (self._mirror.objectId, 'mouseDrag') in self._mirror.guiRenderer._registeredEvents:
             view._draggingItems.append(self._mirror.objectId)
       event.ignore()   # allow cascade to items below
@@ -623,7 +624,30 @@ class _QPolygonItem(_QtGraphicsItemEventMixin, QtWidgets.QGraphicsPolygonItem):
    pass
 
 class _QPixmapItem(_QtGraphicsItemEventMixin, QtWidgets.QGraphicsPixmapItem):
-   pass
+   _colorFilter = None   # (r, g, b, a) set by IconMirror._applyColor; None = no filter
+
+   def paint(self, painter, option, widget=None):
+      if self._colorFilter is None:
+         super().paint(painter, option, widget)
+         return
+
+      pixmap = self.pixmap()
+      if pixmap.isNull():
+         return
+
+      r, g, b, a = self._colorFilter
+      image = pixmap.toImage().convertToFormat(QtGui.QImage.Format.Format_ARGB32)
+
+      filtered = QtGui.QImage(image.size(), QtGui.QImage.Format.Format_ARGB32)
+      filtered.fill(QtCore.Qt.GlobalColor.transparent)
+
+      p = QtGui.QPainter(filtered)
+      p.drawImage(0, 0, image)
+      p.setCompositionMode(QtGui.QPainter.CompositionMode.CompositionMode_SourceOver)
+      p.fillRect(image.rect(), QtGui.QColor(r, g, b, a))
+      p.end()
+
+      painter.drawImage(self.offset(), filtered)
 
 class _QGroupItem(_QtGraphicsItemEventMixin, QtWidgets.QGraphicsItemGroup):
    pass
@@ -653,6 +677,7 @@ class QtView(QtWidgets.QGraphicsView):
       self._display       = displayMirror
       self._pressPos      = None   # QPointF scene pos at last press
       self._draggingItems = []     # objectIds wanting drag events
+      self._pressedItems  = []     # objectIds of items that received the last mousePressEvent
 
    # ── Helpers ────────────────────────────────────────────────────────────────
 
@@ -679,16 +704,28 @@ class QtView(QtWidgets.QGraphicsView):
 
    def mouseReleaseEvent(self, event):
       x, y = self._sceneXY(event)
-      super().mouseReleaseEvent(event)  # → item cascade via mixin
+
+      # Items call event.ignore() in mousePressEvent to allow cascade, so Qt never
+      # sets a mouse grabber and mouseReleaseEvent is never routed to items normally.
+      # Manually deliver mouseUp and mouseClick using the objectIds tracked at press time,
+      # mirroring the _draggingItems pattern used for mouseDrag.
+      registered = self._display.guiRenderer._registeredEvents
+      pos        = self.mapToScene(event.position().toPoint())
+      is_click   = (self._pressPos is not None
+                    and abs(pos.x() - self._pressPos.x()) <= _QtGraphicsItemEventMixin._CLICK_THRESHOLD
+                    and abs(pos.y() - self._pressPos.y()) <= _QtGraphicsItemEventMixin._CLICK_THRESHOLD)
+      for objectId in self._pressedItems:
+         if (objectId, 'mouseUp') in registered:
+            self._display.guiRenderer.sendEvent('mouseUp', objectId, [x, y])
+         if is_click and (objectId, 'mouseClick') in registered:
+            self._display.guiRenderer.sendEvent('mouseClick', objectId, [x, y])
+
       self._sendDisplay('mouseUp', [x, y])
-      if self._pressPos is not None:
-         pos = self.mapToScene(event.position().toPoint())
-         dx  = abs(pos.x() - self._pressPos.x())
-         dy  = abs(pos.y() - self._pressPos.y())
-         if dx <= _QtGraphicsItemEventMixin._CLICK_THRESHOLD and dy <= _QtGraphicsItemEventMixin._CLICK_THRESHOLD:
-            self._sendDisplay('mouseClick', [x, y])
+      if is_click:
+         self._sendDisplay('mouseClick', [x, y])
       self._pressPos      = None
       self._draggingItems = []
+      self._pressedItems  = []
 
    def mouseMoveEvent(self, event):
       x, y = self._sceneXY(event)
@@ -1674,15 +1711,12 @@ class _DrawableMirror:
       self._rotation     = 0
       self._toolTipText  = None
 
-      # GuiRenderer only handles commands that alter an object visually,
-      # or that rely on hit testing.  Everything else is handled in gui.py
+      # GuiRenderer only handles commands that alter an object visually.
+      # Hit testing (contains/intersects/encloses) is handled entirely in gui.py.
       self._commandHandlers = {
          'setPosition':      self._setPosition,
          'setSize':          self._setSize,
          'setRotation':      self._setRotation,
-         'contains':         self._contains,
-         'intersects':       self._intersects,
-         'encloses':         self._encloses,
          'setToolTipText':   self._setToolTipText,
          'show':             self._show,
          'hide':             self._hide,
@@ -1745,43 +1779,6 @@ class _DrawableMirror:
       self.qObject.prepareGeometryChange()
       self.qObject.setRotation(qtDegree)
 
-   # ── Hit testing ────────────────────────────────────────────────────────────
-
-   def _contains(self, args, responseId):
-      """Returns True if the point (x, y) is inside this item."""
-      x           = args.get('x', 0)
-      y           = args.get('y', 0)
-      globalPoint = QtCore.QPointF(x, y)
-      localPoint  = self.qObject.mapFromScene(globalPoint)
-      result      = self.qObject.contains(localPoint)
-      self.guiRenderer.sendResponse(responseId, [result])
-
-   def _intersects(self, args, responseId):
-      """Returns True if this item intersects another item."""
-      otherObjectId = args.get('otherObjectId')
-      otherMirror   = self.guiRenderer._objectRegistry.get(otherObjectId)
-      result        = False
-
-      if otherMirror is not None:
-         pathA  = self.qObject.mapToScene(self.qObject.shape())
-         pathB  = otherMirror.qObject.mapToScene(otherMirror.qObject.shape())
-         result = pathA.intersects(pathB)
-
-      self.guiRenderer.sendResponse(responseId, [result])
-
-   def _encloses(self, args, responseId):
-      """Returns True if this item fully encloses another item."""
-      otherObjectId = args.get('otherObjectId')
-      otherMirror   = self.guiRenderer._objectRegistry.get(otherObjectId)
-      result        = False
-
-      if otherMirror is not None:
-         pathA  = self.qObject.mapToScene(self.qObject.shape())
-         pathB  = otherMirror.qObject.mapToScene(otherMirror.qObject.shape())
-         result = pathA.contains(pathB)
-
-      self.guiRenderer.sendResponse(responseId, [result])
-
    # ── Visibility ─────────────────────────────────────────────────────────────
 
    def _show(self, args, responseId):
@@ -2391,6 +2388,7 @@ class PolygonMirror(_GraphicsMirror):
 # IconMirror  —  mirror of gui.py's Icon
 #######################################################################################
 
+
 class IconMirror(_GraphicsMirror):
    """
    Mirror of gui.py's Icon.  Backed by a QGraphicsPixmapItem.
@@ -2460,16 +2458,25 @@ class IconMirror(_GraphicsMirror):
          'getPixels': self._getPixels,
          'setPixels': self._setPixels,
          'write':     self._write,
+         'setAlpha':  self._setAlpha,
       })
 
    def _applyColor(self):
-      """No-op — QGraphicsPixmapItem has no pen or brush."""
-      pass
+      r, g, b, a = self._color
+      if [r, g, b, a] == [0, 0, 0, 0]:
+         self.qObject._colorFilter = None
+      else:
+         self.qObject._colorFilter = (r, g, b, a)
+      self.qObject.update()
 
    def _applyThickness(self):
       """No-op — QGraphicsPixmapItem has no pen or brush."""
       pass
 
+   def _setAlpha(self, args, responseId):
+      alpha = args.get('alpha', 255)
+      self.qObject.setOpacity(alpha / 255.0)
+
    # ── Size ───────────────────────────────────────────────────────────────────
 
    def _getSize(self, args, responseId):
@@ -2908,8 +2915,7 @@ class _ControlMirror(_DrawableMirror):
    - dimensions: setRect(), setPath(), etc. -> setFixedSize()
    - color: [r, g, b] -> stylesheets
 
-   Controls have no hit-testing (contains/intersects/encloses) because QWidgets
-   handle their own input directly.
+   Controls handle their own input directly via Qt's widget event system.
 
    Concrete classes must:
      1. Call super().__init__(objectId, guiRenderer, args) first.
@@ -2950,48 +2956,6 @@ class _ControlMirror(_DrawableMirror):
    def _setRotation(self, args, responseId):
       pass   # Controls cannot be rotated; gui.py warns at the call site
 
-   # ── Hit testing ────────────────────────────────────────────────────────────
-
-   def _contains(self, args, responseId):
-      """Returns True if the point (x, y) is inside this widget's bounding box."""
-      x      = args.get('x', 0)
-      y      = args.get('y', 0)
-      rect   = QtCore.QRectF(self.qObject.geometry())
-      result = rect.contains(QtCore.QPointF(x, y))
-      self.guiRenderer.sendResponse(responseId, [result])
-
-   def _intersects(self, args, responseId):
-      """Returns True if this widget's bounding box intersects another item."""
-      otherObjectId = args.get('otherObjectId')
-      otherMirror   = self.guiRenderer._objectRegistry.get(otherObjectId)
-      result        = False
-
-      if otherMirror is not None:
-         rectA = QtCore.QRectF(self.qObject.geometry())
-         if isinstance(otherMirror, _ControlMirror):
-            rectB = QtCore.QRectF(otherMirror.qObject.geometry())
-         else:
-            rectB = otherMirror.qObject.sceneBoundingRect()
-         result = rectA.intersects(rectB)
-
-      self.guiRenderer.sendResponse(responseId, [result])
-
-   def _encloses(self, args, responseId):
-      """Returns True if this widget's bounding box fully encloses another item."""
-      otherObjectId = args.get('otherObjectId')
-      otherMirror   = self.guiRenderer._objectRegistry.get(otherObjectId)
-      result        = False
-
-      if otherMirror is not None:
-         rectA = QtCore.QRectF(self.qObject.geometry())
-         if isinstance(otherMirror, _ControlMirror):
-            rectB = QtCore.QRectF(otherMirror.qObject.geometry())
-         else:
-            rectB = otherMirror.qObject.sceneBoundingRect()
-         result = rectA.contains(rectB)
-
-      self.guiRenderer.sendResponse(responseId, [result])
-
    # ── Size ───────────────────────────────────────────────────────────────────
 
    def _getSize(self, args, responseId):

{creativepython-1.1.4 → creativepython-1.1.6}/src/CreativePython/__init__.py

@@ -1,4 +1,10 @@
 import platform, ctypes, importlib.resources
+from importlib.metadata import version as _metadata_version
+
+try:
+    __version__ = _metadata_version("CreativePython")
+except Exception:
+    __version__ = "unknown"
 
 
 # import portaudio binary on MacOS

{creativepython-1.1.4 → creativepython-1.1.6/src/CreativePython.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CreativePython
-Version: 1.1.4
+Version: 1.1.6
 Summary: A Python-based software environment for developing algorithmic art projects.
 Author-email: "Dr. Bill Manaris" <manaris@cofc.edu>, Taj Ballinger <ballingertj@g.cofc.edu>, Trevor Ritchie <ritchiets@g.cofc.edu>
 License: MIT License

{creativepython-1.1.4 → creativepython-1.1.6}/src/CreativePython.egg-info/SOURCES.txt

@@ -88,7 +88,11 @@ src/CreativePython/nevmuse/utilities/PowerLawRandom.py
 src/CreativePython/nevmuse/utilities/__init__.py
 src/bin/libportaudio.2.dylib
 tests/testAnimate.py
+tests/testCompress.py
+tests/testGameboard.py
 tests/testHitTesting.py
 tests/testPeer.py
 tests/testToolTips.py
-tests/test_keyEvent.py
+tests/test_keyEvent.py
+tests/test_midi.py
+tests/test_osc.py