Changes in src/sas/perspectives/fitting/fitpage.py [098f3d2:d06c34c] in sasview
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/perspectives/fitting/fitpage.py
r098f3d2 rd06c34c 268 268 weighting_box.Add(sizer_weighting) 269 269 270 sizer_fit = wx.GridSizer(2, 5, 2, 6)271 272 270 # combobox for smear2d accuracy selection 273 271 self.smear_accuracy = wx.ComboBox(self, -1, size=(50, -1), … … 282 280 283 281 #Fit button 284 self.btFit = wx.Button(self, wx.NewId(), 'Fit' , size=(88, 25))282 self.btFit = wx.Button(self, wx.NewId(), 'Fit') 285 283 self.default_bt_colour = self.btFit.GetDefaultAttributes() 286 284 self.btFit.Bind(wx.EVT_BUTTON, self._onFit, id=self.btFit.GetId()) … … 288 286 289 287 #General Help button 290 self.btFitHelp = wx.Button(self, -1, 'H ELP')291 self.btFitHelp.SetToolTipString("General Fitting Help.")288 self.btFitHelp = wx.Button(self, -1, 'Help') 289 self.btFitHelp.SetToolTipString("General fitting help.") 292 290 self.btFitHelp.Bind(wx.EVT_BUTTON, self._onFitHelp) 293 291 … … 303 301 self.btSmearHelp = wx.Button(self, -1, '?', style=wx.BU_EXACTFIT,\ 304 302 size=size_q) 305 self.btSmearHelp.SetToolTipString("Resolution Smearing Help.")303 self.btSmearHelp.SetToolTipString("Resolution smearing help.") 306 304 self.btSmearHelp.Bind(wx.EVT_BUTTON, self._onSmearHelp) 307 305 … … 362 360 self.disable_smearer.SetValue(True) 363 361 364 # add 4 types of smearing to the sizer365 # Note from June 14, 2015366 # removed the extra (10,10) spaces to make room for help. Actually367 # don't see the need for those anyway as the wx.LEFT, xx should take368 # care of spacing anyway though it does not seem to work for some369 # reason. Currently leaving as we are in "code freeze" only making370 # minimal changes necessary for release 3.1. We probably want to clean371 # up the whole fitpage (and basepage and fitpanel etc) eventually.372 # ---- PDB373 362 sizer_smearer.Add(self.disable_smearer, 0, wx.LEFT, 10) 374 # sizer_smearer.Add((10, 10))375 363 sizer_smearer.Add(self.enable_smearer) 376 # sizer_smearer.Add((10, 10))377 364 sizer_smearer.Add(self.pinhole_smearer) 378 # sizer_smearer.Add((10, 10))379 365 sizer_smearer.Add(self.slit_smearer) 380 # sizer_smearer.Add((10, 10))381 366 sizer_smearer.Add(self.btSmearHelp) 382 367 sizer_smearer.Add((10, 10)) … … 397 382 398 383 # Update and Draw button 399 self.draw_button = wx.Button(self, wx.NewId(), 400 'Compute', size=(88, 24)) 384 self.draw_button = wx.Button(self, wx.NewId(), 'Compute') 401 385 self.draw_button.Bind(wx.EVT_BUTTON, \ 402 386 self._onDraw, id=self.draw_button.GetId()) … … 414 398 box_description_1 = wx.StaticText(self, -1, ' Chi2/Npts') 415 399 box_description_2 = wx.StaticText(self, -1, 'Npts(Fit)') 416 #box_description_3 = wx.StaticText(self, -1, 'Total Npts')417 #box_description_3.SetToolTipString( \418 # " Total Npts : total number of data points")419 420 sizer_fit.Add(box_description_1, 0, 0)421 sizer_fit.Add(box_description_2, 0, 0)422 sizer_fit.Add(self.points_sizer, 0, 0)423 #sizer_fit.Add(box_description_3, 0, 0)424 sizer_fit.Add(self.draw_button, 0, 0)425 sizer_fit.Add((-1,5))426 sizer_fit.Add(self.tcChi, 0, 0)427 sizer_fit.Add(self.Npts_fit, 0, 0)428 sizer_fit.Add(self.Npts_total, 0, 0)429 sizer_fit.Add(self.btFit, 0, 0)430 sizer_fit.Add(self.btFitHelp, 0, 0)431 400 432 401 # StaticText for smear … … 576 545 self.qmin.Bind(wx.EVT_TEXT, self.on_qrange_text) 577 546 self.qmax.Bind(wx.EVT_TEXT, self.on_qrange_text) 578 id = wx.NewId()579 self.reset_qrange = wx.Button(self, id, 'Reset', size=(77, 20))580 581 self.reset_qrange.Bind(wx.EVT_BUTTON, self.on_reset_clicked, id= id)547 wx_id = wx.NewId() 548 self.reset_qrange = wx.Button(self, wx_id, 'Reset') 549 550 self.reset_qrange.Bind(wx.EVT_BUTTON, self.on_reset_clicked, id=wx_id) 582 551 self.reset_qrange.SetToolTipString("Reset Q range to the default") 583 552 584 sizer = wx.GridSizer( 2, 4, 2, 6)585 586 self.btEditMask = wx.Button(self, wx.NewId(), 'Editor' , size=(88, 23))553 sizer = wx.GridSizer(5, 5, 2, 6) 554 555 self.btEditMask = wx.Button(self, wx.NewId(), 'Editor') 587 556 self.btEditMask.Bind(wx.EVT_BUTTON, self._onMask, 588 557 id=self.btEditMask.GetId()) … … 594 563 sizer.Add(wx.StaticText(self, -1, ' Max[1/A]')) 595 564 sizer.Add(self.EditMask_title) 565 sizer.Add((-1,5)) 566 596 567 sizer.Add(self.reset_qrange) 597 568 sizer.Add(self.qmin) 598 569 sizer.Add(self.qmax) 599 #sizer.Add(self.theory_npts_tcrtl)600 570 sizer.Add(self.btEditMask) 571 sizer.Add((-1,5)) 572 573 sizer.AddMany(5*[(-1,5)]) 574 575 sizer.Add(box_description_1, 0, 0) 576 sizer.Add(box_description_2, 0, 0) 577 sizer.Add(self.points_sizer, 0, 0) 578 sizer.Add(self.draw_button, 0, 0) 579 sizer.Add((-1,5)) 580 581 sizer.Add(self.tcChi, 0, 0) 582 sizer.Add(self.Npts_fit, 0, 0) 583 sizer.Add(self.Npts_total, 0, 0) 584 sizer.Add(self.btFit, 0, 0) 585 sizer.Add(self.btFitHelp, 0, 0) 586 601 587 boxsizer_range.Add(sizer_chi2) 602 boxsizer_range.Add((10, 10))603 588 boxsizer_range.Add(sizer) 604 605 boxsizer_range.Add((10, 15))606 boxsizer_range.Add(sizer_fit)607 589 if is_2Ddata: 608 590 self.btEditMask.Enable() … … 2236 2218 """ 2237 2219 # compute weight for the current data 2220 from sas.perspectives.fitting.utils import get_weight 2238 2221 flag_weight = self.get_weight_flag() 2239 2222 if is_2D == None: 2240 2223 is_2D = self._is_2D() 2224 weight = get_weight(data=self.data, 2225 is2d=is_2D, 2226 flag=flag_weight) 2241 2227 self._manager.set_fit_weight(uid=self.uid, 2242 2228 flag=flag_weight, … … 2256 2242 self._update_paramv_on_fit() 2257 2243 2244 # msg default 2245 msg = None 2258 2246 if event != None: 2259 2247 tcrtl = event.GetEventObject() … … 2269 2257 # if any value is changed 2270 2258 if is_new_pinhole: 2271 self._set_pinhole_smear()2259 msg = self._set_pinhole_smear() 2272 2260 # hide all silt sizer 2273 2261 self._hide_all_smear_info()
Note: See TracChangeset
for help on using the changeset viewer.