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

Timestamp:

Oct 24, 2017 10:12:28 AM (7 years ago)

Author:

wojciech

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:

4f9226c

Parents:

cca56a5 (diff), 5d1440e1 (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 ​https://github.com/SasView/sasview into ESS_GUI_magnetism_bug

File:

• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (4 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:
@@ -1039 +1049 @@
         # 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()
 
@@ -1254 +1264 @@
         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)