Merge conflicts from from being forced to pull in dev

psychopy · Feb 24, 2021 · 0d0d398 · 0d0d398
1 parent 5bbfa93
commit 0d0d398
Show file tree

Hide file tree

Showing 4 changed files with 166 additions and 64 deletions.
diff --git a/psychopy/CHANGELOG.txt b/psychopy/CHANGELOG.txt
@@ -76,6 +76,17 @@ FIXES:
 - Online: Allow for parsing of array-like strings when setting VisualStim position or size. psychopy/psychojs#262
 - Online: Prevent Safari from beeping in full screen. psychopy/psychojs#266
 
+PsychoPy 2021.1.0
+~~~~~~~~~~~~~~~~~~
+
+FIXES:
+
+- Error when trying to sync a new project with Pavlovia #33b3d80ea
+- TextBox in Builder was resetting to "default text" on each repeat rather than blank #8510d9f1a
+- Editable elements of Form were being erroneously drawn when they fell beyond the Form boundary #7d02c8251
+- Fix for
+
+
 PsychoPy 2020.2
 -----------------
 

diff --git a/psychopy/demos/builder/Experiments/BigFiveInventory/BFI.psyexp b/psychopy/demos/builder/Experiments/BigFiveInventory/BFI.psyexp
@@ -1,5 +1,5 @@
-<?xml version="1.0" ?>
-<PsychoPy2experiment version="2021.1.0.dev4" encoding="utf-8">
+<?xml version="1.0" ?>
+<PsychoPy2experiment version="2021.1.0" encoding="utf-8">
   <Settings>
     <Param name="Audio latency priority" val="4" valType="str" updates="None"/>
     <Param name="Audio lib" val="pygame" valType="str" updates="None"/>
@@ -9,7 +9,7 @@
     <Param name="Enable Escape" val="True" valType="bool" updates="None"/>
     <Param name="Experiment info" val="{'participant': '', 'session': '001'}" valType="code" updates="None"/>
     <Param name="Force stereo" val="True" valType="bool" updates="None"/>
-    <Param name="Full-screen window" val="True" valType="bool" updates="None"/>
+    <Param name="Full-screen window" val="False" valType="bool" updates="None"/>
     <Param name="HTML path" val="" valType="str" updates="None"/>
     <Param name="Incomplete URL" val="" valType="str" updates="None"/>
     <Param name="Monitor" val="testMonitor" valType="str" updates="None"/>
@@ -75,13 +75,13 @@
         <Param name="Item Padding" val="0.06" valType="num" updates="constant"/>
         <Param name="Items" val="demographics.xlsx" valType="file" updates="constant"/>
         <Param name="Randomize" val="False" valType="bool" updates="constant"/>
-        <Param name="Style" val="dark" valType="str" updates="constant"/>
+        <Param name="Style" val="light" valType="str" updates="constant"/>
         <Param name="Text Height" val="0.025" valType="num" updates="constant"/>
         <Param name="contrast" val="1" valType="code" updates="constant"/>
         <Param name="disabled" val="False" valType="bool" updates="None"/>
         <Param name="durationEstim" val="" valType="num" updates="None"/>
         <Param name="name" val="demog" valType="code" updates="None"/>
-        <Param name="opacity" val="1" valType="num" updates="constant"/>
+        <Param name="opacity" val="" valType="num" updates="constant"/>
         <Param name="pos" val="(0, 0)" valType="list" updates="constant"/>
         <Param name="saveStartStop" val="True" valType="bool" updates="None"/>
         <Param name="size" val="(1, 0.7)" valType="list" updates="constant"/>
@@ -170,7 +170,7 @@
         <Param name="Item Padding" val="0.05" valType="num" updates="constant"/>
         <Param name="Items" val="TIPI.xlsx" valType="file" updates="constant"/>
         <Param name="Randomize" val="False" valType="bool" updates="constant"/>
-        <Param name="Style" val="dark" valType="str" updates="constant"/>
+        <Param name="Style" val="light" valType="str" updates="constant"/>
         <Param name="Text Height" val="0.025" valType="num" updates="constant"/>
         <Param name="contrast" val="1" valType="code" updates="constant"/>
         <Param name="disabled" val="False" valType="bool" updates="None"/>

diff --git a/psychopy/experiment/components/form/__init__.py b/psychopy/experiment/components/form/__init__.py
@@ -41,6 +41,9 @@ def __init__(self, exp, parentName,
                  items='.csv',
                  textHeight=.03,
                  randomize=False,
+                 color='white',
+                 fillColor='red',
+                 borderColor='white',
                  size=(1, .7),
                  pos=(0, 0),
                  style='dark',
@@ -52,15 +55,12 @@ def __init__(self, exp, parentName,
         super(FormComponent, self).__init__(
             exp, parentName, name=name,
             pos=pos, size=size,
+            color=color, fillColor=fillColor, borderColor=borderColor,
             startType=startType, startVal=startVal,
             stopType=stopType, stopVal=stopVal,
             startEstim=startEstim, durationEstim=durationEstim)
 
         # these are defined by the BaseVisual but we don't want them
-        del self.params['color']
-        del self.params['fillColor']
-        del self.params['borderColor']
-        del self.params['colorSpace']
         del self.params['ori']
         del self.params['units']  # we only support height units right now
 
@@ -72,7 +72,6 @@ def __init__(self, exp, parentName,
         self.order += ['Items', 'Randomize',  # Basic tab
                        'Data Format',  # Data tab
                       ]
-        self.order.insert(self.order.index("colorSpace"), "Style")
         self.order.insert(self.order.index("units"), "Item Padding")
 
         # normal params:
@@ -96,13 +95,6 @@ def __init__(self, exp, parentName,
             hint=_translate("Do you want to randomize the order of your questions?"),
             label=_localized['Randomize'])
 
-        self.params['Style'] = Param(
-            style, valType='str', inputType="choice", categ="Appearance",
-            updates='constant', allowedVals=knownStyles,
-            hint=_translate(
-                    "Styles determine the appearance of the form"),
-            label=_localized['Style'])
-
         self.params['Item Padding'] = Param(
             itemPadding, valType='num', inputType="single", allowedTypes=[], categ='Layout',
             updates='constant',
@@ -116,6 +108,25 @@ def __init__(self, exp, parentName,
             hint=_translate("Store item data by columns, or rows"),
             label=_localized['Data Format'])
 
+        self.params['Style'] = Param(
+            style, valType='str', inputType="choice", categ="Appearance",
+            updates='constant', allowedVals=knownStyles,
+            hint=_translate(
+                    "Styles determine the appearance of the form"),
+            label=_localized['Style'])
+
+        self.params['color'].label = _translate("Text Color")
+        self.params['color'].allowedUpdates = []
+        self.params['fillColor'].label = _translate("Marker Colors")
+        self.params['fillColor'].allowedUpdates = []
+        self.params['borderColor'].label =_translate("Lines Color")
+        self.params['borderColor'].allowedUpdates = []
+
+        # TEMPORARY: Hide color params until we have something that works
+        del self.params['color']
+        del self.params['fillColor']
+        del self.params['borderColor']
+
         self.params['pos'].allowedUpdates = []
         self.params['size'].allowedUpdates = []
 
@@ -127,6 +138,7 @@ def writeInitCode(self, buff):
                    "    items={Items},\n"
                    "    textHeight={Text Height},\n"
                    "    randomize={Randomize},\n"
+                   # "    color={color}, fillColor={fillColor}, borderColor={borderColor}, colorSpace={colorSpace}, \n"
                    "    size={size},\n"
                    "    pos={pos},\n"
                    "    style={Style},\n"