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

psychopy/experiment/components/settings/__init__.py

@@ -43,7 +43,7 @@ _numpyRandomImports = ['random', 'randint', 'normal', 'shuffle', 'choice as rand
 
 # this is not a standard component - it will appear on toolbar not in
 # components panel
-ioDeviceMap = dict(ioUtil.getDeviceNames())
+ioDeviceMap = dict(ioUtil.getDeviceNames(device_name="eyetracker.hw"))
 ioDeviceMap['None'] = ""
 
 # Keyboard backend options
@@ -85,7 +85,9 @@ class SettingsComponent:
             winSize=(1024, 768), screen=1, monitor='testMonitor', winBackend='pyglet',
             showMouse=False, saveLogFile=True, showExpInfo=True,
             expInfo="{'participant':'f\"{randint(0, 999999):06.0f}\"', 'session':'001'}",
-            units='height', logging='warning',
+            units='height', 
+            logging="info", 
+            consoleLoggingLevel="warning",
             color='$[0,0,0]', colorSpace='rgb', enableEscape=True,
             measureFrameRate=True, frameRate="", frameRateMsg=_translate(
                 "Attempting to measure frame rate of screen, please wait..."
@@ -117,8 +119,10 @@ class SettingsComponent:
             plCompanionAddress="neon.local",
             plCompanionPort=8080,
             plCompanionRecordingEnabled=True,
+            ecSampleRate='default',
             keyboardBackend="ioHub",
-            filename=None, exportHTML='on Sync', endMessage=''
+            filename=None, exportHTML='on Sync',
+            endMessage=_translate("Thank you for your patience.")
     ):
         self.type = 'Settings'
         self.exp = exp  # so we can access the experiment if necess
@@ -397,6 +401,7 @@ class SettingsComponent:
             "Save psydat file",
             "Save hdf5 file",
             "logging level",
+            "consoleLoggingLevel",
             "clockFormat",
         ]
         self.params['Data filename'] = Param(
@@ -460,11 +465,23 @@ class SettingsComponent:
                             "useful for viewing and analyzing complex data in structures."),
             label=_translate("Save hdf5 file"), categ='Data')
         self.params['logging level'] = Param(
-            logging, valType='code', inputType="choice",
+            logging, valType='code', inputType="choice", categ='Data',
             allowedVals=['error', 'warning', 'data', 'exp', 'info', 'debug'],
-            hint=_translate("How much output do you want in the log files? "
-                            "('error' is fewest messages, 'debug' is most)"),
-            label=_translate("Logging level"), categ='Data')
+            hint=_translate(
+                "How much output do you want in the log files? ('error' is fewest "
+                "messages, 'debug' is most)"
+            ),
+            label=_translate("File logging level")
+        )
+        self.params['consoleLoggingLevel'] = Param(
+            consoleLoggingLevel, valType='code', inputType="choice", categ='Data',
+            allowedVals=['error', 'warning', 'data', 'exp', 'info', 'debug'],
+            hint=_translate(
+                "How much output do you want displayed in the console / app? ('error' "
+                "is fewest messages, 'debug' is most)"
+            ),
+            label=_translate("Console / app logging level")
+        )
         self.params['clockFormat'] = Param(
             clockFormat, valType="str", inputType="choice", categ="Data",
             allowedVals=["iso", "float"],
@@ -526,6 +543,7 @@ class SettingsComponent:
                            "plPupilRemoteAddress", "plPupilRemotePort", "plPupilRemoteTimeoutMs",
                            "plPupilCaptureRecordingEnabled", "plPupilCaptureRecordingLocation"],
             "Pupil Labs (Neon)": ["plCompanionAddress", "plCompanionPort", "plCompanionRecordingEnabled"],
+            "EyeLogic": ["ecSampleRate"],
         }
         for tracker in trackerParams:
             for depParam in trackerParams[tracker]:
