Ignore:
Timestamp:
Feb 22, 2016 9:04:24 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:
06aaa75d
Parents:
d7bb526
Message:

Remaining modules refactored

Location:
src/sas/sasgui/guiframe/local_perspectives
Files:
2 added
25 moved

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

    rb699768 rd85c194  
    99 
    1010from sas.sascalc.dataloader.loader import Loader 
    11 from sas.guiframe.plugin_base import PluginBase 
    12 from sas.guiframe.events import StatusEvent 
    13 from sas.guiframe.gui_style import GUIFRAME 
    14 from sas.guiframe.gui_manager import DEFAULT_OPEN_FOLDER 
     11from sas.sasgui.guiframe.plugin_base import PluginBase 
     12from sas.sasgui.guiframe.events import StatusEvent 
     13from sas.sasgui.guiframe.gui_style import GUIFRAME 
     14from sas.sasgui.guiframe.gui_manager import DEFAULT_OPEN_FOLDER 
    1515try: 
    1616    # Try to find a local config 
     
    2626except: 
    2727    # Didn't find local config, load the default 
    28     import sas.guiframe.config as config 
     28    import sas.sasgui.guiframe.config as config 
    2929 
    3030if config is None: 
    31     import sas.guiframe.config as config 
     31    import sas.sasgui.guiframe.config as config 
    3232 
    3333 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/AnnulusSlicer.py

    rb699768 rd85c194  
    1010# from copy import deepcopy 
    1111# Debug printout 
    12 from sas.guiframe.events import NewPlotEvent 
    13 from sas.guiframe.events import StatusEvent 
    14 from sas.guiframe.events import SlicerParameterEvent 
    15 from sas.guiframe.events import EVT_SLICER_PARS 
     12from sas.sasgui.guiframe.events import NewPlotEvent 
     13from sas.sasgui.guiframe.events import StatusEvent 
     14from sas.sasgui.guiframe.events import SlicerParameterEvent 
     15from sas.sasgui.guiframe.events import EVT_SLICER_PARS 
    1616from BaseInteractor import _BaseInteractor 
    17 from sas.guiframe.dataFitting import Data1D 
     17from sas.sasgui.guiframe.dataFitting import Data1D 
    1818 
    1919class AnnulusInteractor(_BaseInteractor): 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/Arc.py

    r824e488 rd85c194  
    55 
    66from BaseInteractor import _BaseInteractor 
    7 from sas.guiframe.events import SlicerParameterEvent 
     7from sas.sasgui.guiframe.events import SlicerParameterEvent 
    88 
    99class ArcInteractor(_BaseInteractor): 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/AzimutSlicer.py

    rb699768 rd85c194  
    77import wx 
    88from BaseInteractor import _BaseInteractor 
    9 from sas.guiframe.events import NewPlotEvent 
    10 from sas.guiframe.events import EVT_SLICER_PARS 
     9from sas.sasgui.guiframe.events import NewPlotEvent 
     10from sas.sasgui.guiframe.events import EVT_SLICER_PARS 
    1111 
    1212class SectorInteractor(_BaseInteractor): 
     
    156156        sector = sect(self.base.data2D) 
    157157 
    158         from sas.guiframe.dataFitting import Data1D 
     158        from sas.sasgui.guiframe.dataFitting import Data1D 
    159159        if hasattr(sector, "dxl"): 
    160160            dxl = sector.dxl 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

    rd7bb526 rd85c194  
    1717import logging 
    1818from sas.sasgui.plottools.PlotPanel import PlotPanel 
    19 from sas.guiframe.events import StatusEvent 
    20 from sas.guiframe.events import PanelOnFocusEvent 
    21 from sas.guiframe.utils import PanelMenu, IdList 
    22 from sas.guiframe.panel_base import PanelBase 
    23 from sas.guiframe.gui_style import GUIFRAME_ICON 
     19from sas.sasgui.guiframe.events import StatusEvent 
     20from sas.sasgui.guiframe.events import PanelOnFocusEvent 
     21from sas.sasgui.guiframe.utils import PanelMenu, IdList 
     22from sas.sasgui.guiframe.panel_base import PanelBase 
     23from sas.sasgui.guiframe.gui_style import GUIFRAME_ICON 
    2424from appearanceDialog import appearanceDialog 
    2525from graphAppearance import graphAppearance 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter2D.py

    rd7bb526 rd85c194  
    1919from sas.sasgui.plottools.plottables import Graph 
    2020from sas.sasgui.plottools.TextDialog import TextDialog 
    21 from sas.guiframe.events import StatusEvent 
    22 from sas.guiframe.events import NewPlotEvent 
    23 from sas.guiframe.events import PanelOnFocusEvent 
    24 from sas.guiframe.events import SlicerEvent 
    25 from sas.guiframe.utils import PanelMenu 
    26 from  sas.guiframe.local_perspectives.plotting.binder import BindArtist 
     21from sas.sasgui.guiframe.events import StatusEvent 
     22from sas.sasgui.guiframe.events import NewPlotEvent 
     23from sas.sasgui.guiframe.events import PanelOnFocusEvent 
     24from sas.sasgui.guiframe.events import SlicerEvent 
     25from sas.sasgui.guiframe.utils import PanelMenu 
     26from  sas.sasgui.guiframe.local_perspectives.plotting.binder import BindArtist 
    2727from Plotter1D import ModelPanel1D 
    2828from sas.sasgui.plottools.toolbar import NavigationToolBar 
     
    584584                                 bin_width=bin_width) 
    585585        circ = Circle(self.data2D, ismask=ismask) 
    586         from sas.guiframe.dataFitting import Data1D 
     586        from sas.sasgui.guiframe.dataFitting import Data1D 
    587587        if hasattr(circ, "dxl"): 
    588588            dxl = circ.dxl 
     
    656656        """ 
    657657        """ 
    658         from sas.guiframe.gui_manager import MDIFrame 
     658        from sas.sasgui.guiframe.gui_manager import MDIFrame 
    659659        from boxSum import BoxSum 
    660660        self.onClearSlicer(event) 
     
    683683        self.slicer.set_panel_name(name=new_panel.window_caption) 
    684684        ## post slicer panel to guiframe to display it 
    685         from sas.guiframe.events import SlicerPanelEvent 
     685        from sas.sasgui.guiframe.events import SlicerPanelEvent 
    686686 
    687687        win.set_panel(new_panel) 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/SectorSlicer.py

    rb699768 rd85c194  
    55import wx 
    66from BaseInteractor import _BaseInteractor 
    7 from sas.guiframe.events import NewPlotEvent 
    8 from sas.guiframe.events import StatusEvent 
    9 from sas.guiframe.events import SlicerParameterEvent 
    10 from sas.guiframe.events import EVT_SLICER_PARS 
    11 from sas.guiframe.dataFitting import Data1D 
     7from sas.sasgui.guiframe.events import NewPlotEvent 
     8from sas.sasgui.guiframe.events import StatusEvent 
     9from sas.sasgui.guiframe.events import SlicerParameterEvent 
     10from sas.sasgui.guiframe.events import EVT_SLICER_PARS 
     11from sas.sasgui.guiframe.dataFitting import Data1D 
    1212 
    1313 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/SimplePlot.py

    rd7bb526 rd85c194  
    33""" 
    44import wx 
    5 from sas.guiframe.local_perspectives.plotting.Plotter2D import ModelPanel2D as PlotPanel 
     5from sas.sasgui.guiframe.local_perspectives.plotting.Plotter2D import ModelPanel2D as PlotPanel 
    66from sas.sasgui.plottools.toolbar import NavigationToolBar 
    77from sas.sasgui.plottools.plottables import Graph 
    8 from sas.guiframe.utils import PanelMenu 
    9 from sas.guiframe.events import StatusEvent 
     8from sas.sasgui.guiframe.utils import PanelMenu 
     9from sas.sasgui.guiframe.events import StatusEvent 
    1010 
    1111class SimplePlotPanel(PlotPanel): 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/SlicerParameters.py

    rb40ad40 rd85c194  
    44import wx.lib.newevent 
    55#from copy import deepcopy 
    6 from sas.guiframe.events import EVT_SLICER_PARS 
    7 from sas.guiframe.utils import format_number 
    8 from sas.guiframe.events import EVT_SLICER 
    9 from sas.guiframe.events import SlicerParameterEvent 
     6from sas.sasgui.guiframe.events import EVT_SLICER_PARS 
     7from sas.sasgui.guiframe.utils import format_number 
     8from sas.sasgui.guiframe.events import EVT_SLICER 
     9from sas.sasgui.guiframe.events import SlicerParameterEvent 
    1010 
    1111 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/boxSlicer.py

    rb699768 rd85c194  
    22import math 
    33import numpy 
    4 from sas.guiframe.events import NewPlotEvent 
    5 from sas.guiframe.events import StatusEvent 
    6 from sas.guiframe.events import SlicerParameterEvent 
    7 from sas.guiframe.events import EVT_SLICER_PARS 
     4from sas.sasgui.guiframe.events import NewPlotEvent 
     5from sas.sasgui.guiframe.events import StatusEvent 
     6from sas.sasgui.guiframe.events import SlicerParameterEvent 
     7from sas.sasgui.guiframe.events import EVT_SLICER_PARS 
    88from BaseInteractor import _BaseInteractor 
    9 from sas.guiframe.dataFitting import Data1D 
     9from sas.sasgui.guiframe.dataFitting import Data1D 
    1010 
    1111 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/boxSum.py

    rb699768 rd85c194  
    66import wx 
    77from BaseInteractor import _BaseInteractor 
    8 from sas.guiframe.events import SlicerParamUpdateEvent 
    9 from sas.guiframe.events import EVT_SLICER_PARS 
    10 from sas.guiframe.events import StatusEvent 
     8from sas.sasgui.guiframe.events import SlicerParamUpdateEvent 
     9from sas.sasgui.guiframe.events import EVT_SLICER_PARS 
     10from sas.sasgui.guiframe.events import StatusEvent 
    1111 
    1212 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/detector_dialog.py

    rb5de88e rd85c194  
    44import wx 
    55import sys 
    6 from sas.guiframe.utils import format_number 
    7 from sas.guiframe.events import StatusEvent 
     6from sas.sasgui.guiframe.utils import format_number 
     7from sas.sasgui.guiframe.events import StatusEvent 
    88from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas 
    99from matplotlib import mpl 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/masking.py

    rd7bb526 rd85c194  
    2828from sas.sasgui.plottools.plottables import Graph 
    2929from binder import BindArtist 
    30 from sas.guiframe.dataFitting import Data1D, Data2D 
     30from sas.sasgui.guiframe.dataFitting import Data1D, Data2D 
    3131from boxMask import BoxMask 
    3232from sector_mask import SectorMask 
    3333from AnnulusSlicer import CircularMask 
    3434 
    35 from sas.guiframe.events import SlicerEvent 
    36 from sas.guiframe.events import StatusEvent 
     35from sas.sasgui.guiframe.events import SlicerEvent 
     36from sas.sasgui.guiframe.events import StatusEvent 
    3737from functools import partial 
    3838 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/plotting.py

    rf21d496 rd85c194  
    1414import wx 
    1515import sys 
    16 from sas.guiframe.events import EVT_NEW_PLOT 
    17 from sas.guiframe.events import EVT_PLOT_QRANGE 
    18 from sas.guiframe.events import DeletePlotPanelEvent 
    19 from sas.guiframe.plugin_base import PluginBase 
    20 from sas.guiframe.dataFitting import Data1D 
    21 from sas.guiframe.dataFitting import Data2D 
    22 from sas.guiframe.gui_manager import MDIFrame 
     16from sas.sasgui.guiframe.events import EVT_NEW_PLOT 
     17from sas.sasgui.guiframe.events import EVT_PLOT_QRANGE 
     18from sas.sasgui.guiframe.events import DeletePlotPanelEvent 
     19from sas.sasgui.guiframe.plugin_base import PluginBase 
     20from sas.sasgui.guiframe.dataFitting import Data1D 
     21from sas.sasgui.guiframe.dataFitting import Data2D 
     22from sas.sasgui.guiframe.gui_manager import MDIFrame 
    2323DEFAULT_MENU_ITEM_LABEL = "No graph available" 
    2424DEFAULT_MENU_ITEM_ID = wx.NewId() 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/profile_dialog.py

    rd7bb526 rd85c194  
    77from sas.sasgui.plottools.plottables import Graph 
    88from Plotter1D import ModelPanel1D as PlotPanel 
    9 from sas.guiframe.dataFitting import Data1D 
    10 from sas.guiframe.gui_style import GUIFRAME_ID 
     9from sas.sasgui.guiframe.dataFitting import Data1D 
     10from sas.sasgui.guiframe.gui_style import GUIFRAME_ID 
    1111 
    1212DEFAULT_CMAP = None  #pylab.cm.jet 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/sector_mask.py

    rb699768 rd85c194  
    88from SectorSlicer import SideInteractor 
    99from SectorSlicer import LineInteractor 
    10 from sas.guiframe.events import SlicerParameterEvent 
     10from sas.sasgui.guiframe.events import SlicerParameterEvent 
    1111 
    1212class SectorMask(_BaseInteractor): 
  • src/sas/sasgui/guiframe/local_perspectives/plotting/slicerpanel.py

    rb40ad40 rd85c194  
    22import wx.lib.newevent 
    33#from copy import deepcopy 
    4 from sas.guiframe.utils import format_number 
    5 from sas.guiframe.events import SlicerParameterEvent 
    6 from sas.guiframe.events import EVT_SLICER_PARS 
    7 from sas.guiframe.events import EVT_SLICER 
     4from sas.sasgui.guiframe.utils import format_number 
     5from sas.sasgui.guiframe.events import SlicerParameterEvent 
     6from sas.sasgui.guiframe.events import EVT_SLICER_PARS 
     7from sas.sasgui.guiframe.events import EVT_SLICER 
    88 
    9 from sas.guiframe.panel_base import PanelBase 
     9from sas.sasgui.guiframe.panel_base import PanelBase 
    1010 
    1111class SlicerPanel(wx.Panel, PanelBase): 
Note: See TracChangeset for help on using the changeset viewer.