Changeset 7801df8 in sasview for src/sas/perspectives/fitting
- Timestamp:
- Jun 10, 2015 12:12:52 AM (9 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:
- e82a901
- Parents:
- 4b5fe655
- Location:
- src/sas/perspectives/fitting
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/perspectives/fitting/basepage.py
r3db44fb r7801df8 2951 2951 """ 2952 2952 2953 _TreeLocation = "user/perspectives/fitting/ fitting_help.html"2954 _PageAnchor = " #polydispersity-distributions"2953 _TreeLocation = "user/perspectives/fitting/pd_help.html" 2954 _PageAnchor = "" 2955 2955 _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, 2956 2956 _PageAnchor, "Polydispersity Help") -
src/sas/perspectives/fitting/fitpage.py
r5265420 r7801df8 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 295 self.btSmearHelp = wx.Button(self, -1, '?') 296 self.btSmearHelp.SetToolTipString("Resolution Smearing Help.") 297 self.btSmearHelp.Bind(wx.EVT_BUTTON, self._onSmearHelp) 298 286 299 #textcntrl for custom resolution 287 300 self.smear_pinhole_max = ModelTextCtrl(self, -1, … … 391 404 #sizer_fit.Add(box_description_3, 0, 0) 392 405 sizer_fit.Add(self.draw_button, 0, 0) 406 sizer_fit.Add((-1,5)) 393 407 sizer_fit.Add(self.tcChi, 0, 0) 394 408 sizer_fit.Add(self.Npts_fit, 0, 0) 395 409 sizer_fit.Add(self.Npts_total, 0, 0) 396 410 sizer_fit.Add(self.btFit, 0, 0) 411 sizer_fit.Add(self.btFitHelp, 0, 0) 397 412 398 413 # StaticText for smear … … 1046 1061 self.fit_started = self._manager.onFit(uid=self.uid) 1047 1062 wx.CallAfter(self.set_fitbutton) 1063 1064 def _onFitHelp(self, event): 1065 """ 1066 Bring up the Full Fitting Documentation whenever the HELP button is 1067 clicked. 1068 1069 Calls DocumentationWindow with the path of the location within the 1070 documentation tree (after /doc/ ....". Note that when using old 1071 versions of Wx (before 2.9) and thus not the release version of 1072 installers, the help comes up at the top level of the file as 1073 webbrowser does not pass anything past the # to the browser when it is 1074 running "file:///...." 1075 1076 :param evt: Triggers on clicking the help button 1077 """ 1078 1079 _TreeLocation = "user/perspectives/fitting/fitting_help.html" 1080 _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 1081 "General Fitting Help") 1082 1083 def _onSmearHelp(self, event): 1084 """ 1085 Bring up the instrumental resolution smearing Documentation whenever 1086 the ? button in the smearing box is 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/sm_help.html" 1099 _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, "", 1100 "Instrumental Resolution Smearing \ 1101 Help") 1048 1102 1049 1103 def set_fitbutton(self):
Note: See TracChangeset
for help on using the changeset viewer.