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

psychopy/experiment/components/mouse/__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).
 
 from pathlib import Path
@@ -503,111 +503,110 @@ class MouseComponent(BaseComponent):
         buff.writeIndented("// *%s* updates\n" % self.params['name'])
 
         # writes an if statement to determine whether to draw etc
-        self.writeStartTestCodeJS(buff)
-        code = "%(name)s.status = PsychoJS.Status.STARTED;\n"
-        if self.params['timeRelativeTo'].val.lower() == 'mouse onset':
-            code += "%(name)s.mouseClock.reset();\n" % self.params
+        indented = self.writeStartTestCodeJS(buff)
+        if indented:
+            code = "%(name)s.status = PsychoJS.Status.STARTED;\n"
+            if self.params['timeRelativeTo'].val.lower() == 'mouse onset':
+                code += "%(name)s.mouseClock.reset();\n" % self.params
 
-        if self.params['newClicksOnly']:
-            code += (
-                "prevButtonState = %(name)s.getPressed();"
-                "  // if button is down already this ISN'T a new click\n")
-        else:
-            code += (
-                "prevButtonState = [0, 0, 0];"
-                "  // if now button is down we will treat as 'new' click\n")
-        code+=("}\n")
-        buff.writeIndentedLines(code % self.params)
+            if self.params['newClicksOnly']:
+                code += (
+                    "prevButtonState = %(name)s.getPressed();"
+                    "  // if button is down already this ISN'T a new click\n")
+            else:
+                code += (
+                    "prevButtonState = [0, 0, 0];"
+                    "  // if now button is down we will treat as 'new' click\n")
+            buff.writeIndentedLines(code % self.params)
 
-        # to get out of the if statement
-        buff.setIndentLevel(-1, relative=True)
+            # to get out of the if statement
+            for n in range(indented):
+                buff.setIndentLevel(-1, relative=True)
+                buff.writeIndented("}\n")
 
         # test for stop (only if there was some setting for duration or stop)
-        if self.params['stopVal'].val not in ['', None, -1, 'None']:
-            # writes an if statement to determine whether to draw etc
-            self.writeStopTestCodeJS(buff)
-            buff.writeIndented("%(name)s.status = PsychoJS.Status.FINISHED;\n"
-                               "  }\n" % self.params)
+        indented = self.writeStopTestCodeJS(buff)
+        if indented:
+            buff.writeIndented("%(name)s.status = PsychoJS.Status.FINISHED;\n" % self.params)
             # to get out of the if statement
-            buff.setIndentLevel(-1, relative=True)
+            for n in range(indented):
+                buff.setIndentLevel(-1, relative=True)
+                buff.writeIndented("}\n")
 
         # if STARTED and not FINISHED!
-        code = ("if (%(name)s.status === PsychoJS.Status.STARTED) {  "
-                "// only update if started and not finished!\n")
-        buff.writeIndented(code % self.params)
-        buff.setIndentLevel(1, relative=True)  # to get out of if statement
-        dedentAtEnd = 1  # keep track of how far to dedent later
-
-        # write param checking code
-        if (self.params['saveMouseState'].val in ['on click', 'on valid click'] or forceEnd in ['any click', 'correct click', 'valid click']):
-            code = ("_mouseButtons = %(name)s.getPressed();\n")
-            buff.writeIndentedLines(code % self.params)
-            # buff.setIndentLevel(1, relative=True)
-            # dedentAtEnd += 1
-            code = "if (!_mouseButtons.every( (e,i,) => (e == prevButtonState[i]) )) { // button state changed?\n"
-            buff.writeIndented(code)
-            buff.setIndentLevel(1, relative=True)
-            dedentAtEnd += 1
-            buff.writeIndented("prevButtonState = _mouseButtons;\n")
-            code = ("if (_mouseButtons.reduce( (e, acc) => (e+acc) ) > 0) { // state changed to a new click\n")
-            buff.writeIndentedLines(code % self.params)
-            buff.setIndentLevel(1, relative=True)
-            dedentAtEnd += 1
-
-        elif self.params['saveMouseState'].val == 'every frame':
-            code = "_mouseButtons = %(name)s.getPressed();\n" % self.params
-            buff.writeIndented(code)
+        indented = self.writeActiveTestCodeJS(buff)
+        if indented:
+            # write param checking code
+            if (self.params['saveMouseState'].val in ['on click', 'on valid click'] or forceEnd in ['any click', 'correct click', 'valid click']):
+                code = ("_mouseButtons = %(name)s.getPressed();\n")
+                buff.writeIndentedLines(code % self.params)
+                # buff.setIndentLevel(1, relative=True)
+                # dedentAtEnd += 1
+                code = "if (!_mouseButtons.every( (e,i,) => (e == prevButtonState[i]) )) { // button state changed?\n"
+                buff.writeIndented(code)
+                buff.setIndentLevel(1, relative=True)
+                indented += 1
+                buff.writeIndented("prevButtonState = _mouseButtons;\n")
+                code = ("if (_mouseButtons.reduce( (e, acc) => (e+acc) ) > 0) { // state changed to a new click\n")
+                buff.writeIndentedLines(code % self.params)
+                buff.setIndentLevel(1, relative=True)
+                indented += 1
+
+            elif self.params['saveMouseState'].val == 'every frame':
+                code = "_mouseButtons = %(name)s.getPressed();\n" % self.params
+                buff.writeIndented(code)
 
