Let menu items for 2D/3D vis run via non-blocking background processes.

Author: willend

tools/Python/mcgui/mcgui.py

@@ -459,6 +459,37 @@ def run(self, fixed_params, params, inspect=None):
             self.__emitter.status('Started simulation/trace in background shell...')
             subprocess.Popen(runstr, shell=True)
 
+    def vis_run(self, tool=''):
+
+        runstr = tool + ' ' + os.path.basename(self.__instrFile) + ' -n100 -y'
+
+        # Add & for backgrounding on Unix systems
+        if not os.name == 'nt':
+            runstr = runstr + ' &'
+        else:
+            runstr = 'start ' + runstr
+
+        # Ensure assembled runstr is a string, not a QString 
+        runstr = str(runstr)
+
+        if not os.name=='nt':
+        # run simulation in a background thread
+            self.__runthread = McRunQThread()
+            self.__runthread.cmd = runstr
+            self.__runthread.cwd = os.path.dirname(self.__instrFile)
+            self.__runthread.finished.connect(lambda: self.__runFinished(self.__runthread.process_returncode))
+            self.__runthread.thread_exception.connect(handleExceptionMsg)
+            self.__runthread.error.connect(lambda msg: self.__emitter.message(msg, err_msg=True))
+            self.__runthread.message.connect(lambda msg: self.__emitter.message(msg))
+            self.__runthread.start()
+            self.__emitter.message(runstr, gui=True)
+            self.__emitter.status('Running visualisation ...')
+            self.__fireSimStateUpdate()
+        else:
+            self.__emitter.message(runstr, gui=True)
+            self.__emitter.status('Started visualisation in background shell...')
+            subprocess.Popen(runstr, shell=True)
+
     def __runFinished(self, process_returncode):
         self.__fireSimStateUpdate()
         if process_returncode == 0:
@@ -741,43 +772,22 @@ def handleMcDisplayWeb(self):
             DISPLAY="mcdisplay"
         else:
             DISPLAY="mxdisplay"
-        self.emitter.status('Running ' + DISPLAY + '-webgl-classic...')
-        try:
-            cmd = DISPLAY+'-webgl-classic -y -n100 ' + os.path.basename(self.state.getInstrumentFile())
-            if os.name == 'nt':
-                cmd = 'start ' + cmd
-            else:
-                cmd = cmd + ' &'
-            self.emitter.message(cmd, gui=True)
-            self.emitter.message('', gui=True)
-            
-            def messg(s): self.emitter.message(s)
-            def messg_err(s): self.emitter.message(s, err_msg=True)
-            utils.run_subtool_to_completion(cmd, stdout_cb=messg, stderr_cb=messg_err)
-        finally:
-            self.emitter.status('')
-    
+        tool=DISPLAY + "-webgl-classic"
+
+        self.emitter.status('Running ' + tool)
+        self.state.vis_run(tool=tool)
+
     def handleMcDisplay2D(self):
         if mccode_config.configuration["MCCODE"]=="mcstas":
             DISPLAY="mcdisplay"
         else:
             DISPLAY="mxdisplay"
-        self.emitter.status('Running ' + DISPLAY + '-pyqtgraph...')
-        try:
-            cmd = DISPLAY+'-pyqtgraph --default -n100 ' + os.path.basename(self.state.getInstrumentFile())
-            if os.name == 'nt':
-                cmd = 'start ' + cmd
-            else:
-                cmd = cmd + ' &'
-            self.emitter.message(cmd, gui=True)
-            self.emitter.message('', gui=True)
-            
-            def messg(s): self.emitter.message(s)
-            def messg_err(s): self.emitter.message(s, err_msg=True)
-            utils.run_subtool_to_completion(cmd, stdout_cb=messg, stderr_cb=messg_err)
-        finally:
-            self.emitter.status('')
-    
+        tool=DISPLAY + "-pyqtgraph"
+
+        self.emitter.status('Running ' + tool)
+        self.state.vis_run(tool=tool)
+
+
     def handleHelpWeb(self):
         # open the mcstas homepage
         mcurl = 'http://www.'+mccode_config.configuration["MCCODE"]+'.org'