- Timestamp:
- Apr 16, 2008 10:05:21 AM (17 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.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:
- 8e44d51
- Parents:
- dfca3de
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
guitools/fitDialog.py
r831149e r3aa7074 219 219 if self.xtrans == "log10(x)": 220 220 y_model = self.model.run(math.log10(xmin)) 221 221 tempx.append(xmin) 222 222 else: 223 223 y_model = self.model.run(xminView) 224 tempx.append(xmin)225 224 tempx.append(xminView) 225 226 226 if self.ytrans == "log10(y)": 227 227 tempy.append(math.pow(10,y_model)) 228 228 else: 229 229 tempy.append(y_model) 230 #Load tempy with the value between xView min and xView max 231 #for j in range(len(x)): 232 # if (x[j] > xminView and x[j] < xmaxView): 233 # if self.xtrans == "log10(x)": 234 # y_model = self.model.run(math.log10(x[j])) 235 # else: 236 # y_model = self.model.run(x[j]) 237 238 239 # if self.ytrans == "log10(y)": 240 # tempy.append(math.pow(10,y_model)) 241 # else: 242 # tempy.append(y_model) 243 # tempx.append(x[j]) 244 230 245 231 # load tempy with the maximum transformation 246 232 if self.xtrans == "log10(x)": 247 233 y_model = self.model.run(math.log10(xmax)) 248 234 tempx.append(xmax) 249 235 else: 250 236 y_model = self.model.run(xmaxView) 251 tempx.append(xmax)237 tempx.append(xmaxView) 252 238 253 239 if self.ytrans == "log10(y)": … … 255 241 else: 256 242 tempy.append(y_model) 243 244 245 print "this max",xmax 246 print "this view xmax", xmaxView 257 247 # Create new data plottable with result 258 248 self.file_data1.x =[] … … 262 252 self.file_data1.dx=None 263 253 self.file_data1.dy=None 264 254 print "this is the min of data1",min(self.file_data1.x ) 255 print "this is the max of data1",max(self.file_data1.x ) 265 256 #Load the view with the new values 266 257 self.file_data1.reset_view()
Note: See TracChangeset
for help on using the changeset viewer.