@@ -742,6 +760,13 @@ class SettingsComponent:
             label=_translate("Recording enabled"), categ="Eyetracking"
         )
 
+        # EyeLogic
+        self.params['ecSampleRate'] = Param(
+            ecSampleRate, valType='str', inputType="single",
+            hint=_translate("Eyetracker sampling rate: 'default' or <integer>[Hz]. Defaults to tracking mode '0'."),
+            label=_translate("Sampling rate"), categ="Eyetracking"
+        )
+
         # Input
         self.params['keyboardBackend'] = Param(
             keyboardBackend, valType='str', inputType="choice",
@@ -994,7 +1019,6 @@ class SettingsComponent:
             "# start off with values from experiment settings\n"
             "_fullScr = %(Full-screen window)s\n"
             "_winSize = %(Window size (pixels))s\n"
-            "_loggingLevel = logging.getLevel('%(logging level)s')\n"
             "# if in pilot mode, apply overrides according to preferences\n"
             "if PILOTING:\n"
             "    # force windowed mode\n"
@@ -1002,10 +1026,6 @@ class SettingsComponent:
             "        _fullScr = False\n"
             "        # set window size\n"
             "        _winSize = prefs.piloting['forcedWindowSize']\n"
-            "    # override logging level\n"
-            "    _loggingLevel = logging.getLevel(\n"
-            "        prefs.piloting['pilotLoggingLevel']\n"
-            "    )\n"
         )
         buff.writeIndented(code % self.params)
 
@@ -1311,17 +1331,30 @@ class SettingsComponent:
         buff.writeIndentedLines(code)
         buff.setIndentLevel(+1, relative=True)
 
-        # set logging level
+        # set app logging level
         code = (
-            "# this outputs to the screen, not a file\n"
-            "logging.console.setLevel(_loggingLevel)\n"
+            "# set how much information should be printed to the console / app\n"
+            "if PILOTING:\n"
+            "    logging.console.setLevel(\n"
+            "        prefs.piloting['pilotConsoleLoggingLevel']\n"
+            "    )\n"
+            "else:\n"
+            "    logging.console.setLevel('%(consoleLoggingLevel)s')\n"
         )
         buff.writeIndentedLines(code % self.params)
-
+        # create log file
         if self.params['Save log file'].val:
             code = (
                 "# save a log file for detail verbose info\n"
-                "logFile = logging.LogFile(filename+'.log', level=_loggingLevel)\n"
+                "logFile = logging.LogFile(filename+'.log')\n"
+                "if PILOTING:\n"
+                "    logFile.setLevel(\n"
+                "        prefs.piloting['pilotLoggingLevel']\n"
+                "    )\n"
+                "else:\n"
+                "    logFile.setLevel(\n"
+                "        logging.getLevel('%(logging level)s')\n"
+                "    )\n"
                 "\n"
                 "return logFile\n"
             )
@@ -1408,6 +1441,7 @@ class SettingsComponent:
             "ioConfig = {}\n"
         )
         buff.writeIndentedLines(code % inits)
+
         # Add eyetracker config
         if self.params['eyetracker'] != "None":
             # Alert user if window is not fullscreen
@@ -1506,8 +1540,8 @@ class SettingsComponent:
                 buff.writeIndentedLines(code % inits)
                 buff.setIndentLevel(1, relative=True)
                 code = (
-                            "'sample_filtering': %(elDataFiltering)s,\n"
-                            "'elLiveFiltering': %(elLiveFiltering)s,\n"
+                            "'FILTER_FILE': %(elDataFiltering)s,\n"
+                            "'FILTER_ONLINE': %(elLiveFiltering)s,\n"
                 )
                 buff.writeIndentedLines(code % inits)
                 buff.setIndentLevel(-1, relative=True)
@@ -1623,6 +1657,22 @@ class SettingsComponent:
                 )
                 buff.writeIndentedLines(code % inits)
 
