Changeset 6572274 in sasview for calculatorview/src

Timestamp:

Aug 9, 2011 1:13:23 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:

ed91a0e

Parents:

a91dda9

Message:

updated dataloader name on calls

Location:

calculatorview/src/sans/perspectives/calculator

Files:

• aperture_editor.py (modified) (2 diffs)
• collimation_editor.py (modified) (1 diff)
• console.py (modified) (1 diff)
• data_editor.py (modified) (1 diff)
• detector_editor.py (modified) (1 diff)
• load_thread.py (modified) (1 diff)
• sample_editor.py (modified) (1 diff)
• source_editor.py (modified) (1 diff)

calculatorview/src/sans/perspectives/calculator/aperture_editor.py

@@ -3 +3 @@
 import sys
 from copy import deepcopy
-from DataLoader.loader import Loader
+from sans.dataloader.loader import Loader
 from sans.guiframe.utils import check_float
 
@@ -404 +404 @@
     loader = Loader()
     # Load data 
-    from DataLoader.data_info import Aperture
+    from sans.dataloader.data_info import Aperture
     ap = Aperture()
     dlg = ApertureDialog(aperture=ap)

calculatorview/src/sans/perspectives/calculator/collimation_editor.py

@@ -4 +4 @@
 import sys
 from copy import deepcopy
-from DataLoader.loader import Loader
-from DataLoader.data_info import Aperture, Collimation
+from sans.dataloader.loader import Loader
+from sans.dataloader.data_info import Aperture, Collimation
 from aperture_editor import ApertureDialog
 

calculatorview/src/sans/perspectives/calculator/console.py

@@ -4 +4 @@
 import wx
 import sys
-from DataLoader.loader import Loader
+from sans.dataloader.loader import Loader
 
 _BOX_WIDTH = 60

calculatorview/src/sans/perspectives/calculator/data_editor.py

@@ -5 +5 @@
 from copy import deepcopy
 
-from DataLoader.loader import Loader
+from sans.dataloader.loader import Loader
 #from DataLoader.data_info import DataInfo
 #from DataLoader.data_info import  Detector
 #from DataLoader.data_info import Collimation
-from DataLoader.data_info import Data2D
+from sans.dataloader.data_info import Data2D
 from detector_editor import DetectorDialog
 from collimation_editor import CollimationDialog

calculatorview/src/sans/perspectives/calculator/detector_editor.py

@@ -3 +3 @@
 import sys
 from copy import deepcopy
-from DataLoader.data_info import Detector
+from sans.dataloader.data_info import Detector
 from sans.guiframe.utils import check_float
 

calculatorview/src/sans/perspectives/calculator/load_thread.py

@@ -5 +5 @@
 
 from data_util.calcthread import CalcThread
-from DataLoader.loader import Loader
+from sans.dataloader.loader import Loader
         
 

calculatorview/src/sans/perspectives/calculator/sample_editor.py

@@ -546 +546 @@
 if __name__ == "__main__":
     app = wx.App()
-    from DataLoader.data_info import Sample
+    from sans.dataloader.data_info import Sample
     sample = Sample()
     dlg = SampleDialog(sample=sample)

calculatorview/src/sans/perspectives/calculator/source_editor.py

@@ -534 +534 @@
 if __name__ =="__main__":
     app  = wx.App()
-    from DataLoader.data_info import Source
+    from sans.dataloader.data_info import Source
     source = Source()
     dlg = SourceDialog(source=source)