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


Ignore:
Timestamp:
May 18, 2017 3:36:57 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:
6066a3f
Parents:
2a432e7
Message:

Removed qtgui dependency on sasgui and wx SASVIEW-590

Location:
src/sas/qtgui/Plotting
Files:
16 added
11 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Plotting/ColorMap.py

    rcd2cc745 rdc5ef15  
    1111 
    1212from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas 
    13 from sas.sasgui.guiframe.dataFitting import Data2D 
     13from sas.qtgui.Plotting.PlotterData import Data2D 
    1414from sas.qtgui.Utilities.GuiUtils import formatNumber 
    1515from rangeSlider import RangeSlider 
  • src/sas/qtgui/Plotting/LinearFit.py

    rcd2cc745 rdc5ef15  
    77from PyQt4 import QtCore 
    88 
    9 #from sas.sasgui.transform import  
    109from sas.qtgui.Utilities.GuiUtils import formatNumber 
    11 from sas.sasgui.plottools import fittings 
    12 from sas.sasgui.plottools import transform 
    13  
    14 from sas.sasgui.plottools.LineModel import LineModel 
     10 
     11from sas.qtgui.Plotting import Fittings 
     12from sas.qtgui.Plotting import DataTransform 
     13from sas.qtgui.Plotting.LineModel import LineModel 
    1514 
    1615# Local UI 
     
    6766        self.default_A = self.model.getParam('A') 
    6867        self.default_B = self.model.getParam('B') 
    69         self.cstA = fittings.Parameter(self.model, 'A', self.default_A) 
    70         self.cstB = fittings.Parameter(self.model, 'B', self.default_B) 
    71         self.transform = transform 
     68        self.cstA = Fittings.Parameter(self.model, 'A', self.default_A) 
     69        self.cstB = Fittings.Parameter(self.model, 'B', self.default_B) 
     70        self.transform = DataTransform 
    7271 
    7372        self.setFixedSize(self.minimumSizeHint()) 
     
    123122 
    124123        # Find the fitting parameters 
    125         self.cstA = fittings.Parameter(self.model, 'A', self.default_A) 
    126         self.cstB = fittings.Parameter(self.model, 'B', self.default_B) 
     124        self.cstA = Fittings.Parameter(self.model, 'A', self.default_A) 
     125        self.cstB = Fittings.Parameter(self.model, 'B', self.default_B) 
    127126        tempdy = numpy.asarray(tempdy) 
    128127        tempdy[tempdy == 0] = 1 
     
    132131            xmax = numpy.log10(xmax) 
    133132 
    134         chisqr, out, cov = fittings.sasfit(self.model, 
     133        chisqr, out, cov = Fittings.sasfit(self.model, 
    135134                                           [self.cstA, self.cstB], 
    136135                                           tempx, tempy, tempdy, 
     
    193192                tempy  = [numpy.log10(y[i]) 
    194193                         for i in range(len(x)) if x[i] >= xmin_check] 
    195                 tempdy = [transform.errToLogX(y[i], 0, dy[i], 0) 
     194                tempdy = [DataTransform.errToLogX(y[i], 0, dy[i], 0) 
    196195                         for i in range(len(x)) if x[i] >= xmin_check] 
    197196            else: 
    198197                tempy = map(numpy.log10, y) 
    199                 tempdy = map(lambda t1,t2:transform.errToLogX(t1,0,t2,0),y,dy) 
     198                tempdy = map(lambda t1,t2:DataTransform.errToLogX(t1,0,t2,0),y,dy) 
    200199        else: 
    201200            tempy = y 
  • src/sas/qtgui/Plotting/MaskEditor.py

    rcd2cc745 rdc5ef15  
    11from PyQt4 import QtGui 
    22 
    3 from sas.sasgui.guiframe.dataFitting import Data2D 
     3from sas.qtgui.Plotting.PlotterData import Data2D 
    44 
    55# Local UI 
  • src/sas/qtgui/Plotting/Plotter.py

    r83eb5208 rdc5ef15  
    77from matplotlib.font_manager import FontProperties 
    88 
    9 from sas.sasgui.guiframe.dataFitting import Data1D 
     9from sas.qtgui.Plotting.PlotterData import Data1D 
     10 
    1011from sas.qtgui.Plotting.PlotterBase import PlotterBase 
    11 import sas.qtgui.Utilities.GuiUtils as GuiUtils 
    1212from sas.qtgui.Plotting.AddText import AddText 
    1313from sas.qtgui.Plotting.SetGraphRange import SetGraphRange 
    1414from sas.qtgui.Plotting.LinearFit import LinearFit 
    1515from sas.qtgui.Plotting.PlotProperties import PlotProperties 
     16 
     17import sas.qtgui.Utilities.GuiUtils as GuiUtils 
    1618import sas.qtgui.Plotting.PlotUtilities as PlotUtilities 
    1719 
  • src/sas/qtgui/Plotting/Plotter2D.py

    r83eb5208 rdc5ef15  
    1010from mpl_toolkits.mplot3d import Axes3D 
    1111 
     12from sas.sascalc.dataloader.manipulations import CircularAverage 
     13 
     14from sas.qtgui.Plotting.PlotterData import Data1D 
     15from sas.qtgui.Plotting.PlotterData import Data2D 
     16 
    1217import sas.qtgui.Plotting.PlotUtilities as PlotUtilities 
    1318import sas.qtgui.Utilities.GuiUtils as GuiUtils 
    1419from sas.qtgui.Plotting.PlotterBase import PlotterBase 
    1520from sas.qtgui.Plotting.ColorMap import ColorMap 
    16 from sas.sasgui.guiframe.dataFitting import Data1D 
    17 from sas.sasgui.guiframe.dataFitting import Data2D 
    18 from sas.sascalc.dataloader.manipulations import CircularAverage 
    19 from sas.sasgui.guiframe.local_perspectives.plotting.binder import BindArtist 
    2021from sas.qtgui.Plotting.BoxSum import BoxSum 
    2122from sas.qtgui.Plotting.SlicerParameters import SlicerParameters 
    22 from sas.sasgui.guiframe.local_perspectives.plotting.boxSlicer import BoxInteractorX 
    23 from sas.sasgui.guiframe.local_perspectives.plotting.AnnulusSlicer import AnnulusInteractor 
    24 from sas.sasgui.guiframe.local_perspectives.plotting.SectorSlicer import SectorInteractor 
    25 from sas.sasgui.guiframe.local_perspectives.plotting.boxSum import BoxSumCalculator 
    26 from sas.sasgui.guiframe.local_perspectives.plotting.boxSlicer import BoxInteractorY 
     23from sas.qtgui.Plotting.Binder import BindArtist 
     24 
     25# TODO: move to sas.qtgui namespace 
     26from sas.qtgui.Plotting.Slicers.BoxSlicer import BoxInteractorX 
     27from sas.qtgui.Plotting.Slicers.BoxSlicer import BoxInteractorY 
     28from sas.qtgui.Plotting.Slicers.AnnulusSlicer import AnnulusInteractor 
     29from sas.qtgui.Plotting.Slicers.SectorSlicer import SectorInteractor 
     30from sas.qtgui.Plotting.Slicers.BoxSum import BoxSumCalculator 
    2731 
    2832# Minimum value of Z for which we will present data. 
  • src/sas/qtgui/Plotting/PlotterBase.py

    r83eb5208 rdc5ef15  
    1515 
    1616DEFAULT_CMAP = pylab.cm.jet 
    17 from sas.sasgui.plottools.binder import BindArtist 
    18  
    19 import sas.qtgui.Utilities.GuiUtils as GuiUtils 
    20 from sas.sasgui.guiframe.dataFitting import Data1D, Data2D 
     17from sas.qtgui.Plotting.Binder import BindArtist 
     18from sas.qtgui.Plotting.PlotterData import Data1D 
     19from sas.qtgui.Plotting.PlotterData import Data2D 
     20 
    2121from sas.qtgui.Plotting.ScaleProperties import ScaleProperties 
    2222from sas.qtgui.Plotting.WindowTitle import WindowTitle 
     23import sas.qtgui.Utilities.GuiUtils as GuiUtils 
    2324import sas.qtgui.Plotting.PlotHelper as PlotHelper 
    2425import sas.qtgui.Plotting.PlotUtilities as PlotUtilities 
  • src/sas/qtgui/Plotting/UnitTesting/ColorMapTest.py

    r83eb5208 rdc5ef15  
    1010import path_prepare 
    1111 
    12 from sas.sasgui.guiframe.dataFitting import Data2D 
     12from sas.qtgui.Plotting.PlotterData import Data2D 
    1313import sas.qtgui.Plotting.Plotter2D as Plotter2D 
    1414from UnitTesting.TestUtils import WarningTestNotImplemented 
  • src/sas/qtgui/Plotting/UnitTesting/LinearFitTest.py

    r83eb5208 rdc5ef15  
    99import path_prepare 
    1010 
    11 from sas.sasgui.guiframe.dataFitting import Data1D 
     11from sas.qtgui.Plotting.PlotterData import Data1D 
    1212import sas.qtgui.Plotting.Plotter as Plotter 
    1313 
  • src/sas/qtgui/Plotting/UnitTesting/Plotter2DTest.py

    r83eb5208 rdc5ef15  
    1212import path_prepare 
    1313####### 
    14 from sas.sasgui.guiframe.dataFitting import Data1D 
    15 from sas.sasgui.guiframe.dataFitting import Data2D 
     14from sas.qtgui.Plotting.PlotterData import Data1D 
     15from sas.qtgui.Plotting.PlotterData import Data2D 
    1616from UnitTesting.TestUtils import WarningTestNotImplemented 
    1717 
  • src/sas/qtgui/Plotting/UnitTesting/PlotterBaseTest.py

    r83eb5208 rdc5ef15  
    1414from sas.qtgui.Plotting.ScaleProperties import ScaleProperties 
    1515from sas.qtgui.Plotting.WindowTitle import WindowTitle 
    16 #import sas.qtgui.GuiUtils as GuiUtils 
    1716from sas.qtgui.Utilities.GuiUtils import * 
    1817import sas.qtgui.Plotting.PlotHelper as PlotHelper 
  • src/sas/qtgui/Plotting/UnitTesting/PlotterTest.py

    r83eb5208 rdc5ef15  
    1111import path_prepare 
    1212####### 
    13 from sas.sasgui.guiframe.dataFitting import Data1D 
    14 from sas.sasgui.guiframe.dataFitting import Data2D 
    15 from UnitTesting.TestUtils import WarningTestNotImplemented 
     13from sas.qtgui.Plotting.PlotterData import Data1D 
     14from sas.qtgui.Plotting.PlotterData import Data2D 
     15from sas.qtgui.UnitTesting.TestUtils import WarningTestNotImplemented 
    1616from sas.qtgui.Plotting.LinearFit import LinearFit 
    1717from sas.qtgui.Plotting.PlotProperties import PlotProperties 
Note: See TracChangeset for help on using the changeset viewer.