Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -rfe8135c784a6c5ad2f35957d39af96f31d7c5618 -re9a6d98a968bb1b14a4aef8f903f54c6e4edcfd6 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision fe8135c784a6c5ad2f35957d39af96f31d7c5618) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision e9a6d98a968bb1b14a4aef8f903f54c6e4edcfd6) @@ -117,7 +117,7 @@ minimum : vTreatmentRanges.bloodFlowRateMin maximum : vTreatmentRanges.bloodFlowRateMax step : vTreatmentRanges.bloodFlowRateRes - value : vTreatmentRanges.bloodFlowRateDef + defaultValue: vTreatmentRanges.bloodFlowRateDef valid : !vTreatmentCreate.bloodFlowRateRejectReason onValueChanged : { // Reset the valid state to allow repositioning to the next invalid parameter @@ -136,7 +136,7 @@ minimum : vTreatmentRanges.dialysateFlowRateMin maximum : vTreatmentRanges.dialysateFlowRateMax step : vTreatmentRanges.dialysateFlowRateRes - value : vTreatmentRanges.dialysateFlowRateDef + defaultValue: vTreatmentRanges.dialysateFlowRateDef valid : !vTreatmentCreate.dialysateFlowRateRejectReason onValueChanged : { // Reset the valid state to allow repositioning to the next invalid parameter @@ -155,7 +155,7 @@ minimum : vTreatmentRanges.treatmentDurationMin maximum : vTreatmentRanges.treatmentDurationMax step : vTreatmentRanges.treatmentDurationRes - value : vTreatmentRanges.treatmentDurationDef + defaultValue: vTreatmentRanges.treatmentDurationDef valid : !vTreatmentCreate.treatmentDurationRejectReason onValueChanged: { // Reset the valid state to allow repositioning to the next invalid parameter @@ -201,7 +201,7 @@ minimum : vTreatmentRanges.heparinDispensingRateMin maximum : vTreatmentRanges.heparinDispensingRateMax step : vTreatmentRanges.heparinDispensingRateRes - value : vTreatmentRanges.heparinDispensingRateDef + defaultValue: vTreatmentRanges.heparinDispensingRateDef valid : !vTreatmentCreate.heparinDispensingRateRejectReason adjustable : _heparinDispensingRateSwitch.checked inActiveZero : true @@ -281,7 +281,7 @@ minimum : vTreatmentRanges.heparinBolusVolumeMin maximum : vTreatmentRanges.heparinBolusVolumeMax step : vTreatmentRanges.heparinBolusVolumeRes - value : vTreatmentRanges.heparinBolusVolumeDef + defaultValue: vTreatmentRanges.heparinBolusVolumeDef valid : !vTreatmentCreate.heparinBolusVolumeRejectReason adjustable : _heparinBolusVolumeSwitch.checked inActiveZero : true @@ -357,7 +357,7 @@ minimum : vTreatmentRanges.heparinStopTimeMin maximum : vTreatmentRanges.heparinStopTimeMax step : vTreatmentRanges.heparinStopTimeRes - value : vTreatmentRanges.heparinStopTimeDef + defaultValue: vTreatmentRanges.heparinStopTimeDef valid : !vTreatmentCreate.heparinStopTimeRejectReason enabled : false // this switch depends on the heparin dispencing adjustable : false // this switch depends on the heparin dispencing @@ -379,7 +379,7 @@ minimum : vTreatmentRanges.salineBolusVolumeMin maximum : vTreatmentRanges.salineBolusVolumeMax step : vTreatmentRanges.salineBolusVolumeRes - value : vTreatmentRanges.salineBolusVolumeDef + defaultValue: vTreatmentRanges.salineBolusVolumeDef valid : !vTreatmentCreate.salineBolusVolumeRejectReason onValueChanged: { // Reset the valid state to allow repositioning to the next invalid parameter @@ -459,8 +459,9 @@ minimum : vTreatmentRanges.dialysateTempMin maximum : vTreatmentRanges.dialysateTempMax step : vTreatmentRanges.dialysateTempRes - value : vTreatmentRanges.dialysateTempDef + defaultValue: vTreatmentRanges.dialysateTempDef valid : !vTreatmentCreate.dialysateTempRejectReason + onValueChanged: { // Reset the valid state to allow repositioning to the next invalid parameter if(!valid) { @@ -734,7 +735,7 @@ minimum : vTreatmentRanges.bloodPressureMeasureIntervalMin maximum : vTreatmentRanges.bloodPressureMeasureIntervalMax step : vTreatmentRanges.bloodPressureMeasureIntervalRes - value : vTreatmentRanges.bloodPressureMeasureIntervalDef + defaultValue: vTreatmentRanges.bloodPressureMeasureIntervalDef valid : !vTreatmentCreate.bloodPressureMeasureIntervalRejectReason adjustable : _bloodPressureIntervalSwitch.checked inActiveZero: true