Changeset b25caad in sasview for calculatorview

Timestamp:

Jan 14, 2012 4:13:47 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:

f706e09c

Parents:

6f140f2

Message:

added 'delete custom model menu'

File:

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

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

@@ -294 +294 @@
         self.param_tcl = EditWindow(self, id, wx.DefaultPosition, 
                             wx.DefaultSize, wx.CLIP_CHILDREN|wx.SUNKEN_BORDER)
+        self.param_tcl.setDisplayLineNumbers(True)
         self.param_tcl.SetToolTipString(param_tip)
         self.param_sizer.AddMany([(param_txt, 0, wx.LEFT, 10),
@@ -305 +306 @@
         function_txt = wx.StaticText(self, -1, 'Function(x) : ') 
         hint_function = "#Example:\n"
-        hint_function += "y = A + B * numpy.sin(x * math.pi)\n"
-        hint_function += "return y"
+        hint_function += "new_x = x * math.pi\n"
+        hint_function += "if new_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 += "return y\n"
         id  = wx.NewId() 
         self.function_tcl = EditWindow(self, id, wx.DefaultPosition, 
                             wx.DefaultSize, wx.CLIP_CHILDREN|wx.SUNKEN_BORDER)
+        self.function_tcl.setDisplayLineNumbers(True)
         self.function_tcl.SetToolTipString(hint_function)
         self.function_sizer.Add(function_txt, 0, wx.LEFT, 10)
@@ -567 +573 @@
         On close event
         """
-        self.parent.new_model_frame = None
+        if self.parent != None:
+            self.parent.new_model_frame = None
         self.Destroy()