Changeset ecfe6b6 in sasview for src/sas/qtgui/Perspectives/Fitting/UnitTesting

Timestamp:

Aug 13, 2018 10:02:02 AM (6 years ago)

Author:

Torin Cooper-Bennun <torin.cooper-bennun@…>

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:

799963c

Parents:

4e255d1 (diff), e752ab8 (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_iss976' into ESS_GUI.

SASVIEW-976: Make intermediate data from product models (i.e. P(Q) and S(Q)) plottable.

File:

• src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py (modified) (1 diff)

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

@@ -100 +100 @@
         data.id = "poop"
         return_data = (data.x,data.y, 7, None, None,
-                        0, True, 0.0, 1, data,
-                        data, False, None)
+                       0, True, 0.0, 1, data,
+                       data, False, None,
+                       None, None, None,
+                       None, None)
 
         new_plot = self.logic.new1DPlot(return_data=return_data, tab_id=0)