psychopy 2025.1.0__py3-none-any.whl → 2025.2.1__py3-none-any.whl

psychopy/VERSION

@@ -1 +1 @@
-2025.1.0
+2025.2.1

psychopy/alerts/alertsCatalogue/4810.yaml

@@ -0,0 +1,19 @@
+
+code: 4810
+cat: Devices
+msg: Could not find any config for device {deviceName}, please setup this device up in the Device Manager dialog (from Builder)."
+
+# The following are typically used for online help pages, and support reStructured Text.
+label: No config for named device
+
+synopsis: |
+  Your experiment refers to a device by name which has not been setup in Builder's Device Manager dialog.
+
+details: |
+  From 2025.2.0, devices are setup in a dedicated Device Manager dialog and then referred to by name in Components. If you're seeing this message, it means there's a Component in your experiment which refers to a named device which has not been setup. This is common when running experiments made by someone else, or made on a different computer, as they will have setup using their devices.
+
+solutions: |
+  Setup the named device in Builder's Device Manager dialog
+
+versions: |
+  2025.2.0

psychopy/alerts/alertsCatalogue/alertCategories.yaml

@@ -85,6 +85,10 @@
     cat: Loops
     4705: Column name from conditions file clashes with variable name
     4710: Column name from conditions file likely to clash with derived variable names
+  
+  4800:
+    cat: Devices
+    4810: No config for named device
 
 5000:
   cat: Online studies

psychopy/alerts/alertsCatalogue/alertmsg.py

