Changeset 480ddb4 in sasview

Timestamp:

Jun 24, 2010 6:00:12 PM (14 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:

697d798

Parents:

6db541f

Message:

working on documentation

Location:

DataLoader

Files:

• docs/sphinx/api/index.rst (modified) (1 diff)
• docs/sphinx/api/loader.rst (added)
• docs/sphinx/api/readers/danse_reader.rst (added)
• docs/sphinx/api/readers/index.rst (modified) (1 diff)
• docs/sphinx/conf.py (modified) (1 diff)
• docs/sphinx/genmods.py (modified) (1 diff)
• loader.py (modified) (1 diff)

DataLoader/docs/sphinx/api/index.rst

@@ -15 +15 @@
 
    data_info.rst
+   loader.rst
    manipulations.rst
    qsmearing.rst

DataLoader/docs/sphinx/api/readers/index.rst

@@ -18 +18 @@
    associations.rst
    cansas_reader.rst
+   danse_reader.rst
    hfir1d_reader.rst
    IgorReader.rst

DataLoader/docs/sphinx/conf.py

@@ -12 +12 @@
 # serve to show the default.
 
-import sys, os
+import sys, os, glob
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append(os.path.abspath(os.path.dirname('../../DataLoader')))
-sys.path.append(os.path.abspath(os.path.dirname('../../DataLoader/readers')))
+
+path = glob.glob('../../build/lib.*')[0]
+sys.path.append(path)
+
 sys.path.append(os.path.abspath('_extensions'))
 # -- General configuration -----------------------------------------------------

DataLoader/docs/sphinx/genmods.py

@@ -51 +51 @@
         f.write(INDEX_TEMPLATE%locals())
 
+modules = []
+path = os.path.abspath(os.path.dirname('../../'))
 
-modules=[
-    ('data_info', 'data_info'),
-    ('loader', 'loader'),
-    ('manipulations', 'manipulations'),
-    ('qsmearing', 'qsmearing'),
-    ('smearing_2d', 'smearing_2d'),
-]
+
+list = os.listdir(path)
+for item in list:
+    toks = os.path.splitext(os.path.basename(item))
+    if toks[1]=='.py' and toks[0] not in ["__init__", "setup"]:
+        exec "module = ('%s', '%s')"%(toks[0], toks[0])
+        modules.append(module)
+
 package='DataLoader'
 package_name='Reference'
-#genfiles(package, package_name, modules)
 
 if __name__ == "__main__":
     genfiles(package, package_name, modules, dir='api')
-    
-    modules=[
-    ('abs_reader', 'abs_reader'),
-    ('ascii_reader', 'ascii_reader'),
-    ('associations', 'associations'),
-    ('cansas_reader', 'cansas_reader'),
-    ('hfir1d_reader', 'hfir1d_reader'),
-    ('IgorReader', 'IgorReader'),
-    ('red2d_reader', 'red2d_reader'),
-    ('tiff_reader', 'tiff_reader'),
-    ]
+    modules = []
+    path = os.path.abspath(os.path.dirname('../../readers/'))
+    list = os.listdir(path)
+    for item in list:
+        toks = os.path.splitext(os.path.basename(item))
+        if toks[1]=='.py' and toks[0] not in ["__init__", "setup"]:
+         exec "module = ('%s', '%s')"%(toks[0], toks[0])
+         modules.append(module)
     package='DataLoader.readers'
     package_name='Readers'

DataLoader/loader.py

@@ -76 +76 @@
             return super(Registry, self).load(path, format=format)
         except:
+            raise
             # No reader was found. Default to the ascii reader.
-            ascii_loader = ascii_reader.Reader()
-            return ascii_loader.read(path)
+            #ascii_loader = ascii_reader.Reader()
+            #return ascii_loader.read(path)
         
     def find_plugins(self, dir):