Changeset a60b8b6 in sasview

Timestamp:

Aug 10, 2011 2:32:10 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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:

11f5196

Parents:

73f9a68

Message:

updated dataloader calls

Location:

invariantview/src/sans/perspectives/invariant

Files:

• invariant.py (modified) (2 diffs)
• invariant_panel.py (modified) (1 diff)
• invariant_state.py (modified) (2 diffs)

invariantview/src/sans/perspectives/invariant/invariant.py

@@ -22 +22 @@
 from sans.guiframe.gui_style import GUIFRAME_ID
 from .invariant_state import Reader as reader
-from DataLoader.loader import Loader
+from sans.dataloader.loader import Loader
 from .invariant_panel import InvariantPanel
 from sans.guiframe.plugin_base import PluginBase
@@ -213 +213 @@
         else:
             msg = "invariant.save_file: the data being saved is"
-            msg += " not a DataLoader.data_info.Data1D object" 
+            msg += " not a sans.dataloader.data_info.Data1D object" 
             raise RuntimeError, msg
 

invariantview/src/sans/perspectives/invariant/invariant_panel.py

@@ -1837 +1837 @@
         wx.Frame.__init__(self, parent, id, title, size=(PANEL_WIDTH +100,
                                                              PANEL_HEIGHT+100))
-        from DataLoader.loader import  Loader
+        from sans.dataloader.loader import  Loader
         self.loader = Loader()
         import invariant
-        path = "C:/ECLPS/workspace/trunk/DataLoader/test/ascii_test_3.txt"
+        path = "C:/ECLPS/workspace/trunk/sansdataloader/test/ascii_test_3.txt"
         data= self.loader.load(path)
         self.panel = InvariantPanel(self)

invariantview/src/sans/perspectives/invariant/invariant_state.py

@@ -7 +7 @@
 import logging
 import copy
-import DataLoader
+import sans.dataloader
 #from xml.dom.minidom import parse
 from lxml import etree
-from DataLoader.readers.cansas_reader import Reader as CansasReader
-from DataLoader.readers.cansas_reader import get_content
+from sans.dataloader.readers.cansas_reader import Reader as CansasReader
+from sans.dataloader.readers.cansas_reader import get_content
 from sans.guiframe.utils import format_number
 from sans.guiframe.dataFitting import Theory1D
@@ -793 +793 @@
         """
         if datainfo is None:
-            datainfo = DataLoader.data_info.Data1D(x=[], y=[])    
-        elif not issubclass(datainfo.__class__, DataLoader.data_info.Data1D):
+            datainfo = sans.dataloader.data_info.Data1D(x=[], y=[])    
+        elif not issubclass(datainfo.__class__, sans.dataloader.data_info.Data1D):
             msg = "The cansas writer expects a Data1D"
             msg += " instance: %s" % str(datainfo.__class__.__name__)