Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • calculatorview/src/sans/perspectives/calculator/model_editor.py

    r7485cfa rf505470  
    619619""" 
    620620CUSTOM_2D_TEMP = """ 
    621     def run(self, x=0.0): 
     621    def run(self, x=0.0, y=0.0): 
    622622        if x.__class__.__name__ == 'list': 
    623             x_val = x[0]*math.cos(x[1]) 
    624             y_val = x[0]*math.sin(x[1]) 
     623            x_val = x[0] 
     624            y_val = y[0]*0.0 
    625625            return self.function(x_val, y_val) 
    626626        elif x.__class__.__name__ == 'tuple': 
Note: See TracChangeset for help on using the changeset viewer.