BF: Only draw Form when within specified timeframe, fixes #3107

Author: Todd

psychopy/experiment/components/form/__init__.py

@@ -159,10 +159,22 @@ def writeRoutineStartCode(self, buff):
         pass
 
     def writeFrameCode(self, buff):
-        buff.writeIndented("%(name)s.draw()\n" % (self.params))
+        cond = "if "
+        if self.params['startVal']:
+            cond += "t > %(startVal)s"
+        if self.params['stopVal'] and self.params['startVal']:
+            cond += " and "
+        if self.params['stopVal']:
+            cond += "t < %(startVal)s+%(stopVal)s"
+        cond += ":\n"
+        if not self.params['stopVal'] and not self.params['startVal']:
+            cond = ""
+        buff.writeIndented((cond +
+                           "        %(name)s.draw()\n") % (self.params))
 
     def writeFrameCodeJS(self, buff):
-        buff.writeIndented("%(name)s.draw();\n" % (self.params))
+        buff.writeIndented("if t > %(start)s and t < %(stop)s:"
+                           "    %(name)s.draw();\n" % (self.params))
 
     def writeRoutineEndCode(self, buff):
         # save data, according to row/col format