Changes in / [d3e1870:fdd3ba1] in sasview

Files:

• build_tools/sasview_deploy_test.au3 (modified) (3 diffs)
• sasview/installer_generator.py (modified) (1 diff)
• sasview/sasview.py (modified) (1 diff)
• sasview/setup_exe.py (modified) (1 diff)
• src/sas/sascalc/dataloader/readers/cansas_reader.py (modified) (8 diffs)
• test/sasdataloader/test/utest_abs_reader.py (modified) (7 diffs)

build_tools/sasview_deploy_test.au3

@@ -6 +6 @@
 ;
 ; 0 - OK
-; 1 - Download failure
-; 2 - Installer failure
-; 3 - Problems running SasView (simple fitting)
-; 4 - Uninstaller failure
+; 1 - Installer failure
+; 2 - Problems running SasView (simple fitting)
+; 3 - Uninstaller failure
 
 #include <Constants.au3>
 #include <FileConstants.au3>
 #include <MsgBoxConstants.au3>
-#include <InetConstants.au3>
 #include <WinAPIFiles.au3>
 
-; Custom error handler
-;Global $oMyError = ObjEvent("AutoIt.Error","MyErrFunc")
-
 ; Modifiable globals
-if $CmdLine[0] == 0 Then
-   ; Expected command line with the build number as argument
-   Exit (-1)
+Global $fInstallerLocation = @TempDir & "\setupSasView.exe"
+if $CmdLine[0] > 0 Then
+   ; If argument present - use it as local download path
+   $fInstallerLocation = $CmdLine[1]
 EndIf
 
-Local $lBuildNumber = $CmdLine[1]
-;Global $fInstallerLocation = "C:\util\setupSasView.exe" ; debug and testing location
-Global $fInstallerLocation = @TempDir & "\setupSasView.exe"
-Global $fRemoteInstallerLocation = "https://jenkins.esss.dk/sasview/job/SasView_Win7_Test/" & $lBuildNumber & "/artifact/sasview/dist/setupSasView.exe"
 Global $fUninstallerLocation = "C:\Program Files (x86)\SasView\unins000.exe"
 Global $lTimeout = 10          ; 10 sec timeout for waiting on windows
@@ -37 +29 @@
 Global $installerPID = 0
 
-
 ;; MAIN SCRIPT
-Download()
 Install()
 RunSasView()
 Uninstall()
-
 Exit(0)
 
 ;==============================================================
-Func Download()
-   ; Download the file in the background with the selected option of 'force a reload from the remote site.'
-   ConsoleWrite("Downloading...." & @CRLF)
-   Local $iFailFlag = 1
-   Local $hDownload = InetGet($fRemoteInstallerLocation, $fInstallerLocation, $INET_FORCERELOAD)
-
-    ; Close the handle returned by InetGet.
-    InetClose($hDownload)
-        Assert($hDownload, $iFailFlag)
-        ConsoleWrite("Installer downloaded successfully to " & $fInstallerLocation & @CRLF)
-
-EndFunc
 
 Func Install()
    ;;;;; APPLICATION INSTALLED ;;;;;;;
    Local $sSetupWindow = "Setup - SasView"
-   Local $iFailFlag = 2
+   Local $iFailFlag = 1
    ; Run setup
    if FileExists($fInstallerLocation) Then
@@ -75 +52 @@
 
    ; License click through
-   WinActivate($sSetupWindow) ; <-- REQUIRED when connecting from another host
+   WinActivate($sSetupWindow)
    Local $test = WinWaitActive($sSetupWindow, "License Agreement", $lTimeout)
    ;ConsoleWrite("license agreement: " & $test)

sasview/installer_generator.py

@@ -199 +199 @@
     msg += """Source: "dist\plugin_models\*";\tDestDir: "{userdesktop}\..\.sasview\plugin_models";\t"""
     msg += """Flags: recursesubdirs createallsubdirs\n""" 
