Changes in src/sas/sasgui/perspectives/fitting/simfitpage.py [f73b47c:a9f9ca4] in sasview

File:

• src/sas/sasgui/perspectives/fitting/simfitpage.py (modified) (6 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)
 
@@ -527 +544 @@
     """
         _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html"
-        _PageAnchor = "#simultaneous-fit-mode"
-        _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation,
+        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"
+            _doc_viewer = DocumentationWindow(self, self.ID_DOC, _TreeLocation,
+                                          _PageAnchor,
+                                          "Combined Batch Fit Help")
 
     def set_manager(self, manager):
@@ -1050 +1073 @@
         """
 
-        init_map = {}
-        final_map = {}
+        model_map = {}
         if fit.fit_panel.sim_page is None:
             fit.fit_panel.add_sim_page()
@@ -1065 +1087 @@
                 save_id = self._format_id(save_id)
                 if save_id == model_id:
-                    inter_id = str(i) + str(i) + str(i) + str(i) + str(i)
-                    init_map[saved_model.pop('fit_page_source')] = inter_id
-                    final_map[inter_id] = model[3].name
+                    model_map[saved_model.pop('fit_page_source')] = \
+                        model[3].name
                     check = bool(saved_model.pop('checked'))
                     sim_page.model_list[i][0].SetValue(check)
@@ -1085 +1106 @@
                 param = item.pop('param_cbox')
                 equality = item.pop('egal_txt')
-                for key, value in init_map.items():
-                    model_cbox = model_cbox.replace(key, value)
-                    constraint_value = constraint_value.replace(key, value)
-                for key, value in final_map.items():
-                    model_cbox = model_cbox.replace(key, value)
-                    constraint_value = constraint_value.replace(key, value)
+                for key, value in model_map.iteritems():
+                    model_cbox.replace(key, value)
+                    constraint_value.replace(key, value)
 
                 sim_page.constraints_list[index][0].SetValue(model_cbox)