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

psychopy/app/builder/dialogs/paramCtrls.py

@@ -898,9 +898,13 @@ class SurveyCtrl(wx.TextCtrl, _ValidatorMixin, _HideMixin):
 
 
 class TableCtrl(wx.TextCtrl, _ValidatorMixin, _HideMixin, _FileMixin):
-    def __init__(self, parent, valType,
-                 val="", fieldName="",
+    def __init__(self, parent, param, fieldName="",
                  size=wx.Size(-1, 24)):
+        # get val and val type
+        val = param.val
+        valType = param.valType
+        # store param
+        self.param = param
         # Create self
         wx.TextCtrl.__init__(self)
         self.Create(parent, -1, val, name=fieldName, size=size)
@@ -920,19 +924,6 @@ class TableCtrl(wx.TextCtrl, _ValidatorMixin, _HideMixin, _FileMixin):
         self.xlBtn.SetToolTip(_translate("Open/create in your default table editor"))
         self.xlBtn.Bind(wx.EVT_BUTTON, self.openExcel)
         self._szr.Add(self.xlBtn)
-        # Link to Excel templates for certain contexts
-        cmpRoot = Path(experiment.components.__file__).parent
-        expRoot = Path(cmpRoot).parent
-        self.templates = {
-            'Form': Path(cmpRoot) / "form" / "formItems.xltx",
-            'CounterBalance': Path(expRoot) / "routines" / "counterbalance" / "counterbalanceItems.xltx",
-            'TrialHandler': Path(expRoot) / "loopTemplate.xltx",
-            'StairHandler': Path(expRoot) / "loopTemplate.xltx",
-            'MultiStairHandler:simple': Path(expRoot) / "staircaseTemplate.xltx",
-            'MultiStairHandler:QUEST': Path(expRoot) / "questTemplate.xltx",
-            'MultiStairHandler:QUESTPLUS': Path() / "questPlugTemplate.xltx",
-            'None': Path(expRoot) / 'blankTemplate.xltx',
-        }
         # Specify valid extensions
         self.validExt = [".csv",".tsv",".txt",
                          ".xl",".xlsx",".xlsm",".xlsb",".xlam",".xltx",".xltm",".xls",".xlt",
@@ -950,32 +941,15 @@ class TableCtrl(wx.TextCtrl, _ValidatorMixin, _HideMixin, _FileMixin):
     def validate(self, evt=None):
         """Redirect validate calls to global validate method, assigning appropriate valType"""
         validate(self, "file")
-        # Disable Excel button if value is from a variable
-        if "$" in self.GetValue():
-            self.xlBtn.Disable()
-            return
-        # enable Excel button if valid
-        self.xlBtn.Enable(self.valid)
-        # get frame
-        frame = self.GetParent()
-        if frame is None:
-            frame = self.GetTopLevelParent()
-        while hasattr(frame, "GetParent") and not (
-                hasattr(frame, "routine") or hasattr(frame, "component") or hasattr(frame, "type")
-        ):
-            frame = frame.GetParent()
-        # get comp type from frame
-        if hasattr(frame, "component"):
-            thisType = frame.component.type
-        elif hasattr(frame, "routine"):
-            thisType = frame.routine.type
-        elif hasattr(frame, "type"):
-            thisType = frame.type
+        # if field is blank, enable/diable according to whether there's a template
+        if not self.GetValue().strip():
+            self.xlBtn.Enable("template" in self.param.ctrlParams)
+        # otherwise, enable/disable according to validity
         else:
-            thisType = None
-        # does this component have a default template?
-        if thisType in self.templates:
-            self.xlBtn.Enable(True)
+            self.xlBtn.Enable(self.valid)
+            # if value isn't known until runtime, always disable Excel button
+            if "$" in self.GetValue():
+                self.xlBtn.Disable()
 
     def openExcel(self, event):
         """Either open the specified excel sheet, or make a new one from a template"""
@@ -986,24 +960,17 @@ class TableCtrl(wx.TextCtrl, _ValidatorMixin, _HideMixin, _FileMixin):
                 "please remember to add it to {name}").format(name=_translate(self.Name)),
                              caption=_translate("Reminder"))
             dlg.ShowModal()