-    msg += """Source: "dist\compiled_models\*";\tDestDir: "{userdesktop}\..\.sasmodels\compiled_models";\t"""
-    msg += """Flags: recursesubdirs createallsubdirs\n"""
     msg += """Source: "dist\config\custom_config.py";\tDestDir: "{userdesktop}\..\.sasview\config";\t""" 
     msg += """Flags: recursesubdirs createallsubdirs\n"""

sasview/sasview.py

@@ -100 +100 @@
 
 from matplotlib import backend_bases
-backend_bases._default_filetypes.pop('pgf', None)
+backend_bases.FigureCanvasBase.filetypes.pop('pgf', None)
 
 class SasView():

sasview/setup_exe.py

@@ -209 +209 @@
 data_files += guiframe.data_files()
 
-# precompile sas models into the sasview build path; doesn't matter too much
-# where it is so long as it is a place that will get cleaned up afterwards.
-import sasmodels.core
-dll_path = os.path.join(build_path, 'compiled_models')
-compiled_dlls = sasmodels.core.precompile_dlls(dll_path, dtype='double')
-
-# include the compiled models as data; coordinate the target path for the
-# data with installer_generator.py
-data_files.append(('compiled_models', compiled_dlls))
-
 import sasmodels
 data_files += sasmodels.data_files()

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

@@ -206 +206 @@
         # Go through each child in the parent element
         for node in dom:
+            attr = node.attrib
+            name = attr.get("name", "")
+            type = attr.get("type", "")
             # Get the element name and set the current names level
             tagname = node.tag.replace(self.base_ns, "")
@@ -223 +226 @@
                 ## Recursion step to access data within the group
                 self._parse_entry(node)
+                if tagname == "SASsample":
+                    self.current_datainfo.sample.name = name
+                elif tagname == "beam_size":
+                    self.current_datainfo.source.beam_size_name = name
+                elif tagname == "SAScollimation":
+                    self.collimation.name = name
+                elif tagname == "aperture":
+                    self.aperture.name = name
+                    self.aperture.type = type
                 self.add_intermediate()
             else:
@@ -229 +241 @@
                 ## If this is a dataset, store the data appropriately
                 if tagname == 'Run':
+                    self.current_datainfo.run_name[data_point] = name
                     self.current_datainfo.run.append(data_point)
                 elif tagname == 'Title':
@@ -369 +382 @@
                     self.process.notes.append(data_point)
                 elif tagname == 'term' and self.parent_class == 'SASprocess':
-                    self.process.term.append(data_point)
+                    unit = attr.get("unit", "")
+                    dic = {}
+                    dic["name"] = name
+                    dic["value"] = data_point
+                    dic["unit"] = unit
+                    self.process.term.append(dic)
 
                 ## Transmission Spectrum
@@ -531 +549 @@
             self.current_datainfo.collimation.append(self.collimation)
             self.collimation = Collimation()
-        elif self.parent_class == 'SASaperture':
+        elif self.parent_class == 'aperture':
             self.collimation.aperture.append(self.aperture)
             self.aperture = Aperture()
@@ -646 +664 @@
         err_msg = None
         default_unit = None
-        if 'unit' in attr and attr.get('unit') is not None and not self.ns_list.ns_optional:
+        if not isinstance(node_value, float):
+            node_value = float(node_value)
+        if 'unit' in attr and attr.get('unit') is not None:
             try:
                 local_unit = attr['unit']
-                if not isinstance(node_value, float):
-                    node_value = float(node_value)
                 unitname = self.ns_list.current_level.get("unit", "")
                 if "SASdetector" in self.names:
@@ -907 +925 @@
                 self.write_node(point, "I", datainfo.y[i],
                                 {'unit': datainfo.y_unit})
-            if datainfo.dy != None and len(datainfo.dy) > i:
+            if datainfo.dy is not None and len(datainfo.dy) > i:
                 self.write_node(point, "Idev", datainfo.dy[i],
                                 {'unit': datainfo.y_unit})
