Changeset a60b8b6 in sasview for invariantview/src
- Timestamp:
- Aug 10, 2011 2:32:10 PM (13 years ago)
- 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
- Location:
- invariantview/src/sans/perspectives/invariant
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
invariantview/src/sans/perspectives/invariant/invariant.py
r7f14996 ra60b8b6 22 22 from sans.guiframe.gui_style import GUIFRAME_ID 23 23 from .invariant_state import Reader as reader 24 from DataLoader.loader import Loader24 from sans.dataloader.loader import Loader 25 25 from .invariant_panel import InvariantPanel 26 26 from sans.guiframe.plugin_base import PluginBase … … 213 213 else: 214 214 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" 216 216 raise RuntimeError, msg 217 217 -
invariantview/src/sans/perspectives/invariant/invariant_panel.py
r7f14996 ra60b8b6 1837 1837 wx.Frame.__init__(self, parent, id, title, size=(PANEL_WIDTH +100, 1838 1838 PANEL_HEIGHT+100)) 1839 from DataLoader.loader import Loader1839 from sans.dataloader.loader import Loader 1840 1840 self.loader = Loader() 1841 1841 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" 1843 1843 data= self.loader.load(path) 1844 1844 self.panel = InvariantPanel(self) -
invariantview/src/sans/perspectives/invariant/invariant_state.py
r7f14996 ra60b8b6 7 7 import logging 8 8 import copy 9 import DataLoader9 import sans.dataloader 10 10 #from xml.dom.minidom import parse 11 11 from lxml import etree 12 from DataLoader.readers.cansas_reader import Reader as CansasReader13 from DataLoader.readers.cansas_reader import get_content12 from sans.dataloader.readers.cansas_reader import Reader as CansasReader 13 from sans.dataloader.readers.cansas_reader import get_content 14 14 from sans.guiframe.utils import format_number 15 15 from sans.guiframe.dataFitting import Theory1D … … 793 793 """ 794 794 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): 797 797 msg = "The cansas writer expects a Data1D" 798 798 msg += " instance: %s" % str(datainfo.__class__.__name__)
Note: See TracChangeset
for help on using the changeset viewer.