psychopy 2024.1.3__py3-none-any.whl → 2024.2.0__py3-none-any.whl

psychopy/visual/basevisual.py

@@ -1724,7 +1724,7 @@ class DraggingMixin:
         """
         # if we don't have reference to a mouse, make one
         if not isinstance(self.mouse, Mouse):
-            self.mouse = Mouse(win=self.win)
+            self.mouse = Mouse(visible=self.win.mouseVisible, win=self.win)
             # make sure it has an initial pos for rel pos comparisons
             self.mouse.lastPos = self.mouse.getPos()
         # store value
@@ -1762,17 +1762,10 @@ class BaseVisualStim(MinimalStim, WindowMixin, LegacyVisualMixin):
         (transparent). :ref:`Operations <attrib-operations>` are supported.
         Precisely how this is used depends on the :ref:`blendMode`.
         """
-        alphas = []
-        if hasattr(self, '_foreColor'):
-            alphas.append(self._foreColor.alpha)
-        if hasattr(self, '_fillColor'):
-            alphas.append(self._fillColor.alpha)
-        if hasattr(self, '_borderColor'):
-            alphas.append(self._borderColor.alpha)
-        if alphas:
-            return mean(alphas)
-        else:
+        if not hasattr(self, "_opacity"):
             return 1
+        
+        return self._opacity 
 
     @opacity.setter
     def opacity(self, value):
@@ -1780,6 +1773,7 @@ class BaseVisualStim(MinimalStim, WindowMixin, LegacyVisualMixin):
         if value is None:
             # If opacity is set to be None, this indicates that each color should handle its own opacity
             return
+        self._opacity = value
         if hasattr(self, '_foreColor'):
             if self._foreColor != None:
                 self._foreColor.alpha = value

psychopy/visual/button.py

@@ -24,14 +24,14 @@ class ButtonStim(TextBox2):
     """
 
     def __init__(self, win, text, font='Arvo',
-                 pos=(0, 0), size=None, padding=None, anchor='center', units=None,
+                 pos=(0, 0), size=None, ori=0, padding=None, anchor='center', units=None,
                  color='white', fillColor='darkgrey', borderColor=None, borderWidth=0, colorSpace='rgb', opacity=None,
                  letterHeight=None, bold=True, italic=False,
                  name="", depth=0, autoLog=None,
                  ):
         # Initialise TextBox
         TextBox2.__init__(self, win, text, font, name=name,
-                                 pos=pos, size=size, padding=padding, anchor=anchor, units=units,
+                                 pos=pos, size=size, ori=ori, padding=padding, anchor=anchor, units=units,
                                  color=color, fillColor=fillColor, borderColor=borderColor, borderWidth=borderWidth, colorSpace=colorSpace, opacity=opacity,
                                  letterHeight=letterHeight, bold=bold, italic=italic,
                                  alignment='center', editable=False, depth=depth, autoLog=None)
@@ -57,18 +57,6 @@ class ButtonStim(TextBox2):
         # Return True if pressed in
         return bool(self.listener.isPressedIn(self))
 
-    @property
-    def status(self):
-        if hasattr(self, "_status"):
-            return self._status
-
-    @status.setter
-    def status(self, value):
-        if value == STARTED and self._status not in [STARTED, PAUSED]:
-            self.buttonClock.reset()  # Reset clock
-        # Set status
-        self._status = value
-
     def reset(self):
         """
         Clear previously stored times on / off and check current click state.

psychopy/visual/helpers.py

@@ -10,7 +10,7 @@
 
 import os
 import copy
-from pkg_resources import parse_version
+from packaging.version import Version
 from pathlib import Path
 from psychopy import logging, colors, prefs
 
@@ -31,7 +31,7 @@ _nImageResizes = 0
 
 try:
     import matplotlib
-    if parse_version(matplotlib.__version__) > parse_version('1.2'):
+    if Version(matplotlib.__version__) > Version('1.2'):
         from matplotlib.path import Path as mplPath
     else:
         from matplotlib import nxutils
@@ -61,7 +61,7 @@ def pointInPolygon(x, y, poly):
 
     # faster if have matplotlib tools:
     if haveMatplotlib:
-        if parse_version(matplotlib.__version__) > parse_version('1.2'):
+        if Version(matplotlib.__version__) > Version('1.2'):
             return mplPath(poly).contains_point([x, y])
         else:
             try:
@@ -133,7 +133,7 @@ def polygonsOverlap(poly1, poly2):
 
     # faster if have matplotlib tools:
     if haveMatplotlib:
-        if parse_version(matplotlib.__version__) > parse_version('1.2'):
+        if Version(matplotlib.__version__) > Version('1.2'):
             if any(mplPath(poly1_vert_pix).contains_points(poly2_vert_pix)):
                 return True
             return any(mplPath(poly2_vert_pix).contains_points(poly1_vert_pix))
@@ -281,7 +281,7 @@ def findImageFile(filename, checkResources=False):
 
     # try doing the same in the Resources folder
     if checkResources:
-        return findImageFile(Path(prefs.paths['resources'])/orig, checkResources=False)
+        return findImageFile(Path(prefs.paths['assets']) / orig, checkResources=False)
 
 
 def groupFlipVert(flipList, yReflect=0):

psychopy/visual/line.py

@@ -173,7 +173,7 @@ class Line(ShapeStim):
             lineColorSpace=None,
             fillColor=None,
             fillColorSpace=lineColorSpace,  # have these set to the same
-            vertices=None,
+            vertices=(start, end),
             anchor=anchor,
             closeShape=False,
             pos=pos,
@@ -192,7 +192,6 @@ class Line(ShapeStim):
             color=color,
             colorSpace=colorSpace)
 
-        self._vertices.setas([start, end], self.units)
         del self._tesselVertices
 
     @property