Changeset a14a2b0 in sasview

Timestamp:

Sep 18, 2017 8:00:01 AM (7 years ago)

Author:

celinedurniak <celine.durniak@…>

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:

8a32a6ff

Parents:

3c8242c

Message:

Fixed bug with non updated value of fitted parameter in new GUI

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (1 diff)
• UnitTesting/FittingWidgetTest.py (modified) (1 diff)

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

@@ -1275 +1275 @@
 
         # min/max to be changed in self.kernel_module.details[parameter_name] = ['Ang', 0.0, inf]
-        self.kernel_module.details[parameter_name][property_index] = value
+        if model_column > 1:
+            self.kernel_module.details[parameter_name][property_index] = value
 
         # TODO: magnetic params in self.kernel_module.details['M0:parameter_name'] = value

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -815 +815 @@
         pass
 
+    def testOnMainPageChange(self):
+        """
+        Test update  values of modified parameters in models
+        """
+        # select model: cylinder / cylinder
+        category_index = self.widget.cbCategory.findText("Cylinder")
+        self.widget.cbCategory.setCurrentIndex(category_index)
+
+        model_index = self.widget.cbModel.findText("cylinder")
+        self.widget.cbModel.setCurrentIndex(model_index)
+
+        # modify the initial value of length (different from default)
+        # print self.widget.kernel_module.details['length']
+
+        new_value = "333.0"
+        self.widget._model_model.item(5, 1).setText(new_value)
+
+        # name of modified parameter
+        name_modified_param = str(self.widget._model_model.item(5, 0).text())
+
+        # check that the value has been modified in kernel_module
+        self.assertEqual(new_value,
+                         str(self.widget.kernel_module.params[name_modified_param]))
+
+        # check that range of variation for this parameter has NOT been changed
+        print self.widget.kernel_module.details[name_modified_param]
+        self.assertNotIn(new_value, self.widget.kernel_module.details[name_modified_param] )
+
+
 if __name__ == "__main__":
     unittest.main()