Changeset d85c194 in sasview for src/sas/sasgui/guiframe/local_perspectives/data_loader

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

Files:

• __init__.py (added)
• data_loader.py (moved) (moved from src/sas/guiframe/local_perspectives/data_loader/data_loader.py) (2 diffs)
• load_thread.py (moved) (moved from src/sas/guiframe/local_perspectives/data_loader/load_thread.py)

src/sas/sasgui/guiframe/local_perspectives/data_loader/data_loader.py

@@ -9 +9 @@
 
 from sas.sascalc.dataloader.loader import Loader
-from sas.guiframe.plugin_base import PluginBase
-from sas.guiframe.events import StatusEvent
-from sas.guiframe.gui_style import GUIFRAME
-from sas.guiframe.gui_manager import DEFAULT_OPEN_FOLDER
+from sas.sasgui.guiframe.plugin_base import PluginBase
+from sas.sasgui.guiframe.events import StatusEvent
+from sas.sasgui.guiframe.gui_style import GUIFRAME
+from sas.sasgui.guiframe.gui_manager import DEFAULT_OPEN_FOLDER
 try:
     # Try to find a local config
@@ -26 +26 @@
 except:
     # Didn't find local config, load the default
-    import sas.guiframe.config as config
+    import sas.sasgui.guiframe.config as config
 
 if config is None:
-    import sas.guiframe.config as config
+    import sas.sasgui.guiframe.config as config