Changeset 351b53e in sasview for src/sas/qtgui/Perspectives/Fitting/FittingWidget.py

Timestamp:

Mar 22, 2017 6:23:49 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:

0979dfb

Parents:

7248d75d

Message:

More unit tests for fitting SASVIEW-499

File:

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

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

@@ -31 +31 @@
 CATEGORY_DEFAULT = "Choose category..."
 CATEGORY_STRUCTURE = "Structure Factor"
+STRUCTURE_DEFAULT = "None"
 QMIN_DEFAULT = 0.0005
 QMAX_DEFAULT = 0.5
@@ -231 +232 @@
         """
         structure_factor_list = self.master_category_dict.pop(CATEGORY_STRUCTURE)
-        structure_factors = ["None"]
+        factors = [factor[0] for factor in structure_factor_list]
+        factors.insert(0, STRUCTURE_DEFAULT)
         self.cbStructureFactor.clear()
-        structure_factors = [factor[0] for factor in structure_factor_list]
-        self.cbStructureFactor.addItems(sorted(structure_factors))
+        self.cbStructureFactor.addItems(sorted(factors))
 
     def onSelectCategory(self):
@@ -246 +247 @@
             # Otherwise, just return
             if self._previous_category_index != 0:
+                # We need to block signals, or else state changes on perceived unchanged conditions
+                self.cbCategory.blockSignals(True)
                 self.cbCategory.setCurrentIndex(self._previous_category_index)
+                self.cbCategory.blockSignals(False)
             return
 
@@ -288 +292 @@
         model = str(self.cbModel.currentText())
 
+        # Reset structure factor
+        self.cbStructureFactor.setCurrentIndex(0)
+
         # SasModel -> QModel
         self.SASModelToQModel(model)
@@ -357 +364 @@
         Setting model parameters into table based on selected category
         """
+        # TODO - modify for structure factor-only choice
+
         # Crete/overwrite model items
         self._model_model.clear()
@@ -415 +424 @@
             parameter_name = parameter_name[16:]
         property_name = str(self._poly_model.headerData(model_column, 1).toPyObject()) # Value, min, max, etc.
-        print "%s(%s) => %d" % (parameter_name, property_name, value)
+        # print "%s(%s) => %d" % (parameter_name, property_name, value)
 
         # Update the sasmodel
@@ -454 +463 @@
         property_name = str(self._model_model.headerData(1, model_column).toPyObject()) # Value, min, max, etc.
 
-        print "%s(%s) => %d" % (parameter_name, property_name, value)
+        # print "%s(%s) => %d" % (parameter_name, property_name, value)
         self.kernel_module.params[parameter_name] = value
 
@@ -691 +700 @@
         self._last_model_row = self._model_model.rowCount()
 
-
     def modifyShellsInList(self, index):
         """