-            if datainfo.dx != None and len(datainfo.dx) > i:
+            if datainfo.dx is not None and len(datainfo.dx) > i:
                 self.write_node(point, "Qdev", datainfo.dx[i],
                                 {'unit': datainfo.x_unit})
-            if datainfo.dxw != None and len(datainfo.dxw) > i:
+            if datainfo.dxw is not None and len(datainfo.dxw) > i:
                 self.write_node(point, "dQw", datainfo.dxw[i],
                                 {'unit': datainfo.x_unit})
-            if datainfo.dxl != None and len(datainfo.dxl) > i:
+            if datainfo.dxl is not None and len(datainfo.dxl) > i:
                 self.write_node(point, "dQl", datainfo.dxl[i],
                                 {'unit': datainfo.x_unit})
@@ -1184 +1202 @@
                 if isinstance(term, list):
                     value = term['value']
+                    del term['value']
+                elif isinstance(term, dict):
+                    value = term.get("value")
                     del term['value']
                 else:

test/sasdataloader/test/utest_abs_reader.py

@@ -176 +176 @@
         
         self.assertEqual(self.data.run[0], "1234")
-        self.assertEqual(self.data.meta_data['loader'], "CanSAS 1D")
-        self.assertEqual(len(self.data.errors), 0)
+        self.assertEqual(self.data.meta_data['loader'], "CanSAS XML 1D")
         
         # Data
@@ -198 +197 @@
         self.assertEqual(self.data.sample.name, "my sample")
         self.assertEqual(self.data.sample.thickness_unit, 'mm')
-        self.assertEqual(self.data.sample.thickness, 1.03)
-        
-        self.assertEqual(self.data.sample.transmission, 0.327)
+        self.assertAlmostEqual(self.data.sample.thickness, 1.03)
+        
+        self.assertAlmostEqual(self.data.sample.transmission, 0.327)
         
         self.assertEqual(self.data.sample.temperature_unit, 'C')
@@ -233 +232 @@
         
         self.assertEqual(self.data.source.wavelength_max_unit, "nm")
-        self.assertEqual(self.data.source.wavelength_max, 1.0)
+        self.assertAlmostEqual(self.data.source.wavelength_max, 1.0)
         self.assertEqual(self.data.source.wavelength_min_unit, "nm")
-        self.assertEqual(self.data.source.wavelength_min, 0.22)
+        self.assertAlmostEqual(self.data.source.wavelength_min, 0.22)
         self.assertEqual(self.data.source.wavelength_spread_unit, "percent")
         self.assertEqual(self.data.source.wavelength_spread, 14.3)
@@ -248 +247 @@
             self.assertEqual(item.size_unit,'mm')
             self.assertEqual(item.distance_unit,'mm')
-            
+
             if item.size.x==50 \
                 and item.distance==11000.0 \
@@ -294 +293 @@
             self.assertTrue(item.date in ['04-Sep-2007 18:35:02',
                                           '03-SEP-2006 11:42:47'])
+            print item.term
             for t in item.term:
                 if t['name']=="ABS:DSTAND" \
@@ -345 +345 @@
         self.assertEqual(self.data.filename, filename)
         # The followed should not have been loaded
-        self.assertEqual(self.data.sample.thickness, 0.00103)
+        self.assertAlmostEqual(self.data.sample.thickness, 0.00103)
         # This one should
-        self.assertEqual(self.data.sample.transmission, 0.327)
-        
-        self.assertEqual(self.data.meta_data['loader'], "CanSAS 1D")
+        self.assertAlmostEqual(self.data.sample.transmission, 0.327)
+        
+        self.assertEqual(self.data.meta_data['loader'], "CanSAS XML 1D")
         print self.data.errors
         self.assertEqual(len(self.data.errors), 1)
@@ -385 +385 @@
 
 if __name__ == '__main__':
-    unittest.main(testRunner=unittest.TextTestRunner(verbosity=2))
+    unittest.main()