+            elif self.params['eyetracker'] == "EyeLogic":
+                code = (
+                    "'runtime_settings': {\n"
+                )
+                buff.writeIndentedLines(code % inits)
+                buff.setIndentLevel(1, relative=True)
+                code = (
+                    "'sampling_rate': %(ecSampleRate)s,\n"
+                )
+                buff.writeIndentedLines(code % inits)
+                buff.setIndentLevel(-1, relative=True)
+                code = (
+                    "}\n"
+                )
+                buff.writeIndentedLines(code % inits)
+
             # Close ioDevice dict
             buff.setIndentLevel(-1, relative=True)
             code = (
@@ -1635,36 +1685,66 @@ class SettingsComponent:
             code = (
                 "\n"
                 "# Setup iohub keyboard\n"
-                "ioConfig['Keyboard'] = dict(use_keymap='psychopy')\n\n"
+                "ioConfig['Keyboard'] = dict(use_keymap='psychopy')\n"
             )
             buff.writeIndentedLines(code % inits)
 
         if self.needIoHub and self.params['keyboardBackend'] == 'PsychToolbox':
             alert(code=4550)
 
-        # Start ioHub server
+        # Add experiment handler filename to ioConfig
         if self.needIoHub:
+            code = (
+                "\n"
+                "# Setup iohub experiment\n"
+                "ioConfig['Experiment'] = dict(filename=thisExp.dataFileName)\n"
+            )
+            buff.writeIndentedLines(code % inits)
+
+        # Make ioDataStoreConfig dict
+        if self.params['Save hdf5 file'].val:
+            code = (
+                "\n"
+                "# --- Setup iohub hdf5 datastore ---\n"
+            )
+            buff.writeIndentedLines(code % inits)
             # Specify session
             code = (
-                "ioSession = '1'\n"
-                "if 'session' in expInfo:\n"
+                "ioSession = str(expInfo.get('session', '1'))\n"
+            )
+            buff.writeIndentedLines(code % inits)
+            # Create ioDataStoreConfig dict
+            code = (
+                "ioDataStoreConfig = {"
             )
             buff.writeIndentedLines(code % inits)
             buff.setIndentLevel(1, relative=True)
             code = (
-                    "ioSession = str(expInfo['session'])\n"
+                f"'experiment_code': %(expName)s,\n"  # noqa: F541
+                "'session_code': ioSession,\n"
+                "'datastore_name': thisExp.dataFileName,\n"
             )
             buff.writeIndentedLines(code % inits)
             buff.setIndentLevel(-1, relative=True)
-            # Start server
+            code = (
+                "}\n"
+            )
+            buff.writeIndentedLines(code % inits)
+
+        # Start ioHub server
+        if self.needIoHub:
+            code = (
+                "\n"
+                "# Start ioHub server\n"
+            )
+            buff.writeIndentedLines(code % inits)
             if self.params['Save hdf5 file'].val:
                 code = (
-                    f"ioServer = io.launchHubServer(window=win, experiment_code=%(expName)s, session_code=ioSession, "
-                    f"datastore_name=thisExp.dataFileName, **ioConfig)\n"
+                    "ioServer = io.launchHubServer(window=win, **ioDataStoreConfig, **ioConfig)\n"
                 )
             else:
                 code = (
-                    f"ioServer = io.launchHubServer(window=win, **ioConfig)\n"
+                    "ioServer = io.launchHubServer(window=win, **ioConfig)\n"
                 )
             buff.writeIndentedLines(code % inits)
         else:
@@ -1675,6 +1755,7 @@ class SettingsComponent:
 
         # store ioServer
         code = (
+            "\n"
             "# store ioServer object in the device manager\n"
             "deviceManager.ioServer = ioServer\n"
         )
@@ -1822,7 +1903,7 @@ class SettingsComponent:
             "if expInfo is not None:\n"
             "    # get/measure frame rate if not already in expInfo\n"
             "    if win._monitorFrameRate is None:\n"
-            "        win.getActualFrameRate(infoMsg=%(frameRateMsg)s)\n"
+            "        win._monitorFrameRate = win.getActualFrameRate(infoMsg=%(frameRateMsg)s)\n"
             "    expInfo['frameRate'] = win._monitorFrameRate\n"
             )
             buff.writeIndentedLines(code % params)
