Changeset 73b1c72 in sasview

Timestamp:

Jul 3, 2008 10:32:59 AM (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:

14226f4

Parents:

87bff18

Message:

modified but working on singleton

Location:

DataLoader

Files:

• loader.py (modified) (5 diffs)
• readers/tiff_reader.py (modified) (1 diff)
• test/testLoad.py (modified) (1 diff)

DataLoader/loader.py

@@ -9 +9 @@
 import logging
 import os.path
+
+
 def _findReaders(dir):
     # List of plugin objects
@@ -86 +88 @@
         self.readers = {}
         self.reading=None
+        self.dir='plugins'
+        self.__setitem__()
         
-        
+    def set_pluginDir (self,path):
+        """ specify the name of folder containing pluging"""
+        if not os.path.isdir(path):
+            os.mkdir(path)
+        self.dir=path
     def __setitem__(self, ext=None, reader=None):
         if reader==None:
             plugReader=None
-            if os.path.isdir('plugins'):
-                plugReader=_findReaders('plugins')# import all module in plugins
-            elif os.path.isdir('../plugins'):
-                plugReader=_findReaders('../plugins')
+            if os.path.isdir(self.dir):
+                plugReader=_findReaders(self.dir)# import all module in plugins
+            elif os.path.isdir('../'+self.dir):
+                plugReader=_findReaders('../'+self.dir)
             if plugReader !=None:
                 for preader in plugReader:# for each modules takes list of extensions
@@ -135 +143 @@
     def lookup(self, path):
         """
-        Return the loader associated with the file type of path.
+        Return the reader associated with the file type of path.
         """        
         file = os.path.basename(path)
@@ -148 +156 @@
                 
     def getAcTReader(self,path):
+        """ return  Reader  actually reading"""
         return self.reading
     
@@ -171 +180 @@
 if __name__=="__main__":
     l=Loader()
-    l.__setitem__()
     print "look up",l.lookup('angles_flat.png')
     print l.__getitem__('.tiff')
+    print l.__getitem__('jpeg')
     print l.__contains__('.tiff')
     

DataLoader/readers/tiff_reader.py

@@ -43 +43 @@
     type = []
     ## Extension
-    ext  = ['tif', 'jpg', 'png', 'jpeg', 'tiff', 'gif', 'bmp']    
+    ext  = ['tif', 'jpg', '.png', 'jpeg', '.tiff', 'gif', 'bmp']    
         
     def read(self, filename=None):

DataLoader/test/testLoad.py

@@ -101 +101 @@
         """ test loading with plugging"""
         l=Loader()
-        l.__setitem__()
         self.assertEqual(l.__contains__('.tiff'),True)
         self.assertEqual(l.__contains__('.png'),True)