BF: Keep track of context for colorpicker and prepend a $ if it's goi…

…ng to Builder - otherwise it compiles as a string and breaks

psychopy/app/builder/dialogs/paramCtrls.py

@@ -390,7 +390,7 @@ def __init__(self, parent, valType,
         self.validate()
 
     def colorPicker(self, evt):
-        dlg = PsychoColorPicker(self.GetTopLevelParent().frame)
+        dlg = PsychoColorPicker(self.GetTopLevelParent().frame, context='builder')
         dlg.ShowModal()
         dlg.Destroy()
 

psychopy/app/colorpicker/__init__.py

@@ -27,7 +27,7 @@ class PsychoColorPicker(wx.Dialog):
         Reference to a :class:`~wx.Frame` which owns this dialog.
 
     """
-    def __init__(self, parent):
+    def __init__(self, parent, context=None):
         wx.Dialog.__init__(
             self,
             parent,
@@ -40,6 +40,9 @@ def __init__(self, parent):
         self.SetSizeHints(wx.DefaultSize, wx.DefaultSize)
         self.SetMinSize(wx.Size(600, 480))
 
+        # Store context
+        self.context = context
+
         # current output color, should be displayed in the preview
         global LAST_COLOR
         self._color = LAST_COLOR.copy()
@@ -339,6 +342,8 @@ def onCopyObject(self, event):
         outputSpace = self.cboOutputSpace.GetSelection()
         toReturn = "colors.Color({}, space='{}')".format(
             self.getOutputValue(), self._spaces[outputSpace])
+        if self.context == 'builder':
+            toReturn = "$" + toReturn
         self._copyToClipboard(toReturn)
         self.Close()
         event.Skip()
@@ -347,7 +352,10 @@ def onCopyValue(self, event):
         """Event to copy the color to the clipboard as a value.
 
         """
-        self._copyToClipboard(self.getOutputValue())  # copy out to clipboard
+        toReturn = self.getOutputValue()
+        if self.context == 'builder':
+            toReturn = "$" + toReturn
+        self._copyToClipboard(toReturn)  # copy out to clipboard
         self.Close()
         event.Skip()