Changeset bbc8013 in sasview

Timestamp:

Oct 24, 2008 9:36:56 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

e43c012

Parents:

753552d

Message:

Modify the way default readers are loaded.

Location:

DataLoader

Files:

• __init__.py (modified) (1 diff)
• loader.py (modified) (4 diffs)
• readers/__init__.py (modified) (1 diff)
• test/write_test.xml (modified) (1 diff)

DataLoader/__init__.py

@@ -1 @@
-
+from data_info import *
+from manipulations import *
+from qsmearing import *
+from readers import *

DataLoader/loader.py

@@ -2 +2 @@
     File handler to support different file extensions.
     Uses reflectometry's registry utility.
+    
+    The default readers are found in the 'readers' sub-module
+    and registered by default at initialization time.
+    
+    To add a new default reader, one must register it in
+    the register_readers method found in readers/__init__.py. 
+    
+    A utility method (find_plugins) is available to inspect 
+    a directory (for instance, a user plug-in directory) and
+    look for new readers/writers.
 """
 
@@ -21 +31 @@
 from zipfile import ZipFile
 
+# Default readers are defined in the readers sub-module
+import readers
+
 class Registry(ExtensionRegistry):
     """
@@ -39 +52 @@
         self._created = time.time()
         
-        # Find internal readers
-        try:
-            cwd = os.path.split(__file__)[0]
-        except:
-            cwd = os.getcwd()
-            logging.error("Registry: could not find the installed reader's directory\n %s" % sys.exc_value)
-            
-        dir = os.path.join(cwd, 'readers')
-        n = self.find_plugins(dir)
-        logging.info("Loader found %i readers" % n)
+        # Register default readers
+        readers.register_readers(self._identify_plugin)
         
     def find_plugins(self, dir):
         """
-            Find readers in a given directory
+            Find readers in a given directory. This method
+            can be used to inspect user plug-in directories to
+            find new readers/writers.
             
             @param dir: directory to search into
@@ -58 +65 @@
         """
         readers_found = 0
+        
+        # Check whether the directory exists
+        if not os.path.isdir(dir): 
+            logging.warning("DataLoader couldn't load from %s" % dir)
+            return readers_found
+        
         for item in os.listdir(dir):
             full_path = os.path.join(dir, item)

DataLoader/readers/__init__.py

@@ +1 @@
+import abs_reader
+import cansas_reader
+import ascii_reader
+import cansas_reader
+import danse_reader
+import hfir1d_reader
+import IgorReader
+import tiff_reader
+
+def register_readers(registry_function):
+    """
+        Function called by the registry/loader object to register
+        all default readers using a call back function.
+    
+        @param registry_function: function to be called to register each reader
+    """
+    registry_function(abs_reader)
+    registry_function(cansas_reader)
+    registry_function(ascii_reader)
+    registry_function(cansas_reader)
+    registry_function(danse_reader)
+    registry_function(hfir1d_reader)
+    registry_function(IgorReader)
+    registry_function(tiff_reader)
+    

DataLoader/test/write_test.xml

@@ -1 +1 @@
 <?xml version="1.0" ?>
-<SASroot version="1.0">
+<SASroot version="1.0" xmlns="cansas1d/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd">
         <SASentry>
                 <Title>
                         Test title
                 </Title>
-                <Run name="run name">
+                <Run>
                         1234
                 </Run>