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

Timestamp:

Jun 6, 2017 9:37:52 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:

06b0138

Parents:

358b39d

Message:

More polydisp. functionality SASVIEW-601

File:

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

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

@@ -37 +37 @@
     return (param_name, param_length)
 
-def addParametersToModel(parameters, is2D):
+def addParametersToModel(parameters, kernel_module, is2D):
     """
     Update local ModelModel with sasmodel parameters
@@ -69 +69 @@
                 if p.name != param.name:
                     continue
-                item1_2 = QtGui.QStandardItem(str(p.default))
+                width = kernel_module.getParam(p.name+'.width')
+                #npts = kernel_module.getParam(p.name+'.npts')
+                #nsigs = kernel_module.getParam(p.name+'.nsigmas')
+                type = kernel_module.getParam(p.name+'.type')
+
+                item1_2 = QtGui.QStandardItem(str(width))
                 item1_2.setEditable(False)
-                item1_3 = QtGui.QStandardItem(str(p.limits[0]))
+                item1_3 = QtGui.QStandardItem()
                 item1_3.setEditable(False)
-                item1_4 = QtGui.QStandardItem(str(p.limits[1]))
+                item1_4 = QtGui.QStandardItem()
                 item1_4.setEditable(False)
-                item1_5 = QtGui.QStandardItem(p.units)
+                item1_5 = QtGui.QStandardItem(type)
                 item1_5.setEditable(False)
                 poly_item.appendRow([item1_1, item1_2, item1_3, item1_4, item1_5])
@@ -156 +161 @@
     model.setHeaderData(5, QtCore.Qt.Horizontal, QtCore.QVariant("Nsigs"))
     model.setHeaderData(6, QtCore.Qt.Horizontal, QtCore.QVariant("Function"))
+
+def addErrorPolyHeadersToModel(model):
+    """
+    Adds predefined headers to the model
+    """
+    model.setHeaderData(0, QtCore.Qt.Horizontal, QtCore.QVariant("Parameter"))
+    model.setHeaderData(1, QtCore.Qt.Horizontal, QtCore.QVariant("PD[ratio]"))
+    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("Npts"))
+    model.setHeaderData(6, QtCore.Qt.Horizontal, QtCore.QVariant("Nsigs"))
+    model.setHeaderData(7, QtCore.Qt.Horizontal, QtCore.QVariant("Function"))
 
 def addShellsToModel(parameters, model, index):