Changeset f182f93 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py

Timestamp:

Apr 5, 2017 10:44:27 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:

454670d

Parents:

116260a

Message:

Fitting connected. Initial prototype

File:

• src/sas/qtgui/Perspectives/Fitting/FittingUtilities.py (modified) (4 diffs)

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

@@ -55 +55 @@
         item1 = QtGui.QStandardItem(item_name)
         item1.setCheckable(True)
+        item_err = QtGui.QStandardItem()
         # check for polydisp params
         if param.polydisperse:
@@ -94 +95 @@
         # TODO: the error column.
         # Either add a proxy model or a custom view delegate
-        #item_err = QtGui.QStandardItem()
-        item3 = QtGui.QStandardItem(str(param.limits[0]))
-        item4 = QtGui.QStandardItem(str(param.limits[1]))
-        item5 = QtGui.QStandardItem(param.units)
-        model.appendRow([item1, item2, item3, item4, item5])
+        item_err = QtGui.QStandardItem()
+        item4 = QtGui.QStandardItem(str(param.limits[0]))
+        item5 = QtGui.QStandardItem(str(param.limits[1]))
+        item6 = QtGui.QStandardItem(param.units)
+        model.appendRow([item1, item2, item4, item5, item6])
 
 def addCheckedListToModel(model, param_list):
@@ -118 +119 @@
     model.setHeaderData(3, QtCore.Qt.Horizontal, QtCore.QVariant("Max"))
     model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("[Units]"))
+
+def addErrorHeadersToModel(model):
+    """
+    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("Error"))
+    model.setHeaderData(3, QtCore.Qt.Horizontal, QtCore.QVariant("Min"))
+    model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("Max"))
+    model.setHeaderData(5, QtCore.Qt.Horizontal, QtCore.QVariant("[Units]"))
 
 def addPolyHeadersToModel(model):
@@ -316 +328 @@
                     str(reference_data.filename) + "]"
     residuals.title = residuals.name
+    residuals.ytransform = 'y'
+
     # when 2 data have the same id override the 1 st plotted
     # include the last part if keeping charts for separate models is required