Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • invariantview/src/sans/perspectives/invariant/invariant.py

    r7f14996 ra60b8b6  
    2222from sans.guiframe.gui_style import GUIFRAME_ID 
    2323from .invariant_state import Reader as reader 
    24 from DataLoader.loader import Loader 
     24from sans.dataloader.loader import Loader 
    2525from .invariant_panel import InvariantPanel 
    2626from sans.guiframe.plugin_base import PluginBase 
     
    213213        else: 
    214214            msg = "invariant.save_file: the data being saved is" 
    215             msg += " not a DataLoader.data_info.Data1D object"  
     215            msg += " not a sans.dataloader.data_info.Data1D object"  
    216216            raise RuntimeError, msg 
    217217 
  • invariantview/src/sans/perspectives/invariant/invariant_panel.py

    r7f14996 ra60b8b6  
    18371837        wx.Frame.__init__(self, parent, id, title, size=(PANEL_WIDTH +100, 
    18381838                                                             PANEL_HEIGHT+100)) 
    1839         from DataLoader.loader import  Loader 
     1839        from sans.dataloader.loader import  Loader 
    18401840        self.loader = Loader() 
    18411841        import invariant 
    1842         path = "C:/ECLPS/workspace/trunk/DataLoader/test/ascii_test_3.txt" 
     1842        path = "C:/ECLPS/workspace/trunk/sansdataloader/test/ascii_test_3.txt" 
    18431843        data= self.loader.load(path) 
    18441844        self.panel = InvariantPanel(self) 
  • invariantview/src/sans/perspectives/invariant/invariant_state.py

    r7f14996 ra60b8b6  
    77import logging 
    88import copy 
    9 import DataLoader 
     9import sans.dataloader 
    1010#from xml.dom.minidom import parse 
    1111from lxml import etree 
    12 from DataLoader.readers.cansas_reader import Reader as CansasReader 
    13 from DataLoader.readers.cansas_reader import get_content 
     12from sans.dataloader.readers.cansas_reader import Reader as CansasReader 
     13from sans.dataloader.readers.cansas_reader import get_content 
    1414from sans.guiframe.utils import format_number 
    1515from sans.guiframe.dataFitting import Theory1D 
     
    793793        """ 
    794794        if datainfo is None: 
    795             datainfo = DataLoader.data_info.Data1D(x=[], y=[])     
    796         elif not issubclass(datainfo.__class__, DataLoader.data_info.Data1D): 
     795            datainfo = sans.dataloader.data_info.Data1D(x=[], y=[])     
     796        elif not issubclass(datainfo.__class__, sans.dataloader.data_info.Data1D): 
    797797            msg = "The cansas writer expects a Data1D" 
    798798            msg += " instance: %s" % str(datainfo.__class__.__name__) 
Note: See TracChangeset for help on using the changeset viewer.