Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r62797b3c6e0539e22a04404e16daa7c4465e178f -re1816d3c0bcda6e4810d634a02160c1aab41e643 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 62797b3c6e0539e22a04404e16daa7c4465e178f) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision e1816d3c0bcda6e4810d634a02160c1aab41e643) @@ -95,9 +95,12 @@ Connections { target: _treatmentAdjustmentSetPoints function onConfirmClicked ( vValue ) { - vTreatmentAdjustmentSetPointss.doAdjustment( - _treatmentAdjustmentSetPoints.bloodFlowRateValue , - _treatmentAdjustmentSetPoints.dialysateFlowRateValue + vTreatmentAdjustmentSetPoints.doAdjustment( + _treatmentAdjustmentSetPoints.bloodFlowRate , + _treatmentAdjustmentSetPoints.dialysateFlowRate , + _treatmentAdjustmentSetPoints.dialysateTemperature , + _treatmentAdjustmentSetPoints.acidConcentrate , + _treatmentAdjustmentSetPoints.bicarbConcentrate ) } } @@ -144,6 +147,17 @@ } } + Connections { target: vTreatmentAdjustmentSetPoints + function onAdjustmentTriggered ( vValue ) { + if (vTreatmentAdjustmentSetPoints.adjustment_Accepted) { + _treatmentAdjustmentSetPoints.close() + } + else { + _treatmentAdjustmentSetPoints.notification.text = vTreatmentAdjustmentSetPoints.adjustment_ReasonText + } + } + } + Connections { target: vTDOpMode // The initail screen should be the Blood Prime, since that one is the earlier state in the list. // also since it is being used in two stacks In-Treatment and also in End-Treatmet is has been defined in the MainStack.