Changeset 1228007 in sasview

Timestamp:

Feb 17, 2017 3:25:42 AM (7 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:

8595edd

Parents:

6a9559d

Message:

Category and models selections are responosive now

File:

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

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

@@ -25 +25 @@
         self.comboBox.addItems(cat_list)
         self.tableView.setModel(self._model_model)
+        self.comboBox.currentIndexChanged.connect(self.selectCategoryModels)
 
-        model_list = self.master_category_dict['Cylinder']
+        category = self.comboBox.currentText()
+
+        model_list = self.master_category_dict[str(category)]
         for (model, enabled) in model_list:
             self.comboBox_2.addItem(model)
-        self.setModelModel('barbell')
+
+        self.comboBox_2.currentIndexChanged.connect(self.selectModel)
 
         self.pushButton.setEnabled(False)
@@ -49 +53 @@
             i = self.tableView_2.model().index(row,6)
             self.tableView_2.setIndexWidget(i,c)
+
+    def selectCategoryModels(self, index):
+        self.comboBox_2.clear()
+        category = self.comboBox.currentText()
+        model_list = self.master_category_dict[str(category)]
+        for (model, enabled) in model_list:
+            self.comboBox_2.addItem(model)
+
+    def selectModel(self, index):
+
+        model = self.comboBox_2.currentText()
+        self.setModelModel(model)
 
     def _readCategoryInfo(self):
@@ -87 +103 @@
     def setModelModel(self, model_name):
         # Crete/overwrite model items
-
+        self._model_model.clear()
         model_name = str(model_name)
         kernel_module = generate.load_kernel_module(model_name)