Changeset f4aa7a8 in sasview

Timestamp:

Sep 5, 2018 4:46:08 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:

5aad7a5

Parents:

d738feb

git-author:

Piotr Rozyczko <rozyczko@…> (09/05/18 04:45:20)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/05/18 04:46:08)

Message:

More checks for model combo being disabled. SASVIEW-1015

File:

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

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

@@ -958 +958 @@
         model = self.cbModel.currentText()
 
-        # empty combobox forced to be read
+        # Assure the control is active
+        if not self.cbModel.isEnabled():
+            return
+        # Empty combobox forced to be read
         if not model:
             return
@@ -1112 +1115 @@
             self.disableModelCombo()
             self.enableStructureCombo()
+            # set the index to 0
+            self.cbStructureFactor.setCurrentIndex(0)
+            self.model_parameters = None
             self._model_model.clear()
             return