psychopy 2024.2.5__py3-none-any.whl → 2025.1.1__py3-none-any.whl

psychopy/visual/aperture.py

@@ -5,7 +5,7 @@
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import os
@@ -26,7 +26,7 @@ import psychopy.event
 # (JWP has no idea why!)
 from psychopy.tools.monitorunittools import cm2pix, deg2pix, convertToPix
 from psychopy.tools.attributetools import attributeSetter, setAttribute
-from psychopy.visual.shape import BaseShapeStim, knownShapes
+from psychopy.visual.shape import ShapeStim, knownShapes
 from psychopy.visual.image import ImageStim
 from psychopy.visual.basevisual import MinimalStim, ContainerMixin, WindowMixin
 
@@ -102,7 +102,7 @@ class Aperture(MinimalStim, ContainerMixin):
                 win=self.win, image=self.__dict__['filename'],
                 pos=pos, size=size, autoLog=False, units=self.units)
         else:
-            self._shape = BaseShapeStim(
+            self._shape = ShapeStim(
                 win=self.win, vertices=vertices, fillColor=1, lineColor=None, colorSpace='rgb',
                 interpolate=False, pos=pos, size=size, anchor=anchor, autoLog=False, units=self.units)
             self.vertices = self._shape.vertices
@@ -134,7 +134,9 @@ class Aperture(MinimalStim, ContainerMixin):
             GL.glClearStencil(0)
             GL.glClear(GL.GL_STENCIL_BUFFER_BIT)
 
-            GL.glPushMatrix()
+            if self.win.USE_LEGACY_GL:
+                GL.glPushMatrix()
+
             if self.__dict__['filename'] == False:
                 self.win.setScale('pix')
 
@@ -159,7 +161,8 @@ class Aperture(MinimalStim, ContainerMixin):
                 GL.glStencilFunc(GL.GL_EQUAL, 1, 1)
             GL.glStencilOp(GL.GL_KEEP, GL.GL_KEEP, GL.GL_KEEP)
 
-            GL.glPopMatrix()
+            if self.win.USE_LEGACY_GL:
+                GL.glPopMatrix()
 
     @property
     def size(self):
@@ -327,4 +330,4 @@ class Aperture(MinimalStim, ContainerMixin):
         try:
             self.enabled = False
         except (ImportError, ModuleNotFoundError, TypeError):
-            pass  # trying to avoid 'Exception ignored in: ....' error from pyglet when experiment exits
+            pass  # trying to avoid 'Exception ignored in: ....' error from pyglet when experiment exits

psychopy/visual/backends/__init__.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 """Backends provide the window creation and flipping commands.

psychopy/visual/backends/_base.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 """A Backend class defines the core low-level functions required by a Window

psychopy/visual/backends/gamma.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 # set the gamma LUT using platform-specific hardware calls

psychopy/visual/backends/glfwbackend.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 """A Backend class defines the core low-level functions required by a Window
@@ -12,17 +12,13 @@ used by backends.getBackend(winType) which will locate the appropriate class
 and initialize an instance using the attributes of the Window.
 """
 
-import psychopy.logging as logging
 
-try:
-    from psychopy_glfw import GLFWBackend
-except (ModuleNotFoundError, ImportError):
-    logging.warning(
-        "GLFW window backend support is not installed. To get support, install "
-        "the `psychopy-glfw` package and restart your session."
-    )
-    logging.flush()
+from psychopy.plugins import PluginStub
 
 
-if __name__ == "__main__":
-    pass
+class GLFWBackend(
+    PluginStub,
+    plugin="psychopy-glfw",
+    docsHome="https://github.com/psychopy/psychopy-glfw",
+):
+    pass

psychopy/visual/backends/pygamebackend.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 """A Backend class defines the core low-level functions required by a Window

psychopy/visual/backends/pygletbackend.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 """A Backend class defines the core low-level functions required by a Window
@@ -46,6 +46,9 @@ if pyglet.version < '1.4':
 else:
     _default_display_ = pyglet.canvas.get_display()
 
+USE_LEGACY_GL = pyglet.version < '2.0'
+
+
 # Cursors available to pyglet. These are used to map string names to symbolic
 # constants used to specify which cursor to use.
 _PYGLET_CURSORS_ = {
@@ -139,11 +142,13 @@ class PygletBackend(BaseBackend):
             win.stereo = False
 
         if sys.platform == 'darwin' and not win.useRetina and pyglet.version >= "1.3":
-            raise ValueError(
+            logging.warn(
                 "As of PsychoPy 1.85.3 OSX windows should all be set to "
                 "`useRetina=True` (or remove the argument). Pyglet 1.3 appears "
                 "to be forcing us to use retina on any retina-capable screen "
-                "so setting to False has no effect.")
+                "so setting to False has no effect."
+            )
+            win.useRetina = True
 
         # window framebuffer configuration
         bpc = backendConf.get('bpc', (8, 8, 8))
@@ -385,6 +390,17 @@ class PygletBackend(BaseBackend):
 
         # store properties of the system
         self._driver = pyglet.gl.gl_info.get_renderer()
+        logging.info("Using renderer '{}' for graphics".format(self._driver))
+
+        # report the OpenGL version
+        glVersion = pyglet.gl.gl_info.get_version()
+        logging.info("OpenGL version supported by driver is {}.{}".format(
+            glVersion[0], glVersion[1]))
+
+        if int(glVersion[0]) < 2:
+            raise RuntimeError(
+                "OpenGL version 2.0 or higher is required! Please update your "
+                "graphics drivers or use a different backend.")
 
     @property
     def frameBufferSize(self):
@@ -394,7 +410,7 @@ class PygletBackend(BaseBackend):
     @property
     def shadersSupported(self):
         # on pyglet shaders are fine so just check GL>2.0
-        return pyglet.gl.gl_info.get_version() >= '2.0'
+        return int(pyglet.gl.gl_info.get_version()[0]) >= 2
 
     def swapBuffers(self, flipThisFrame=True):
         """Performs various hardware events around the window flip and then
@@ -409,7 +425,9 @@ class PygletBackend(BaseBackend):
             self.winHandle.switch_to()
             globalVars.currWindow = self
 
-        GL.glTranslatef(0.0, 0.0, -5.0)
+        # DEPRECATED: this is now done in the Window class
+        if USE_LEGACY_GL:
+            GL.glTranslatef(0.0, 0.0, -5.0)
 
         for dispatcher in self.win._eventDispatchers:
             try:
@@ -941,9 +959,12 @@ def _onResize(width, height):
         back_width, back_height = width, height
 
     GL.glViewport(0, 0, back_width, back_height)
-    GL.glMatrixMode(GL.GL_PROJECTION)
-    GL.glLoadIdentity()
-    GL.glOrtho(-1, 1, -1, 1, -1, 1)
-    # GL.gluPerspective(90, 1.0 * width / height, 0.1, 100.0)
-    GL.glMatrixMode(GL.GL_MODELVIEW)
-    GL.glLoadIdentity()
+
+    # DEPRECATED - this is now done with matrices we compute
+    if USE_LEGACY_GL:
+        GL.glMatrixMode(GL.GL_PROJECTION)
+        GL.glLoadIdentity()
+        GL.glOrtho(-1, 1, -1, 1, -1, 1)
+        # GL.gluPerspective(90, 1.0 * width / height, 0.1, 100.0)
+        GL.glMatrixMode(GL.GL_MODELVIEW)
+        GL.glLoadIdentity()

psychopy/visual/basevisual.py

@@ -5,7 +5,7 @@
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from pathlib import Path
@@ -1155,12 +1155,12 @@ class TextureMixin:
                     stim.win.glVendor.startswith('nvidia')):
                 # nvidia under win/linux might not support 32bit float
                 # could use GL_LUMINANCE32F_ARB here but check shader code?
-                internalFormat = GL.GL_RGB16F_ARB
+                internalFormat = GL.GL_RGB16F
             else:
                 # we've got a mac or an ATI card and can handle
                 # 32bit float textures
                 # could use GL_LUMINANCE32F_ARB here but check shader code?
-                internalFormat = GL.GL_RGB32F_ARB
+                internalFormat = GL.GL_RGB32F
             # initialise data array as a float
             data = numpy.ones((intensity.shape[0], intensity.shape[1], 3),
                               numpy.float32)
@@ -1180,7 +1180,7 @@ class TextureMixin:
             data[:, :, 2] = intensity  # B
         elif pixFormat == GL.GL_RGB and dataType == GL.GL_FLOAT:
             # probably a custom rgb array or rgb image
-            internalFormat = GL.GL_RGB32F_ARB
+            internalFormat = GL.GL_RGB32F
             data = intensity
         elif pixFormat == GL.GL_RGB:
             # not wasLum, not useShaders  - an RGB bitmap with no shader
@@ -1203,8 +1203,8 @@ class TextureMixin:
                 pixFormat = GL.GL_RGBA
             if internalFormat == GL.GL_RGB:
                 internalFormat = GL.GL_RGBA
-            elif internalFormat == GL.GL_RGB32F_ARB:
-                internalFormat = GL.GL_RGBA32F_ARB
+            elif internalFormat == GL.GL_RGB32F:
+                internalFormat = GL.GL_RGBA32F
         texture = data.ctypes  # serialise
 
         # Create the pixel buffer object which will serve as the texture memory
@@ -1242,9 +1242,9 @@ class TextureMixin:
                 GL.GL_TEXTURE_2D, GL.GL_TEXTURE_WRAP_T, GL.GL_REPEAT)
         else:
             GL.glTexParameteri(
-                GL.GL_TEXTURE_2D, GL.GL_TEXTURE_WRAP_S, GL.GL_CLAMP)
+                GL.GL_TEXTURE_2D, GL.GL_TEXTURE_WRAP_S, GL.GL_CLAMP_TO_BORDER)
             GL.glTexParameteri(
-                GL.GL_TEXTURE_2D, GL.GL_TEXTURE_WRAP_T, GL.GL_CLAMP)
+                GL.GL_TEXTURE_2D, GL.GL_TEXTURE_WRAP_T, GL.GL_CLAMP_TO_BORDER)
         # data from PIL/numpy is packed, but default for GL is 4 bytes
         GL.glPixelStorei(GL.GL_UNPACK_ALIGNMENT, 1)
         # important if using bits++ because GL_LINEAR
@@ -1252,11 +1252,8 @@ class TextureMixin:
         if interpolate:
             GL.glTexParameteri(
                 GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MAG_FILTER, GL.GL_LINEAR)
-            # GL_GENERATE_MIPMAP was only available from OpenGL 1.4
             GL.glTexParameteri(
                 GL.GL_TEXTURE_2D, GL.GL_TEXTURE_MIN_FILTER, GL.GL_LINEAR)
-            GL.glTexParameteri(GL.GL_TEXTURE_2D, GL.GL_GENERATE_MIPMAP,
-                               GL.GL_TRUE)
             GL.glTexImage2D(GL.GL_TEXTURE_2D, 0, internalFormat,
                             data.shape[1], data.shape[0], 0,
                             pixFormat, dataType, texture)
@@ -1268,9 +1265,10 @@ class TextureMixin:
             GL.glTexImage2D(GL.GL_TEXTURE_2D, 0, internalFormat,
                             data.shape[1], data.shape[0], 0,
                             pixFormat, dataType, texture)
+        GL.glGenerateMipmap(GL.GL_TEXTURE_2D)
 
-        GL.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_MODE,
-                     GL.GL_MODULATE)  # ?? do we need this - think not!
+        # GL.glTexEnvi(GL.GL_TEXTURE_ENV, GL.GL_TEXTURE_ENV_MODE,
+        #              GL.GL_MODULATE)  # ?? do we need this - think not!
         # unbind our texture so that it doesn't affect other rendering
         GL.glBindTexture(GL.GL_TEXTURE_2D, 0)
 
@@ -1661,6 +1659,69 @@ class WindowMixin:
         self._updateListShaders()
 
 
+class PointerMixin:
+    """Mixin class to handle mouse/pointer interaction with an object.
+
+    Attributes
+    ==========
+    clickable : bool
+        This attribute determines whether the stimulus can be clicked on and 
+        trigger the `onMouse` method. 
+
+    Methods
+    =======
+    containsPointer
+        Check if the mouse is within the stimulus boundaries.
+    doClickActions
+        Handle mouse interaction with the stimulus. This is called by the 
+        `Window` object each frame to update the stimulus based on mouse
+        interactions.
+
+    """ 
+    def containsPointer(self):
+        """Check if the mouse is within the stimulus boundaries.
+
+        Returns
+        -------
+        bool
+            Whether the mouse is within the stimulus.
+
+        """
+        if not isinstance(self.mouse, Mouse):
+            self.mouse = Mouse(visible=self.win.mouseVisible, win=self.win)
+
+        # Check if mouse is within vertices
+        return self.mouse.isPressedIn(self, buttons=[0])
+    
+    def doPointerActions(self):
+        """Handle mouse interaction with the stimulus.
+
+        This method should be called each frame to update the stimulus based
+        on mouse interactions.
+
+        """
+        # If the stimulus is clickable and the mouse is within the stimulus
+        if self.clickable and self.containsPointer():
+            if not hasattr(self, '_onMouse'):
+                return  
+                
+            self._onMouse()
+             
+    @attributeSetter
+    def clickable(self, value):
+        """Whether the stimulus can be clicked on.
+
+        If set to `True`, the stimulus will be checked for mouse clicks
+        and the `_onMouse` method will be called if the stimulus is clicked.
+
+        """
+        # if we don't have reference to a mouse, make one
+        if not isinstance(self.mouse, Mouse):
+            self.mouse = Mouse(visible=self.win.mouseVisible, win=self.win)
+
+        self.__dict__['clickable'] = value
+
+
 class DraggingMixin:
     """
     Mixin to give an object innate dragging behaviour.
@@ -1944,3 +2005,22 @@ class BaseVisualStim(MinimalStim, WindowMixin, LegacyVisualMixin):
         # For DotStim
         if attrib in ('nDots', 'coherence'):
             self.coherence = round(self.coherence * self.nDots) / self.nDots
+
+    @attributeSetter
+    def alphaThreshold(self, value):
+        """Threshold for alpha values.
+
+        If the alpha value of a pixel is below this threshold, the pixel will
+        be rejected (not drawn). This can be useful for creating a mask from
+        an image with an alpha channel. The default value is 0.0, which means
+        that no thresholding will be applied.
+
+        """
+        self.__dict__['alphaThreshold'] = value
+    
+    def setAlphaThreshold(self, value, log=None):
+        """Usually you can use 'stim.attribute = value' syntax instead,
+        but use this method if you need to suppress the log message.
+        """
+        setAttribute(self, 'alphaThreshold', value, log)
+

psychopy/visual/brush.py

@@ -6,7 +6,7 @@ Inspired by rockNroll87q - https://github.com/rockNroll87q/pyDrawing
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from psychopy import event, logging

psychopy/visual/bufferimage.py

@@ -5,7 +5,7 @@
 RBGA object.`"""
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 
@@ -27,6 +27,8 @@ from psychopy import core, logging
 from psychopy.tools.attributetools import attributeSetter, setAttribute
 from psychopy.tools.typetools import float_uint8
 from psychopy.visual.image import ImageStim
+from psychopy.tools import mathtools as mt
+from psychopy.tools import gltools as gt
 
 try:
     from PIL import Image
@@ -143,7 +145,7 @@ class BufferImageStim(ImageStim):
 
         # take a screenshot of the buffer using win._getRegionOfFrame():
         glversion = pyglet.gl.gl_info.get_version()
-        if glversion >= '2.1' and not sqPower2:
+        if not sqPower2:
             region = win._getRegionOfFrame(buffer=buffer, rect=rect)
         else:
             if not sqPower2:
@@ -206,6 +208,21 @@ class BufferImageStim(ImageStim):
         """
         setAttribute(self, 'flipVert', newVal, log)  # call attributeSetter
 
+    def _drawLegacyGL(self, win):
+        """Legacy draw method for OpenGL 2.x."""
+        GL.glPushMatrix()  # preserve state
+        # GL.glLoadIdentity()
+
+        # dynamic flip
+        GL.glScalef(self.thisScale[0] * (1, -1)[self.flipHoriz],
+                    self.thisScale[1] * (1, -1)[self.flipVert], 1.0)
+
+        # enable dynamic position, orientation, opacity; depth not working?
+        GL.glColor4f(*self._foreColor.render('rgba1'))
+
+        GL.glCallList(self._listID)  # make it happen
+        GL.glPopMatrix()  # return the view to previous state
+
     def draw(self, win=None):
         """Draws the BufferImage on the screen, similar to
         :class:`~psychopy.visual.ImageStim` `.draw()`.
@@ -217,15 +234,78 @@ class BufferImageStim(ImageStim):
             win = self.win
         self._selectWindow(win)
 
-        GL.glPushMatrix()  # preserve state
-        # GL.glLoadIdentity()
+        if win.USE_LEGACY_GL:
+            self._drawLegacyGL(win)
+            return
 
-        # dynamic flip
-        GL.glScalef(self.thisScale[0] * (1, -1)[self.flipHoriz],
-                    self.thisScale[1] * (1, -1)[self.flipVert], 1.0)
+        win.setScale('pix')
+        win.setOrthographicView()
 
+        # dynamic flip
+        # GL.glScalef(self.thisScale[0] * (1, -1)[self.flipHoriz],
+        #             self.thisScale[1] * (1, -1)[self.flipVert], 1.0)
         # enable dynamic position, orientation, opacity; depth not working?
-        GL.glColor4f(*self._foreColor.render('rgba1'))
+        # GL.glColor4f(*self._foreColor.render('rgba1'))
 
-        GL.glCallList(self._listID)  # make it happen
-        GL.glPopMatrix()  # return the view to previous state
+        if self._needTextureUpdate:
+            self.setImage(value=self._imName, log=False)
+
+        if self.isLumImage:  # select the appropriate shader
+            # for a luminance image do recoloring
+            _prog = self.win._progSignedTexMask
+        else:
+            # for an rgb image there is no recoloring
+            _prog = self.win._progImageStim
+
+        gt.useProgram(_prog)
+
+        # bind textures
+        GL.glEnable(GL.GL_TEXTURE_2D)
+        GL.glActiveTexture(GL.GL_TEXTURE1)  # mask
+        GL.glBindTexture(GL.GL_TEXTURE_2D, self._maskID)
+        GL.glActiveTexture(GL.GL_TEXTURE0)  # color/lum image
+        GL.glBindTexture(GL.GL_TEXTURE_2D, self._texID)
+
+        scaleMat = mt.scaleMatrix(
+            (self.thisScale[0] * (1, -1)[self.flipHoriz], 
+             self.thisScale[1] * (1, -1)[self.flipVert],
+             1.0)
+        )
+        modelViewMatrix = mt.multMatrix((win.viewMatrix, scaleMat))
+
+        # set the shader uniforms
+        gt.setUniformValue(_prog, b'uTexture', 0, 'int')  # is texture unit 0
+        gt.setUniformValue(_prog, b'uMask', 1, 'int')  # mask is texture unit 1
+        gt.setUniformValue(_prog, b'uColor', self._foreColor.render('rgba1'))
+        alphaThreshold = getattr(self, 'alphaThreshold', 1.0)
+        gt.setUniformValue(
+            _prog, b'uAlphaThreshold', alphaThreshold, ignoreNotDefined=True)
+        gt.setUniformMatrix(
+            _prog, 
+            'uModelViewMatrix', 
+            modelViewMatrix,
+            transpose=True)
+        gt.setUniformMatrix(
+            _prog, 
+            b'uProjectionMatrix', 
+            win.projectionMatrix,
+            transpose=True)
+
+        # draw the image
+        gt.drawClientArrays({
+            'gl_Vertex': self.verticesPix,
+            'gl_MultiTexCoord0': self._texCoords,
+            'gl_MultiTexCoord1': self._maskCoords}, 
+            'GL_QUADS')
+        
+        gt.useProgram(None)
+
+        # unbind the textures
+        GL.glActiveTexture(GL.GL_TEXTURE1)
+        GL.glBindTexture(GL.GL_TEXTURE_2D, 0)
+        GL.glActiveTexture(GL.GL_TEXTURE0)
+        GL.glBindTexture(GL.GL_TEXTURE_2D, 0)
+        GL.glDisable(GL.GL_TEXTURE_2D)
+
+        # GL.glCallList(self._listID)  # make it happen
+        # GL.glPopMatrix()  # return the view to previous state

psychopy/visual/button.py

@@ -4,7 +4,7 @@
 """Creates a button"""
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 import numpy as np
 

psychopy/visual/circle.py

@@ -6,11 +6,12 @@ as a special case of a :class:`~psychopy.visual.Polygon`
 """
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import psychopy  # so we can get the __path__
 
+from psychopy.tools.attributetools import undefined
 from psychopy.visual.polygon import Polygon
 
 
@@ -39,11 +40,6 @@ class Circle(Polygon):
     lineColor, fillColor : array_like, str, :class:`~psychopy.colors.Color` or None
         Color of the circle's outline and fill. If `None`, a fully
         transparent color is used which makes the fill or outline invisible.
-    lineColorSpace, fillColorSpace : str
-        Colorspace to use for the outline and fill. These change how the
-        values passed to `lineColor` and `fillColor` are interpreted.
-        *Deprecated*. Please use `colorSpace` to set both outline and fill
-        colorspace. These arguments may be removed in a future version.
     pos : array_like
         Initial position (`x`, `y`) of the circle on-screen relative to the
         origin located at the center of the window or buffer in `units`
@@ -80,9 +76,6 @@ class Circle(Polygon):
         produces a smoother (less-pixelated) outline of the shape.
     draggable : bool
         Can this stimulus be dragged by a mouse click?
-    lineRGB, fillRGB: array_like, :class:`~psychopy.colors.Color` or None
-        *Deprecated*. Please use `lineColor` and `fillColor`. These
-        arguments may be removed in a future version.
     name : str
         Optional name of the stimuli for logging.
     autoLog : bool
@@ -107,17 +100,14 @@ class Circle(Polygon):
 
     """
 
-    _defaultFillColor = "white"
-    _defaultLineColor = None
-
     def __init__(self,
                  win,
                  radius=.5,
                  edges="circle",
                  units='',
                  lineWidth=1.5,
-                 lineColor=False,
-                 fillColor=False,
+                 lineColor=None,
+                 fillColor="white",
                  colorSpace='rgb',
                  pos=(0, 0),
                  size=1.0,
@@ -134,9 +124,9 @@ class Circle(Polygon):
                  autoLog=None,
                  autoDraw=False,
                  # legacy
-                 color=False,
-                 fillColorSpace=None,
-                 lineColorSpace=None,
+                 color=undefined,
+                 fillColorSpace=undefined,
+                 lineColorSpace=undefined,
                  ):
 
         # what local vars are defined (these are the init params) for use by
@@ -152,9 +142,7 @@ class Circle(Polygon):
             units=units,
             lineWidth=lineWidth,
             lineColor=lineColor,
-            lineColorSpace=lineColorSpace,
             fillColor=fillColor,
-            fillColorSpace=fillColorSpace,
             pos=pos,
             size=size,
             anchor=anchor,
@@ -169,5 +157,9 @@ class Circle(Polygon):
             name=name,
             autoLog=autoLog,
             autoDraw=autoDraw,
+            colorSpace=colorSpace,
+            # legacy
             color=color,
-            colorSpace=colorSpace)
+            fillColorSpace=fillColorSpace,
+            lineColorSpace=lineColorSpace,
+        )

psychopy/visual/custommouse.py

@@ -5,7 +5,7 @@
 including the pointer graphic and bounding box."""
 
 # Part of the PsychoPy library
-# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2025 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).