Merge pull request #2381 from willend/main

Changed (hard-coded) mcgui 3D visualiser to be webgl-classic

Author: willend

tools/Python/mccodelib/instrgeom.py

@@ -578,7 +578,8 @@ def _get_points(self):
         elif self.plane == 'yz':
             return map(lambda p: cen.add(Vector3d(0, p.x, p.y)), square)
         else:
-            raise Exception('DrawCircle: invalid plane argument')
+            # Fallback to xy
+            return map(lambda p: cen.add(p), square)
 
     def get_points_on_circle(self, steps=60):
         ''' returns points on the circle, transformed into the proper plane '''

tools/Python/mccodelib/utils.py

@@ -918,6 +918,7 @@ def call_if_not_none(fct, *args):
         ''' shorthand utility for calling a function if it is defined, and otherwise ignoring it '''
         if fct:
             fct(*args)
+
     if not cwd:
         cwd = os.getcwd()
 

tools/Python/mcgui/mcgui.py

@@ -459,6 +459,23 @@ 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)
+
+        self.__emitter.status('Starting visualisation in background shell...')
+        self.__emitter.message(runstr, gui=False)
+        subprocess.Popen(runstr, shell=True)
+
     def __runFinished(self, process_returncode):
         self.__fireSimStateUpdate()
         if process_returncode == 0:
@@ -741,35 +758,22 @@ def handleMcDisplayWeb(self):
             DISPLAY="mcdisplay"
         else:
             DISPLAY="mxdisplay"
-        self.emitter.status('Running ' + DISPLAY + '-webgl...')
-        try:
-            cmd = DISPLAY+'-webgl --default -n100 ' + os.path.basename(self.state.getInstrumentFile()) + '&'
-            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()) + '&'
-            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'

tools/Python/mcgui/mw.ui

@@ -349,7 +349,7 @@
   </action>
   <action name="actionDisplay">
    <property name="text">
-    <string>Display-3D</string>
+    <string>Display-3D (classic)</string>
    </property>
   </action>
   <action name="actionDisplay_2d">

tools/Python/mcgui/widgets.py

@@ -263,7 +263,7 @@ def retranslateUi(self, MainWindow):
         self.actionConfiguration.setToolTip(_translate("MainWindow", "mccode configuration"))
         self.actionCompile_Instrument_MPI.setText(_translate("MainWindow", "Compile Instrument (MPI)"))
         self.actionMcdoc.setText(_translate("MainWindow", "mcdoc Component Reference"))
-        self.actionDisplay.setText(_translate("MainWindow", "Display-3D"))
+        self.actionDisplay.setText(_translate("MainWindow", "Display-3D (classic)"))
         self.actionDisplay_2d.setText(_translate("MainWindow", "Display-2D"))
         self.actionPlotOther.setText(_translate("MainWindow", "Plot Other Results"))
         self.actionPlotOther.setShortcut(_translate("MainWindow", "Ctrl+Shift+P"))