@@ -1962,11 +2043,11 @@ class SettingsComponent:
             "if thisExp.status != PAUSED:\n"
             "    return\n"
             "\n"
+            "# start a timer to figure out how long we're paused for\n"
+            "pauseTimer = core.Clock()\n"
             "# pause any playback components\n"
             "for comp in playbackComponents:\n"
             "    comp.pause()\n"
-            "# prevent components from auto-drawing\n"
-            "win.stashAutoDraw()\n"
             "# make sure we have a keyboard\n"
             "defaultKeyboard = deviceManager.getDevice('defaultKeyboard')\n"
             "if defaultKeyboard is None:\n"
@@ -1985,19 +2066,17 @@ class SettingsComponent:
             "        endExperiment(thisExp, win=win)\n"
             )
         code += (
-            "    # flip the screen\n"
-            "    win.flip()\n"
+            "    # sleep 1ms so other threads can execute\n"
+            "    clock.time.sleep(0.001)\n"
             "# if stop was requested while paused, quit\n"
             "if thisExp.status == FINISHED:\n"
             "    endExperiment(thisExp, win=win)\n"
             "# resume any playback components\n"
             "for comp in playbackComponents:\n"
             "    comp.play()\n"
-            "# restore auto-drawn components\n"
-            "win.retrieveAutoDraw()\n"
             "# reset any timers\n"
             "for timer in timers:\n"
-            "    timer.reset()\n"
+            "    timer.addTime(-pauseTimer.getTime())\n"
         )
         buff.writeIndentedLines(code % self.params)
 
@@ -2036,11 +2115,10 @@ class SettingsComponent:
             "    # Flip one final time so any remaining win.callOnFlip() \n"
             "    # and win.timeOnFlip() tasks get executed\n"
             "    win.flip()\n"
+            "# return console logger level to WARNING\n"
+            "logging.console.setLevel(logging.WARNING)\n"
             "# mark experiment handler as finished\n"
             "thisExp.status = FINISHED\n"
-            "# shut down eyetracker, if there is one\n"
-            "if deviceManager.getDevice('eyetracker') is not None:\n"
-            "    deviceManager.removeDevice('eyetracker')\n"
         )
         if self.params['Save log file'].val:
             code += (
@@ -2077,9 +2155,6 @@ class SettingsComponent:
             "    # and win.timeOnFlip() tasks get executed before quitting\n"
             "    win.flip()\n"
             "    win.close()\n"
-            "# shut down eyetracker, if there is one\n"
-            "if deviceManager.getDevice('eyetracker') is not None:\n"
-            "    deviceManager.removeDevice('eyetracker')\n"
         )
         if self.params['Save log file'].val:
             code += (

psychopy/experiment/components/sound/__init__.py

@@ -52,9 +52,6 @@ class SoundComponent(BaseDeviceComponent):
             "volume", "hammingWindow",  # Playback tab
         ]
         # params
-        self.params['stopType'].allowedVals = ['duration (s)']
-        self.params['stopType'].hint = _translate('The maximum duration of a'
-                                                  ' sound in seconds')
         hnt = _translate("When does the Component end? (blank to use the "
                          "duration of the media)")
         self.params['stopVal'].hint = hnt
@@ -209,35 +206,33 @@ class SoundComponent(BaseDeviceComponent):
     def writeFrameCode(self, buff):
         """Write the code that will be called every frame
         """
-        # Write start code
+        # Write start code to update parameters. Unlike BaseVisualComponents, which
+        # inserts writeActiveTestCode() after the start code, we need to insert it
+        # here before the start code to provide the correct parameters for calling
+        # the play() method.
+
+        buff.writeIndented("\n")
+        buff.writeIndented(f"# *{self.params['name']}* updates\n")
         self.writeParamUpdates(buff, 'set every frame')
