Changeset 490c617 in sasview for src/sas/sasgui/perspectives
- Timestamp:
- Aug 2, 2017 10:29:05 AM (7 years ago)
- 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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 5c3c310
- Parents:
- bc04647
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/calculator/model_editor.py
ra1b8fee r490c617 657 657 self.warning = "" 658 658 #This does not seem to be used anywhere so commenting out for now 659 # -- PDB 2/26/17 659 # -- PDB 2/26/17 660 660 #self._description = "New Plugin Model" 661 661 self.function_tcl = None … … 740 740 self.param_sizer.AddMany([(param_txt, 0, wx.LEFT, 10), 741 741 (self.param_tcl, 1, wx.EXPAND | wx.ALL, 10)]) 742 742 743 743 # Parameters with polydispersity 744 744 pd_param_txt = wx.StaticText(self, -1, 'Fit Parameters requiring ' + \ … … 755 755 self.pd_param_tcl.setDisplayLineNumbers(True) 756 756 self.pd_param_tcl.SetToolTipString(pd_param_tip) 757 757 758 758 self.param_sizer.AddMany([(pd_param_txt, 0, wx.LEFT, 10), 759 759 (self.pd_param_tcl, 1, wx.EXPAND | wx.ALL, 10)]) … … 1030 1030 if has_scipy: 1031 1031 lines.insert(0, 'import scipy') 1032 1033 # Think about 2D later 1032 1033 # Think about 2D later 1034 1034 #self.is_2d = func_str.count("#self.ndim = 2") 1035 1035 #line_2d = '' 1036 1036 #if self.is_2d: 1037 1037 # line_2d = CUSTOM_2D_TEMP.split('\n') 1038 1039 # Also think about test later 1038 1039 # Also think about test later 1040 1040 #line_test = TEST_TEMPLATE.split('\n') 1041 1041 #local_params = '' … … 1043 1043 spaces4 = ' '*4 1044 1044 spaces13 = ' '*13 1045 spaces16 = ' '*16 1045 spaces16 = ' '*16 1046 1046 param_names = [] # to store parameter names 1047 1047 has_scipy = func_str.count("scipy.") … … 1055 1055 out_f.write(line + '\n') 1056 1056 if line.count('#name'): 1057 out_f.write('name = "%s" \n' % name) 1057 out_f.write('name = "%s" \n' % name) 1058 1058 elif line.count('#title'): 1059 out_f.write('title = "User model for %s"\n' % name) 1059 out_f.write('title = "User model for %s"\n' % name) 1060 1060 elif line.count('#description'): 1061 out_f.write('description = "%s"\n' % desc_str) 1061 out_f.write('description = "%s"\n' % desc_str) 1062 1062 elif line.count('#parameters'): 1063 1063 out_f.write('parameters = [ \n') … … 1075 1075 out_f.write("%s['%s', '', %s, [-numpy.inf, numpy.inf], 'volume', ''],\n" % (spaces16, pname, pvalue)) 1076 1076 out_f.write('%s]\n' % spaces13) 1077 1077 1078 1078 # No form_volume or ER available in simple model editor 1079 1079 out_f.write('def form_volume(*arg): \n') … … 1082 1082 out_f.write('def ER(*arg): \n') 1083 1083 out_f.write(' return 1.0 \n') 1084 1084 1085 1085 # function to compute 1086 1086 out_f.write('\n') … … 1091 1091 for func_line in func_str.split('\n'): 1092 1092 out_f.write('%s%s\n' % (spaces4, func_line)) 1093 1093 1094 1094 Iqxy_string = 'return Iq(numpy.sqrt(x**2+y**2) ' 1095 1095 1096 1096 out_f.write('\n') 1097 1097 out_f.write('def Iqxy(x, y ') … … 1113 1113 items = line.split(";") 1114 1114 for item in items: 1115 name = item.split("=")[0]. lstrip().rstrip()1115 name = item.split("=")[0].strip() 1116 1116 try: 1117 value = item.split("=")[1].lstrip().rstrip() 1117 value = item.split("=")[1].strip() 1118 if value.count("#"): 1119 # If line ends in a comment, remove it before parsing float 1120 value = value[:value.index("#")].strip() 1118 1121 float(value) 1119 except :1122 except ValueError: 1120 1123 value = 1.0 # default 1121 1124 … … 1204 1207 import numpy 1205 1208 1206 #name 1209 #name 1207 1210 1208 1211 #title … … 1210 1213 #description 1211 1214 1212 #parameters 1215 #parameters 1213 1216 1214 1217 """
Note: See TracChangeset
for help on using the changeset viewer.