@@ -27,6 +27,13 @@ _translate(
 _translate(
     "Your stimulus {type} time of {time} seconds cannot be accurately presented for {time} on a {Hz}Hz monitor.")
 
+# Alert 3210
+_translate("Speaker {deviceName} is set to \"Exclusive low latency\" mode. As resampling is enabled, this mode has little benefit over \"Shared low latency\" mode, with some drawbacks.")
+
+# Alert 3610
+_translate(
+    "Multiple Components in the same Routine are validated by {validator}, please ensure that the timing of these Components do not overlap.")
+
 # Alert 4051
 _translate(
     "Experiment was built in a future version of PsychoPy ({version}), we recommend either updating PsychoPy or changing the \"Use Version\" setting in Experiment Settings to this version.")
@@ -51,6 +58,9 @@ _translate(
 _translate(
     "Microphone component `{name}` given blank stop time, using max duration allowed by buffer size ({stopVal}s).")
 
+# Alert 4130
+_translate("Static Component `{name}` given infinite stop time")
+
 # Alert 4205
 _translate(
     "Python Syntax Error in '{codeTab}' tab. See '{code}' on line number {lineNumber} of the '{codeTab}' tab.")
@@ -76,7 +86,7 @@ _translate(
 
 # Alert 4325
 _translate(
-    "Font `{font} {style}` not available in weight `{weight}`, component `{name}` will default to Noto Sans Regular.")
+    "Font `{font} {style}` not available in weight `{weight}`, component `{name}` will default to Open Sans Regular.")
 
 # Alert 4330
 _translate(
@@ -138,6 +148,10 @@ _translate(
 # Alert 4710
 _translate("Column name '{param}' is likely to cause name clashes. {msg}.")
 
+# Alert 4810
+_translate(
+    "Could not find any config for device {deviceName}, please setup this device up in the Device Manager dialog (from Builder).\"")
+
 # Alert 5055
 _translate(
     "Device parameter of microphone component \"{name}\" will not be used online.")

psychopy/alerts/alertsCatalogue/generateAlertmsg.py

@@ -3,11 +3,11 @@ from psychopy import core
 import sys
 
 write_mode = 'w'
-
+new_line = '\n'
 alertmsgFile = 'alertmsg.py'
 
 try:
-    fp = open(alertmsgFile, write_mode)
+    fp = open(alertmsgFile, write_mode, newline=new_line)
     fp.write('#!/usr/bin/env python\n# -*- coding: utf-8 -*-\n\n')
     fp.write('# This file was generated by generateAlertmsg.py.\n')
     fp.write('# Following strings are used to localize alerts.\n')

psychopy/app/_psychopyApp.py

@@ -163,6 +163,8 @@ class _Showgui_Hack():
 
 class PsychoPyApp(wx.App, handlers.ThemeMixin):
     _called_from_test = False  # pytest needs to change this
+    # are we running a beta release?
+    beta = True
 
     def __init__(self, arg=0, testMode=False, startView=None, profiling=False, **kwargs):
         """With a wx.App some things get done here, before App.__init__
@@ -417,7 +419,7 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
 
         if showSplash:
             # show splash screen
-            if str(__version__).endswith("beta"):
+            if self.beta:
                 splashFile = os.path.join(
                     self.prefs.paths['resources'], 'betasplash.png'
                 )
@@ -520,6 +522,10 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
         if self.isRetina:
             self._codeFont.SetPointSize(int(self._codeFont.GetPointSize()*fontScale))
             self._mainFont.SetPointSize(int(self._mainFont.GetPointSize()*fontScale))
+        # apply calculated point size to themed font defaults
+        from psychopy.app.themes import fonts
+        fonts.AppFont.pointSize = self._mainFont.GetPointSize()
+        fonts.CodeFont.pointSize = self._codeFont.GetPointSize()
         # that gets most of the properties of _codeFont but the FaceName
         # FaceName is set in the setting of the theme:
         self.theme = prefs.app['theme']
@@ -605,7 +611,7 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
                 ).format(thisFile, err))
 
         # if we started a busy cursor which never finished, finish it now
-        if wx.IsBusy():
+        if wx.IsBusy() and wx.Platform != '__WXGTK__':
             wx.EndBusyCursor()
 
         # send anonymous info to https://usage.psychopy.org
@@ -821,13 +827,18 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
         # have to reimport because it is only local to __init__ so far
         from . import coder
         if self.coder is None:
-            title = "PsychoPy Coder (IDE) (v%s)"
-            wx.BeginBusyCursor()
+            title = "PsychoPy Coder (v{version}{beta})".format(
+                version=self.version,
+                beta="beta" if self.beta else ""
+            )
+            if wx.Platform != '__WXGTK__':
+                wx.BeginBusyCursor()
             self.coder = coder.CoderFrame(None, -1,
-                                          title=title % self.version,
+                                          title=title,
                                           files=fileList, app=self)
             self.updateWindowMenu()
-            wx.EndBusyCursor()
+            if wx.Platform != '__WXGTK__':
+                wx.EndBusyCursor()
         else:
             # set output window and standard streams
             self.coder.setOutputWindow(True)
@@ -844,17 +855,22 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
 
     def newBuilderFrame(self, event=None, fileName=None):
         # have to reimport because it is only local to __init__ so far
-        wx.BeginBusyCursor()
+        if wx.Platform != '__WXGTK__':
+            wx.BeginBusyCursor()
         from .builder.builder import BuilderFrame
-        title = "PsychoPy Builder (v%s)"
+        title = "PsychoPy Builder (v{version}{beta})".format(
+            version=self.version,
+            beta="beta" if self.beta else ""
+        )
         self.builder = BuilderFrame(None, -1,
-                                    title=title % self.version,
+                                    title=title,
                                     fileName=fileName, app=self)
         self.builder.Show(True)
         self.builder.Raise()
         self.SetTopWindow(self.builder)
         self.updateWindowMenu()
-        wx.EndBusyCursor()
+        if wx.Platform != '__WXGTK__':
+            wx.EndBusyCursor()
 
         return self.builder
 
@@ -908,14 +924,20 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
     def newRunnerFrame(self, event=None):
         # have to reimport because it is only local to __init__ so far
         from .runner.runner import RunnerFrame
-        title = "PsychoPy Runner (v{})".format(self.version)
-        wx.BeginBusyCursor()
+        
+        title = 'PsychoPy Runner (v{version}{beta})'.format(
+            version=self.version,
+            beta="beta" if self.beta else ""
+        )
+        if wx.Platform != '__WXGTK__':
+            wx.BeginBusyCursor()
         self.runner = RunnerFrame(parent=None,
                                   id=-1,
                                   title=title,
                                   app=self)
         self.updateWindowMenu()
-        wx.EndBusyCursor()
+        if wx.Platform != '__WXGTK__':
+            wx.EndBusyCursor()
         return self.runner
 
     def OnDrop(self, x, y, files):

psychopy/app/builder/builder.py

@@ -30,12 +30,14 @@ from wx.lib import platebtn
 from wx.html import HtmlWindow
 
 import psychopy.app.plugin_manager.dialog
+from .dialogs.paramCtrls import EVT_PARAM_CHANGED
 from .validators import WarningManager
 from ..pavlovia_ui import sync, PavloviaMiniBrowser
 from ..pavlovia_ui.project import ProjectFrame
 from ..pavlovia_ui.search import SearchFrame
 from ..pavlovia_ui.user import UserFrame
 from ..pavlovia_ui.functions import logInPavlovia
+from ..deviceManager import DeviceManagerDlg
 from ...experiment import getAllElements, getAllCategories
 from ...experiment.routines import Routine, BaseStandaloneRoutine
 from psychopy.tools.versionchooser import parseVersionSafely, psychopyVersion
@@ -76,7 +78,11 @@ from psychopy.scripts.psyexpCompile import generateScript
 
 # Components which are always hidden
 alwaysHidden = [
-    'BaseComponent', 'BaseStandaloneRoutine', 'BaseValidatorRoutine'
+    'BaseComponent', 
+    'BaseDeviceComponent',
+    'BaseStandaloneRoutine', 
+    'BaseDeviceRoutine',
+    'BaseValidatorRoutine',
 ]
 
 
@@ -132,37 +138,45 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
         self.generateScript = generateScript
 
         # default window title
-        self.winTitle = 'PsychoPy Builder (v{})'.format(self.app.version)
+        self.winTitle = title
 
+        # get last frame information, or default
         if fileName in self.appData['frames']:
             self.frameData = self.appData['frames'][fileName]
-        else:  # work out a new frame size/location
-            dispW, dispH = self.app.getPrimaryDisplaySize()
-            default = self.appData['defaultFrame']
-            default['winW'] = int(dispW * 0.75)
-            default['winH'] = int(dispH * 0.75)
-            if default['winX'] + default['winW'] > dispW:
-                default['winX'] = 5
-            if default['winY'] + default['winH'] > dispH:
-                default['winY'] = 5
-            self.frameData = dict(self.appData['defaultFrame'])  # copy
+        else:
+            self.frameData = dict(self.appData['defaultFrame'])
+            # work out best default size from screen size
+            i = wx.Display.GetFromPoint(wx.Point(
+                int(self.frameData['winX']), int(self.frameData['winY'])
+            ))
+            try:
+                disp = wx.Display(max(i, 0))
+            except:
+                disp = wx.Display(0)
+            dispW, dispH = list(disp.GetGeometry())[2:]
+            # set in frameData array
+            self.frameData['winW'] = dispW * 0.75
+            self.frameData['winH'] = dispH * 0.75
             # increment default for next frame
-            default['winX'] += 10
-            default['winY'] += 10
-
-        # we didn't have the key or the win was minimized / invalid
-        if self.frameData['winH'] == 0 or self.frameData['winW'] == 0:
-            self.frameData['winX'], self.frameData['winY'] = (0, 0)
-        if self.frameData['winY'] < 20:
-            self.frameData['winY'] = 20
-
-        BaseAuiFrame.__init__(self, parent=parent, id=id, title=title,
-                              pos=(int(self.frameData['winX']),
-                                   int(self.frameData['winY'])),
-                              size=(int(self.frameData['winW']),
-                                    int(self.frameData['winH'])),
-                              style=style)
-
+            self.frameData['winX'] += 10
+            self.frameData['winY'] += 10
+        # handle when last open frame was minimised or invalid
+        for key in ("winH", "winW", "winX", "winY"):
+            self.frameData[key] = max(self.frameData[key], 20)
+        # initialise
+        BaseAuiFrame.__init__(
+            self, 
+            parent=parent, 
+            id=id, 
+            size=(
+                int(self.frameData['winW']), int(self.frameData['winH'])
+            ),
+            pos=(
+                int(self.frameData['winX']), int(self.frameData['winY'])
+            ),
+            title=title,
+            style=style
+        )
         # detect retina displays (then don't use double-buffering)
         self.isRetina = \
             self.GetContentScaleFactor() != 1 and wx.Platform == '__WXMAC__'
@@ -191,7 +205,7 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
         self.SetAcceleratorTable(accelTable)
 
         # setup a default exp
-        if self.filename.is_file():
+        if fileName is not None and self.filename.is_file():
             self.fileOpen(filename=fileName, closeCurrent=False)
         else:
             self.lastSavedCopy = None
@@ -242,7 +256,11 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
         self._mgr.Update()
         # self.SetSizer(self.mainSizer)  # not necessary for aui type controls
         if self.frameData['auiPerspective']:
-            self._mgr.LoadPerspective(self.frameData['auiPerspective'])
+            backup = self._mgr.SavePerspective()
+            try:
+                self._mgr.LoadPerspective(self.frameData['auiPerspective'])
+            except:
+                self._mgr.LoadPerspective(backup)
         self.SetMinSize(wx.Size(600, 400))  # min size for the whole window
         self.SetSize(
             (int(self.frameData['winW']), int(self.frameData['winH'])))
@@ -437,6 +455,11 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
                            _translate("To set information about your monitor"))
         self.Bind(wx.EVT_MENU, self.app.openMonitorCenter, item)
 
+        item = menu.Append(wx.ID_ANY,
+                           _translate("Device Manager"),
+                           _translate("Setup named devices for your Components to refer to"))
+        self.Bind(wx.EVT_MENU, self.openDeviceManager, item)
+
         item = menu.Append(wx.ID_ANY,
                            _translate("Compile\t%s") % keys['compileScript'],
                            _translate("Compile the exp to a script"))
@@ -599,6 +622,12 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
         self.Bind(wx.EVT_MENU, self.app.showNews, id=item.GetId())
 
         self.SetMenuBar(menuBar)
+    
+    def openDeviceManager(self, evt=None):
+        # create a device manager dialog
+        dlg = DeviceManagerDlg(self)
+        # show it modal to this window
+        dlg.ShowModal()
 
     def commandCloseFrame(self, event):
         """Defines Builder Frame Closing Event"""
@@ -1571,6 +1600,19 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
             return True
 
     def openPluginManager(self, evt=None):
+        # check if the package index is currently being updated, show a message
+        # to tell the user to wait before opening the plugin manager
+        import psychopy.app.plugin_manager.packageIndex as packageIndex
+        if packageIndex.isIndexing():
+            msg = _translate("The package index is currently being updated. "
+                             "Please try again later.")
+            wx.MessageBox(
+                msg,
+                _translate("Package indexing in progress"),
+                style=wx.OK | wx.ICON_INFORMATION
+            )
+            return
+        
         dlg = psychopy.app.plugin_manager.dialog.EnvironmentManagerDlg(self)
         dlg.Show()
         
@@ -2725,7 +2767,9 @@ class StandaloneRoutineCanvas(scrolledpanel.ScrolledPanel):
         self.sizer = wx.BoxSizer(wx.VERTICAL)
         self.SetSizer(self.sizer)
         # Setup categ notebook
+        self.warnings = WarningManager(self)
         self.ctrls = ParamNotebook(self, experiment=self.frame.exp, element=routine)
+        self.ctrls.Bind(EVT_PARAM_CHANGED, self.updateExperiment)
         self.paramCtrls = self.ctrls.paramCtrls
         self.sizer.Add(self.ctrls, border=12, proportion=1, flag=wx.ALIGN_CENTER | wx.TOP)
         # Make buttons
@@ -2734,10 +2778,9 @@ class StandaloneRoutineCanvas(scrolledpanel.ScrolledPanel):
         self.helpBtn.Bind(wx.EVT_BUTTON, self.onHelp)
         self.btnsSizer.Add(self.helpBtn, border=6, flag=wx.ALL | wx.EXPAND)
         self.btnsSizer.AddStretchSpacer(1)
-        # Add validator stuff
-        self.warnings = WarningManager(self)
+        # add warnings to sizer
         self.sizer.Add(self.warnings.output, border=3, flag=wx.EXPAND | wx.ALL)
-        # Add buttons to sizer
+        # add buttons to sizer
         self.sizer.Add(self.btnsSizer, border=3, proportion=0, flag=wx.EXPAND | wx.ALL)
         # Style
         self.SetupScrolling(scroll_y=True)
@@ -2757,12 +2800,15 @@ class StandaloneRoutineCanvas(scrolledpanel.ScrolledPanel):
         for name, routine in routines.items():
             if routine == self.routine:
                 # Update the routine dict keys to use the current name for this routine
-                self.frame.exp.routines[self.routine.params['name'].val] = self.frame.exp.routines.pop(name)
+                self.frame.exp.routines[self.routine.name] = self.frame.exp.routines.pop(name)
+                # update experiment namespace
+                self.frame.exp.namespace.remove(name)
+                self.frame.exp.namespace.add(self.routine.name)
         # Redraw the flow panel
         self.frame.flowPanel.canvas.draw()
         # Rename this page
         page = self.frame.routinePanel.GetPageIndex(self)
-        self.frame.routinePanel.SetPageText(page, self.routine.params['name'].val)
+        self.frame.routinePanel.SetPageText(page, self.routine.name)
         # Update save button
         self.frame.setIsModified(True)
 
@@ -4546,6 +4592,13 @@ class BuilderRibbon(ribbon.FrameRibbon):
             tooltip=_translate("Monitor settings and calibration"),
             callback=parent.app.openMonitorCenter
         )
+        # device manager
+        self.addButton(
+            section="experiment", name='devices', label=_translate('Device manager'),
+            icon="devices",
+            tooltip=_translate("Map devices from this machine to names in your experiment"),
+            callback=parent.openDeviceManager
+        )
         # settings
         self.addButton(
             section="experiment", name='expsettings', label=_translate('Experiment settings'), icon="expsettings",