Changeset 3d18691 in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Aug 6, 2018 9:37:19 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

060413c

Parents:

97df8a9

git-author:

wpotrzebowski <Wojciech.Potrzebowski@…> (10/27/17 04:35:49)

git-committer:

Piotr Rozyczko <rozyczko@…> (08/06/18 09:37:19)

Message:

New category manager design

File:

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

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

@@ -373 +373 @@
         self.cbCategory.addItem(CATEGORY_DEFAULT)
         self.cbCategory.addItems(category_list)
-        self.cbCategory.addItem(CATEGORY_STRUCTURE)
+        if CATEGORY_STRUCTURE not in category_list:
+            self.cbCategory.addItem(CATEGORY_STRUCTURE)
         self.cbCategory.setCurrentIndex(0)
 
@@ -523 +524 @@
         self.communicate.copyFitParamsSignal.connect(self.onParameterCopy)
         self.communicate.pasteFitParamsSignal.connect(self.onParameterPaste)
+
+        # Communicator signal
+        self.communicate.updateModelCategoriesSignal.connect(self.onCategoriesChanged)
 
     def modelName(self):
@@ -2248 +2252 @@
         self.createNewIndex(residuals_plot)
 
+    def onCategoriesChanged(self):
+            """
+            Reload the category/model comboboxes
+            """
+            # Store the current combo indices
+            current_cat = self.cbCategory.currentText()
+            current_model = self.cbModel.currentText()
+
+            # reread the category file and repopulate the combo
+            self.cbCategory.blockSignals(True)
+            self.cbCategory.clear()
+            self.readCategoryInfo()
+            self.initializeCategoryCombo()
+
+            # Scroll back to the original index in Categories
+            new_index = self.cbCategory.findText(current_cat)
+            if new_index != -1:
+                self.cbCategory.setCurrentIndex(new_index)
+            self.cbCategory.blockSignals(False)
+            # ...and in the Models
+            self.cbModel.blockSignals(True)
+            new_index = self.cbModel.findText(current_model)
+            if new_index != -1:
+                self.cbModel.setCurrentIndex(new_index)
+            self.cbModel.blockSignals(False)
+
+            return
+
     def calcException(self, etype, value, tb):
         """