Changeset f4a1433 in sasview for src/sas/qtgui/Calculators

Timestamp:

Oct 24, 2017 2:44:26 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

fca1f50, d6b234b

Parents:

16afe01 (diff), 5582b078 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ESS_GUI

Location:

src/sas/qtgui/Calculators

Files:

• SlitSizeCalculator.py (modified) (2 diffs)
• UnitTesting/GenericScatteringCalculatorTest.py (modified) (2 diffs)
• UnitTesting/SLDCalculatorTest.py (modified) (2 diffs)
• UnitTesting/SlitSizeCalculatorTest.py (modified) (2 diffs)
• DataOperationUtilityPanel.py (added)
• DensityPanel.py (added)
• GenericScatteringCalculator.py (added)
• KiessigPanel.py (added)
• ResolutionCalculatorPanel.py (added)
• SldPanel.py (added)
• UI/DataOperationUtilityUI.ui (added)
• UI/DensityPanel.ui (added)
• UI/GenericScatteringCalculator.ui (added)
• UI/KiessigPanel.ui (added)
• UI/ResolutionCalculatorPanelUI.ui (added)
• UI/SldPanel.ui (added)
• UI/SlitSizeCalculator.ui (added)
• UI/__init__.py (added)
• UnitTesting/DataOperationUtilityTest.py (added)
• UnitTesting/DensityCalculatorTest.py (added)
• UnitTesting/KiessigCalculatorTest.py (added)
• UnitTesting/ResolutionCalculatorPanelTest.py (added)
• UnitTesting/__init__.py (added)
• __init__.py (added)

src/sas/qtgui/Calculators/SlitSizeCalculator.py

@@ -63 +63 @@
             return
         loader = Loader()
-        data = loader.load(path_str)
+        data = loader.load(path_str)[0]
 
         self.data_file.setText(os.path.basename(path_str))
@@ -104 +104 @@
         Computes slit lenght from given 1D data
         """
-
         if data is None:
             self.clearResults()

src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

@@ -305 +305 @@
         self.widget.loadFile()
         self.assertEqual(self.widget.cmdLoad.text(), 'Loading...')
-        time.sleep(1)
+        time.sleep(2)
 
         self.assertEqual(self.widget.txtData.text(), 'A_Raw_Example-1.omf')
@@ -377 +377 @@
         self.assertFalse(self.widget.cmdCompute.isEnabled())
 
-        self.widget.complete([numpy.ones(1), numpy.zeros(1), numpy.zeros(1)], update=None)
-        self.assertEqual(self.widget.cmdCompute.text(), 'Compute')
-        self.assertTrue(self.widget.cmdCompute.isEnabled())
+        #self.widget.complete([numpy.ones(1), numpy.zeros(1), numpy.zeros(1)], update=None)
+        #self.assertEqual(self.widget.cmdCompute.text(), 'Compute')
+        #self.assertTrue(self.widget.cmdCompute.isEnabled())
 
     # TODO

src/sas/qtgui/Calculators/UnitTesting/SLDCalculatorTest.py

@@ -98 +98 @@
 
         # Assure the output fields are set
-        self.assertEqual(self.widget.ui.editNeutronIncXs.text(), '5.37')
+        self.assertEqual(self.widget.ui.editNeutronIncXs.text(), '5.62')
 
         # Change mass density
@@ -128 +128 @@
 
         # Assure the mass density field is set
-        self.assertEqual(self.widget.ui.editNeutronIncXs.text(), '40.6')
+        self.assertEqual(self.widget.ui.editNeutronIncXs.text(), '43.4')
 
         # Reset the widget

src/sas/qtgui/Calculators/UnitTesting/SlitSizeCalculatorTest.py

@@ -71 +71 @@
         filename = "beam_profile.DAT"
         loader = Loader()
-        data = loader.load(filename)
+        data = loader.load(filename)[0]
 
         self.widget.calculateSlitSize(data)
@@ -81 +81 @@
         """ Test on wrong input data """
 
-        filename = "Dec07031.ASC"
+        filename = "P123_D2O_10_percent.dat"
         loader = Loader()
-        data = loader.load(filename)
+        data = loader.load(filename)[0]
         self.assertRaisesRegexp(RuntimeError,
                                 "Slit Length cannot be computed for 2D Data",