Index: sources/gui/qml/components/BaseComboBox.qml =================================================================== diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -rf7b92a45b2b7fa814fba3d080bcf91d465f279df --- sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision 40ddf63592b60608ae34aeb3099fe4e62ae45054) +++ sources/gui/qml/components/BaseComboBox.qml (.../BaseComboBox.qml) (revision f7b92a45b2b7fa814fba3d080bcf91d465f279df) @@ -44,7 +44,7 @@ active = false } - function sync () { currentIndex = actualValue } + function refresh () { currentIndex = actualValue } contentItem: Text { id: _displayText text : parent.displayText Index: sources/gui/qml/compounds/ValueAdjuster.qml =================================================================== diff -u -r40ddf63592b60608ae34aeb3099fe4e62ae45054 -rf7b92a45b2b7fa814fba3d080bcf91d465f279df --- sources/gui/qml/compounds/ValueAdjuster.qml (.../ValueAdjuster.qml) (revision 40ddf63592b60608ae34aeb3099fe4e62ae45054) +++ sources/gui/qml/compounds/ValueAdjuster.qml (.../ValueAdjuster.qml) (revision f7b92a45b2b7fa814fba3d080bcf91d465f279df) @@ -30,7 +30,7 @@ property bool active : false property bool editable : true property bool allowOff : false - property bool synchronize : false + property bool doRefresh : false // fix floating-point precision issue readonly property real stepVal : Math.round(step * 100) / 100 @@ -42,15 +42,14 @@ value > minimum : true onActiveChanged : { - // use actual value not default value to synchronize - if ( synchronize ) { synchronize = false; return; } + if ( doRefresh ) { doRefresh = false; return; } - if ( active ) { _root.value = _root.defaultValue } + if ( active ) { _root.value = _root.defaultValue } } - function sync () { value = actualValue; synchronize = true } + function refresh () { value = actualValue; doRefresh = true } - function clear() { _root.active = false } + function clear() { _root.active = false } function increment() { if ( ! active ) { active = true; return; } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml =================================================================== diff -u -rc0fb8d6ccf506d2c93efcb6a319a504d8b80a9b5 -rf7b92a45b2b7fa814fba3d080bcf91d465f279df --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision c0fb8d6ccf506d2c93efcb6a319a504d8b80a9b5) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision f7b92a45b2b7fa814fba3d080bcf91d465f279df) @@ -43,8 +43,8 @@ function canEdit (state) { editingEnabled = state } - function activateAndSync() { - syncAll () // needs to be first + function activateAndRefresh() { + refreshAll () // needs to be first _bloodFlowRateControl .active = true _dialysateFlowRateControl .active = true _durationControl .active = true @@ -59,19 +59,19 @@ _bpMeasurementIntervalControl .active = true } - function syncAll () { - _bloodFlowRateControl .sync() - _dialysateFlowRateControl .sync() - _durationControl .sync() - _heparinDispensingRateControl .sync() - _heparinBolusVolumeControl .sync() - _heparinStopTimeControl .sync() - _acidConcentrateComboBox .sync() - _bicarbonateConcentrateComboBox .sync() - _dialyzerTypeComboBox .sync() - _dialysateTemperatureControl .sync() - _salineBolusVolumeControl .sync() - _bpMeasurementIntervalControl .sync() + function refreshAll () { + _bloodFlowRateControl .refresh() + _dialysateFlowRateControl .refresh() + _durationControl .refresh() + _heparinDispensingRateControl .refresh() + _heparinBolusVolumeControl .refresh() + _heparinStopTimeControl .refresh() + _acidConcentrateComboBox .refresh() + _bicarbonateConcentrateComboBox .refresh() + _dialyzerTypeComboBox .refresh() + _dialysateTemperatureControl .refresh() + _salineBolusVolumeControl .refresh() + _bpMeasurementIntervalControl .refresh() } function clear () { @@ -139,7 +139,7 @@ function onDidValidationPass ( vValue ) { vPostTreatmentAdjustmentTreatmentLog.heparinDispensingRateOff = vTreatmentCreate.heparinDispensingRateOff = ! vTreatmentCreate.heparinDispensingRate vPostTreatmentAdjustmentTreatmentLog.heparinBolusVolumeOff = vTreatmentCreate.heparinBolusVolumeOff = ! vTreatmentCreate.heparinBolusVolume - activateAndSync() // sync on validation + activateAndRefresh() // refresh values on validation clearErrors() }