Changeset fde5bcd in sasview for src/sas

Timestamp:

Feb 28, 2018 6:04:56 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:

91ad45c

Parents:

c3eb858

Message:

Fixed issue with unwanted headers

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingUtilities.py (modified) (7 diffs)
• FittingWidget.py (modified) (1 diff)
• UnitTesting/FittingUtilitiesTest.py (modified) (2 diffs)
• ViewDelegate.py (modified) (1 diff)

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

@@ -1 @@
-from copy import deepcopy
+import copy
 
 from PyQt5 import QtCore
@@ -159 +159 @@
         model.setHeaderData(i, QtCore.Qt.Horizontal, item)
 
-    model.header_tooltips = model_header_tooltips
+    model.header_tooltips = copy.copy(model_header_tooltips)
 
 def addErrorHeadersToModel(model):
@@ -165 +165 @@
     Adds predefined headers to the model
     """
-    model_header_error_captions = model_header_captions
+    model_header_error_captions = copy.copy(model_header_captions)
     model_header_error_captions.insert(2, header_error_caption)
     for i, item in enumerate(model_header_error_captions):
         model.setHeaderData(i, QtCore.Qt.Horizontal, item)
 
-    model_header_error_tooltips = model_header_tooltips
+    model_header_error_tooltips = copy.copy(model_header_tooltips)
     model_header_error_tooltips.insert(2, error_tooltip)
-    model.header_tooltips = model_header_error_tooltips
+    model.header_tooltips = copy.copy(model_header_error_tooltips)
 
 def addPolyHeadersToModel(model):
@@ -181 +181 @@
         model.setHeaderData(i, QtCore.Qt.Horizontal, item)
 
-    model.header_tooltips = poly_header_tooltips
+    model.header_tooltips = copy.copy(poly_header_tooltips)
 
 
@@ -188 +188 @@
     Adds predefined headers to the model
     """
-    poly_header_error_captions = poly_header_captions
+    poly_header_error_captions = copy.copy(poly_header_captions)
     poly_header_error_captions.insert(2, header_error_caption)
     for i, item in enumerate(poly_header_error_captions):
         model.setHeaderData(i, QtCore.Qt.Horizontal, item)
 
-    poly_header_error_tooltips = poly_header_tooltips
+    poly_header_error_tooltips = copy.copy(poly_header_tooltips)
     poly_header_error_tooltips.insert(2, error_tooltip)
-    model.header_tooltips = poly_header_error_tooltips
+    model.header_tooltips = copy.copy(poly_header_error_tooltips)
 
 def addShellsToModel(parameters, model, index):
@@ -271 +271 @@
             ## Set consistently w/AbstractFitengine:
             # But this should be corrected later.
-            dy = deepcopy(current_data.dy)
+            dy = copy.deepcopy(current_data.dy)
             dy[dy == 0] = 1
         fn = current_data.y[index]
@@ -369 +369 @@
     Create Data1D/Data2D with residuals, ready for plotting
     """
-    data_copy = deepcopy(current_data)
+    data_copy = copy.deepcopy(current_data)
     # Get data: data I, theory I, and data dI in order
     method_name = current_data.__class__.__name__

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

@@ -1320 +1320 @@
 
         # switch off reponse to model change
-        self._model_model.blockSignals(True)
         self._model_model.insertColumn(2, error_column)
-        self._model_model.blockSignals(False)
         FittingUtilities.addErrorHeadersToModel(self._model_model)
         # Adjust the table cells width.

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

@@ -1 +1 @@
 import sys
 import unittest
-from PyQt5 import QtGui
+from PyQt5 import QtGui, QtCore
 
 from sas.qtgui.Plotting.PlotterData import Data1D
@@ -266 +266 @@
             chi = FittingUtilities.calculateChi2(reference_data, current_data)
 
+    def notestAddHeadersToModel(self):
+        '''Check to see if headers are correctly applied'''
+        #test model
+        model = QtGui.QStandardItemModel()
+        FittingUtilities.addHeadersToModel(model)
+
+        # Assure we have properly named columns
+        names = FittingUtilities.model_header_captions
+        names_from_model = [model.headerData(i, QtCore.Qt.Horizontal) for i in range(len(names))]
+        self.assertEqual(names, names_from_model)
+
+        # Add another model
+        model2 = QtGui.QStandardItemModel()
+        # Add headers again
+        FittingUtilities.addHeadersToModel(model2)
+        # We still should have only the original names
+        names_from_model2 = [model2.headerData(i, QtCore.Qt.Horizontal) for i in range(len(names))]
+        self.assertEqual(names, names_from_model2)
+
+
 if __name__ == "__main__":
     unittest.main()

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

@@ -84 +84 @@
             editor.setValidator(validator)
             return editor
-        if index.column() in [self.param_property, self.param_error]:
+        if index.column() in [self.param_property, self.param_error, self.param_unit]:
             # Set some columns uneditable
             return None