Changes in / [5a731c63:4a0d3197] in sasview
- Location:
- src/sas/qtgui/Calculators
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/qtgui/Calculators/DensityPanel.py
raed0532 rd813cf9a 16 16 17 17 from sas.qtgui.Utilities.GuiUtils import enum 18 from sas.qtgui.Utilities.GuiUtils import formatNumber 18 19 19 20 MODEL = enum( … … 98 99 if index == MODEL.MOLECULAR_FORMULA: 99 100 molarMass = toMolarMass(self.model.item(MODEL.MOLECULAR_FORMULA).text()) 101 molarMass = formatNumber(molarMass, high=True) 100 102 self.model.item(MODEL.MOLAR_MASS).setText(molarMass) 101 103 … … 120 122 121 123 molarDensity = molarMass / molarVolume 124 molarDensity = formatNumber(molarDensity, high=True) 122 125 self.model.item(MODEL.MASS_DENSITY).setText(str(molarDensity)) 123 126 … … 131 134 132 135 molarVolume = molarMass / molarDensity 136 molarVolume = formatNumber(molarVolume, high=True) 133 137 self.model.item(MODEL.MOLAR_VOLUME).setText(str(molarVolume)) 134 138 -
src/sas/qtgui/Calculators/UnitTesting/DensityCalculatorTest.py
re90988c rbc3debf8 78 78 79 79 # Assure the mass density field is set 80 self.assertEqual(self.widget.ui.editMassDensity.text(), '18.015 3')80 self.assertEqual(self.widget.ui.editMassDensity.text(), '18.015') 81 81 82 82 # Change mass density … … 88 88 89 89 # Assure the molar volume field got updated 90 self.assertEqual(self.widget.ui.editMolarVolume.text(), '1.12 595625')90 self.assertEqual(self.widget.ui.editMolarVolume.text(), '1.126') 91 91 92 92 def testComplexEntryAndReset(self): … … 113 113 114 114 self.assertEqual(self.widget.ui.editMolecularFormula.text(), "H2O") 115 self.assertEqual(self.widget.ui.editMolarMass.text(), "18.015 3")115 self.assertEqual(self.widget.ui.editMolarMass.text(), "18.015") 116 116 self.assertEqual(self.widget.ui.editMolarVolume.text(), "") 117 117 self.assertEqual(self.widget.ui.editMassDensity.text(), "")
Note: See TracChangeset
for help on using the changeset viewer.