Changeset a9f9ca4 in sasview for src/sas/sasgui

Timestamp:

Apr 9, 2017 10:04:02 AM (8 years ago)

Author:

butler

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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

14ecc24e

Parents:

9b5e70c

Message:

finish fixing all places that needed to point to combined batch instead
of constratined/simultaneous fits addressing #597

File:

• src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) (3 diffs)

src/sas/sasgui/perspectives/fitting/simfitpage.py

@@ -1 +1 @@
 """
-    Simultaneous fit page
+    Simultaneous or Batch fit page
 """
+# Note that this is used for both Simultaneous/Constrained fit AND for 
+# combined batch fit.  This is done through setting of the batch_on parameter.
+# There are the a half dozen or so places where an if statement is used as in 
+# if not batch_on:
+#     xxxx
+# else:
+#     xxxx
+# This is just wrong but dont have time to fix this go. Proper approach would be
+# to strip all parts of the code that depend on batch_on and create the top
+# level class from which a contrained/simultaneous fit page and a combined 
+# batch page inherit.
+#
+#            04/09/2017   --PDB
+
 import sys
 from collections import namedtuple
@@ -400 +414 @@
         # General Help button
         self.btHelp = wx.Button(self, wx.ID_HELP, 'HELP')
-        self.btHelp.SetToolTipString("Simultaneous/Constrained Fitting help.")
+        if self.batch_on:
+            self.btHelp.SetToolTipString("Combined Batch Fitting help.")
+        else:
+            self.btHelp.SetToolTipString("Simultaneous/Constrained Fitting help.")
         self.btHelp.Bind(wx.EVT_BUTTON, self._on_help)
 
@@ -526 +543 @@
     :param event: Triggers on clicking the help button
     """
+        _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html"
         if not self.batch_on:
             _PageAnchor = "#simultaneous-fit-mode"
+            _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation,
+                                          _PageAnchor,
+                                          "Simultaneous/Constrained Fitting Help")
         else:
             _PageAnchor = "#combined-batch-fit-mode"
-        _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html"
-        _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation,
+            _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation,
                                           _PageAnchor,
-                                          "Simultaneous/Constrained Fitting Help")
+                                          "Combined Batch Fit Help")
 
     def set_manager(self, manager):