-            # get frame
-            frame = self.GetParent()
-            while hasattr(frame, "GetParent") and not (hasattr(frame, "routine") or hasattr(frame, "component")):
-                frame = frame.GetParent()
-            # get comp type from frame
-            if hasattr(frame, "component"):
-                thisType = frame.component.type
-            elif hasattr(frame, "routine"):
-                thisType = frame.routine.type
-            elif hasattr(frame, "type"):
-                thisType = frame.type
-            else:
-                thisType = "None"
-            # open type specific template, or blank
-            if thisType in self.templates:
-                file = self.templates[thisType]
+            # get template
+            if "template" in self.param.ctrlParams:
+                file = self.param.ctrlParams['template']
+                # if template is specified as a method, call it now to get the value live
+                if callable(file):
+                    file = file()
+                # convert to Path
+                file = Path(file)
             else:
-                file = self.templates['None']
+                # use blank template if none given
+                file = Path(experiment.__file__).parent / 'blankTemplate.xltx',
         # Open whatever file is used
         try:
             os.startfile(file)

psychopy/app/builder/validators.py

@@ -13,12 +13,12 @@ import psychopy.experiment.utils
 from psychopy.tools import stringtools
 from psychopy.localization import _translate
 from . import experiment
-from pkg_resources import parse_version
+from packaging.version import Version
 from psychopy.tools.fontmanager import FontManager
 
 fontMGR = FontManager()
 
-if parse_version(wx.__version__) < parse_version('4.0.0a1'):
+if Version(wx.__version__) < Version('4.0.0a1'):
     _ValidatorBase = wx.PyValidator
 else:
     _ValidatorBase = wx.Validator

psychopy/app/coder/codeEditorBase.py

@@ -106,14 +106,6 @@ class BaseCodeEditor(wx.stc.StyledTextCtrl, handlers.ThemeMixin):
         deleteItem = wx.MenuItem(menu, self.DeleteID, _translate("Delete"))
         selectItem = wx.MenuItem(menu, self.SelectAllID, _translate("Select All"))
 
-        # Check whether items should be enabled
-        undoItem.Enable(self.CanUndo())
-        redoItem.Enable(self.CanRedo())
-        cutItem.Enable(self.CanCut())
-        copyItem.Enable(self.CanCopy())
-        pasteItem.Enable(self.CanPaste())
-        deleteItem.Enable(self.CanCopy())
-
         # Append items to menu
         menu.Append(undoItem)
         menu.Append(redoItem)
@@ -125,6 +117,14 @@ class BaseCodeEditor(wx.stc.StyledTextCtrl, handlers.ThemeMixin):
         menu.Append(deleteItem)
         menu.Append(selectItem)
 
+        # Check whether items should be enabled
+        undoItem.Enable(self.CanUndo())
+        redoItem.Enable(self.CanRedo())
+        cutItem.Enable(self.CanCut())
+        copyItem.Enable(self.CanCopy())
+        pasteItem.Enable(self.CanPaste())
+        deleteItem.Enable(self.CanCopy())
+
         self.PopupMenu(menu)
         menu.Destroy()
 

psychopy/app/coder/coder.py

@@ -2070,6 +2070,7 @@ class CoderFrame(BaseAuiFrame, handlers.ThemeMixin):
         #     self.OnFindClose(None)
 
     def OnFindClose(self, event):
+        self.findDlg.Destroy()
         self.findDlg = None
 
     def OnFileHistory(self, evt=None):
@@ -2873,10 +2874,6 @@ class CoderFrame(BaseAuiFrame, handlers.ThemeMixin):
         # TODO: Allow user to run project from coder
         pass
 
-    def setPavloviaUser(self, user):
-        # TODO: update user icon on button to user avatar
-        pass
-
     def resetPrefs(self, event):
         """Reset preferences to default"""
         # Present "are you sure" dialog
@@ -3056,6 +3053,9 @@ class CoderRibbon(ribbon.FrameRibbon):
 
         self.addSeparator()
 
+        # --- Plugin sections ---
+        self.addPluginSections("psychopy.app.builder")
+
         # --- Views ---
         self.addStretchSpacer()
         self.addSeparator()

psychopy/app/connections/sendusage.py

