Changeset 4102709 in sasview

Timestamp:

Jul 9, 2008 12:17:14 PM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

e6e76ef

Parents:

573eb2d6

Message:

need to clean the code …working on it

Location:

guiframe

Files:

• data_loader.py (modified) (1 diff)
• gui_manager.py (modified) (2 diffs)

guiframe/data_loader.py

@@ -57 +57 @@
     from sans.guicomm.events import NewPlotEvent
     from sans.guitools.plottables import Data1D, Theory1D
-    x, y, dy = load_ascii_1D(path)
+    from DataLoader.loader import  Loader
+    #Instantiate a loader 
+    L=Loader()
+    
+    #Recieves data 
+    x,y,dy=L.load(path)
+   
+    import numpy
     
     if dy==None:

guiframe/gui_manager.py

@@ -589 +589 @@
         
     def _on_open(self, event):
+   
         from data_loader import plot_data
         path = self.choose_file()
@@ -594 +595 @@
         if path and os.path.isfile(path):
             plot_data(self, path)
-                
+