Changeset f4a1433 in sasview for src/sas/qtgui/Plotting

Timestamp:

Oct 24, 2017 12:44:26 AM (6 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

Location:

src/sas/qtgui/Plotting

Files:

• Plotter2D.py (modified) (1 diff)
• AddText.py (added)
• Arrow3D.py (added)
• Binder.py (added)
• BoxSum.py (added)
• ColorMap.py (added)
• ConvertUnits.py (added)
• DataTransform.py (added)
• Fittings.py (added)
• LineModel.py (added)
• LinearFit.py (added)
• MaskEditor.py (added)
• PlotHelper.py (added)
• PlotProperties.py (added)
• PlotUtilities.py (added)
• Plottables.py (added)
• Plotter.py (added)
• PlotterBase.py (added)
• PlotterData.py (added)
• ScaleProperties.py (added)
• SetGraphRange.py (added)
• SlicerModel.py (added)
• SlicerParameters.py (added)
• Slicers/AnnulusSlicer.py (added)
• Slicers/Arc.py (added)
• Slicers/AzimutSlicer.py (added)
• Slicers/BaseInteractor.py (added)
• Slicers/BoxSlicer.py (added)
• Slicers/BoxSum.py (added)
• Slicers/SectorSlicer.py (added)
• Slicers/__init__.py (added)
• UI/AddTextUI.ui (added)
• UI/BoxSumUI.ui (added)
• UI/ColorMapUI.ui (added)
• UI/LinearFitUI.ui (added)
• UI/MaskEditorUI.ui (added)
• UI/PlotPropertiesUI.ui (added)
• UI/ScalePropertiesUI.ui (added)
• UI/SetGraphRangeUI.ui (added)
• UI/SlicerParametersUI.ui (added)
• UI/WindowTitleUI.ui (added)
• UI/__init__.py (added)
• UnitTesting/AddTextTest.py (added)
• UnitTesting/BoxSumTest.py (added)
• UnitTesting/ColorMapTest.py (added)
• UnitTesting/LinearFitTest.py (added)
• UnitTesting/PlotHelperTest.py (added)
• UnitTesting/PlotPropertiesTest.py (added)
• UnitTesting/PlotUtilitiesTest.py (added)
• UnitTesting/Plotter2DTest.py (added)
• UnitTesting/PlotterBaseTest.py (added)
• UnitTesting/PlotterTest.py (added)
• UnitTesting/ScalePropertiesTest.py (added)
• UnitTesting/SetGraphRangeTest.py (added)
• UnitTesting/SlicerModelTest.py (added)
• UnitTesting/SlicerParametersTest.py (added)
• UnitTesting/WindowTitleTest.py (added)
• UnitTesting/__init__.py (added)
• WindowTitle.py (added)
• __init__.py (added)
• rangeSlider.py (added)

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: