Changeset c642155 in sasview

Timestamp:

Aug 9, 2011 3:17:36 PM (13 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

815da17

Parents:

c089120

Message:

rename import statement in guiframe module

Location:

sansguiframe/src/sans/guiframe

Files:

• dataFitting.py (modified) (1 diff)
• data_manager.py (modified) (1 diff)
• data_panel.py (modified) (1 diff)
• gui_manager.py (modified) (1 diff)
• local_perspectives/data_loader/data_loader.py (modified) (1 diff)

sansguiframe/src/sans/guiframe/dataFitting.py

@@ -10 +10 @@
 from danse.common.plottools.plottables import Theory1D as PlotTheory1D
 
-from DataLoader.data_info import Data1D as LoadData1D
-from DataLoader.data_info import Data2D as LoadData2D
+from sans.dataloader.data_info import Data1D as LoadData1D
+from sans.dataloader.data_info import Data2D as LoadData2D
 
 

sansguiframe/src/sans/guiframe/data_manager.py

@@ -21 +21 @@
 from sans.guiframe.data_state import DataState
 from sans.guiframe.utils import parse_name
-import DataLoader.data_info as DataInfo
+import sans.dataloader.data_info as DataInfo
 from sans.guiframe.dataFitting import Data1D
 from sans.guiframe.dataFitting import Data2D

sansguiframe/src/sans/guiframe/data_panel.py

@@ -36 +36 @@
 from sans.guiframe.gui_style import GUIFRAME
 from sans.guiframe.events import NewBatchEvent
-from DataLoader.loader import Loader
+from sans.dataloader.loader import Loader
 
 try:

sansguiframe/src/sans/guiframe/gui_manager.py

@@ -77 +77 @@
 from sans.guiframe.data_processor import GridFrame
 from sans.guiframe.events import EVT_NEW_BATCH
-from DataLoader.loader import Loader
+from sans.dataloader.loader import Loader
 
 

sansguiframe/src/sans/guiframe/local_perspectives/data_loader/data_loader.py

@@ -8 +8 @@
 import logging
 
-from DataLoader.loader import Loader
-import DataLoader.data_info as DataInfo
+from sans.dataloader.loader import Loader
+import sans.dataloader.data_info as DataInfo
 from sans.guiframe.plugin_base import PluginBase
 from sans.guiframe.events import StatusEvent