Changes in / [ab06de7:fcba29a] 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)
• sasview/sasview.py (modified) (5 diffs)
• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (1 diff)
• 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>

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()
-

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):