Changeset f505470 in sasview for calculatorview/src/sans/perspectives/calculator

Timestamp:

Jan 18, 2012 10:28:31 AM (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:

33b7954

Parents:

7485cfa

Message:

fixed run function

File:

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

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

@@ -619 +619 @@
 """
 CUSTOM_2D_TEMP = """
-    def run(self, x=0.0):
+    def run(self, x=0.0, y=0.0):
         if x.__class__.__name__ == 'list':
-            x_val = x[0]*math.cos(x[1])
-            y_val = x[0]*math.sin(x[1])
+            x_val = x[0]
+            y_val = y[0]*0.0
             return self.function(x_val, y_val)
         elif x.__class__.__name__ == 'tuple':