-        # also write code about clicked objects if needed.
-        if self.params['clickable'].val:
-            self._writeClickableObjectsCodeJS(buff)
+            # also write code about clicked objects if needed.
+            if self.params['clickable'].val:
+                self._writeClickableObjectsCodeJS(buff)
 
-        # also write code about correct objects if needed
-        if self.params['storeCorrect']:
-            self._writeCorrectAnsCodeJS(buff)
-
-        if self.params['saveMouseState'].val in ['on click', 'on valid click', 'every frame']:
-            storeCode = (
-                    "_mouseXYs = %(name)s.getPos();\n"
-                    "%(name)s.x.push(_mouseXYs[0]);\n"
-                    "%(name)s.y.push(_mouseXYs[1]);\n"
-                    "%(name)s.leftButton.push(_mouseButtons[0]);\n"
-                    "%(name)s.midButton.push(_mouseButtons[1]);\n"
-                    "%(name)s.rightButton.push(_mouseButtons[2]);\n"
-                    % self.params
-            )
-            storeCode += ("%s.time.push(%s.getTime());\n" % (self.params['name'], self.clockStr))
-            if self.params['clickable'].val and self.params['saveMouseState'].val in ['on valid click']:
-                code = (
-                    "if (gotValidClick === true) { \n"
+            # also write code about correct objects if needed
+            if self.params['storeCorrect']:
+                self._writeCorrectAnsCodeJS(buff)
+
+            if self.params['saveMouseState'].val in ['on click', 'on valid click', 'every frame']:
+                storeCode = (
+                        "_mouseXYs = %(name)s.getPos();\n"
+                        "%(name)s.x.push(_mouseXYs[0]);\n"
+                        "%(name)s.y.push(_mouseXYs[1]);\n"
+                        "%(name)s.leftButton.push(_mouseButtons[0]);\n"
+                        "%(name)s.midButton.push(_mouseButtons[1]);\n"
+                        "%(name)s.rightButton.push(_mouseButtons[2]);\n"
+                        % self.params
                 )
+                storeCode += ("%s.time.push(%s.getTime());\n" % (self.params['name'], self.clockStr))
+                if self.params['clickable'].val and self.params['saveMouseState'].val in ['on valid click']:
+                    code = (
+                        "if (gotValidClick === true) { \n"
+                    )
+                    buff.writeIndentedLines(code)
+                    buff.setIndentLevel(+1, relative=True)
+                    buff.writeIndentedLines(storeCode)
+                    buff.setIndentLevel(-1, relative=True)
+                    code = (
+                        "}\n"
+                    )
+                    buff.writeIndentedLines(code)
+                else:
+                    buff.writeIndentedLines(storeCode)
+
+                # does the response end the trial?
+            if forceEnd == 'any click':
+                code = ("// end routine on response\n"
+                        "continueRoutine = false;\n")
                 buff.writeIndentedLines(code)
-                buff.setIndentLevel(+1, relative=True)
-                buff.writeIndentedLines(storeCode)
-                buff.setIndentLevel(-1, relative=True)
-                code = (
-                    "}\n"
-                )
+
+            elif forceEnd == 'valid click':
+                code = ("if (gotValidClick === true) { // end routine on response\n"
+                        "  continueRoutine = false;\n"
+                        "}\n")
                 buff.writeIndentedLines(code)
             else:
-                buff.writeIndentedLines(storeCode)
-
-            # does the response end the trial?
-        if forceEnd == 'any click':
-            code = ("// end routine on response\n"
-                    "continueRoutine = false;\n")
-            buff.writeIndentedLines(code)
-
-        elif forceEnd == 'valid click':
-            code = ("if (gotValidClick === true) { // end routine on response\n"
-                    "  continueRoutine = false;\n"
-                    "}\n")
-            buff.writeIndentedLines(code)
-        else:
-            pass  # forceEnd == 'never'
-        for thisDedent in range(dedentAtEnd):
-            buff.setIndentLevel(-1, relative=True)
-            buff.writeIndentedLines('}')
+                pass  # forceEnd == 'never'
+            # to get out of the if statement
+            for n in range(indented):
+                buff.setIndentLevel(-1, relative=True)
+                buff.writeIndented("}\n")
 
     def writeRoutineEndCode(self, buff):
         # some shortcuts

psychopy/experiment/components/movie/__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).
 
 from pathlib import Path
