Changeset 6057915 in sasview

Timestamp:

Sep 5, 2012 6:23:27 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

82cd844

Parents:

1d490fd

Message:

simple model editor: better error msg and keep the previous code

Files:

• calculatorview/src/sans/perspectives/calculator/model_editor.py (modified) (6 diffs)
• fittingview/src/sans/perspectives/fitting/fitting.py (modified) (1 diff)

calculatorview/src/sans/perspectives/calculator/model_editor.py

@@ -12 +12 @@
 import os
 from wx.py.editwindow import EditWindow
+import subprocess
 
 if sys.platform.count("win32") > 0:
@@ -736 +737 @@
         event.Skip()
         info = 'Info'
+        msg = ''
         # Sort out the errors if occur
         if self.check_name():
@@ -743 +745 @@
             func_str = self.function_tcl.GetText()
             # No input for the model function
-            if func_str.lstrip().rstrip():
+            if func_str.lstrip().rstrip():     
                 if func_str.count('return') > 0:
-                    self.write_file(self.fname, description, param_str, func_str)
+                    self.write_file(self.fname, description, param_str, 
+                                                                    func_str)
                     tr_msg = _compileFile(self.fname)
                     msg = tr_msg.__str__()
                     # Compile error
                     if msg:
-                        _deleteFile(self.fname)
-                        msg +=  "\nCompile Failed"
+                        msg +=  "\nCompiling Failed"
                     else:
-                        msg = ''
+                        proc = subprocess.Popen(['python','%s'% self.fname], 
+                                                bufsize=1,
+                                                stdout=subprocess.PIPE, 
+                                                stderr=subprocess.STDOUT,
+                                                universal_newlines=True)
+
+                        while proc.poll() is None:
+                            line = proc.stdout.readline()
+                            if line:
+                                #the real code does filtering here
+                                if line.count("Error"):
+                                    msg = line.rstrip()
                 else:
                     msg = "Error: The func(x) must 'return' a value at least.\n"
@@ -772 +785 @@
         else:
             info = 'Error'
-            color = 'red'
-            #wx.MessageBox(msg, info)  
-        
+            color = 'red' 
+            try:
+                # try to remove pyc file if exists
+                #_deleteFile(self.fname)
+                _deleteFile(self.fname + "c")
+            except:
+                pass
         self._msg_box.SetLabel(msg)
         self._msg_box.SetForegroundColour(color)
@@ -906 +923 @@
         leave data as it is and close
         """
-        self.parent.Close()
+        self.parent.Show(False)#Close()
         event.Skip()
         
@@ -931 +948 @@
         On close event
         """
-        if self.parent != None:
-            self.parent.new_model_frame = None
-        self.Destroy()  
+        self.Show(False)
+        #if self.parent != None:
+        #    self.parent.new_model_frame = None
+        #self.Destroy()  
 
 ## Templates for custom models

fittingview/src/sans/perspectives/fitting/fitting.py

@@ -304 +304 @@
         Make new model
         """
-        if self.new_model_frame != None and self.new_model_frame.IsShown():
+        if self.new_model_frame != None:
             self.new_model_frame.Show(False)
+            self.new_model_frame.Show(True)
         else:
             id = event.GetId()