+
+        # write code for starting
         indented = self.writeStartTestCode(buff)
         if indented:
             if self.params['syncScreenRefresh'].val:
-                code = ("%(name)s.play(when=win)  # sync with win flip\n") % self.params
+                code = ("%(name)s.play(when=win)  # sync with win flip\n")
             else:
-                code = "%(name)s.play()  # start the sound (it finishes automatically)\n" % self.params
-            buff.writeIndented(code)
+                code = "%(name)s.play()  # start the sound (it finishes automatically)\n"
+            buff.writeIndentedLines(code % self.params)
         buff.setIndentLevel(-indented, relative=True)
 
-        # Write stop code
-        indented = self.writeStopTestCode(buff)
+        # write code for stopping
+        indented = self.writeStopTestCode(buff, extra=" or %(name)s.isFinished")
         if indented:
             code = ("%(name)s.stop()\n")
             buff.writeIndentedLines(code % self.params)
         # because of the 'if' statement of the time test
         buff.setIndentLevel(-indented, relative=True)
 
-        # Update status
-        code = (
-            "# update %(name)s status according to whether it's playing\n"
-            "if %(name)s.isPlaying:\n"
-            "    %(name)s.status = STARTED\n"
-            "elif %(name)s.isFinished:\n"
-            "    %(name)s.status = FINISHED\n"
-        )
-        buff.writeIndentedLines(code % self.params)
-
     def writeFrameCodeJS(self, buff):
         """Write the code that will be called every frame
         """
@@ -305,3 +300,43 @@ class SoundComponent(BaseDeviceComponent):
                 "%(name)s.stop();  // ensure sound has stopped at end of Routine\n"
             )
             buff.writeIndentedLines(code % self.params)
+
+    def writeParamUpdate(
+            self, 
+            buff, 
+            compName, 
+            paramName, 
+            val, 
+            updateType,
+            params=None, 
+            target="PsychoPy",
+    ):
+        """
+        Overload BaseComponent.writeParamUpdate to handle special case for SoundComponent
+        """
+        # when writing param updates for Sound.sound, needs to be `setValue` in JS
+        # (this is intended as a temporary patch - please delete when `setSound` in JS can accept 
+        # the same range of values as in Py)
+        if target == 'PsychoJS' and paramName == "sound":
+            # get logging string
+            if updateType == 'set every frame' and target == 'PsychoJS':
+                loggingStr = ', false'
+            else:
+                loggingStr = ''
+            # write setValue code
+            code = (
+                f"{compName}.setValue({val}{loggingStr});\n"
+            )
+            buff.writeIndented(code)
+        else:
+            # do normal stuff for every other param
+            BaseDeviceComponent.writeParamUpdate(
+                self, 
+                buff, 
+                compName, 
+                paramName, 
+                val, 
+                updateType,
+                params=params, 
+                target=target,
+            )

psychopy/experiment/components/static/__init__.py

@@ -246,7 +246,7 @@ class StaticComponent(BaseComponent):
                                       paramName=fieldName,
                                       val=prms[fieldName],
                                       updateType=prms[fieldName].updates,
-                                      params=prms)
+                                      params=prms, target=target)
             # Comment to mark end of updates
             if target == "PsychoJS":
                 code = "// Component updates done\n"

psychopy/experiment/components/text/__init__.py

@@ -24,7 +24,8 @@ class TextComponent(BaseVisualComponent):
                  text=_translate('Any text\n\nincluding line breaks'),
                  font='Arial', units='from exp settings',
                  color='white', colorSpace='rgb',
-                 pos=(0, 0), letterHeight=0.05, ori=0,
+                 pos=(0, 0), letterHeight=0.05,
+                 ori=0, draggable=False,
                  startType='time (s)', startVal=0.0,
                  stopType='duration (s)', stopVal=1.0,
                  flip='None', startEstim='', durationEstim='', wrapWidth='',
