Changeset e499ca0 in sasview

Timestamp:

Jan 22, 2012 2:07:55 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:

f9feff3

Parents:

d2c4c06

Message:

set 'import math' as default

File:

• calculatorview/src/sans/perspectives/calculator/model_editor.py (modified) (7 diffs)

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

@@ -287 +287 @@
         Do the layout for parameter related widgets
         """
-        param_txt = wx.StaticText(self, -1, 'Parameters : ') 
+        param_txt = wx.StaticText(self, -1, 'Fit Parameters (if any): ') 
         param_tip = "#Set the parameters and initial values.\n"
         param_tip += "#Example:\n"
@@ -307 +307 @@
         function_txt = wx.StaticText(self, -1, 'Function(x) : ') 
         hint_function = "#Example:\n"
-        hint_function += "new_x = x * math.pi\n"
-        hint_function += "if new_x <= 0:\n"
+        hint_function += "if x <= 0:\n"
         hint_function += "    y = A + B\n"
         hint_function += "else:\n"
-        hint_function += "    y = A + B * numpy.cos(new_x)\n"
+        hint_function += "    y = A + B * cos(2 * pi * x)\n"
         hint_function += "return y\n"
         id  = wx.NewId() 
@@ -423 +422 @@
         # Sort out the errors if occur
         if self.check_name():
+            name = self.name_tcl.GetValue().lstrip().rstrip()
             description = self.desc_tcl.GetValue()
             param_str = self.param_tcl.GetText()
@@ -471 +471 @@
         except :
             raise
+        # Prepare the content of the function
         lines = CUSTOM_TEMPLATE.split('\n')
+        im_np = 'import numpy'
+        im_sp = 'import scipy'
+        if func_str.count(im_np):
+            func_str = func_str.replace(im_np, '')
+        if func_str.count(im_sp):
+            func_str = func_str.replace(im_sp, '')
         has_scipy = func_str.count("scipy.")
         self.is_2d = func_str.count("#self.ndim = 2")
@@ -495 +502 @@
                     out_f.write(local_params)
             elif line.count("self.description = "):
+                des0 = self.name + "\\n"
                 desc = str(desc_str.lstrip().rstrip().replace('\"', ''))
-                if not desc:
-                    desc= self.name
-                out_f.write(line% desc + "\n")
+                out_f.write(line% (des0 + desc) + "\n")
             elif line.count("def function(self, x=0.0%s):"):
                 if self.is_2d:
@@ -544 +550 @@
         for item in items:
             name = item.split("=")[0].lstrip().rstrip()
-            value = item.split("=")[1].lstrip().rstrip()
             try:
+                value = item.split("=")[1].lstrip().rstrip()
                 float(value)
             except:
-               raise
+                value = 1.0 # default
             params_str += spaces + "self.params['%s'] = %s\n"% (name, value)
             
@@ -604 +610 @@
 CUSTOM_TEMPLATE = """
 from sans.models.pluginmodel import Model1DPlugin
-import math
+from math import *
 import numpy
 #import scipy?