Changeset 69363c7 in sasview for src/sas/sasgui/perspectives/fitting/simfitpage.py
- Timestamp:
- Sep 22, 2017 10:29:48 AM (7 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- ab0b93f
- Parents:
- 1386b2f (diff), d76c43a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - git-author:
- Paul Kienzle <pkienzle@…> (09/22/17 10:28:48)
- git-committer:
- Paul Kienzle <pkienzle@…> (09/22/17 10:29:48)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sasgui/perspectives/fitting/simfitpage.py
r00f7ff1 r69363c7 1 1 """ 2 Simultaneous fit page2 Simultaneous or Batch fit page 3 3 """ 4 # Note that this is used for both Simultaneous/Constrained fit AND for 5 # combined batch fit. This is done through setting of the batch_on parameter. 6 # There are the a half dozen or so places where an if statement is used as in 7 # if not batch_on: 8 # xxxx 9 # else: 10 # xxxx 11 # This is just wrong but dont have time to fix this go. Proper approach would be 12 # to strip all parts of the code that depend on batch_on and create the top 13 # level class from which a contrained/simultaneous fit page and a combined 14 # batch page inherit. 15 # 16 # 04/09/2017 --PDB 17 4 18 import sys 5 19 from collections import namedtuple … … 456 470 # General Help button 457 471 self.btHelp = wx.Button(self, wx.ID_HELP, 'HELP') 458 self.btHelp.SetToolTipString("Simultaneous/Constrained Fitting help.") 472 if self.batch_on: 473 self.btHelp.SetToolTipString("Combined Batch Fitting help.") 474 else: 475 self.btHelp.SetToolTipString("Simultaneous/Constrained Fitting help.") 459 476 self.btHelp.Bind(wx.EVT_BUTTON, self._on_help) 460 477 … … 583 600 """ 584 601 _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html" 585 _PageAnchor = "#simultaneous-fit-mode" 586 _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation, 602 if not self.batch_on: 603 _PageAnchor = "#simultaneous-fit-mode" 604 _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation, 587 605 _PageAnchor, 588 606 "Simultaneous/Constrained Fitting Help") 607 else: 608 _PageAnchor = "#combined-batch-fit-mode" 609 _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation, 610 _PageAnchor, 611 "Combined Batch Fit Help") 589 612 590 613 def set_manager(self, manager):
Note: See TracChangeset
for help on using the changeset viewer.