Changeset 3c6ecd9 in sasview for src/sas/qtgui/Utilities/UnitTesting/GridPanelTest.py

Timestamp:

May 7, 2018 6:47:21 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:

42787fb

Parents:

b0ba43e (diff), 80468f6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ESS_GUI' into ESS_GUI_Pr

File:

• src/sas/qtgui/Utilities/UnitTesting/GridPanelTest.py (modified) (5 diffs)

src/sas/qtgui/Utilities/UnitTesting/GridPanelTest.py

@@ -16 +16 @@
 
 from sas.sascalc.fit.AbstractFitEngine import FResult
+from sas.sascalc.fit.AbstractFitEngine import FitData1D
 from sasmodels.sasview_model import load_standard_models
 from sas.qtgui.Plotting.PlotterData import Data1D
@@ -32 +33 @@
         # dummy perspective
         class dummy_manager(object):
+            _parent = QtWidgets.QWidget()
             def communicator(self):
                 return GuiUtils.Communicate()
@@ -56 +58 @@
         self.assertIsNotNone(m)
         data = Data1D(x=[1,2], y=[3,4], dx=[0.1, 0.1], dy=[0.,0.])
+        fit_data = FitData1D(x=[1,2], y=[3,4], data=data)
         param_list = ['sld_shell', 'sld_solvent']
-        output = FResult(model=model, data=data, param_list=param_list)
+        output = FResult(model=model, data=fit_data, param_list=param_list)
+        output.sas_data = data
         output.theory = np.array([0.1,0.2])
         output.pvec = np.array([0.1, 0.02])
@@ -63 +67 @@
         output.fitness = 9000.0
         output.fitter_id = 200
+        output.stderr = [0.001, 0.001]
         output_data = [[output],[output]]
         return output_data
@@ -70 +75 @@
         self.assertIsInstance(self.widget, QtWidgets.QMainWindow)
         # Default title
-        self.assertEqual(self.widget.windowTitle(), "Grid Panel")
+        self.assertEqual(self.widget.windowTitle(), "Batch Fitting Results")
 
         # non-modal window