Changeset ca7c6bd in sasview for src/sas

Timestamp:

Oct 9, 2017 9:26:07 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:

a95c44b

Parents:

13cd397

Message:

Attempt to pass parameters

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (1 diff)
• FittingWidget.py (modified) (2 diffs)

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

@@ -131 +131 @@
     Adds predefined headers to the model
     """
-    model.setHeaderData(0, QtCore.Qt.Horizontal, QtCore.QVariant("Parameter"))
-    model.setHeaderData(1, QtCore.Qt.Horizontal, QtCore.QVariant("Value"))
-    model.setHeaderData(2, QtCore.Qt.Horizontal, QtCore.QVariant("Min"))
-    model.setHeaderData(3, QtCore.Qt.Horizontal, QtCore.QVariant("Max"))
-    model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("Units"))
+    model.parameter_headers = ['Parameter', 'Value', 'Min', 'Max', 'Units']
+    #model.setHeaderData(0, QtCore.Qt.Horizontal, QtCore.QVariant("Parameter"))
+    #model.setHeaderData(1, QtCore.Qt.Horizontal, QtCore.QVariant("Value"))
+    #model.setHeaderData(2, QtCore.Qt.Horizontal, QtCore.QVariant("Min"))
+    #model.setHeaderData(3, QtCore.Qt.Horizontal, QtCore.QVariant("Max"))
+    #model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("Units"))
 
 def addErrorHeadersToModel(model):

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

@@ -56 +56 @@
         QtGui.QStandardItemModel.__init__(self,parent)
 
+        super(ToolTippedItemModel, self).__init__()
+        self.parent = parent
+        self.parameter_headers = None
+
     # optional method for Model class
     def headerData(self, section, orientation, role):
@@ -61 +65 @@
         if role == QtCore.Qt.ToolTipRole:
             if orientation == QtCore.Qt.Horizontal:
-                return QtCore.QString("Horizontal Header %s Tooltip" % str(section))
-            else:
-                return QtCore.QString("Vertical Header %s Tooltip" % str(section))
+                return QtCore.QString("Horizontal Header Tooltip for %s" % str(self.parameter_headers[section]))
+
+        if role == QtCore.Qt.DisplayRole:
+            if orientation == QtCore.Qt.Horizontal:
+                return QtCore.QString(self.parameter_headers[section])
+
 
 class FittingWidget(QtGui.QWidget, Ui_FittingWidgetUI):