@@ -58,6 +59,14 @@ class TextComponent(BaseVisualComponent):
             hint=_translate("The font name (e.g. Comic Sans)"),
             label=_translate("Font"))
         del self.params['size']  # because you can't specify width for text
+        self.params['draggable'] = Param(
+            draggable, valType="code", inputType="bool", categ="Layout",
+            updates="constant",
+            label=_translate("Draggable?"),
+            hint=_translate(
+                "Should this stimulus be moveble by clicking and dragging?"
+            )
+        )
         self.params['letterHeight'] = Param(
             letterHeight, valType='num', inputType="single", allowedTypes=[], categ='Formatting',
             updates='constant', allowedUpdates=_allow3[:],  # copy the list
@@ -86,6 +95,22 @@ class TextComponent(BaseVisualComponent):
         del self.params['fillColor']
         del self.params['borderColor']
 
+    def _getParamCaps(self, paramName):
+        """
+        TEMPORARY FIX
+
+        TextStim in JS doesn't accept `letterHeight` as a param. Ideally this needs to be fixed
+        in JS, but in the meantime overloading this function in Python to write `setHeight`
+        rather than `setLetterHeight` means it stops biting users.
+        """
+        # call base function
+        paramName = BaseVisualComponent._getParamCaps(self, paramName)
+        # replace letterHeight
+        if paramName == "LetterHeight":
+            paramName = "Height"
+
+        return paramName
+
     def writeInitCode(self, buff):
         # do we need units code?
         if self.params['units'].val == 'from exp settings':
@@ -103,7 +128,7 @@ class TextComponent(BaseVisualComponent):
                 "    text=%(text)s,\n"
                 "    font=%(font)s,\n"
                 "    " + unitsStr +
-                "pos=%(pos)s, height=%(letterHeight)s, "
+                "pos=%(pos)s, draggable=%(draggable)s, height=%(letterHeight)s, "
                 "wrapWidth=%(wrapWidth)s, ori=%(ori)s, \n"
                 "    color=%(color)s, colorSpace=%(colorSpace)s, "
                 "opacity=%(opacity)s, \n"
@@ -141,7 +166,7 @@ class TextComponent(BaseVisualComponent):
                 "  name: '%(name)s',\n"
                 "  text: %(text)s,\n"
                 "  font: %(font)s,\n" + unitsStr +
-                "  pos: %(pos)s, height: %(letterHeight)s,"
+                "  pos: %(pos)s, draggable: %(draggable)s, height: %(letterHeight)s,"
                 "  wrapWidth: %(wrapWidth)s, ori: %(ori)s,\n"
                 "  languageStyle: %(languageStyle)s,\n"
                 "  color: new util.Color(%(color)s),"

psychopy/experiment/components/textbox/__init__.py

@@ -28,7 +28,7 @@ class TextboxComponent(BaseVisualComponent):
                  font='Arial', units='from exp settings', bold=False, italic=False,
                  color='white', colorSpace='rgb', opacity="",
                  pos=(0, 0), size=(0.5, 0.5), letterHeight=0.05, ori=0,
-                 speechPoint="",
+                 speechPoint="", draggable=False,
                  anchor='center', alignment='center',
                  lineSpacing=1.0, padding=0,  # gap between box and text
                  startType='time (s)', startVal=0.0,
@@ -107,6 +107,14 @@ class TextboxComponent(BaseVisualComponent):
             hint=_translate("horiz = left-right reversed; vert = up-down"
                             " reversed; $var = variable"),
             label=_translate("Flip vertical"))