@@ -180,53 +180,6 @@ class MovieComponent(BaseVisualComponent):
                 "    )\n")
         buff.writeIndentedLines(code % depth)
 
-    def _writeCreationCodeJS(self, buff, useInits):
-
-        # If we're in writeInitCode then we need to convert params to initVals
-        # because some (variable) params haven't been created yet.
-        if useInits:
-            inits = getInitVals(self.params)
-        else:
-            inits = copy.deepcopy(self.params)
-        inits['depth'] = -self.getPosInRoutine()
-
-        noAudio = '{}'.format(inits['No audio'].val).lower()
-        loop = '{}'.format(inits['loop'].val).lower()
-
-        for param in inits:
-            if inits[param] in ['', None, 'None', 'none', 'from exp settings']:
-                inits[param].val = 'undefined'
-                inits[param].valType = 'code'
-
-        code = "{name}Clock = new util.Clock();\n".format(**inits)
-        buff.writeIndented(code)
-
-        code = ("{name} = new visual.MovieStim({{\n"
-                "  win: psychoJS.window,\n"
-                "  name: '{name}',\n"
-                "  units: {units},\n"
-                "  movie: {movie},\n"
-                "  pos: {pos},\n"
-                "  anchor: {anchor},\n"
-                "  size: {size},\n"
-                "  ori: {ori},\n"
-                "  opacity: {opacity},\n"
-                "  loop: {loop},\n"
-                "  noAudio: {noAudio},\n"
-                "  depth: {depth}\n"
-                "  }});\n").format(name=inits['name'],
-                                   movie=inits['movie'],
-                                   units=inits['units'],
-                                   pos=inits['pos'],
-                                   anchor=inits['anchor'],
-                                   size=inits['size'],
-                                   ori=inits['ori'],
-                                   loop=loop,
-                                   opacity=inits['opacity'],
-                                   noAudio=noAudio,
-                                   depth=inits['depth'])
-        buff.writeIndentedLines(code)
-
     def writeInitCode(self, buff):
         # Get init values
         params = getInitVals(self.params)
@@ -266,8 +219,33 @@ class MovieComponent(BaseVisualComponent):
         buff.writeIndentedLines(code % params)
 
     def writeInitCodeJS(self, buff):
