Changes in / [ab06de7:9b7c596] in sasview

Files:

• .gitignore (modified) (2 diffs)
• docs/sphinx-docs/source/user/sasgui/perspectives/file_converter/file_converter_help.rst (added)
• docs/sphinx-docs/source/user/tools.rst (modified) (1 diff)
• run.py (modified) (2 diffs)
• sasview/sasview.py (modified) (5 diffs)
• setup.py (modified) (10 diffs)
• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (1 diff)
• src/sas/sascalc/file_converter/__init__.py (added)
• src/sas/sascalc/file_converter/bsl_loader.py (added)
• src/sas/sascalc/file_converter/c_ext/__init__.py (added)
• src/sas/sascalc/file_converter/c_ext/bsl_loader.c (added)
• src/sas/sascalc/file_converter/c_ext/bsl_loader.h (added)
• src/sas/sasgui/perspectives/file_converter/__init__.py (added)
• src/sas/sasgui/perspectives/file_converter/bsl_loader.py (added)
• src/sas/sasgui/perspectives/file_converter/cansas_writer.py (added)
• src/sas/sasgui/perspectives/file_converter/converter_panel.py (added)
• src/sas/sasgui/perspectives/file_converter/converter_widgets.py (added)
• src/sas/sasgui/perspectives/file_converter/file_converter.py (added)
• src/sas/sasgui/perspectives/file_converter/frame_select_dialog.py (added)
• src/sas/sasgui/perspectives/file_converter/media/file_converter_help.rst (added)
• src/sas/sasgui/perspectives/file_converter/meta_panels.py (added)

.gitignore

@@ -8 +8 @@
 # generated.
 #
-# Feel free to add more stuff to this as and when it becomes an issue. 
+# Feel free to add more stuff to this as and when it becomes an issue.
 
 .project
@@ -50 +50 @@
 /test/sasdataloader/test/plugins.zip
 /test/sasdataloader/test/test_log.txt
+/test/sasdataloader/test/isis_1_0_write_test.xml
+/test/sasdataloader/test/isis_1_1_write_test.xml
+/test/sasdataloader/test/write_test.xml
 
 # autogenerated scripts
 /sasview/installer.iss
-

docs/sphinx-docs/source/user/tools.rst

@@ -8 +8 @@
 
    Data Operations Utility <sasgui/perspectives/calculator/data_operator_help>
-      
+
    Density/Volume Calculator <sasgui/perspectives/calculator/density_calculator_help>
-   
+
    Generic SANS Calculator <sasgui/perspectives/calculator/sas_calculator_help>
-   
+
    Image Viewer <sasgui/perspectives/calculator/image_viewer_help>
-   
+
    Kiessig Thickness Calculator <sasgui/perspectives/calculator/kiessig_calculator_help>
-   
+
    SLD Calculator <sasgui/perspectives/calculator/sld_calculator_help>
-   
+
    Slit Size Calculator <sasgui/perspectives/calculator/slit_calculator_help>
-   
+
    Q Resolution Estimator <sasgui/perspectives/calculator/resolution_calculator_help>
-   
+
    Python Shell <sasgui/perspectives/calculator/python_shell_help>
-   
+
+   File Converter <sasgui/perspectives/file_converter/file_converter_help>

run.py

@@ -72 +72 @@
     platform = '%s-%s'%(get_platform(),sys.version[:3])
     build_path = joinpath(root, 'build','lib.'+platform)
-    
-    # Notify the help menu that the Sphinx documentation is in a different 
+
+    # Notify the help menu that the Sphinx documentation is in a different
     # place than it otherwise would be.
     os.environ['SASVIEW_DOC_PATH'] = joinpath(build_path, "doc")
@@ -123 +123 @@
     # Compiled modules need to be pulled from the build directory.
     # Some packages are not where they are needed, so load them explicitly.
