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

Timestamp:

May 18, 2017 5:36:57 AM (8 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:

6066a3f

Parents:

2a432e7

Message:

Removed qtgui dependency on sasgui and wx SASVIEW-590

File:

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

src/sas/qtgui/Plotting/Plotter2D.py

@@ -10 +10 @@
 from mpl_toolkits.mplot3d import Axes3D
 
+from sas.sascalc.dataloader.manipulations import CircularAverage
+
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
+
 import sas.qtgui.Plotting.PlotUtilities as PlotUtilities
 import sas.qtgui.Utilities.GuiUtils as GuiUtils
 from sas.qtgui.Plotting.PlotterBase import PlotterBase
 from sas.qtgui.Plotting.ColorMap import ColorMap
-from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sasgui.guiframe.dataFitting import Data2D
-from sas.sascalc.dataloader.manipulations import CircularAverage
-from sas.sasgui.guiframe.local_perspectives.plotting.binder import BindArtist
 from sas.qtgui.Plotting.BoxSum import BoxSum
 from sas.qtgui.Plotting.SlicerParameters import SlicerParameters
-from sas.sasgui.guiframe.local_perspectives.plotting.boxSlicer import BoxInteractorX
-from sas.sasgui.guiframe.local_perspectives.plotting.AnnulusSlicer import AnnulusInteractor
-from sas.sasgui.guiframe.local_perspectives.plotting.SectorSlicer import SectorInteractor
-from sas.sasgui.guiframe.local_perspectives.plotting.boxSum import BoxSumCalculator
-from sas.sasgui.guiframe.local_perspectives.plotting.boxSlicer import BoxInteractorY
+from sas.qtgui.Plotting.Binder import BindArtist
+
+# TODO: move to sas.qtgui namespace
+from sas.qtgui.Plotting.Slicers.BoxSlicer import BoxInteractorX
+from sas.qtgui.Plotting.Slicers.BoxSlicer import BoxInteractorY
+from sas.qtgui.Plotting.Slicers.AnnulusSlicer import AnnulusInteractor
+from sas.qtgui.Plotting.Slicers.SectorSlicer import SectorInteractor
+from sas.qtgui.Plotting.Slicers.BoxSum import BoxSumCalculator
 
 # Minimum value of Z for which we will present data.