Changeset d7bb526 in sasview


Ignore:
Timestamp:
Feb 22, 2016 3:06:35 AM (9 years ago)
Author:
Piotr Rozyczko <piotr.rozyczko@…>
Branches:
master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
d85c194
Parents:
b699768
Message:

Refactored plottools into sasgui

Files:
1 added
19 edited
20 moved

Legend:

Unmodified
Added
Removed

  • setup.py

    rb699768 rd7bb526  
    231231 
    232232# Plottools 
    233 package_dir["sas.plottools"] = os.path.join("src", "sas", "plottools") 
    234 packages.append("sas.plottools") 
     233package_dir["sas.sasgui.plottools"] = os.path.join("src", "sas", "sasgui", "plottools") 
     234packages.append("sas.sasgui.plottools") 
    235235 
    236236# sas models 

  • src/examples/test_chisq_panel.py

    r3a39c2e rd7bb526  
    2727 
    2828import wx 
    29 from sas.plottools.PlotPanel import PlotPanel 
    30 from sas.plottools.plottables import Plottable, Graph, Data1D, Theory1D 
     29from sas.sasgui.plottools.PlotPanel import PlotPanel 
     30from sas.sasgui.plottools.plottables import Plottable, Graph, Data1D, Theory1D 
    3131import  sys 
    3232import numpy 

  • src/examples/test_copy_print.py

    r3a39c2e rd7bb526  
    2626 
    2727import wx 
    28 from sas.plottools.PlotPanel import PlotPanel 
    29 from sas.plottools.plottables import Graph, Data1D, Theory1D 
     28from sas.sasgui.plottools.PlotPanel import PlotPanel 
     29from sas.sasgui.plottools.plottables import Graph, Data1D, Theory1D 
    3030import  sys 
    3131sys.platform = 'win95' 

  • src/examples/test_panel.py

    r3a39c2e rd7bb526  
    3737""" 
    3838import wx 
    39 from sas.plottools.PlotPanel import PlotPanel 
    40 from sas.plottools.plottables import Data1D 
     39from sas.sasgui.plottools.PlotPanel import PlotPanel 
     40from sas.sasgui.plottools.plottables import Data1D 
    4141import  sys 
    4242import numpy 

  • src/examples/test_panel2D.py

    rb699768 rd7bb526  
    3737""" 
    3838import wx 
    39 from sas.plottools.PlotPanel import PlotPanel 
    40 from sas.plottools.plottables import Data1D, Theory1D, Data2D 
     39from sas.sasgui.plottools.PlotPanel import PlotPanel 
     40from sas.sasgui.plottools.plottables import Data1D, Theory1D, Data2D 
    4141import  sys,os 
    4242import numpy 

  • src/examples/test_text_panel.py

    r3a39c2e rd7bb526  
    2727 
    2828import wx 
    29 from sas.plottools.PlotPanel import PlotPanel 
    30 from sas.plottools.plottables import Text, Graph 
     29from sas.sasgui.plottools.PlotPanel import PlotPanel 
     30from sas.sasgui.plottools.plottables import Text, Graph 
    3131 
    3232class TestPlotPanel(PlotPanel): 

  • src/sas/guiframe/dataFitting.py

    rb699768 rd7bb526  
    66import math 
    77from sas.sascalc.data_util.uncertainty import Uncertainty 
    8 from sas.plottools.plottables import Data1D as PlotData1D 
    9 from sas.plottools.plottables import Data2D as PlotData2D 
    10 from sas.plottools.plottables import Theory1D as PlotTheory1D 
     8from sas.sasgui.plottools.plottables import Data1D as PlotData1D 
     9from sas.sasgui.plottools.plottables import Data2D as PlotData2D 
     10from sas.sasgui.plottools.plottables import Theory1D as PlotTheory1D 
    1111 
    1212from sas.sascalc.dataloader.data_info import Data1D as LoadData1D 

  • src/sas/guiframe/data_processor.py

    r44d20af rd7bb526  
    2828from sas.guiframe.events import NewPlotEvent 
    2929from sas.guiframe.events import StatusEvent 
    30 from sas.plottools import plottables 
     30from sas.sasgui.plottools import plottables 
    3131from sas.guiframe.dataFitting import Data1D 
    3232 

  • src/sas/guiframe/local_perspectives/plotting/Plotter1D.py

    r6f16e25 rd7bb526  
    1616import numpy 
    1717import logging 
    18 from sas.plottools.PlotPanel import PlotPanel 
     18from sas.sasgui.plottools.PlotPanel import PlotPanel 
    1919from sas.guiframe.events import StatusEvent 
    2020from sas.guiframe.events import PanelOnFocusEvent 

  • src/sas/guiframe/local_perspectives/plotting/Plotter2D.py

    rb699768 rd7bb526  
    1616import numpy 
    1717import logging 
    18 from sas.plottools.PlotPanel import PlotPanel 
    19 from sas.plottools.plottables import Graph 
    20 from sas.plottools.TextDialog import TextDialog 
     18from sas.sasgui.plottools.PlotPanel import PlotPanel 
     19from sas.sasgui.plottools.plottables import Graph 
     20from sas.sasgui.plottools.TextDialog import TextDialog 
    2121from sas.guiframe.events import StatusEvent 
    2222from sas.guiframe.events import NewPlotEvent 
    … …  
    2626from  sas.guiframe.local_perspectives.plotting.binder import BindArtist 
    2727from Plotter1D import ModelPanel1D 
    28 from sas.plottools.toolbar import NavigationToolBar 
     28from sas.sasgui.plottools.toolbar import NavigationToolBar 
    2929from matplotlib.font_manager import FontProperties 
    3030from graphAppearance import graphAppearance 

  • src/sas/guiframe/local_perspectives/plotting/SimplePlot.py

    r098f3d2 rd7bb526  
    44import wx 
    55from sas.guiframe.local_perspectives.plotting.Plotter2D import ModelPanel2D as PlotPanel 
    6 from sas.plottools.toolbar import NavigationToolBar 
    7 from sas.plottools.plottables import Graph 
     6from sas.sasgui.plottools.toolbar import NavigationToolBar 
     7from sas.sasgui.plottools.plottables import Graph 
    88from sas.guiframe.utils import PanelMenu 
    99from sas.guiframe.events import StatusEvent 

  • src/sas/guiframe/local_perspectives/plotting/graphAppearance.py

    rac7be54 rd7bb526  
    1212 
    1313import wx 
    14 from sas.plottools.SimpleFont import SimpleFont 
     14from sas.sasgui.plottools.SimpleFont import SimpleFont 
    1515 
    1616COLOR = ['black', 'blue', 'green', 'red', 'cyan', 'magenta', 'yellow'] 

  • src/sas/guiframe/local_perspectives/plotting/masking.py

    rb699768 rd7bb526  
    2525import copy 
    2626import numpy 
    27 from sas.plottools.PlotPanel import PlotPanel 
    28 from sas.plottools.plottables import Graph 
     27from sas.sasgui.plottools.PlotPanel import PlotPanel 
     28from sas.sasgui.plottools.plottables import Graph 
    2929from binder import BindArtist 
    3030from sas.guiframe.dataFitting import Data1D, Data2D 

  • src/sas/guiframe/local_perspectives/plotting/profile_dialog.py

    rc039589 rd7bb526  
    55import sys 
    66from copy import deepcopy 
    7 from sas.plottools.plottables import Graph 
     7from sas.sasgui.plottools.plottables import Graph 
    88from Plotter1D import ModelPanel1D as PlotPanel 
    99from sas.guiframe.dataFitting import Data1D 

  • src/sas/perspectives/calculator/data_operator.py

    rb699768 rd7bb526  
    77import numpy 
    88from sas.sascalc.dataloader.data_info import Data1D 
    9 from sas.plottools.PlotPanel import PlotPanel 
    10 from sas.plottools.plottables import Graph 
    11 from sas.plottools import transform 
     9from sas.sasgui.plottools.PlotPanel import PlotPanel 
     10from sas.sasgui.plottools.plottables import Graph 
     11from sas.sasgui.plottools import transform 
    1212from matplotlib.font_manager import FontProperties 
    1313from sas.guiframe.events import StatusEvent 
    … …  
    888888            first_item = list.keys()[0] 
    889889            if first_item.x != []: 
    890                 from sas.plottools.PropertyDialog import Properties 
     890                from sas.sasgui.plottools.PropertyDialog import Properties 
    891891                dial = Properties(self, -1, 'Change Scale') 
    892892                # type of view or model used 

  • src/sas/perspectives/calculator/gen_scatter_panel.py

    rb699768 rd7bb526  
    3434from wx.lib.scrolledpanel import ScrolledPanel 
    3535from sas.perspectives.calculator.load_thread import GenReader 
    36 from sas.plottools.arrow3d import Arrow3D 
     36from sas.sasgui.plottools.arrow3d import Arrow3D 
    3737from sas.perspectives.calculator import calculator_widgets as widget 
    3838from sas.guiframe.events import NewPlotEvent 

  • src/sas/perspectives/fitting/basepage.py

    rb699768 rd7bb526  
    18321832        x, y = self.model.getProfile() 
    18331833 
    1834         from sas.plottools import Data1D as pf_data1d 
     1834        from sas.sasgui.plottools import Data1D as pf_data1d 
    18351835        #from sas.perspectives.theory.profile_dialog import SLDPanel 
    18361836        from sas.guiframe.local_perspectives.plotting.profile_dialog \ 

  • src/sas/perspectives/pr/explore_dialog.py

    rb699768 rd7bb526  
    2828 
    2929# Import plotting classes 
    30 from sas.plottools.PlotPanel import PlotPanel 
    31 from sas.plottools import Data1D as Model1D 
     30from sas.sasgui.plottools.PlotPanel import PlotPanel 
     31from sas.sasgui.plottools import Data1D as Model1D 
    3232from sas.guiframe.gui_style import GUIFRAME_ID 
    33 from sas.plottools.plottables import Graph 
     33from sas.sasgui.plottools.plottables import Graph 
    3434 
    3535from pr_widgets import PrTextCtrl 

  • src/sas/sascalc/calculator/sas_gen.py

    rb699768 rd7bb526  
    10401040        Test code 
    10411041    """ 
    1042     from sas.plottools.arrow3d import Arrow3D 
     1042    from sas.sasgui.plottools.arrow3d import Arrow3D 
    10431043    current_dir = os.path.abspath(os.path.curdir) 
    10441044    print current_dir 

  • src/sas/sasgui/plottools/PlotPanel.py

    rd3d67f0 rd7bb526  
    3232import numpy 
    3333 
    34 from ..guiframe.events import StatusEvent 
     34from sas.guiframe.events import StatusEvent 
    3535from .toolbar import NavigationToolBar, PlotPrintout, bind 
    3636 

  • src/sas/sasgui/plottools/config.py

    rd3d67f0 rd7bb526  
    99 
    1010    # Select matplotlib version and backend 
    11     import sas.plottools.config 
     11    import sas.sasgui.plottools.config 
    1212 
    1313Note that plottools requires particular versions of matplotlib 
Note: See TracChangeset for help on using the changeset viewer.