Added a CONFIGURE command to set the the interpreter's frame rate.

Arrahed · Arrahed · commit 5abb79195210 · 2016-08-28T10:51:50.000+02:00
diff --git a/floppy/floppySettings.py b/floppy/floppySettings.py
@@ -17,6 +17,8 @@ def __init__(self, *args, settings=None, globals=None):
                         ('Pin Size', PinSizeEdit(settings, globals, self)),
                         ('Temporary File Settings', None),
                         ('Work File Directory', WorkFileDirEdit(settings, globals, self)),
+                        ('Remote Interpreter Settings', None),
+                        ('Frame Rate', RGIFrameRateEdit(settings, globals, self)),
                         ]
         super(SettingsDialog, self).__init__(*args)
         self.setStyleSheet('''SettingsDialog {
@@ -266,3 +268,17 @@ def __init__(self, settings, globals, parent):
     def commit(self):
         self.settings.setValue('LocalPort', self.value())
         self.globals['LOCALPORT'] = self.value()
+
+
+class RGIFrameRateEdit(QLineEdit):
+    def __init__(self, settings, globals, parent):
+        self.parent = parent
+        self.globals = globals
+        self.settings = settings
+        super(RGIFrameRateEdit, self).__init__()
+        v = settings.value('FrameRate', type=float)
+        v = v if v else .1
+        self.setText(str(v))
+
+    def commit(self):
+        self.settings.setValue('FrameRate', float(self.text()))
diff --git a/floppy/graph.py b/floppy/graph.py
@@ -670,6 +670,9 @@ def deleteNode(self, node):
             self.removeConnection(out.ID)
         del self.nodes[node.ID]
 
+    def configureInterpreter(self, options):
+        self.rgiConnection.send('CONFIGURE{}'.format(json.dumps(options)), print)
+
 
 class NodeThread(Thread):
 
diff --git a/floppy/painter.py b/floppy/painter.py
@@ -872,6 +872,11 @@ def initActions(self):
         self.createSubgraphAction.setIconVisibleInMenu(False)
         self.addAction(self.createSubgraphAction)
         
+        self.configureAction = QAction(QIcon(os.path.join(self.iconRoot, 'configure.png')), 'configure', self)
+        self.configureAction.setShortcut('Ctrl+Y')
+        self.configureAction.triggered.connect(self.configureInterpreter)
+        self.configureAction.setIconVisibleInMenu(False)
+        self.addAction(self.configureAction)
 
     def initMenus(self):
         fileMenu = self.menuBar.addMenu('&File')
@@ -928,6 +933,9 @@ def selectSubgraph(self):
         self.drawer.setSelectedSubgraph(self.macroSelector.currentText())
         self.drawer.update()
 
+    def configureInterpreter(self):
+        self.drawer.graph.configureInterpreter({'framerate': 0.01, 'foo': 'bar'})
+
     def getSubgraphList(self):
         new = self.drawer.getAllSubgraphs()
         self.macroSelector.addItems(new.difference(self.knownSubgraphs))
diff --git a/floppy/runner.py b/floppy/runner.py
@@ -109,6 +109,14 @@ def kill(self):
         self.cmdQueue.put(ExecutionThread.kill)
         xLock.release()
 
+    def configure(self, options):
+        try:
+            framerate = options['framerate']
+        except KeyError:
+            pass
+        else:
+            self.executionThread.setFrameRate(framerate)
+
     def unpause(self):
         xLock.acquire()
         if not self.cmdQueue.empty():
@@ -151,7 +159,7 @@ def getReport(self, nodeID):
 class ExecutionThread(Thread):
     def __init__(self, cmdQueue, master):
         self.graph = None
-
+        self.framerate = 0.1
         self.master = master
         self.paused = True
         self.alive = True
@@ -161,6 +169,9 @@ def __init__(self, cmdQueue, master):
         # self.updateGraph()
         self.start()
 
+    def setFrameRate(self, framerate):
+        self.framerate = framerate
+
     def run(self):
         while self.alive:
             xLock.acquire()
@@ -183,7 +194,7 @@ def run(self):
                 self.executeGraphStepPar()
                 self.master.updateRunningNodes(self.graph.runningNodes)
             else:
-                time.sleep(.5)
+                time.sleep(self.framerate)
         print('That\'s it. I\'m dead.')
 
     def pause(self):
@@ -269,32 +280,6 @@ def executeGraphStepPar(self):
                 print('Nothing to do here @ {}'.format(time.time()))
                 time.sleep(.1)
 
-    def execute(self):
-        """
-        Execute the Graph instance.
-
-        First, the execution loop will set itself up to terminate after the first iteration.
-        Next, every node is given the chance to run if all prerequisites are met.
-        If a node is executed, the loop termination criterion will be reset to allow an additional iteration over all
-        nodes.
-        If no node is execute during one iteration, the termination criterion will not be reset and the execution loop
-        terminates.
-        :return:
-        """
-        return self.testRun()
-        running = True
-        i = 0
-        while running:
-            i += 1
-            print('\nExecuting iteration {}.'.format(i))
-            running = False
-            for node in self.nodes.values():
-                checked = node.check()
-                running = checked if not running else True
-                if checked:
-                    node.run()
-                    # raise RuntimeError('Uncaught exception while executing node {}.'.format(node))
-                    node.notify()
 
 
 class Listener(Thread):
@@ -374,6 +359,9 @@ def run(self):
                     nextID = int(message[4:])
                     self.send('Runner jumping to node {}.'.format(nextID))
                     self.master.goto(nextID)
+                elif message.startswith('CONFIGURE'):
+                    msg = message[9:]
+                    self.master.configure(json.loads(msg))
                 elif message == 'STEP':
                     self.send('Runner is performing one step.')
                     self.master.step()
