CreativePython 1.1.5__tar.gz → 1.2__tar.gz

{creativepython-1.1.5/src/CreativePython.egg-info → creativepython-1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CreativePython
-Version: 1.1.5
+Version: 1.2
 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.5 → creativepython-1.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "CreativePython"
-version = "1.1.5"
+version = "1.2"
 description = "A Python-based software environment for developing algorithmic art projects."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -40,7 +40,7 @@ dependencies = [
 
 [tool.setuptools]
 package-dir = {"" = "src"}
-py-modules = ["gui", "image", "midi", "music", "osc", "timer", "iannix", "markov", "zipf"]
+py-modules = ["gui", "image", "midi", "music", "osc", "timer", "animation", "iannix", "markov", "zipf"]
 
 [tool.setuptools.packages.find]
 where = ["src"]

{creativepython-1.1.5 → creativepython-1.2}/src/CreativePython/GuiRenderer.py

@@ -624,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
@@ -974,8 +997,6 @@ class DisplayMirror:
          else:
             item.qObject.setZValue(qZValue)
             self._scene.addItem(item.qObject)      # attach QGraphicsItem to scene
-            cacheMode = QtWidgets.QGraphicsItem.CacheMode.DeviceCoordinateCache
-            item.qObject.setCacheMode(cacheMode)
 
          posArgs = {}
          if x is not None:
@@ -1688,15 +1709,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,
@@ -1759,43 +1777,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):
@@ -2405,6 +2386,7 @@ class PolygonMirror(_GraphicsMirror):
 # IconMirror  —  mirror of gui.py's Icon
 #######################################################################################
 
+
 class IconMirror(_GraphicsMirror):
    """
    Mirror of gui.py's Icon.  Backed by a QGraphicsPixmapItem.
@@ -2474,16 +2456,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):
@@ -2881,9 +2872,6 @@ class GroupMirror(_DrawableMirror):
       item.qObject.setZValue(qZValue)
       self.qObject.addToGroup(item.qObject)
 
-      cacheMode = QtWidgets.QGraphicsItem.CacheMode.DeviceCoordinateCache
-      item.qObject.setCacheMode(cacheMode)
-
    def _removeChild(self, args, responseId):
       """Removes a child from the group."""
       itemId = args.get('itemId')
@@ -2922,8 +2910,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.
@@ -2964,48 +2951,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.5 → creativepython-1.2}/src/CreativePython/RealtimeAudioPlayer.py

@@ -306,9 +306,9 @@ class _RealtimeAudioPlayer:
       self.loopRegionStartFrame = max(0.0, float(loopRegionStartFrame))
       self.loopRegionEndFrame = float(loopRegionEndFrame) if loopRegionEndFrame is not None else -1.0
 
-      # adjust the loop region end frame so it does not exceed the last valid frame in the audio file
+      # adjust the loop region end frame so it does not exceed the end of the audio file
       if self.loopRegionEndFrame > 0:
-         self.loopRegionEndFrame = min(self.loopRegionEndFrame, self.numFrames - 1 if self.numFrames > 0 else 0.0)
+         self.loopRegionEndFrame = min(self.loopRegionEndFrame, float(self.numFrames))
 
       # ensure the loop region is valid: if the start frame is after or equal to the end frame, reset to default (full file)
       if self.numFrames > 0 and self.loopRegionEndFrame > 0 and self.loopRegionStartFrame >= self.loopRegionEndFrame:
@@ -689,7 +689,8 @@ class _RealtimeAudioPlayer:
 
       # determine where playback should end for this segment
       # NOTE: supports three modes: natural EOF, loop region end, or play(size) duration
-      effectiveSegmentEndFrame = numAudioFrames - 1
+      # effectiveSegmentEndFrame is the exclusive end (first frame NOT to play)
+      effectiveSegmentEndFrame = float(numAudioFrames)
       if looping and self.loopRegionEndFrame > 0:
          effectiveSegmentEndFrame = self.loopRegionEndFrame
       elif not looping and self.targetEndSourceFrame > 0:
@@ -699,14 +700,13 @@ class _RealtimeAudioPlayer:
       # NOTE: batch boundary detection avoids per-sample checks (major optimization)
       framesToProcess = frames
       willHitBoundary = False
-      boundaryFrame = -1
 
       if effectiveSegmentEndFrame > 0:
          framesToEndpoint = (effectiveSegmentEndFrame - self.playbackPosition) / rateFactor
-         if framesToEndpoint < frames and framesToEndpoint > 0:
+         if 0 <= framesToEndpoint < frames:
             willHitBoundary = True
-            boundaryFrame = int(np.floor(framesToEndpoint))
-            framesToProcess = min(frames, boundaryFrame + 1)
+            # ceil gives the number of frames that stay strictly within the endpoint
+            framesToProcess = min(frames, int(np.ceil(framesToEndpoint)))
 
       ###########################################################################
       # PHASE 2: PITCH SHIFTING VIA TIME-STRETCH INTERPOLATION
@@ -856,7 +856,8 @@ class _RealtimeAudioPlayer:
                outdata[framesToProcess:, :] = 0.0
 
       # safety - fill any unfilled portion with silence
-      if framesToProcess < frames and self.isPlaying:
+      # skip when willHitBoundary is True: boundary handling already filled remainder (via recursion or explicit zero-fill)
+      if framesToProcess < frames and self.isPlaying and not willHitBoundary:
          outdata[framesToProcess:, :] = 0.0
 
       # update pan smoothing (prevents clicks from abrupt pan changes)

{creativepython-1.1.5 → creativepython-1.2/src/CreativePython.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CreativePython
-Version: 1.1.5
+Version: 1.2
 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.5 → creativepython-1.2}/src/CreativePython.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ LICENSE-PSF
 MANIFEST.in
 README.md
 pyproject.toml
+src/animation.py
 src/gui.py
 src/iannix.py
 src/image.py
@@ -93,6 +94,8 @@ tests/testGameboard.py
 tests/testHitTesting.py
 tests/testPeer.py
 tests/testToolTips.py
+tests/test_crescendo.py
+tests/test_crescendo_import.py
 tests/test_keyEvent.py
 tests/test_midi.py
 tests/test_osc.py

{creativepython-1.1.5 → creativepython-1.2}/src/CreativePython.egg-info/top_level.txt

@@ -1,4 +1,5 @@
 CreativePython
+animation
 bin
 gui
 iannix