Changeset 2fd516b in sasview

Timestamp:

Jul 9, 2008 5:05:25 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:

94daf8a

Parents:

9cd84ee

Message:

change load function instead of looking in plug-in directory for readers look in readers directory. readers directory modify for test purpose

Location:

DataLoader

Files:

• loader.py (modified) (4 diffs)
• readers/IgorReader.py (modified) (1 diff)
• readers/TXT2_Reader.py (deleted)
• test/testplugings.py (modified) (1 diff)

DataLoader/loader.py

@@ -73 +73 @@
             
             
-        def __setitem__(self, ext=None, reader=None):
+        def __setitem__(self,dir=None, ext=None, reader=None):
             """
                 __setitem__  sets in a dictionary(self.readers) a given reader
@@ -79 +79 @@
                 @param ext: extension given of type string
                 @param reader:instance Reader class
+                @param dir: directory name where plugins readers will be saved
                 @raise : ValueError will be raise if a "plugins" directory is not found
                 and the user didn't add a reader as parameter or if the user didn't 
@@ -86 +87 @@
                 ext , a ValueError "missing extension" is raised.
                 @note: when called without parameters __setitem__ will try to load
-                readers inside a "plugins" directory 
-            """
-            import os
+                readers inside a "readers" directory 
+                if call with a directory name will try find readers 
+                from that directory "dir"
+            """
+            if dir==None:
+                dir='readers'
+            
             if reader==None and  ext==None:#1st load
                 plugReader=None
-                if os.path.isdir('plugins'):
-                    plugReader=_findReaders('plugins')# import all module in plugins
-                if os.path.isdir('../plugins'):
-                    plugReader=_findReaders('../plugins')
+                if os.path.isdir(dir):
+                    plugReader=_findReaders(dir)# import all module in plugins
+                if os.path.isdir('../'+dir):
+                    plugReader=_findReaders('../'+dir)
                 else:
-                    if os.path.isdir('..\DataLoader\plugins'):
-                        os.chdir(os.path.abspath('..\DataLoader\plugins'))# change the current 
-                        plugReader=_findReaders('plugins')
+                    if os.path.isdir('../DataLoader/'+dir):
+                        os.chdir(os.path.abspath('../DataLoader/'+dir))# change the current 
+                        plugReader=_findReaders(dir)
                        
                 if plugReader !=None:
                     for preader in plugReader:# for each modules takes list of extensions
-                        print preader,preader.ext
-                        for item in preader.ext:
+                        try:
+                            list=preader.ext
+                        except:
+                            raise AttributeError," %s instance has no attribute 'ext'"\
+                            %(preader.__class__)
+                        for item in list:
                             ext=item
                             if ext not in self.readers:#assign extension with its reader
@@ -115 +124 @@
             elif reader!=None:
                 #only reader is receive try to find a field ext
-                if reader.ext:
-                    for item in reader.ext:
-                        ext=item
-                        if ext not in self.readers:#assign extension with its reader
-                            self.readers[ext] = []
-                        self.readers[ext].insert(0,reader)
-                else:
-                    raise ValueError,"missing extension"
+                try:
+                    list=preader.ext
+                except:
+                    raise AttributeError," Reader instance has no attribute 'ext'"
+                for item in list:
+                
+                    ext=item
+                    if ext not in self.readers:#assign extension with its reader
+                        self.readers[ext] = []
+                    self.readers[ext].insert(0,reader)
+
             else:
                 raise ValueError,"missing reader"

DataLoader/readers/IgorReader.py

@@ -5 +5 @@
 class Reader:
     """ Simple data reader for Igor data files """
-    
+    ext=['.ASC']
     def __init__(self, filename=None):
         """ Init

DataLoader/test/testplugings.py

@@ -12 +12 @@
 import os 
 class testLoader(unittest.TestCase):
-   
+    L=Loader()
     def testplugin(self):
+        """ test loading with readers"""
+        
+        self.assertEqual(self.L.__contains__('.tiff'),True)
+        self.assertEqual(self.L.__contains__('.png'),True)
+        self.assertEqual(self.L.__contains__('.txt'),True)
+    def testplugin1(self):
         """ test loading with plugging"""
-        l=Loader()
-        self.assertEqual(l.__contains__('.tiff'),True)
-        self.assertEqual(l.__contains__('.png'),True)
-        self.assertEqual(l.__contains__('.txt'),True)
-       
+        self.L.__setitem__(dir='plugins')
+        #Testing loading a txt file of 2 columns, the only reader should be read1 
+        xload,yload,dyload=self.L.load('test_2_columns.txt') 
+        x=[2.83954,0.204082,0.408163,0.612245,0.816327,1.02041,1.22449,1.42857,1.63265]
+        y=[0.6,3.44938, 5.82026,5.27591,5.2781,5.22531,7.47487,7.85852,10.2278]
+        dx=[]
+        dy=[]
+        self.assertEqual(len(xload),len(x))
+        self.assertEqual(len(yload),len(y))
+        self.assertEqual(len(dyload),0)
+        for i in range(len(x)):
+            self.assertEqual(xload[i],x[i])
+            self.assertEqual(yload[i],y[i])