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

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

Location:

src/sas/qtgui/Plotting

Files:

• Arrow3D.py (added)
• Binder.py (added)
• ColorMap.py (modified) (1 diff)
• ConvertUnits.py (added)
• DataTransform.py (added)
• Fittings.py (added)
• LineModel.py (added)
• LinearFit.py (modified) (5 diffs)
• MaskEditor.py (modified) (1 diff)
• Plottables.py (added)
• Plotter.py (modified) (1 diff)
• Plotter2D.py (modified) (1 diff)
• PlotterBase.py (modified) (1 diff)
• PlotterData.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)
• UnitTesting/ColorMapTest.py (modified) (1 diff)
• UnitTesting/LinearFitTest.py (modified) (1 diff)
• UnitTesting/Plotter2DTest.py (modified) (1 diff)
• UnitTesting/PlotterBaseTest.py (modified) (1 diff)
• UnitTesting/PlotterTest.py (modified) (1 diff)

src/sas/qtgui/Plotting/ColorMap.py

@@ -11 +11 @@
 
 from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
-from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.qtgui.Plotting.PlotterData import Data2D
 from sas.qtgui.Utilities.GuiUtils import formatNumber
 from rangeSlider import RangeSlider

src/sas/qtgui/Plotting/LinearFit.py

@@ -7 +7 @@
 from PyQt4 import QtCore
 
-#from sas.sasgui.transform import 
 from sas.qtgui.Utilities.GuiUtils import formatNumber
-from sas.sasgui.plottools import fittings
-from sas.sasgui.plottools import transform
-
-from sas.sasgui.plottools.LineModel import LineModel
+
+from sas.qtgui.Plotting import Fittings
+from sas.qtgui.Plotting import DataTransform
+from sas.qtgui.Plotting.LineModel import LineModel
 
 # Local UI
@@ -67 +66 @@
         self.default_A = self.model.getParam('A')
         self.default_B = self.model.getParam('B')
-        self.cstA = fittings.Parameter(self.model, 'A', self.default_A)
-        self.cstB = fittings.Parameter(self.model, 'B', self.default_B)
-        self.transform = transform
+        self.cstA = Fittings.Parameter(self.model, 'A', self.default_A)
+        self.cstB = Fittings.Parameter(self.model, 'B', self.default_B)
+        self.transform = DataTransform
 
         self.setFixedSize(self.minimumSizeHint())
@@ -123 +122 @@
 
         # Find the fitting parameters
-        self.cstA = fittings.Parameter(self.model, 'A', self.default_A)
-        self.cstB = fittings.Parameter(self.model, 'B', self.default_B)
+        self.cstA = Fittings.Parameter(self.model, 'A', self.default_A)
+        self.cstB = Fittings.Parameter(self.model, 'B', self.default_B)
         tempdy = numpy.asarray(tempdy)
         tempdy[tempdy == 0] = 1
@@ -132 +131 @@
             xmax = numpy.log10(xmax)
 
-        chisqr, out, cov = fittings.sasfit(self.model,
+        chisqr, out, cov = Fittings.sasfit(self.model,
                                            [self.cstA, self.cstB],
                                            tempx, tempy, tempdy,
@@ -193 +192 @@
                 tempy  = [numpy.log10(y[i])
                          for i in range(len(x)) if x[i] >= xmin_check]
-                tempdy = [transform.errToLogX(y[i], 0, dy[i], 0)
+                tempdy = [DataTransform.errToLogX(y[i], 0, dy[i], 0)
                          for i in range(len(x)) if x[i] >= xmin_check]
             else:
                 tempy = map(numpy.log10, y)
-                tempdy = map(lambda t1,t2:transform.errToLogX(t1,0,t2,0),y,dy)
+                tempdy = map(lambda t1,t2:DataTransform.errToLogX(t1,0,t2,0),y,dy)
         else:
             tempy = y

src/sas/qtgui/Plotting/MaskEditor.py

@@ -1 +1 @@
 from PyQt4 import QtGui
 
-from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.qtgui.Plotting.PlotterData import Data2D
 
 # Local UI

src/sas/qtgui/Plotting/Plotter.py

@@ -7 +7 @@
 from matplotlib.font_manager import FontProperties
 
-from sas.sasgui.guiframe.dataFitting import Data1D
+from sas.qtgui.Plotting.PlotterData import Data1D
+
 from sas.qtgui.Plotting.PlotterBase import PlotterBase
-import sas.qtgui.Utilities.GuiUtils as GuiUtils
 from sas.qtgui.Plotting.AddText import AddText
 from sas.qtgui.Plotting.SetGraphRange import SetGraphRange
 from sas.qtgui.Plotting.LinearFit import LinearFit
 from sas.qtgui.Plotting.PlotProperties import PlotProperties
+
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
 import sas.qtgui.Plotting.PlotUtilities as PlotUtilities
 

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.

src/sas/qtgui/Plotting/PlotterBase.py

@@ -15 +15 @@
 
 DEFAULT_CMAP = pylab.cm.jet
-from sas.sasgui.plottools.binder import BindArtist
-
-import sas.qtgui.Utilities.GuiUtils as GuiUtils
-from sas.sasgui.guiframe.dataFitting import Data1D, Data2D
+from sas.qtgui.Plotting.Binder import BindArtist
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
+
 from sas.qtgui.Plotting.ScaleProperties import ScaleProperties
 from sas.qtgui.Plotting.WindowTitle import WindowTitle
+import sas.qtgui.Utilities.GuiUtils as GuiUtils
 import sas.qtgui.Plotting.PlotHelper as PlotHelper
 import sas.qtgui.Plotting.PlotUtilities as PlotUtilities

src/sas/qtgui/Plotting/UnitTesting/ColorMapTest.py

@@ -10 +10 @@
 import path_prepare
 
-from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.qtgui.Plotting.PlotterData import Data2D
 import sas.qtgui.Plotting.Plotter2D as Plotter2D
 from UnitTesting.TestUtils import WarningTestNotImplemented

src/sas/qtgui/Plotting/UnitTesting/LinearFitTest.py

@@ -9 +9 @@
 import path_prepare
 
-from sas.sasgui.guiframe.dataFitting import Data1D
+from sas.qtgui.Plotting.PlotterData import Data1D
 import sas.qtgui.Plotting.Plotter as Plotter
 

src/sas/qtgui/Plotting/UnitTesting/Plotter2DTest.py

@@ -12 +12 @@
 import path_prepare
 #######
-from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sasgui.guiframe.dataFitting import Data2D
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
 from UnitTesting.TestUtils import WarningTestNotImplemented
 

src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py

@@ -14 +14 @@
 from sas.qtgui.Plotting.ScaleProperties import ScaleProperties
 from sas.qtgui.Plotting.WindowTitle import WindowTitle
-#import sas.qtgui.GuiUtils as GuiUtils
 from sas.qtgui.Utilities.GuiUtils import *
 import sas.qtgui.Plotting.PlotHelper as PlotHelper

src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py

@@ -11 +11 @@
 import path_prepare
 #######
-from sas.sasgui.guiframe.dataFitting import Data1D
-from sas.sasgui.guiframe.dataFitting import Data2D
-from UnitTesting.TestUtils import WarningTestNotImplemented
+from sas.qtgui.Plotting.PlotterData import Data1D
+from sas.qtgui.Plotting.PlotterData import Data2D
+from sas.qtgui.UnitTesting.TestUtils import WarningTestNotImplemented
 from sas.qtgui.Plotting.LinearFit import LinearFit
 from sas.qtgui.Plotting.PlotProperties import PlotProperties