Changeset 0a90d92 in sasview for calculatorview

Timestamp:

Feb 8, 2012 5:18:11 PM (13 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:

51da9dc

Parents:

9fafa39

Message:

Added more error msg when no return was defined n the function.

File:

• calculatorview/src/sans/perspectives/calculator/model_editor.py (modified) (1 diff)

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

@@ -428 +428 @@
             # No input for the model function
             if func_str.lstrip().rstrip():
-                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"
+                if func_str.count('return') > 0:
+                    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"
+                    else:
+                        msg = ''
                 else:
-                    msg = ''
+                    msg = "Error: The func(x) must 'return' a value at least.\n"
+                    msg += "For example: \n\nreturn 2*x"
             else:
                 msg = 'Error: Function is not defined.'