Changeset d7bb526 in sasview for src/sas/perspectives

Timestamp:

Feb 22, 2016 5: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

Location:

src/sas/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/sas/perspectives/calculator/data_operator.py

@@ -7 +7 @@
 import numpy
 from sas.sascalc.dataloader.data_info import Data1D
-from sas.plottools.PlotPanel import PlotPanel
-from sas.plottools.plottables import Graph
-from sas.plottools import transform
+from sas.sasgui.plottools.PlotPanel import PlotPanel
+from sas.sasgui.plottools.plottables import Graph
+from sas.sasgui.plottools import transform
 from matplotlib.font_manager import FontProperties
 from sas.guiframe.events import StatusEvent
@@ -888 +888 @@
             first_item = list.keys()[0]
             if first_item.x != []:
-                from sas.plottools.PropertyDialog import Properties
+                from sas.sasgui.plottools.PropertyDialog import Properties
                 dial = Properties(self, -1, 'Change Scale')
                 # type of view or model used

src/sas/perspectives/calculator/gen_scatter_panel.py

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

src/sas/perspectives/fitting/basepage.py

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

src/sas/perspectives/pr/explore_dialog.py

@@ -28 +28 @@
 
 # Import plotting classes
-from sas.plottools.PlotPanel import PlotPanel
-from sas.plottools import Data1D as Model1D
+from sas.sasgui.plottools.PlotPanel import PlotPanel
+from sas.sasgui.plottools import Data1D as Model1D
 from sas.guiframe.gui_style import GUIFRAME_ID
-from sas.plottools.plottables import Graph
+from sas.sasgui.plottools.plottables import Graph
 
 from pr_widgets import PrTextCtrl