Changeset 3f4c12f in sasview for src/sas

Timestamp:

Feb 23, 2017 8:49:45 AM (8 years ago)

Author:

wojciech

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:

6ee82dd

Parents:

84be77e

Message:

Set Polydispersity parameters from sasmodels

File:

• src/sas/qtgui/Perspectives/Fitting/FittingPerspective.py (modified) (7 diffs)

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

@@ -31 +31 @@
         self._poly_model = QtGui.QStandardItemModel()
         self.tableView.setModel(self._model_model)
-
         self._readCategoryInfo()
+        self.model_parameters = None
 
         structure_factor_list = self.master_category_dict.pop('Structure Factor')
@@ -62 +62 @@
         self.setPolyModel()
         self.setTableProperties(self.tableView_2)
-
-        for row in range(2):
-            c = QtGui.QComboBox()
-            c.addItems(['rectangle','array','lognormal','gaussian','schulz',])
-            i = self.tableView_2.model().index(row,6)
-            self.tableView_2.setIndexWidget(i,c)
 
     def selectCategory(self):
@@ -141 +135 @@
         model_name = str(model_name)
         kernel_module = generate.load_kernel_module(model_name)
-        parameters = modelinfo.make_parameter_table(getattr(kernel_module, 'parameters', []))
+        self.model_parameters = modelinfo.make_parameter_table(getattr(kernel_module, 'parameters', []))
 
         #TODO: scaale and background are implicit in sasmodels and needs to be added
@@ -162 +156 @@
         #TODO: iq_parameters are used here. If orientation paramateres or magnetic are needed kernel_paramters should be used instead
         #For orientation and magentic parameters param.type needs to be checked
-        for param in parameters.iq_parameters:
+        for param in self.model_parameters.iq_parameters:
             item1 = QtGui.QStandardItem(param.name)
             item1.setCheckable(True)
@@ -176 +170 @@
         self._model_model.setHeaderData(3, QtCore.Qt.Horizontal, QtCore.QVariant("Max"))
         self._model_model.setHeaderData(4, QtCore.Qt.Horizontal, QtCore.QVariant("[Units]"))
+
+        self.setPolyModel()
 
     def setTableProperties(self, table):
@@ -200 +196 @@
         :return:
         """
-        item1 = QtGui.QStandardItem("Distribution of radius")
-        item1.setCheckable(True)
-        item2 = QtGui.QStandardItem("0")
-        item3 = QtGui.QStandardItem("")
-        item4 = QtGui.QStandardItem("")
-        item5 = QtGui.QStandardItem("35")
-        item6 = QtGui.QStandardItem("3")
-        item7 = QtGui.QStandardItem("")
-        self._poly_model.appendRow([item1, item2, item3, item4, item5, item6, item7])
-        item1 = QtGui.QStandardItem("Distribution of thickness")
-        item1.setCheckable(True)
-        item2 = QtGui.QStandardItem("0")
-        item3 = QtGui.QStandardItem("")
-        item4 = QtGui.QStandardItem("")
-        item5 = QtGui.QStandardItem("35")
-        item6 = QtGui.QStandardItem("3")
-        item7 = QtGui.QStandardItem("")
-        self._poly_model.appendRow([item1, item2, item3, item4, item5, item6, item7])
+
+        if self.model_parameters:
+            for row, param in enumerate(self.model_parameters.form_volume_parameters):
+                item1 = QtGui.QStandardItem("Distribution of "+param.name)
+                item1.setCheckable(True)
+                item2 = QtGui.QStandardItem("0")
+                item3 = QtGui.QStandardItem("")
+                item4 = QtGui.QStandardItem("")
+                item5 = QtGui.QStandardItem("35")
+                item6 = QtGui.QStandardItem("3")
+                item7 = QtGui.QStandardItem("")
+
+                self._poly_model.appendRow([item1, item2, item3, item4, item5, item6, item7])
+
+                #TODO: Need to find cleaner way to input functions
+                func = QtGui.QComboBox()
+                func.addItems(['rectangle','array','lognormal','gaussian','schulz',])
+                func_index = self.tableView_2.model().index(row,6)
+                self.tableView_2.setIndexWidget(func_index,func)
 
         self._poly_model.setHeaderData(0, QtCore.Qt.Horizontal, QtCore.QVariant("Parameter"))
@@ -232 +229 @@
         header.setStretchLastSection(True)
 
-
 if __name__ == "__main__":
     app = QtGui.QApplication([])