CreativePython 0.1.7__tar.gz → 0.1.8__tar.gz

{creativepython-0.1.7/src/CreativePython.egg-info → creativepython-0.1.8}/PKG-INFO

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

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

{creativepython-0.1.7 → creativepython-0.1.8/src/CreativePython.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: CreativePython
-Version: 0.1.7
+Version: 0.1.8
 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-0.1.7 → creativepython-0.1.8}/src/gui.py

@@ -567,10 +567,10 @@ class EventDispatcher(_QtCore.QObject):
    def __init__(self, display):
       super().__init__()
       self.display = display
-      self.lastMouseDown = None  # last location mouse down event occured (set to None when mouse is up)
-      self.lastMouseMove = None  # last known mouse movement/position
-      self.moveThreshold = 5     # maximum distance to trigger a mouse click (down/up in the same place)
-      self.focusItem = None      # last item clicked on (doesn't need to have an event)
+      self.lastMouseDown = None     # last location mouse down event occured (set to None when mouse is up)
+      self.lastMouseMove = None     # last known mouse movement/position
+      self.moveThreshold = 5        # maximum distance to trigger a mouse click (down/up in the same place)
+      self.draggingItem  = None     # last item clicked on
       self.itemsUnderMouse = set()  # set of items under last known mouse position
 
       self.display._view.viewport().installEventFilter(self)  # redirect mouse events
@@ -630,10 +630,14 @@ class EventDispatcher(_QtCore.QObject):
       self.lastMouseDown = (x, y)                # store mouse down position
       candidates = self._findObjectListAt(x, y)  # find all items under mouse
 
-      if len(candidates) > 0:
-         self.focusItem = candidates[0]          # store topmost item under mouse (for key events)
-      else:
-         self.focusItem = None
+      self.draggingItem = None                   # clear dragging item
+      i = 0
+      while self.draggingItem is None and i < len(candidates):
+         item = candidates[i]
+         if "mouseDrag" in item._callbackFunctions:  # if item has a mouseDrag event, store it
+            self.draggingItem = item
+         i = i + 1
+
 
       # second, we can send event to display
       self.display._event("mouseDown", [x, y])
@@ -661,8 +665,8 @@ class EventDispatcher(_QtCore.QObject):
          if dx <= self.moveThreshold and dy <= self.moveThreshold:  # is it under the threshold?
             isMouseClick = True                                     # yes, this is also a mouseClick
 
-      # self.focusItem     = None  # clear focus item
       self.lastMouseDown = None  # clear mouse down position
+      self.draggingItem  = None  # clear dragging item
 
       # second, we can send event(s) to display
       self.display._event("mouseUp", [x, y])
@@ -708,11 +712,9 @@ class EventDispatcher(_QtCore.QObject):
          # second, we can send event to display
          self.display._event("mouseDrag", [x, y])
 
-         # last, drag events only deliver to the last item we clicked on...
-         # (that way we don't pick up other items while dragging)
-         # so we send event to focus item, if it exists
-         if self.focusItem is not None:
-            moveHandled = self.focusItem._event("mouseDrag", [x,y])
+         # last, drag events to the dragging item
+         if self.draggingItem is not None:
+            moveHandled = self.draggingItem._event("mouseDrag", [x,y])
          else:
             moveHandled = False
 
@@ -774,7 +776,7 @@ class EventDispatcher(_QtCore.QObject):
 
    def handleKeyPress(self, event):
       """
-      Delivers keyDown and keyType events to the display and last clicked item (focusItem).
+      Delivers keyDown and keyType events to the display and each item in the display.
       keyDown uses the numeric code for the pressed key.
       keyType uses the typed character for the pressed key (if any).
       """
@@ -786,20 +788,21 @@ class EventDispatcher(_QtCore.QObject):
       self.display._event("keyDown", [key])
       self.display._event("keyType", [char])
 
-      # last, we send events to last clicked item (focusItem)
-      if self.focusItem is not None:
-         keyDownHandled = self.focusItem._event("keyDown", [key])
-         keyTypeHandled = self.focusItem._event("keyType", [char])
-      else:
-         keyDownHandled = False
-         keyTypeHandled = False
+      # last, we send events to each item
+      eventHandled = False
+
+      for item in self.display.items:
+         keyDownHandled = item._event("keyDown", [key])
+         keyTypeHandled = item._event("keyType", [char])
+         if keyDownHandled or keyTypeHandled:  
+            eventHandled = True  # if either event got handled by any item, report it
 
-      return keyDownHandled or keyTypeHandled
+      return eventHandled
 
 
    def handleKeyRelease(self, event):
       """
-      Delivers keyUp events to the display and last clicked item (focusItem).
+      Delivers keyUp events to the display and each item in the display.
       keyUp uses the numeric code for the pressed key.
       """
       # first, we need to find some information
@@ -808,13 +811,15 @@ class EventDispatcher(_QtCore.QObject):
       # second, we send event to display
       self.display._event("keyUp", [key])
 
-      # last, we send event to last clicked item (focusItem)
-      if self.focusItem is not None:
-         keyUpHandled = self.focusItem._event("keyUp", [key])
-      else:
-         keyUpHandled = False
+      # last, we send event to each item
+      eventHandled = False
 
-      return keyUpHandled
+      for item in self.display.items:
+         keyUpHandled = item._event("keyUp", [key])
+         if keyUpHandled:  
+            eventHandled = True  # if the event got handled by any item, report it
+
+      return eventHandled
 
 
    def _findMousePosition(self, event):