Changeset 58c6ba6 in sasview for sansview/perspectives/fitting
- Timestamp:
- Aug 7, 2009 9:38:17 AM (15 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:
- 26e4a24
- Parents:
- 9bd69098
- Location:
- sansview/perspectives/fitting
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sansview/perspectives/fitting/fitpage.py
r30d103a r58c6ba6 438 438 wx.EXPAND|wx.ADJUST_MINSIZE, 0) 439 439 ix +=1 440 self.sizer4_4.Add((20,20), (iy,ix),(1,1),441 wx.EXPAND|wx.ADJUST_MINSIZE, 0)440 #self.sizer4_4.Add((20,20), (iy,ix),(1,1), 441 #wx.EXPAND|wx.ADJUST_MINSIZE, 0) 442 442 self.fixed_param.append([None,name3, Tctl 443 443 ,None,None, None, None,None]) … … 457 457 ix =0 458 458 iy +=1 459 self.sizer4_4.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)459 #self.sizer4_4.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 460 460 self.sizer4_4.Layout() 461 461 self.sizer4.Layout() … … 1261 1261 1262 1262 iy+=1 1263 sizer.Add((10,10),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)1263 #sizer.Add((10,10),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 1264 1264 1265 1265 #Display units text on panel -
sansview/perspectives/fitting/modelpage.py
rba8f2c3 r58c6ba6 124 124 self.fixed_param=[] 125 125 self.orientation_params_disp=[] 126 #self.temp=[] 126 127 127 128 self.sizer4_4.Clear(True) … … 268 269 wx.EXPAND|wx.ADJUST_MINSIZE, 0) 269 270 ix +=1 270 self.sizer4_4.Add((20,20), (iy,ix),(1,1),271 wx.EXPAND|wx.ADJUST_MINSIZE, 0)271 #self.sizer4_4.Add((20,20), (iy,ix),(1,1), 272 #wx.EXPAND|wx.ADJUST_MINSIZE, 0) 272 273 self.fixed_param.append([None,name3, Tctl2, 273 274 None,None, None, None,None]) … … 280 281 ix =0 281 282 iy +=1 282 self.sizer4_4.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)283 #self.sizer4_4.Add((20,20),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 283 284 self.sizer4_4.Layout() 284 285 self.sizer4.Layout() … … 300 301 self.model_view.Disable() 301 302 302 #ToDo:cleanup this mess. 303 #self.set_model_param_sizer(self.model) 304 #self._set_sizer_gaussian() 303 #ToDo:cleanup this mess. resets orient param on 2D when polydis. is on. 304 #broken since _set_sizer_gaussian() was removed from the code. 305 n = self.disp_box.GetCurrentSelection() 306 dispersity= self.disp_box.GetClientData(n) 307 308 self.set_model_param_sizer(self.model) 309 self._set_sizer_dispersion(dispersity) 305 310 306 311 if len(self.orientation_params)>0: 312 #recover hidden orient. param.s 313 #for item in self.temp: 314 # for num in range(len(item)): 315 # item[num].Show(True) 307 316 for item in self.orientation_params: 308 317 if item[2]!=None: 309 318 #item[2].Show() 310 319 item[2].Enable() 320 311 321 if self.disp_name.lower() == "array": 312 322 self._set_sizer_arraydispersion() 313 323 else: 324 314 325 if len(self.orientation_params_disp)>0: 315 for item in self.orientation_params_disp: 326 #for item in self.temp: 327 # for num in range(len(item)): 328 # item[num].Show(True) 329 330 for item in self.orientation_params_disp: 316 331 if item[2]!=None: 332 #item[2].Show() 317 333 item[2].Enable() 318 334 self.state.enable2D = copy.deepcopy(self.enable2D) 335 self.Layout() 319 336 ## post state to fit panel 320 337 self._undo.Enable(True) … … 458 475 self.orientation_params=[] 459 476 self.orientation_params_disp=[] 477 #self.temp=[] 460 478 if model ==None: 461 479 ##no model avaiable to draw sizer … … 567 585 if not self.enable2D: 568 586 units.Hide() 569 units.Disable()587 #units.Disable() 570 588 else: 571 589 units.Show(True) 572 units.Enable()573 590 #units.Enable() 591 574 592 sizer.Add(units, (iy,ix),(1,1), wx.EXPAND|wx.ADJUST_MINSIZE, 0) 575 593 #Save 2D orient. params 594 #self.temp.append([name,ctl1,units,orient_angle]) 595 596 576 597 ##[cb state, name, value, "+/-", error of fit, min, max , units] 577 598 self.parameters.append([None,item, ctl1, … … 581 602 582 603 iy+=1 583 sizer.Add((10,10),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15)604 #sizer.Add((10,10),(iy,ix),(1,1), wx.LEFT|wx.EXPAND|wx.ADJUST_MINSIZE, 15) 584 605 585 606 #Display units text on panel … … 597 618 598 619 599 620 621 600 622 601 623 class HelpWindow(wx.Frame):
Note: See TracChangeset
for help on using the changeset viewer.