Changeset 2e5081b in sasview for src/sas/qtgui/Perspectives/Fitting/UnitTesting

Timestamp:

Nov 26, 2018 9:07:55 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

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

Children:

9c207f5

Parents:

9c05f22

Message:

Redone the widget slightly, to fit with requirements in trac#1135.
Added comboboxes for all available fitpage names
Removed constraint of needing two selected fitpages
Removed the "Swap" button - it is redundant now.
Added context dependence on the "Select All" action.
Removed immediate constraint validation to allow for more complex
formulas

File:

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

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

@@ -69 +69 @@
         self.assertEqual(self.widget.txtConstraint.text(), 'M1.scale')
         self.assertEqual(self.widget.txtOperator.text(), '=')
-        self.assertEqual(self.widget.txtName1.text(), 'M1')
-        self.assertEqual(self.widget.txtName2.text(), 'M1')
+        self.assertEqual(self.widget.cbModel1.currentText(), 'M1')
+        self.assertEqual(self.widget.cbModel2.currentText(), 'M1')
 
     def testTooltip(self):
@@ -81 +81 @@
         self.assertEqual(self.widget.txtConstraint.toolTip(), tooltip)
 
-    def testValidateFormula(self):
+    def notestValidateFormula(self):
         ''' assure enablement and color for valid formula '''
         # Invalid string
@@ -141 +141 @@
         c = self.widget.constraint()
         self.assertEqual(c[0], 'M1')
-        self.assertEqual(c[1].func, 'M1.sld_solvent')
+        self.assertEqual(c[1].func, 'M1.bjerrum_length')
         #self.assertEqual(c[1].operator, '>=')