Changeset 44880ac in sasview for src/sas

Timestamp:

Oct 16, 2017 7:20:55 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

f331852

Parents:

c691d36 (diff), c7358b2 (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_ToolTips' into ESS_GUI

Location:

src/sas/qtgui/Perspectives

Files:

• Fitting/FittingUtilities.py (modified) (4 diffs)
• Fitting/FittingWidget.py (modified) (2 diffs)
• Fitting/UnitTesting/FittingWidgetTest.py (modified) (3 diffs)
• Invariant/InvariantDetails.py (modified) (1 diff)

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

@@ -137 +137 @@
     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):
     """
@@ -147 +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):
@@ -160 +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):
@@ -174 +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

@@ -50 +50 @@
 
 USING_TWISTED = True
+
+class ToolTippedItemModel(QtGui.QStandardItemModel):
+
+    def __init__(self, parent = None):
+        QtGui.QStandardItemModel.__init__(self,parent)
+
+    def headerData(self, section, orientation, role):
+
+        if role == QtCore.Qt.ToolTipRole:
+            if orientation == QtCore.Qt.Horizontal:
+                return QtCore.QString(str(self.header_tooltips[section]))
+
+        return QtGui.QStandardItemModel.headerData(self, section, orientation, role)
 
 class FittingWidget(QtGui.QWidget, Ui_FittingWidgetUI):
@@ -240 +253 @@
         # We can't use a single model here, due to restrictions on flattening
         # the model tree with subclassed QAbstractProxyModel...
-        self._model_model = QtGui.QStandardItemModel()
-        self._poly_model = QtGui.QStandardItemModel()
-        self._magnet_model = QtGui.QStandardItemModel()
+        self._model_model = ToolTippedItemModel()
+        self._poly_model = ToolTippedItemModel()
+        self._magnet_model = ToolTippedItemModel()
 
         # Param model displayed in param list

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -342 +342 @@
         self.assertEqual(self.widget.lstPoly.horizontalHeader().count(), 8)
         self.assertFalse(self.widget.lstPoly.horizontalHeader().stretchLastSection())
+
+        # Test tooltips
+        self.assertEqual(len(self.widget._poly_model.header_tooltips), 8)
+
+        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']
+        for column, tooltip in enumerate(header_tooltips):
+             self.assertEqual(self.widget._poly_model.headerData( column,
+                QtCore.Qt.Horizontal, QtCore.Qt.ToolTipRole),
+                         header_tooltips[column])
 
         # Test presence of comboboxes in last column
@@ -478 +495 @@
         self.assertFalse(self.widget.lstMagnetic.horizontalHeader().stretchLastSection())
 
+        #Test tooltips
+        self.assertEqual(len(self.widget._magnet_model.header_tooltips), 5)
+
+        header_tooltips = ['Select parameter for fitting',
+                             'Enter parameter value',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Unit of the parameter']
+        for column, tooltip in enumerate(header_tooltips):
+             self.assertEqual(self.widget._magnet_model.headerData(column,
+                QtCore.Qt.Horizontal, QtCore.Qt.ToolTipRole),
+                         header_tooltips[column])
+
         # Test rows
         for row in xrange(self.widget._magnet_model.rowCount()):
@@ -835 +865 @@
         name_modified_param = str(self.widget._model_model.item(5, 0).text())
 
+         # Check the model
+        self.assertEqual(self.widget._model_model.rowCount(), 6)
+        self.assertEqual(self.widget._model_model.columnCount(), 5)
+
+        # Test the header
+        #self.assertEqual(self.widget.lstParams.horizontalHeader().count(), 5)
+        #self.assertFalse(self.widget.lstParams.horizontalHeader().stretchLastSection())
+
+        self.assertEqual(len(self.widget._model_model.header_tooltips), 5)
+        header_tooltips = ['Select parameter for fitting',
+                             'Enter parameter value',
+                             'Enter minimum value for parameter',
+                             'Enter maximum value for parameter',
+                             'Unit of the parameter']
+        for column, tooltip in enumerate(header_tooltips):
+             self.assertEqual(self.widget._model_model.headerData(column,
+                QtCore.Qt.Horizontal, QtCore.Qt.ToolTipRole),
+                         header_tooltips[column])
+
         # check that the value has been modified in kernel_module
         self.assertEqual(new_value,

src/sas/qtgui/Perspectives/Invariant/InvariantDetails.py

@@ -64 +64 @@
         self.label_3.setStyleSheet(new_font)
         self.label_4.setStyleSheet(new_font)
-        self.label_.setStyleSheet(new_font)
+        self.label_7.setStyleSheet(new_font)
 
         self.show()