-        # create the code using init vals
-        self._writeCreationCodeJS(buff, useInits=True)
+        # get init values
+        inits = getInitVals(self.params)
+        inits['depth'] = -self.getPosInRoutine()
+        # choose a movie attribute
+        if "youtube.com/watch" in str(inits['movie'].val):
+            inits['movieAttr'] = "youtubeUrl"
+        else:
+            inits['movieAttr'] = "movie"
+        # create a movie stim
+        code = (
+            "%(name)sClock = new util.Clock();\n"
+            "%(name)s = new visual.MovieStim({\n"
+            "  win: psychoJS.window,\n"
+            "  %(movieAttr)s: %(movie)s,\n"
+            "  name: '%(name)s',\n"
+            "  units: %(units)s,\n"
+            "  pos: %(pos)s,\n"
+            "  anchor: %(anchor)s,\n"
+            "  size: %(size)s,\n"
+            "  ori: %(ori)s,\n"
+            "  opacity: %(opacity)s,\n"
+            "  loop: %(loop)s,\n"
+            "  noAudio: %(No audio)s,\n"
+            "  depth: %(depth)s\n"
+            "})\n"
+        )
+        buff.writeIndentedLines(code % inits)
 
     def writeFrameCode(self, buff):
         """Write the code that will be called every frame

psychopy/experiment/components/parallelOut/__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).
 
 from pathlib import Path
@@ -49,7 +49,7 @@ class ParallelOutComponent(BaseComponent):
                          "options in preferences>general)")
         self.params['address'] = Param(
             address, valType='str', inputType="choice", allowedVals=addressOptions,
-            categ='Hardware', hint=msg, label=_translate("Port address"))
+            categ="Device", hint=msg, label=_translate("Port address"))
 
         self.depends.append(
             {"dependsOn": "address",  # must be param name
@@ -63,7 +63,7 @@ class ParallelOutComponent(BaseComponent):
         msg = _translate("U3 Register to write byte to")
         self.params['register'] = Param(register, valType='str',
                                         inputType="choice", allowedVals=['EIO', 'FIO'],
-                                        categ='Hardware', hint=msg, label=_translate("U3 register"))
+                                        categ="Device", hint=msg, label=_translate("U3 register"))
 
         self.params['startData'] = Param(
             startData, valType='code', inputType="single", allowedTypes=[], categ='Data',

psychopy/experiment/components/polygon/__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).
 
 from pathlib import Path
@@ -296,8 +296,7 @@ class PolygonComponent(BaseVisualComponent):
         # make a util.Color object for non-transparent
         for key in ("fillColor", "lineColor"):
             if inits[key].val != "undefined":
-                inits[key].val = "new util.Color(%s)" % inits[key]
-                inits[key].valType = "code"
+                inits[key] = "new util.Color(%s)" % inits[key]
         # add other params
         code += (
             "  ori: {ori}, \n"

psychopy/experiment/components/roi/__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).
 
 from pathlib import Path
@@ -18,7 +18,7 @@ class RegionOfInterestComponent(PolygonComponent):
     version = "2021.2.0"
     iconFile = Path(__file__).parent / 'eyetracker_roi.png'
     tooltip = _translate('Region Of Interest: Define a region of interest for use with eyetrackers')
-    beta = True
+    beta = False
 
     def __init__(self, exp, parentName, name='roi',
                  units='from exp settings',

psychopy/experiment/components/routineSettings/__init__.py

@@ -14,6 +14,8 @@ class RoutineSettingsComponent(BaseComponent):
     iconFile = Path(__file__).parent / 'routineSettings.png'
     tooltip = _translate('Settings for this Routine.')
     version = "2023.2.0"
+    # a Routine only has one RoutineSettingsComponent, so hide it from the Components panel
+    hidden = True
 
     def __init__(
             self, exp, parentName,

psychopy/experiment/components/serialOut/__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).
 from copy import copy
 from pathlib import Path
@@ -18,7 +18,7 @@ class SerialOutComponent(BaseComponent):
     version = "2022.2.0"
     iconFile = Path(__file__).parent / 'serial.png'
     tooltip = _translate('Serial out: send signals from a serial port')
-    beta = True
+    beta = False
 
     def __init__(self, exp, parentName, name='serialPort',
                  startType='time (s)', startVal=0.0,
@@ -45,22 +45,22 @@ class SerialOutComponent(BaseComponent):
             label=_translate("Port")
         )
         self.params['baudrate'] = Param(
-            baudrate, valType='int', inputType="single", categ='Hardware',
+            baudrate, valType='int', inputType="single", categ="Device",
             hint=_translate("The baud rate, or speed, of the connection."),
             label=_translate("Baud rate")
         )
         self.params['bytesize'] = Param(
-            bytesize, valType='int', inputType="single", categ='Hardware',
+            bytesize, valType='int', inputType="single", categ="Device",
             hint=_translate("Size of bits to be sent."),
             label=_translate("Data bits")
         )
         self.params['stopbits'] = Param(
-            stopbits, valType='int', inputType="single", categ='Hardware',
+            stopbits, valType='int', inputType="single", categ="Device",
             hint=_translate("Size of bits to be sent on stop."),
             label=_translate("Stop bits")
         )
         self.params['parity'] = Param(
-            parity, valType='str', inputType="choice", categ='Hardware',
+            parity, valType='str', inputType="choice", categ="Device",
             allowedVals=('N', 'E', 'O', 'M', 'S'),
             allowedLabels=("None", "Even", "Off", "Mark", "Space"),
             hint=_translate("Parity mode."),
@@ -68,7 +68,7 @@ class SerialOutComponent(BaseComponent):
         )
 
         self.params['timeout'] = Param(
-            timeout, valType='int', inputType="single", allowedTypes=[], categ='Hardware',
+            timeout, valType='int', inputType="single", allowedTypes=[], categ="Device",
             hint=_translate("Time at which to give up listening for a response (leave blank for no limit)"),
             label=_translate("Timeout"))