-                      rf8de7de
+                      r8bd8ea4
  - All data loaded from a file should be stored in a common class object.
+ - Avoid use of __setitem__ from outside a class.
+ - Bug: Loading blah.my.txt won't work. Is fixed in reflectivity registry.py
+ - Bug: The extension recognition is case sensitive and shouldn't be.
+ - BUG: if a reader raises an exception other than ValueError, the loader doesn't catch it.
  * Error conditions
  - Trying to load a file with an unknown extension should raise a RuntimeException.

DataLoader/readers/abs_reader.py

-                      rd8a5f12
+                      r8bd8ea4
     """
     ## List of allowed extensions
     ext=['.abs']
+    ext=['.abs', '.ABS']
     def read(self, path):
 …
                 if not len(y) == len(dy):
                     raise ValueError, "abs_reader: y and dy have different length"
+                # If the data length is zero, consider this as
+                # though we were not able to read the file.
+                if len(x)==0:
+                    raise ValueError, "ascii_reader: could not load file"
                 output.x = x
 …
                 output.dy = dy
                 output.xaxis("\\rm{Q}", 'A^{-1}')
                 output.yaxis("\\rm{I(Q)} ","cm^{-1}")
+                output.yaxis("\\rm{I(Q)}","cm^{-1}")
                 return output

DataLoader/readers/tiff_reader.py

-                      r68f6ae2
+                      r8bd8ea4
-import Image
 import math,logging
 …
     def read(self, filename=None):
+        import Image
         print "in tiff"
         """

r5f0f3d2	r8bd8ea4
16	16	import DataLoader
17	17	from DataLoader.loader import Loader
18		~~from DataLoader.readers import TXT3_Reader,TXT2_Reader~~
19		~~from DataLoader.readers import IgorReader,danse_reader,tiff_reader~~
20	18
21	19	import os.path

Note: See TracChangeset for help on using the changeset viewer.