Changes in / [f331852:1420066] in sasview

Files:

• sasview/squish_test_suites/suite_sasview_bdd/envvars (deleted)
• sasview/squish_test_suites/suite_sasview_bdd/objects.map (deleted)
• sasview/squish_test_suites/suite_sasview_bdd/shared/scripts/bdd_hooks.py (deleted)
• sasview/squish_test_suites/suite_sasview_bdd/shared/steps/steps.py (deleted)
• sasview/squish_test_suites/suite_sasview_bdd/suite.conf (deleted)
• sasview/squish_test_suites/suite_sasview_bdd/tst_case1/test.feature (deleted)
• sasview/squish_test_suites/suite_sasview_bdd/tst_case1/test.py (deleted)
• src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (modified) (4 diffs)
• src/sas/qtgui/Perspectives/Fitting/FittingWidget.py (modified) (2 diffs)
• src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py (modified) (3 diffs)
• src/sas/qtgui/Perspectives/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):
     """
@@ -152 +147 @@
     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):
@@ -172 +160 @@
     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):
@@ -196 +174 @@
     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):
@@ -253 +240 @@
         # We can't use a single model here, due to restrictions on flattening
         # the model tree with subclassed QAbstractProxyModel...
-        self._model_model = ToolTippedItemModel()
-        self._poly_model = ToolTippedItemModel()
-        self._magnet_model = ToolTippedItemModel()
+        self._model_model = QtGui.QStandardItemModel()
+        self._poly_model = QtGui.QStandardItemModel()
+        self._magnet_model = QtGui.QStandardItemModel()
 
         # 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
@@ -495 +478 @@
         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()):
@@ -865 +835 @@
         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_7.setStyleSheet(new_font)
+        self.label_.setStyleSheet(new_font)
 
         self.show()