Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r159f2bb0317c7c3c0336e4cb80c7fef3f87e329a -r9748f87234116f59d949f779dfa63fa35a2b4b6c --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 159f2bb0317c7c3c0336e4cb80c7fef3f87e329a) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 9748f87234116f59d949f779dfa63fa35a2b4b6c) @@ -119,7 +119,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 @@ -138,7 +138,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 @@ -157,7 +157,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 @@ -203,7 +203,7 @@ minimum : vTreatmentRanges.heparinDispensingRateMin maximum : vTreatmentRanges.heparinDispensingRateMax step : vTreatmentRanges.heparinDispensingRateRes - value : vTreatmentRanges.heparinDispensingRateDef + defaultValue: vTreatmentRanges.heparinDispensingRateDef valid : !vTreatmentCreate.heparinDispensingRateRejectReason adjustable : _heparinDispensingRateSwitch.checked inActiveZero : true @@ -283,7 +283,7 @@ minimum : vTreatmentRanges.heparinBolusVolumeMin maximum : vTreatmentRanges.heparinBolusVolumeMax step : vTreatmentRanges.heparinBolusVolumeRes - value : vTreatmentRanges.heparinBolusVolumeDef + defaultValue: vTreatmentRanges.heparinBolusVolumeDef valid : !vTreatmentCreate.heparinBolusVolumeRejectReason adjustable : _heparinBolusVolumeSwitch.checked inActiveZero : true @@ -359,7 +359,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 @@ -381,7 +381,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 @@ -461,8 +461,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) { @@ -736,7 +737,7 @@ minimum : vTreatmentRanges.bloodPressureMeasureIntervalMin maximum : vTreatmentRanges.bloodPressureMeasureIntervalMax step : vTreatmentRanges.bloodPressureMeasureIntervalRes - value : vTreatmentRanges.bloodPressureMeasureIntervalDef + defaultValue: vTreatmentRanges.bloodPressureMeasureIntervalDef valid : !vTreatmentCreate.bloodPressureMeasureIntervalRejectReason adjustable : _bloodPressureIntervalSwitch.checked inActiveZero: true @@ -813,7 +814,7 @@ minimum : vTreatmentRanges.rinsebackFlowRateMin maximum : vTreatmentRanges.rinsebackFlowRateMax step : vTreatmentRanges.rinsebackFlowRateRes - value : vTreatmentRanges.rinsebackFlowRateDef + defaultValue: vTreatmentRanges.rinsebackFlowRateDef valid : !vTreatmentCreate.rinsebackFlowRateRejectReason onValueChanged: { // Reset the valid state to allow repositioning to the next invalid parameter