Changeset 4a0d3197 in sasview

Timestamp:

May 15, 2018 4:04:13 AM (7 years ago)

Author:

wojciech

Branches:

ESS_GUI, 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:

085e3c9d, 6459916

Parents:

5a731c63 (diff), bc3debf8 (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 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI

Location:

src/sas/qtgui/Calculators

Files:

• DensityPanel.py (modified) (4 diffs)
• UnitTesting/DensityCalculatorTest.py (modified) (3 diffs)
• media/data_oper_pic.png (modified) (1 prop) (previous)
• media/density_calculator_help.rst (modified) (1 diff)
• media/density_tutor.png (modified) (1 prop) (previous)

src/sas/qtgui/Calculators/DensityPanel.py

@@ -16 +16 @@
 
 from sas.qtgui.Utilities.GuiUtils import enum
+from sas.qtgui.Utilities.GuiUtils import formatNumber
 
 MODEL = enum(
@@ -98 +99 @@
             if index == MODEL.MOLECULAR_FORMULA:
                 molarMass = toMolarMass(self.model.item(MODEL.MOLECULAR_FORMULA).text())
+                molarMass = formatNumber(molarMass, high=True)
                 self.model.item(MODEL.MOLAR_MASS).setText(molarMass)
 
@@ -120 +122 @@
 
             molarDensity = molarMass / molarVolume
+            molarDensity = formatNumber(molarDensity, high=True)
             self.model.item(MODEL.MASS_DENSITY).setText(str(molarDensity))
 
@@ -131 +134 @@
 
             molarVolume = molarMass / molarDensity
+            molarVolume = formatNumber(molarVolume, high=True)
             self.model.item(MODEL.MOLAR_VOLUME).setText(str(molarVolume))
 

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

@@ -78 +78 @@
 
         # Assure the mass density field is set
-        self.assertEqual(self.widget.ui.editMassDensity.text(), '18.0153')
+        self.assertEqual(self.widget.ui.editMassDensity.text(), '18.015')
 
         # Change mass density
@@ -88 +88 @@
 
         # Assure the molar volume field got updated
-        self.assertEqual(self.widget.ui.editMolarVolume.text(), '1.12595625')
+        self.assertEqual(self.widget.ui.editMolarVolume.text(), '1.126')
 
     def testComplexEntryAndReset(self):
@@ -113 +113 @@
 
         self.assertEqual(self.widget.ui.editMolecularFormula.text(), "H2O")
-        self.assertEqual(self.widget.ui.editMolarMass.text(), "18.0153")
+        self.assertEqual(self.widget.ui.editMolarMass.text(), "18.015")
         self.assertEqual(self.widget.ui.editMolarVolume.text(), "")
         self.assertEqual(self.widget.ui.editMassDensity.text(), "")

src/sas/qtgui/Calculators/media/density_calculator_help.rst

@@ -27 +27 @@
    then type in an input value.
 
-4) Click the 'Calculate' button to perform the calculation.
+4) Press Tab button or click out to perform the calculation.
 
 .. image:: density_tutor.png