Changeset c21e87b in sasview for fittingview/src/sans/perspectives/fitting
- Timestamp:
- Aug 10, 2011 12:15:52 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:
- c29ab8c
- Parents:
- 054db23
- Location:
- fittingview/src/sans/perspectives/fitting
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
fittingview/src/sans/perspectives/fitting/batchfitpage.py
r49c69de rc21e87b 9 9 import time 10 10 from sans.models.dispersion_models import ArrayDispersion, GaussianDispersion 11 from DataLoader.data_info import Data1D11 from sans.dataloader.data_info import Data1D 12 12 from sans.guiframe.events import StatusEvent 13 13 from sans.guiframe.events import NewPlotEvent -
fittingview/src/sans/perspectives/fitting/fitpage.py
r49c69de rc21e87b 9 9 import time 10 10 from sans.models.dispersion_models import ArrayDispersion, GaussianDispersion 11 from DataLoader.data_info import Data1D11 from sans.dataloader.data_info import Data1D 12 12 from sans.guiframe.events import StatusEvent 13 13 from sans.guiframe.events import NewPlotEvent -
fittingview/src/sans/perspectives/fitting/fitting.py
r49c69de rc21e87b 24 24 25 25 26 from DataLoader.loader import Loader26 from sans.dataloader.loader import Loader 27 27 from sans.guiframe.dataFitting import Data2D 28 28 from sans.guiframe.dataFitting import Data1D … … 1292 1292 1293 1293 """ 1294 from DataLoader.data_info import Detector, Source1294 from sans.dataloader.data_info import Detector, Source 1295 1295 1296 1296 detector = Detector() -
fittingview/src/sans/perspectives/fitting/pagestate.py
r49c69de rc21e87b 22 22 from lxml import etree 23 23 24 import DataLoader25 from DataLoader.readers.cansas_reader import Reader as CansasReader26 from DataLoader.readers.cansas_reader import get_content, write_node27 from DataLoader.data_info import Data2D, Detector24 import sans.dataloader 25 from sans.dataloader.readers.cansas_reader import Reader as CansasReader 26 from sans.dataloader.readers.cansas_reader import get_content, write_node 27 from sans.dataloader.data_info import Data2D, Detector 28 28 29 29 #Information to read/write state as xml … … 1501 1501 1502 1502 if state.data is None: 1503 data = DataLoader.data_info.Data1D(x=[], y=[])1503 data = sans.dataloader.data_info.Data1D(x=[], y=[]) 1504 1504 else: 1505 1505 #make sure title and data run is filled up. … … 1509 1509 state.data.run_name[0] = state.data.name 1510 1510 1511 if issubclass(state.data.__class__, DataLoader.data_info.Data1D):1511 if issubclass(state.data.__class__, sans.dataloader.data_info.Data1D): 1512 1512 1513 1513 data = state.data
Note: See TracChangeset
for help on using the changeset viewer.