Changeset 605d944 in sasview for src

Timestamp:

Sep 6, 2018 5:11:49 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:

c0de493

Parents:

fd7ef36

git-author:

Piotr Rozyczko <rozyczko@…> (09/06/18 05:10:43)

git-committer:

Piotr Rozyczko <rozyczko@…> (09/06/18 05:11:49)

Message:

Fixed unit tests for fitting SASVIEW-1024
Corrected behaviour of the Structure factor combo box on model/category change

Location:

src/sas/qtgui/Perspectives/Fitting

Files:

• FittingWidget.py (modified) (3 diffs)
• UnitTesting/FittingWidgetTest.py (modified) (14 diffs)

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

@@ -968 +968 @@
         self.has_poly_error_column = False
 
-        self.respondToModelStructure(model=model, structure_factor=None)
+        structure = None
+        if self.cbStructureFactor.isEnabled():
+            structure = str(self.cbStructureFactor.currentText())
+        self.respondToModelStructure(model=model, structure_factor=structure)
 
     def onSelectBatchFilename(self, data_index):
@@ -1962 +1965 @@
             # Allow the SF combobox visibility for the given sasmodel
             self.enableStructureFactorControl(structure_factor)
+            if self.cbStructureFactor.isEnabled():
+                structure_factor = self.cbStructureFactor.currentText()
+                self.fromStructureFactorToQModel(structure_factor)
 
         # Then, add multishells
@@ -2056 +2062 @@
         Setting model parameters into QStandardItemModel based on selected _structure factor_
         """
+        if structure_factor is None or structure_factor=="None":
+            return
         structure_module = generate.load_kernel_module(structure_factor)
         structure_parameters = modelinfo.make_parameter_table(getattr(structure_module, 'parameters', []))

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

@@ -262 +262 @@
         self.widget.cbModel.setCurrentIndex(0)
 
-        # Observe factor reset to None
-        self.assertEqual(self.widget.cbStructureFactor.currentText(), STRUCTURE_DEFAULT)
+        # Observe factor doesn't reset to None
+        self.assertEqual(self.widget.cbStructureFactor.currentText(), 'squarewell')
 
         # Switch category to structure factor
@@ -639 +639 @@
         self.assertEqual(spy.count(), 0)
 
-    def notestPlotData(self):
+    def testPlotData(self):
         """
         See that data item can produce a chart
@@ -649 +649 @@
         # Set data
         test_data = Data1D(x=[1,2], y=[1,2])
-
+        item = QtGui.QStandardItem()
+        updateModelItem(item, test_data, "test")
         # Force same data into logic
-        self.widget.logic.data = test_data
-        self.widget.data_is_loaded = True
+        self.widget.data = item
 
         # Change the category index so we have a model available
@@ -674 +674 @@
         self.assertEqual(spy.count(), 1)
 
-    def notestOnEmptyFit(self):
+    def testOnEmptyFit(self):
         """
         Test a 1D/2D fit with no parameters
@@ -687 +687 @@
         self.widget.cbCategory.setCurrentIndex(category_index)
 
-        #self.widget.show()
+        self.widget.show()
 
         # Test no fitting params
@@ -698 +698 @@
         self.widget.close()
 
+    def testOnEmptyFit2(self):
         test_data = Data2D(image=[1.0, 2.0, 3.0],
                            err_image=[0.01, 0.02, 0.03],
@@ -708 +709 @@
         item = QtGui.QStandardItem()
         updateModelItem(item, test_data, "test")
+
         # Force same data into logic
         self.widget.data = item
@@ -723 +725 @@
         self.assertTrue(logging.error.called_once())
         self.assertTrue(logging.error.called_with('no fitting parameters'))
-        #self.widget.close()
-
+        self.widget.close()
 
     def notestOnFit1D(self):
@@ -853 +854 @@
         self.assertIn("magnetism.html", self.widget.parent.showHelp.call_args[0][0])
 
-    def notestReadFitPage(self):
+    def testReadFitPage(self):
         """
         Read in the fitpage object and restore state
@@ -859 +860 @@
         # Set data
         test_data = Data1D(x=[1,2], y=[1,2])
-
+        item = QtGui.QStandardItem()
+        updateModelItem(item, test_data, "test")
         # Force same data into logic
-        self.widget.logic.data = test_data
-        self.widget.data_is_loaded = True
+        self.widget.data = item
+
+        # Force same data into logic
         category_index = self.widget.cbCategory.findText('Sphere')
+
         self.widget.cbCategory.setCurrentIndex(category_index)
         self.widget.main_params_to_fit = ['scale']
@@ -939 +943 @@
         self.assertTrue(self.widget.tabFitting.isTabEnabled(4))
 
-    def notestCurrentState(self):
+    def testCurrentState(self):
         """
         Set up the fitpage with current state
@@ -945 +949 @@
         # Set data
         test_data = Data1D(x=[1,2], y=[1,2])
-
+        item = QtGui.QStandardItem()
+        updateModelItem(item, test_data, "test")
         # Force same data into logic
-        self.widget.logic.data = test_data
-        self.widget.data_is_loaded = True
+        self.widget.data = item
         category_index = self.widget.cbCategory.findText("Sphere")
         self.widget.cbCategory.setCurrentIndex(category_index)
@@ -964 +968 @@
         self.assertListEqual(fp.main_params_to_fit, ['scale'])
 
-    def notestPushFitPage(self):
+    def testPushFitPage(self):
         """
         Push current state of fitpage onto stack
@@ -970 +974 @@
         # Set data
         test_data = Data1D(x=[1,2], y=[1,2])
-
+        item = QtGui.QStandardItem()
+        updateModelItem(item, test_data, "test")
         # Force same data into logic
-        self.widget.logic.data = test_data
-        self.widget.data_is_loaded = True
+        self.widget.data = item
         category_index = self.widget.cbCategory.findText("Sphere")