@@ -36,10 +36,10 @@ def sendUsageStats(app=None):
         OSXver, junk, architecture = platform.mac_ver()
         systemInfo = "OSX_%s" % (OSXver)
     elif sys.platform.startswith('linux'):
-        from distro import linux_distribution
+        import distro
         systemInfo = '%s_%s_%s' % (
             'Linux',
-            ':'.join([x for x in linux_distribution() if x != '']),
+            ':'.join([x for x in [distro.name(), distro.version(), distro.codename()] if x != '']),
             platform.release())
         if len(systemInfo) > 30:  # if it's too long PHP/SQL fails to store!?
             systemInfo = systemInfo[0:30]

psychopy/app/connections/updates.py

@@ -12,7 +12,7 @@ import time
 import zipfile
 import platform
 import os
-from pkg_resources import parse_version
+from packaging.version import Version
 import wx
 import wx.lib.filebrowsebutton
 try:
@@ -116,8 +116,8 @@ class Updater():
             raise(err)
         skip = self.app.prefs.appData['skipVersion'] == self.latest['version']
         if newer and not skip:
-            if (parse_version(self.latest['lastUpdatable'])
-                    <= parse_version(self.runningVersion)):
+            if (Version(self.latest['lastUpdatable'])
+                    <= Version(self.runningVersion)):
                 # go to the updating window
                 confirmDlg = SuggestUpdateDialog(
                     self.latest, self.runningVersion)
@@ -338,8 +338,8 @@ class InstallUpdateDialog(wx.Dialog):
             msg += _translate("Check proxy settings in preferences.")
             self.statusMessage.SetLabel(msg)
             return
-        elif (parse_version(self.latest['version'])
-                  < parse_version(self.runningVersion)):
+        elif (Version(self.latest['version'])
+                  < Version(self.runningVersion)):
             msg = _translate(
                 "You are running PsychoPy (%(running)s), which is ahead of "
                 "the latest official version (%(latest)s)") % {
@@ -354,8 +354,8 @@ class InstallUpdateDialog(wx.Dialog):
                 "PsychoPy v%(latest)s is available\nYou are running v%(running)s")
             msg = txt % {'latest': self.latest['version'],
                          'running': self.runningVersion}