+        self.params['draggable'] = Param(
+            draggable, valType="code", inputType="bool", categ="Layout",
+            updates="constant",
+            label=_translate("Draggable?"),
+            hint=_translate(
+                "Should this stimulus be moveble by clicking and dragging?"
+            )
+        )
         self.params['languageStyle'] = Param(
             languageStyle, valType='str', inputType="choice", categ='Formatting',
             allowedVals=['LTR', 'RTL', 'Arabic'],
@@ -207,7 +215,7 @@ class TextboxComponent(BaseVisualComponent):
         code = (
             "%(name)s = visual.TextBox2(\n"
             "     win, text=%(text)s, placeholder=%(placeholder)s, font=%(font)s,\n"
-            "     pos=%(pos)s," + unitsStr +
+            "     ori=%(ori)s, pos=%(pos)s, draggable=%(draggable)s, " + unitsStr +
             "     letterHeight=%(letterHeight)s,\n"
             "     size=%(size)s, borderWidth=%(borderWidth)s,\n"
             "     color=%(color)s, colorSpace=%(colorSpace)s,\n"
@@ -249,9 +257,11 @@ class TextboxComponent(BaseVisualComponent):
                 "  placeholder: %(placeholder)s,\n"
                 "  font: %(font)s,\n" 
                 "  pos: %(pos)s, \n"
+                "  draggable: %(draggable)s,\n"
                 "  letterHeight: %(letterHeight)s,\n"
                 "  lineSpacing: %(lineSpacing)s,\n"
                 "  size: %(size)s," + unitsStr +
+                "  ori: %(ori)s,\n"
                 "  color: %(color)s, colorSpace: %(colorSpace)s,\n"
                 "  fillColor: %(fillColor)s, borderColor: %(borderColor)s,\n"
                 "  languageStyle: %(languageStyle)s,\n"

psychopy/experiment/components/unknown/__init__.py

@@ -22,13 +22,12 @@ class UnknownComponent(BaseComponent):
                          'future)')
 
     def __init__(self, exp, parentName, name='', compType="UnknownComponent"):
-        self.type = compType
         self.exp = exp  # so we can access the experiment if necess
         self.parentName = parentName  # to access the routine too if needed
         self.params = {}
         self.depends = []
         super(UnknownComponent, self).__init__(exp, parentName, name=name)
-        self.order += []
+        self.type = compType
 
     @property
     def _xml(self):

psychopy/experiment/components/unknownPlugin/__init__.py

@@ -20,13 +20,13 @@ class UnknownPluginComponent(BaseComponent):
     tooltip = _translate('Unknown: A component which comes from a plugin which you do not have installed & activated.')
 
     def __init__(self, exp, parentName, name='', compType="UnknownPluginComponent"):
-        self.type = compType
         self.exp = exp  # so we can access the experiment if necess
         self.parentName = parentName  # to access the routine too if needed
         self.params = {}
         self.depends = []
         super(UnknownPluginComponent, self).__init__(exp, parentName, name=name)
-        self.order += []
+        # replace default type with the type given
+        self.type = compType
 
     @property
     def _xml(self):

psychopy/experiment/flow.py

@@ -432,11 +432,18 @@ class Flow(list):
                     loopStack.remove(thisEntry.loop)
             script.writeIndentedLines(code)
         # quit when all routines are finished
-        script.writeIndented("flowScheduler.add(quitPsychoJS, %(End Message)s, true);\n" % self.exp.settings.params)
+        code = (
+            "flowScheduler.add(quitPsychoJS, %(End Message)s, true);\n"
+        )
+        script.writeIndentedLines(code % self.exp.settings.params)
         # handled all the flow entries
-        code = ("\n// quit if user presses Cancel in dialog box:\n"
-                "dialogCancelScheduler.add(quitPsychoJS, '', false);\n\n")
-        script.writeIndentedLines(code)
+        code = (
+            "\n"
+            "// quit if user presses Cancel in dialog box:\n"
+            "dialogCancelScheduler.add(quitPsychoJS, %(End Message)s, false);\n"
+            "\n"
+        )
+        script.writeIndentedLines(code % self.exp.settings.params)
 
         # Write resource list
         resourceFiles = []