Index: sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml =================================================================== diff -u -r8b2648d33d06cb18d22103f8904360790bc52f4b -ree594afa3a2084c03395570954d723d04bbae215 --- sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml (.../AcidConcentrateAdjustment.qml) (revision 8b2648d33d06cb18d22103f8904360790bc52f4b) +++ sources/gui/qml/dialogs/AcidConcentrateAdjustment.qml (.../AcidConcentrateAdjustment.qml) (revision ee594afa3a2084c03395570954d723d04bbae215) @@ -91,10 +91,8 @@ decimal : Variables.potassiumPrecision value : vTreatmentRanges.potassium isActive : vTreatmentRanges.potassiumSet - onDidActiveChange: function(vState) { vTreatmentRanges.potassiumSet = vState } - onDidChange : function(vValue) { - vTreatmentRanges.potassium = vValue - } + onDidActiveChange : function(vState) { vTreatmentRanges.potassiumSet = vState } + onDidChange : function(vValue) { vTreatmentRanges.potassium = vValue } } } @@ -118,10 +116,8 @@ decimal : Variables.calciumPrecision value : vTreatmentRanges.calcium isActive : vTreatmentRanges.calciumSet - onDidActiveChange: function(vState) { vTreatmentRanges.calciumSet = vState } - onDidChange : function(vValue) { - vTreatmentRanges.calcium = vValue - } + onDidActiveChange : function(vState) { vTreatmentRanges.calciumSet = vState } + onDidChange : function(vValue) { vTreatmentRanges.calcium = vValue } } } @@ -159,17 +155,12 @@ } } - function onDidPopulateAcidConcentrate ( vActive ) { - if ( vActive ) { - _potassiumValueControl .refresh() - _calciumValueControl .refresh() - vTreatmentRanges.potassiumSet = vActive - vTreatmentRanges.calciumSet = vActive - notificationText = qsTr("Duplicate Acid Concentrate Entry") - } - else { - notificationText = "" - } + function onDidPopulateAcidConcentrate () { + _potassiumValueControl .refresh() + _calciumValueControl .refresh() + vTreatmentRanges.potassiumSet = true + vTreatmentRanges.calciumSet = true + notificationText = qsTr("Duplicate Acid Concentrate Entry") } } } Index: sources/view/hd/data/VTreatmentRanges.cpp =================================================================== diff -u -r254725cce5518a3fdafa203aeb1e537b9f9898bf -ree594afa3a2084c03395570954d723d04bbae215 --- sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision 254725cce5518a3fdafa203aeb1e537b9f9898bf) +++ sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision ee594afa3a2084c03395570954d723d04bbae215) @@ -95,13 +95,13 @@ eMagnesium , }; - if ( ! vSet ) { didPopulateAcidConcentrate(false); return; } + if ( ! vSet ) { return; } QString mAcidConcentrate =_acidConcentrateOptions[vIndex]; QStringList values = mAcidConcentrate.split(QRegExp("[^0-9.]"), Qt::SkipEmptyParts); potassium (values.value(AcidConcentrates::ePotassium) .toFloat()); calcium (values.value(AcidConcentrates::eCalcium) .toFloat()); - didPopulateAcidConcentrate(true); + didPopulateAcidConcentrate(); } /*! Index: sources/view/hd/data/VTreatmentRanges.h =================================================================== diff -u -r10d95daf091fedda008906727088648f66ae5bac -ree594afa3a2084c03395570954d723d04bbae215 --- sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision 10d95daf091fedda008906727088648f66ae5bac) +++ sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision ee594afa3a2084c03395570954d723d04bbae215) @@ -83,8 +83,8 @@ VIEW_DEC_SLOT(SettingsData ) signals: - void didTreatmentRangesDone ( bool vPass ); - void didPopulateAcidConcentrate (const bool &vSet ); + void didTreatmentRangesDone (bool vPass ); + void didPopulateAcidConcentrate ( ); public slots: void doSaveAcidConcentrate (const QString &vOption );