Changes in / [4a0d3197:5a731c63] in sasview

Location:

src/sas/qtgui/Calculators

Files:

• DensityPanel.py (modified) (4 diffs)
• UnitTesting/DensityCalculatorTest.py (modified) (3 diffs)

src/sas/qtgui/Calculators/DensityPanel.py

@@ -16 +16 @@
 
 from sas.qtgui.Utilities.GuiUtils import enum
-from sas.qtgui.Utilities.GuiUtils import formatNumber
 
 MODEL = enum(
@@ -99 +98 @@
             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)
 
@@ -122 +120 @@
 
             molarDensity = molarMass / molarVolume
-            molarDensity = formatNumber(molarDensity, high=True)
             self.model.item(MODEL.MASS_DENSITY).setText(str(molarDensity))
 
@@ -134 +131 @@
 
             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.015')
+        self.assertEqual(self.widget.ui.editMassDensity.text(), '18.0153')
 
         # Change mass density
@@ -88 +88 @@
 
         # Assure the molar volume field got updated
-        self.assertEqual(self.widget.ui.editMolarVolume.text(), '1.126')
+        self.assertEqual(self.widget.ui.editMolarVolume.text(), '1.12595625')
 
     def testComplexEntryAndReset(self):
@@ -113 +113 @@
 
         self.assertEqual(self.widget.ui.editMolecularFormula.text(), "H2O")
-        self.assertEqual(self.widget.ui.editMolarMass.text(), "18.015")
+        self.assertEqual(self.widget.ui.editMolarMass.text(), "18.0153")
         self.assertEqual(self.widget.ui.editMolarVolume.text(), "")
         self.assertEqual(self.widget.ui.editMassDensity.text(), "")