Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r600b6707b102919d981f3b1d18611834e23eae60 -r698c4d2275163b2d81bd4ab430be02bad65ede84 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 600b6707b102919d981f3b1d18611834e23eae60) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 698c4d2275163b2d81bd4ab430be02bad65ede84) @@ -149,7 +149,7 @@ //// Treatment Adjustment Dialogs TreatmentAdjustmentSetPoints { id: _treatmentAdjustmentSetPoints } TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits } - TreatmentAdjustmentBolusVolume { id: _treatmentAdjustmentBolusVolume } + TreatmentAdjustmentBolusVolume { id: _treatmentAdjustmentBolusVolume } TreatmentAdjustmentUltrafiltrationStack { id: _treatmentAdjustmentUltrafiltration } TreatmentAdjustmentHDF { id: _treatmentAdjustmentHDF } @@ -160,7 +160,12 @@ _treatmentAdjustmentSetPoints.dialysateFlowRate , _treatmentAdjustmentSetPoints.dialysateTemperature , _treatmentAdjustmentSetPoints.acidConcentrate , - _treatmentAdjustmentSetPoints.bicarbConcentrate + vTreatmentRanges.acidConcentrateModel.get(_treatmentAdjustmentSetPoints.acidConcentrate).value, + _treatmentAdjustmentSetPoints.bicarbConcentrate , + _treatmentAdjustmentSetPoints.treatmentModality , + _treatmentAdjustmentSetPoints.hepatitus , + _treatmentAdjustmentSetPoints.sodium , + _treatmentAdjustmentSetPoints.bicarbonate ) } } @@ -210,6 +215,13 @@ Connections { target: vTreatmentAdjustmentSetPoints function onAdjustmentTriggered ( vValue ) { if (vTreatmentAdjustmentSetPoints.adjustment_Accepted) { + // TODO update setpoints here? + vTreatmentCreate.treatmentModality = _treatmentAdjustmentSetPoints.treatmentModality + vTreatmentCreate.acidConcentrate = _treatmentAdjustmentSetPoints.acidConcentrate + vTreatmentCreate.dryBicarbCartSize = _treatmentAdjustmentSetPoints.bicarbConcentrate + vTreatmentCreate.hepatitusBStatus = _treatmentAdjustmentSetPoints.hepatitus + vTreatmentCreate.sodium = _treatmentAdjustmentSetPoints.sodium + vTreatmentCreate.bicarbonate = _treatmentAdjustmentSetPoints.bicarbonate _treatmentAdjustmentSetPoints.close() } else {