Changeset 2aa960a in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Oct 25, 2017 9:01:37 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Branches:

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

Children:

aae5f4c

Parents:

e7a0b2f (diff), f7d14a1 (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.

Message:

Merge branch 'ESS_GUI' of github.com:SasView/sasview into ESS_GUI

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (9 diffs)

src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

@@ -13 +13 @@
 from PyQt4 import QtWebKit
 
+from sasmodels import product
 from sasmodels import generate
 from sasmodels import modelinfo
@@ -52 +53 @@
 
 class ToolTippedItemModel(QtGui.QStandardItemModel):
-
-    def __init__(self, parent = None):
+    """
+    Subclass from QStandardItemModel to allow displaying tooltips in
+    QTableView model.
+    """
+    def __init__(self, parent=None):
         QtGui.QStandardItemModel.__init__(self,parent)
 
     def headerData(self, section, orientation, role):
-
+        """
+        Displays tooltip for each column's header
+        :param section:
+        :param orientation:
+        :param role:
+        :return:
+        """
         if role == QtCore.Qt.ToolTipRole:
             if orientation == QtCore.Qt.Horizontal:
@@ -136 +146 @@
     def data(self, value):
         """ data setter """
+        # Value is either a list of indices for batch fitting or a simple index
+        # for standard fitting. Assure we have a list, regardless.
         if isinstance(value, list):
             self.is_batch_fitting = True
@@ -149 +161 @@
 
         # Update logics with data items
+        # Logics.data contains only a single Data1D/Data2D object
         self.logic.data = GuiUtils.dataFromItem(value[0])
 
@@ -154 +167 @@
         self.is2D = True if isinstance(self.logic.data, Data2D) else False
 
+        # Let others know we're full of data now
         self.data_is_loaded = True
 
@@ -333 +347 @@
         self.chk2DView.setVisible(False)
         self.chkMagnetism.setEnabled(self.is2D)
+        self.tabFitting.setTabEnabled(TAB_MAGNETISM, self.is2D)
         # Combo box or label for file name"
         if self.is_batch_fitting:
@@ -344 +359 @@
         # Similarly on other tabs
         self.options_widget.setEnablementOnDataLoad()
+
+        # Reload the model
+        self.onSelectModel()
 
         # Smearing tab
@@ -1038 +1056 @@
         # Regardless of previous state, this should now be `plot show` functionality only
         self.cmdPlot.setText("Show Plot")
-        if not self.data_is_loaded:
-            self.recalculatePlotData()
+        # Force data recalculation so existing charts are updated
+        self.recalculatePlotData()
         self.showPlot()
 
@@ -1253 +1271 @@
         structure_module = generate.load_kernel_module(structure_factor)
         structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', []))
+        structure_kernel = self.models[structure_factor]()
+
+        self.kernel_module._model_info = product.make_product_info(self.kernel_module._model_info, structure_kernel._model_info)
 
         new_rows = FittingUtilities.addSimpleParametersToModel(structure_parameters, self.is2D)