Changes in src/sas/perspectives/fitting/fitpage.py [5265420:f3dc56c] in sasview
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/perspectives/fitting/fitpage.py
r5265420 rf3dc56c 16 16 from sas.guiframe.utils import format_number 17 17 from sas.guiframe.utils import check_float 18 from sas.guiframe.documentation_window import DocumentationWindow 18 19 19 20 (Chi2UpdateEvent, EVT_CHI2_UPDATE) = wx.lib.newevent.NewEvent() … … 188 189 def _fill_range_sizer(self): 189 190 """ 190 Fill the sizer containing the plotting range 191 add access to npts 191 Fill the Fitting sizer on the fit panel which contains: the smearing 192 information (dq), the weighting information (dI or other), the plotting 193 range, access to the 2D mask editor, the compute, fit, and help 194 buttons, xi^2, number of points etc. 192 195 """ 193 196 is_2Ddata = False … … 265 268 weighting_box.Add(sizer_weighting) 266 269 267 sizer_fit = wx.GridSizer(2, 4, 2, 6)270 sizer_fit = wx.GridSizer(2, 5, 2, 6) 268 271 269 272 # combobox for smear2d accuracy selection … … 284 287 self.btFit.SetToolTipString("Start fitting.") 285 288 289 #General Help button 290 self.btFitHelp = wx.Button(self, -1, 'HELP') 291 self.btFitHelp.SetToolTipString("General Fitting Help.") 292 self.btFitHelp.Bind(wx.EVT_BUTTON, self._onFitHelp) 293 294 #Resolution Smearing Help button (for now use same technique as 295 #used for dI help to get tiniest possible button that works 296 #both on MAC and PC. Should completely rewrite the fitting sizer 297 #in future. This is minimum to get out release 3.1 298 # comment June 14, 2015 --- PDB 299 if sys.platform.count("win32") > 0: 300 size_q = (20, 15) #on PC 301 else: 302 size_q = (30, 20) #on MAC 303 self.btSmearHelp = wx.Button(self, -1, '?', style=wx.BU_EXACTFIT,\ 304 size=size_q) 305 self.btSmearHelp.SetToolTipString("Resolution Smearing Help.") 306 self.btSmearHelp.Bind(wx.EVT_BUTTON, self._onSmearHelp) 307 286 308 #textcntrl for custom resolution 287 309 self.smear_pinhole_max = ModelTextCtrl(self, -1, … … 341 363 342 364 # add 4 types of smearing to the sizer 365 # Note from June 14, 2015 366 # removed the extra (10,10) spaces to make room for help. Actually 367 # don't see the need for those anyway as the wx.LEFT, xx should take 368 # care of spacing anyway though it does not seem to work for some 369 # reason. Currently leaving as we are in "code freeze" only making 370 # minimal changes necessary for release 3.1. We probably want to clean 371 # up the whole fitpage (and basepage and fitpanel etc) eventually. 372 # ---- PDB 343 373 sizer_smearer.Add(self.disable_smearer, 0, wx.LEFT, 10) 344 sizer_smearer.Add((10, 10))374 # sizer_smearer.Add((10, 10)) 345 375 sizer_smearer.Add(self.enable_smearer) 346 sizer_smearer.Add((10, 10))376 # sizer_smearer.Add((10, 10)) 347 377 sizer_smearer.Add(self.pinhole_smearer) 348 sizer_smearer.Add((10, 10))378 # sizer_smearer.Add((10, 10)) 349 379 sizer_smearer.Add(self.slit_smearer) 380 # sizer_smearer.Add((10, 10)) 381 sizer_smearer.Add(self.btSmearHelp) 350 382 sizer_smearer.Add((10, 10)) 351 383 … … 391 423 #sizer_fit.Add(box_description_3, 0, 0) 392 424 sizer_fit.Add(self.draw_button, 0, 0) 425 sizer_fit.Add((-1,5)) 393 426 sizer_fit.Add(self.tcChi, 0, 0) 394 427 sizer_fit.Add(self.Npts_fit, 0, 0) 395 428 sizer_fit.Add(self.Npts_total, 0, 0) 396 429 sizer_fit.Add(self.btFit, 0, 0) 430 sizer_fit.Add(self.btFitHelp, 0, 0) 397 431 398 432 # StaticText for smear … … 1046 1080 self.fit_started = self._manager.onFit(uid=self.uid) 1047 1081 wx.CallAfter(self.set_fitbutton) 1082 1083 def _onFitHelp(self, event): 1084 """ 1085 Bring up the Full Fitting Documentation whenever the HELP button is 1086 clicked. 1087 1088 Calls DocumentationWindow with the path of the location within the 1089 documentation tree (after /doc/ ....". Note that when using old 1090 versions of Wx (before 2.9) and thus not the release version of 1091 installers, the help comes up at the top level of the file as 1092 webbrowser does not pass anything past the # to the browser when it is 1093 running "file:///...." 1094 1095 :param evt: Triggers on clicking the help button 1096 """ 1097 1098 _TreeLocation = "user/perspectives/fitting/fitting_help.html" 1099 _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 1100 "General Fitting Help") 1101 1102 def _onSmearHelp(self, event): 1103 """ 1104 Bring up the instrumental resolution smearing Documentation whenever 1105 the ? button in the smearing box is clicked. 1106 1107 Calls DocumentationWindow with the path of the location within the 1108 documentation tree (after /doc/ ....". Note that when using old 1109 versions of Wx (before 2.9) and thus not the release version of 1110 installers, the help comes up at the top level of the file as 1111 webbrowser does not pass anything past the # to the browser when it is 1112 running "file:///...." 1113 1114 :param evt: Triggers on clicking the help button 1115 """ 1116 1117 _TreeLocation = "user/perspectives/fitting/sm_help.html" 1118 _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 1119 "Instrumental Resolution Smearing \ 1120 Help") 1048 1121 1049 1122 def set_fitbutton(self): … … 3012 3085 orient_angle = wx.StaticText(self, -1, '[For 2D only]:') 3013 3086 mag_on_button = wx.Button(self, -1, "Magnetic ON") 3087 mag_on_button.SetToolTipString("Turn Pol Beam/Mag scatt on/off") 3014 3088 mag_on_button.Bind(wx.EVT_BUTTON, self._on_mag_on) 3015 mag_help_button = wx.Button(self, -1, "Magnetic angles?") 3089 mag_angle_help_button = wx.Button(self, -1, "Magnetic angles?") 3090 mag_angle_help_button.SetToolTipString("see angle definitions") 3091 mag_help_button = wx.Button(self, -1, "Mag HELP") 3092 mag_help_button.SetToolTipString("Help on pol beam/mag fitting") 3016 3093 mag_help_button.Bind(wx.EVT_BUTTON, self._on_mag_help) 3094 mag_angle_help_button.Bind(wx.EVT_BUTTON, \ 3095 self._on_mag_angle_help) 3017 3096 sizer.Add(orient_angle, (iy, ix), (1, 1), 3018 3097 wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15) … … 3020 3099 sizer.Add(mag_on_button, (iy, ix), (1, 1), 3021 3100 wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15) 3101 ix += 1 3102 sizer.Add(mag_angle_help_button, (iy, ix), (1, 1), 3103 wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15) 3022 3104 sizer.Add(mag_help_button, (iy, ix + 1), (1, 1), 3023 3105 wx.LEFT | wx.EXPAND | wx.ADJUST_MINSIZE, 15) 3024 3106 3025 3107 #handle the magnetic buttons 3108 #clean this up so that assume mag is off then turn 3109 #all buttons on IF mag has mag and has 2D 3026 3110 if not self._has_magnetic: 3027 3111 mag_on_button.Show(False) … … 3035 3119 mag_on_button.SetLabel("Magnetic OFF") 3036 3120 mag_help_button.Show(True) 3121 mag_angle_help_button.Show(True) 3037 3122 else: 3038 3123 mag_on_button.SetLabel("Magnetic ON") 3039 3124 mag_help_button.Show(False) 3125 mag_angle_help_button.Show(False) 3040 3126 3041 3127 if not self.data.__class__.__name__ == "Data2D" and \
Note: See TracChangeset
for help on using the changeset viewer.