+    import sas.sascalc.file_converter
+    sas.sascalc.file_converter.core = import_package('sas.sascalc.file_converter.core',
+                                  joinpath(build_path, 'sas', 'sascalc', 'file_converter', 'core'))                    
+
+    # Compiled modules need to be pulled from the build directory.
+    # Some packages are not where they are needed, so load them explicitly.
     import sas.sascalc.calculator
     sas.sascalc.calculator.core = import_package('sas.sascalc.calculator.core',

sasview/sasview.py

@@ -81 +81 @@
 #Always use private .matplotlib setup to avoid conflicts with other
 #uses of matplotlib
-#Have to check if .sasview exists first 
+#Have to check if .sasview exists first
 sasdir = os.path.join(os.path.expanduser("~"),'.sasview')
 if not os.path.exists(sasdir):
@@ -119 +119 @@
         # Fitting perspective
         try:
-            import sas.sasgui.perspectives.fitting as module    
+            import sas.sasgui.perspectives.fitting as module
             fitting_plug = module.Plugin()
             self.gui.add_perspective(fitting_plug)
@@ -145 +145 @@
             logging.error(traceback.format_exc())
 
-        #Calculator perspective   
+        #Calculator perspective
         try:
             import sas.sasgui.perspectives.calculator as module
@@ -152 +152 @@
         except:
             logging.error("%s: could not find Calculator plug-in module"% \
+                                                        APP_NAME)
+            logging.error(traceback.format_exc())
+
+        # File converter tool
+        try:
+            import sas.sasgui.perspectives.file_converter as module
+            converter_plug = module.Plugin()
+            self.gui.add_perspective(converter_plug)
+        except:
+            logging.error("%s: could not find File Converter plug-in module"% \
                                                         APP_NAME)
             logging.error(traceback.format_exc())
@@ -191 +201 @@
 if __name__ == "__main__":
     run()
-

setup.py

@@ -9 +9 @@
 from distutils.command.build_ext import build_ext
 from distutils.core import Command
+import numpy
 
 # Manage version number ######################################
@@ -54 +55 @@
         print "Removing existing build directory", SASVIEW_BUILD, "for a clean build"
         shutil.rmtree(SASVIEW_BUILD)
-                    
+
 # 'sys.maxsize' and 64bit: Not supported for python2.5
 is_64bits = False
 if sys.version_info >= (2, 6):
     is_64bits = sys.maxsize > 2**32
-    
+
 enable_openmp = False
 
@@ -118 +119 @@
         c = self.compiler.compiler_type
         print "Compiling with %s (64bit=%s)" % (c, str(is_64bits))
-        
+
         # OpenMP build options
         if enable_openmp:
@@ -127 +128 @@
                 for e in self.extensions:
                     e.extra_link_args = lopt[ c ]
-                    
+
         # Platform-specific build options
         if platform_lopt.has_key(c):
@@ -205 +206 @@
 )
 
-    
+
 # sas.sascalc.pr
 srcdir  = os.path.join("src", "sas", "sascalc", "pr", "c_extensions")
@@ -217 +218 @@
                               include_dirs=[],
                               ) )
-        
+
+# sas.sascalc.file_converter
+mydir = os.path.join("src", "sas", "sascalc", "file_converter", "c_ext")
+package_dir["sas.sascalc.file_converter.core"] = mydir
+package_dir["sas.sascalc.file_converter"] = os.path.join("src","sas", "sascalc", "file_converter")
+packages.extend(["sas.sascalc.file_converter","sas.sascalc.file_converter.core"])
+ext_modules.append( Extension("sas.sascalc.file_converter.core.bsl_loader",
+                              sources = [os.path.join(mydir, "bsl_loader.c")],
+                              include_dirs=[numpy.get_include()],
+                              ) )
+
 # sas.sascalc.fit
 package_dir["sas.sascalc.fit"] = os.path.join("src", "sas", "sascalc", "fit")
@@ -239 +250 @@
 packages.extend(["sas.sasgui.perspectives", "sas.sasgui.perspectives.calculator"])
 package_data['sas.sasgui.perspectives.calculator'] = ['images/*', 'media/*']
-    
+
 # Data util
 package_dir["sas.sascalc.data_util"] = os.path.join("src", "sas", "sascalc", "data_util")
@@ -294 +305 @@
                                'test/2d_data/*',
                                'test/save_states/*',
-                               'test/upcoming_formats/*', 
+                               'test/upcoming_formats/*',
                                  'default_categories.json']
 packages.append("sas.sasview")
@@ -316 +327 @@
     required.extend(['pillow'])
 
-# Set up SasView    
+# Set up SasView
 setup(
     name="sasview",
@@ -341 +352 @@
                 'docs': BuildSphinxCommand,
                 'disable_openmp': DisableOpenMPCommand}
-    )   
+    )

src/sas/sascalc/dataloader/readers/cansas_reader.py

@@ -957 +957 @@
             written = written | self.write_node(pix, "z", item.pixel_size.z,
                                                 {"unit": item.pixel_size_unit})
-            written = written | self.write_node(det, "slit_length",
-                                                item.slit_length,
-                                                {"unit": item.slit_length_unit})
             if written == True:
                 self.append(pix, det)
+            self.write_node(det, "slit_length", item.slit_length,
+                {"unit": item.slit_length_unit})
+
 
     def _write_process_notes(self, datainfo, entry_node):