Changeset f4a1433 in sasview for src/sas/qtgui/Plotting/Plotter2D.py

Timestamp:

Oct 24, 2017 2:44:26 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:

fca1f50, d6b234b

Parents:

16afe01 (diff), 5582b078 (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 'master' into ESS_GUI

File:

• src/sas/qtgui/Plotting/Plotter2D.py (modified) (1 diff)

src/sas/qtgui/Plotting/Plotter2D.py

@@ -394 +394 @@
         if data is None:
             return
-        if data.ndim == 1:
+        if data.ndim == 0:
+            return
+        elif data.ndim == 1:
             output = PlotUtilities.build_matrix(data, self.qx_data, self.qy_data)
         else: