Changeset a95c44b in sasview

Timestamp:

Oct 13, 2017 3:38:54 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:

c7358b2

Parents:

ca7c6bd

Message:

Added descriptive tooltips to column headers

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

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

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

@@ -131 +131 @@
     Adds predefined headers to the model
     """
-    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"))
-
+    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.header_tooltips = ['Select parameter for fitting',
+                             'Enter parameter value',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Unit of the parameter']
 def addErrorHeadersToModel(model):
     """
@@ -148 +152 @@
     model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("Max"))
     model.setHeaderData(5, QtCore.Qt.Horizontal, QtCore.QVariant("Units"))
+
+    model.header_tooltips = ['Select parameter for fitting',
+                             'Enter parameter value',
+                             'Error value for fitted parameter',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Unit of the parameter']
 
 def addPolyHeadersToModel(model):
@@ -161 +172 @@
     model.setHeaderData(6, QtCore.Qt.Horizontal, QtCore.QVariant("Function"))
     model.setHeaderData(7, QtCore.Qt.Horizontal, QtCore.QVariant("Filename"))
+
+    model.header_tooltips = ['Select parameter for fitting',
+                             'Enter polydispersity ratio (STD/mean). '
+                             'STD: standard deviation from the mean value',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Enter number of points for parameter',
+                             'Enter number of sigmas parameter',
+                             'Select distribution function',
+                             'Select filename with user-definable distribution']
 
 def addErrorPolyHeadersToModel(model):
@@ -175 +196 @@
     model.setHeaderData(7, QtCore.Qt.Horizontal, QtCore.QVariant("Function"))
     model.setHeaderData(8, QtCore.Qt.Horizontal, QtCore.QVariant("Filename"))
+
+    model.header_tooltips = ['Select parameter for fitting',
+                             'Enter polydispersity ratio (STD/mean). '
+                             'STD: standard deviation from the mean value',
+                             'Error value for fitted parameter',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Enter number of points for parameter',
+                             'Enter number of sigmas parameter',
+                             'Select distribution function',
+                             'Select filename with user-definable distribution']
 
 def addShellsToModel(parameters, model, index):

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):
 
         if role == QtCore.Qt.ToolTipRole:
             if orientation == QtCore.Qt.Horizontal:
-                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])
-
+                return QtCore.QString(str(self.header_tooltips[section]))
+
+        return QtGui.QStandardItemModel.headerData(self, section, orientation, role)
 
 class FittingWidget(QtGui.QWidget, Ui_FittingWidgetUI):