Changeset 51b9c14 in sasview for src

Timestamp:

Sep 27, 2018 7:25:52 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

b6f47be

Parents:

2f55df6

Message:

Made the SLD calculator listen and respond to textEdited signal on
QLineEdit, in addition to model change with dataChanged.
SASVIEW-1139

File:

• src/sas/qtgui/Calculators/DensityPanel.py (modified) (2 diffs)

src/sas/qtgui/Calculators/DensityPanel.py

@@ -81 +81 @@
         self.model.dataChanged.connect(self.dataChanged)
 
+        self.ui.editMolarVolume.textEdited.connect(self.volumeChanged)
+        self.ui.editMassDensity.textEdited.connect(self.massChanged)
+        self.ui.editMolecularFormula.textEdited.connect(self.formulaChanged)
+
         self.modelReset()
 
@@ -112 +116 @@
             elif index == MODEL.MASS_DENSITY and self.mode == MODES.DENSITY_TO_VOLUME:
                 self._updateVolume()
+
+    def volumeChanged(self, current_text):
+        try:
+            molarMass = float(toMolarMass(self.model.item(MODEL.MOLECULAR_FORMULA).text()))
+            molarVolume = float(current_text)
+
+            molarDensity = molarMass / molarVolume
+            molarDensity = formatNumber(molarDensity, high=True)
+            self.model.item(MODEL.MASS_DENSITY).setText(str(molarDensity))
+
+        except (ArithmeticError, ValueError):
+            self.model.item(MODEL.MASS_DENSITY).setText("")
+
+    def massChanged(self, current_text):
+        try:
+            molarMass = float(toMolarMass(self.model.item(MODEL.MOLECULAR_FORMULA).text()))
+            molarDensity = float(current_text)
+
+            molarVolume = molarMass / molarDensity
+            molarVolume = formatNumber(molarVolume, high=True)
+            self.model.item(MODEL.MOLAR_VOLUME).setText(str(molarVolume))
+
+        except (ArithmeticError, ValueError):
+            self.model.item(MODEL.MOLAR_VOLUME).setText("")
+
+    def formulaChanged(self, current_text):
+        try:
+            molarMass = toMolarMass(current_text)
+            molarMass = formatNumber(molarMass, high=True)
+            self.model.item(MODEL.MOLAR_MASS).setText(molarMass)
+
+        except (ArithmeticError, ValueError):
+            self.model.item(MODEL.MOLAR_VOLUME).setText("")
 
     def setMode(self, mode):