Changeset f468791 in sasview for src/sans/perspectives

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/perspectives

Files:

• calculator/data_operator.py (modified) (2 diffs)
• calculator/gen_scatter_panel.py (modified) (1 diff)
• fitting/basepage.py (modified) (1 diff)
• pr/explore_dialog.py (modified) (1 diff)

src/sans/perspectives/calculator/data_operator.py

@@ -6 +6 @@
 import time
 import numpy
-from sans.dataloader.data_info import Data2D
 from sans.dataloader.data_info import Data1D
-from danse.common.plottools.PlotPanel import PlotPanel
-from danse.common.plottools.plottables import Graph
-from danse.common.plottools.canvas import FigureCanvas
-from danse.common.plottools import transform
+from sans.plottools.PlotPanel import PlotPanel
+from sans.plottools.plottables import Graph
+from sans.plottools import transform
 from matplotlib.font_manager import FontProperties
-from matplotlib.figure import Figure
 from sans.guiframe.events import StatusEvent 
 from sans.perspectives.calculator import calculator_widgets as widget   
@@ -865 +862 @@
             first_item = list.keys()[0]
             if first_item.x != []:
-                from danse.common.plottools.PropertyDialog import Properties
+                from sans.plottools.PropertyDialog import Properties
                 dial = Properties(self, -1, 'Change Scale')
                 # type of view or model used

src/sans/perspectives/calculator/gen_scatter_panel.py

@@ -34 +34 @@
 from wx.lib.scrolledpanel import ScrolledPanel
 from sans.perspectives.calculator.load_thread import GenReader
-from danse.common.plottools.arrow3d import Arrow3D
+from sans.plottools.arrow3d import Arrow3D
 from sans.perspectives.calculator import calculator_widgets as widget
 from sans.guiframe.events import NewPlotEvent    

src/sans/perspectives/fitting/basepage.py

@@ -2005 +2005 @@
         x, y = self.model.getProfile()
 
-        from danse.common.plottools import Data1D as pf_data1d
+        from sans.plottools import Data1D as pf_data1d
         #from sans.perspectives.theory.profile_dialog import SLDPanel
         from sans.guiframe.local_perspectives.plotting.profile_dialog \

src/sans/perspectives/pr/explore_dialog.py

@@ -29 +29 @@
 
 # Import plotting classes
-from danse.common.plottools.PlotPanel import PlotPanel
-from danse.common.plottools import Data1D as Model1D
+from sans.plottools.PlotPanel import PlotPanel
+from sans.plottools import Data1D as Model1D
 from sans.guiframe.gui_style import GUIFRAME_ID
-from danse.common.plottools.plottables import Graph
+from sans.plottools.plottables import Graph
 
 from pr_widgets import PrTextCtrl