Changeset f468791 in sasview for src/sans/guiframe

Timestamp:

Oct 24, 2013 10:40:22 AM (11 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

1f8eecb

Parents:

a9d5684

Message:

Move plottools under sans

Location:

src/sans/guiframe

Files:

• dataFitting.py (modified) (1 diff)
• data_processor.py (modified) (4 diffs)
• local_perspectives/plotting/Plotter1D.py (modified) (1 diff)
• local_perspectives/plotting/Plotter2D.py (modified) (2 diffs)
• local_perspectives/plotting/SimplePlot.py (modified) (1 diff)
• local_perspectives/plotting/graphAppearance.py (modified) (1 diff)
• local_perspectives/plotting/masking.py (modified) (1 diff)
• local_perspectives/plotting/profile_dialog.py (modified) (1 diff)

src/sans/guiframe/dataFitting.py

@@ -6 +6 @@
 import math
 from data_util.uncertainty import Uncertainty
-from danse.common.plottools.plottables import Data1D as PlotData1D
-from danse.common.plottools.plottables import Data2D as PlotData2D
-from danse.common.plottools.plottables import Theory1D as PlotTheory1D
+from sans.plottools.plottables import Data1D as PlotData1D
+from sans.plottools.plottables import Data2D as PlotData2D
+from sans.plottools.plottables import Theory1D as PlotTheory1D
 
 from sans.dataloader.data_info import Data1D as LoadData1D

src/sans/guiframe/data_processor.py

@@ -5 +5 @@
 import numpy
 import math
-import time
 import re
 import os
@@ -16 +15 @@
 import wx.lib.sheet as sheet
 from sans.guiframe.panel_base import PanelBase
-from sans.guiframe.utils import format_number
 from sans.guiframe.events import NewPlotEvent 
 from sans.guiframe.events import StatusEvent  
-from danse.common.plottools import plottables
+from sans.plottools import plottables
 from sans.guiframe.dataFitting import Data1D
 
@@ -1051 +1049 @@
                                                  StatusEvent(status=msg,
                                                               info="error"))
-                                    #time.sleep(0.5) 
                                     return
 
@@ -1066 +1063 @@
                     msg += "Column %s is NOT " % str(label)
                     msg += "the results of fits to view..."
-                    #raise ValueError, msg
                     wx.PostEvent(self.parent.parent, 
                          StatusEvent(status=msg, info="error")) 
-                    #time.sleep(0.5)
                     return
-                    #continue
     
     def on_plot(self, event):

src/sans/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -13 +13 @@
 import wx
 import sys
-import os
-import pylab
 import math
 import numpy
-import time
-
-from danse.common.plottools.PlotPanel import PlotPanel
-from danse.common.plottools.SizeDialog import SizeDialog
-from danse.common.plottools.LabelDialog import LabelDialog
-#from danse.common.plottools.plottables import Graph
-from sans.guiframe import dataFitting 
-from sans.guiframe.events import EVT_NEW_PLOT
+
+from sans.plottools.PlotPanel import PlotPanel
 from sans.guiframe.events import StatusEvent 
-from sans.guiframe.events import NewPlotEvent
-from sans.guiframe.events import NewColorEvent
-from sans.guiframe.events import SlicerEvent
 from sans.guiframe.events import PanelOnFocusEvent
-from sans.guiframe.events import EVT_NEW_LOADED_DATA
 from sans.guiframe.utils import PanelMenu
-from sans.guiframe.dataFitting import Data1D
 from sans.guiframe.panel_base import PanelBase
 from sans.guiframe.gui_style import GUIFRAME_ICON
-from danse.common.plottools.binder import BindArtist
 from appearanceDialog import appearanceDialog
 from graphAppearance import graphAppearance

src/sans/guiframe/local_perspectives/plotting/Plotter2D.py

@@ -13 +13 @@
 import wx
 import sys
-import os
 import math
 import numpy
-import pylab
-import danse.common.plottools
-from danse.common.plottools.PlotPanel import PlotPanel
-from danse.common.plottools.plottables import Graph
-from danse.common.plottools.TextDialog import TextDialog
-from sans.guiframe.events import EVT_NEW_PLOT
-from sans.guiframe.events import EVT_SLICER_PARS
+from sans.plottools.PlotPanel import PlotPanel
+from sans.plottools.plottables import Graph
+from sans.plottools.TextDialog import TextDialog
 from sans.guiframe.events import StatusEvent 
 from sans.guiframe.events import NewPlotEvent
@@ -30 +25 @@
 from  sans.guiframe.local_perspectives.plotting.binder import BindArtist
 from Plotter1D import ModelPanel1D
-from danse.common.plottools.toolbar import NavigationToolBar 
-from sans.guiframe.dataFitting import Data1D
+from sans.plottools.toolbar import NavigationToolBar 
 from matplotlib.font_manager import FontProperties
 from graphAppearance import graphAppearance

src/sans/guiframe/local_perspectives/plotting/SimplePlot.py

@@ -5 +5 @@
 from sans.guiframe.local_perspectives.plotting.Plotter2D import ModelPanel2D \
                     as PlotPanel
-from danse.common.plottools.toolbar import NavigationToolBar
-#from danse.common.plottools.PlotPanel import PlotPanel 
-from danse.common.plottools.plottables import Graph
+from sans.plottools.toolbar import NavigationToolBar
+from sans.plottools.plottables import Graph
 from sans.guiframe.utils import PanelMenu
 

src/sans/guiframe/local_perspectives/plotting/graphAppearance.py

@@ -18 +18 @@
 
 import wx
-from danse.common.plottools.SimpleFont import SimpleFont
+from sans.plottools.SimpleFont import SimpleFont
 
 COLOR = ['black', 'blue', 'green', 'red', 'cyan', 'magenta', 'yellow']

src/sans/guiframe/local_perspectives/plotting/masking.py

@@ -25 +25 @@
 import copy
 import numpy
-from danse.common.plottools.PlotPanel import PlotPanel
-from danse.common.plottools.plottables import Graph
+from sans.plottools.PlotPanel import PlotPanel
+from sans.plottools.plottables import Graph
 from binder import BindArtist
 from sans.guiframe.dataFitting import Data1D, Data2D

src/sans/guiframe/local_perspectives/plotting/profile_dialog.py

@@ -6 +6 @@
 import sys
 from copy import deepcopy
-from danse.common.plottools.plottables import Graph
+from sans.plottools.plottables import Graph
 from Plotter1D import ModelPanel1D as PlotPanel
 from sans.guiframe.dataFitting import Data1D