Added option to specify the port the local interperter is using.

JLuebben · JLuebben · commit e7c931695595 · 2016-08-22T11:39:11.000+02:00
All threads should be daemons now.
diff --git a/floppy/floppySettings.py b/floppy/floppySettings.py
@@ -7,6 +7,7 @@ def __init__(self, *args, settings=None, globals=None):
         self.settings= settings
         self.dialogs = [('Network Settings', None),
                         ('Default Connection', DefaultConnectionEdit(settings, globals, self)),
+                        ('Local Interpreter Port', LocalInterpreterPortEdit(settings, globals, self)),
                         ('Node Graph Render Settings', None),
                         ('Node Font Size', FontSizeEdit(settings, globals, self)),
                         ('Node Font Offset', FontOffsetEdit(settings, globals, self)),
@@ -249,3 +250,19 @@ def commit(self):
     def openDialog(self):
         dirName = QFileDialog.getExistingDirectory(self, 'Temporary file storage', self.value)
         self.value = dirName
+
+
+class LocalInterpreterPortEdit(QSpinBox):
+    def __init__(self, settings, globals, parent):
+        self.parent = parent
+        self.globals = globals
+        self.settings = settings
+        super(LocalInterpreterPortEdit, self).__init__()
+        v = settings.value('LocalPort', type=int)
+        v = v if v else 8080
+        self.setRange(1, 99999)
+        self.setValue(v)
+
+    def commit(self):
+        self.settings.setValue('LocalPort', self.value())
+        self.globals['LOCALPORT'] = self.value()
diff --git a/floppy/graph.py b/floppy/graph.py
@@ -48,17 +48,17 @@ def __init__(self, painter=None):
         else:
             self.painter = dummy
 
-    def spawnAndConnect(self):
+    def spawnAndConnect(self, port=8079):
         """
         Spawns a new graph interpreter instance and establishes a TCP/IP connection to it.
         :return:
         """
         if not self.runner:
             self.runner = Runner()
-        self.connect2RemoteRunner(host='127.0.0.1', port=7234)
+        self.connect2RemoteRunner(host='127.0.0.1', port=port)
         self.slave = True
 
-    def connect2RemoteRunner(self, host='127.0.0.1', port=7234):
+    def connect2RemoteRunner(self, host='127.0.0.1', port=8079):
         self.cmdHost = host
         self.cmdPort = int(port)
         self.slave = False
@@ -661,8 +661,10 @@ def __init__(self, node, cb, arg):
         # node.lock()
         self.node = node
         self.cb = cb
+
         self.arg = arg
         super(NodeThread, self).__init__()
+        self.daemon = True
         self.start()
 
     def run(self):
diff --git a/floppy/node.py b/floppy/node.py
@@ -142,7 +142,7 @@ def isAvailable(self):
             if self.pure == 1:
                 self.pure = 2
             # self.usedDefault = True
-            print('+++++++++++++++++', self.name, self.value, self.valueSet, self.owner, self.usedDefault)
+            # print('+++++++++++++++++', self.name, self.value, self.valueSet, self.owner, self.usedDefault)
             return True
         return False
 
diff --git a/floppy/painter.py b/floppy/painter.py
@@ -12,6 +12,7 @@
 import platform
 
 
+LOCALPORT = 8080
 PINSIZE = 8
 NODETITLEFONTSIZE = 12
 CONNECTIONLINEWIDTH = 2
@@ -881,7 +882,10 @@ def close(self):
         workDir = self.settings.value('WorkDir', type=str)
         for file in os.listdir(workDir):
             if file.startswith('_'):
-                os.remove(workDir+'/'+file)
+                try:
+                    os.remove(workDir+'/'+file)
+                except:
+                    pass
         qApp.quit()
 
     def updateStatus(self):
@@ -924,7 +928,7 @@ def unpauseRunner(self):
     def spawnRunner(self):
         print('Spawning new Runner.')
         self.statusBar.showMessage('New Remote Interpreter spawned.', 2000)
-        self.drawer.graph.spawnAndConnect()
+        self.drawer.graph.spawnAndConnect(LOCALPORT)
 
     def runCode(self, *args):
         self.drawer.graph.execute()
diff --git a/floppy/runner.py b/floppy/runner.py
@@ -16,7 +16,8 @@
 # host = '127.0.0.1'
 # host = '10.76.64.86'
 host = ''
-port = 7234
+port = 8079
+
 
 # updatePort = 7237
 
@@ -148,11 +149,13 @@ def getReport(self, nodeID):
 class ExecutionThread(Thread):
     def __init__(self, cmdQueue, master):
         self.graph = None
+
         self.master = master
         self.paused = True
         self.alive = True
         self.cmdQueue = cmdQueue
         super(ExecutionThread, self).__init__()
+        self.daemon = True
         # self.updateGraph()
         self.start()
 