-            if (parse_version(self.latest['lastUpdatable'])
-                                  <= parse_version(self.runningVersion)):
+            if (Version(self.latest['lastUpdatable'])
+                                  <= Version(self.runningVersion)):
                 msg += _translate("\nYou can update to the latest version automatically")
             else:
                 msg += _translate("\nYou cannot update to the latest version "
@@ -620,10 +620,10 @@ def sendUsageStats():
         OSXver, junk, architecture = platform.mac_ver()
         systemInfo = "OSX_%s_%s" % (OSXver, architecture)
     elif sys.platform.startswith('linux'):
-        from distro import linux_distribution
+        import distro
         systemInfo = '%s_%s_%s' % (
             'Linux',
-            ':'.join([x for x in linux_distribution() if x != '']),
+            ':'.join([x for x in [distro.name(), distro.version(), distro.codename()] if x != '']),
             platform.release())
         if len(systemInfo) > 30:  # if it's too long PHP/SQL fails to store!?
             systemInfo = systemInfo[0:30]

psychopy/app/dialogs.py

@@ -18,7 +18,7 @@ from wx.lib.newevent import NewEvent
 
 from psychopy import logging
 from psychopy.localization import _translate
-from pkg_resources import parse_version
+from packaging.version import Version
 
 
 class MessageDialog(wx.Dialog):
@@ -79,6 +79,38 @@ class MessageDialog(wx.Dialog):
 (GBSizerExLayoutEvent, EVT_GBSIZEREX_LAYOUT) = NewEvent()
 
 
+class RichMessageDialog(wx.Dialog):
+    def __init__(
+            self,
+            parent=None,
+            message="",
+            title="",
+            size=(600, 500),
+            style=wx.RESIZE_BORDER
+    ):
+        from psychopy.app.utils import MarkdownCtrl
+        # initialise dialog
+        wx.Dialog.__init__(
+            self, parent,
+            title=title,
+            size=size,
+            style=style
+        )
+        # setup sizer
+        self.border = wx.BoxSizer(wx.VERTICAL)
+        self.SetSizer(self.border)
+        self.sizer = wx.BoxSizer(wx.VERTICAL)
+        self.border.Add(self.sizer, proportion=1, border=6, flag=wx.EXPAND | wx.ALL)
+        # add markdown ctrl
+        self.ctrl = MarkdownCtrl(
+            self, value=message, style=wx.TE_READONLY
+        )
+        self.sizer.Add(self.ctrl, border=6, proportion=1, flag=wx.EXPAND | wx.ALL)
+        # add OK button
+        self.btns = self.CreateStdDialogButtonSizer(flags=wx.OK)
+        self.border.Add(self.btns, border=12, flag=wx.EXPAND | wx.ALL)
+
+
 class GlobSizer(wx.GridBagSizer):
     """This is a GridBagSizer that supports adding/removing/inserting rows and
     columns. It was found online, with not clear use license (public domain?).
@@ -620,7 +652,7 @@ class ListWidget(GlobSizer):
 
 
 if __name__ == '__main__':
-    if parse_version(wx.__version__) < parse_version('2.9'):
+    if Version(wx.__version__) < Version('2.9'):
         app = wx.PySimpleApp()
     else:
         app = wx.App(False)

psychopy/app/idle.py

@@ -82,6 +82,37 @@ tasks['getPavloviaUser'] = {
 currentTask = None
 
 
+def addTask(taskName, func, tstart=None, tend=None, thread=True):
+    """Add an idle task.
+    
+    Parameters
+    ----------
+    taskName : str
+        Name of the task.
+    func : function
+        Function to be executed.
+    tstart : float, optional
+        Start time of the task.
+    tend : float, optional
+        End time of the task.
+    thread : bool, optional
+        Whether to run the task in a separate thread.
+    
+    """
+    global tasks
+    if taskName in tasks:
+        logging.warning('Task {} already exists'.format(taskName))
+        return
+
+    tasks[taskName] = {
+        'status': NOT_STARTED,
+        'func': func,
+        'tstart': tstart, 
+        'tEnd': tend,
+        'thread': thread,
+    }
+
+
 def doIdleTasks(app=None):
     global currentTask
 

psychopy/app/jobs.py

@@ -37,6 +37,7 @@ import os.path
 
 import wx
 import os
+import sys
 from subprocess import Popen, PIPE
 from threading import Thread, Event
 from queue import Queue, Empty
@@ -246,6 +247,22 @@ class Job:
         # start the sub-process
         command = self._command
 
+        # # subprocess inherits the environment of the parent process
+        if env is None:  
+            scriptEnv = os.environ.copy()
+        else:
+            scriptEnv = env
+
+        # remove some environment variables that can cause issues
+        if 'PYTHONSTARTUP' in scriptEnv:
+            del scriptEnv['PYTHONSTARTUP']
+
+        # Set encoding for text mode pipes, needs to be explicitly set or we 
+        # crash on windows
+        scriptEnv['PYTHONIOENCODING'] = 'utf-8'
+        if sys.platform == 'win32':
+            scriptEnv['PYTHONLEGACYWINDOWSSTDIO'] = 'utf-8'
+
         try:
             self._process = Popen(
                 args=command,
@@ -257,10 +274,11 @@ class Job:
                 preexec_fn=None,
                 shell=False,
                 cwd=cwd,
-                env=env,
-                universal_newlines=True,  # gives us back a string instead of bytes
+                env=scriptEnv,
+                # universal_newlines=True,  # gives us back a string instead of bytes
                 creationflags=0,
-                text=True
+                text=False,
+                encoding='utf-8'
             )
         except FileNotFoundError:
             return -1  # negative PID means failure

psychopy/app/linuxconfig/__init__.py

@@ -19,6 +19,7 @@ import sys
 
 import wx
 from .ui import BaseLinuxConfigDialog
+from ...core import rush
 
 # Text that appears at the top of the dialog with provides instructions to the
 # user.
@@ -142,3 +143,11 @@ def linuxConfigFileExists():
         return True
 
     return os.path.isfile(_confPath)
+
+def linuxRushAllowed():
+    if sys.platform != 'linux':
+        return True
+
+    success = rush(1)
+    rush(0)
+    return success