Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r7bb28b34d5337c6fe8669ee797e0312639c0e02f -rcf61c7736f11f4b75a4e2df803f29bdc7769db53 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 7bb28b34d5337c6fe8669ee797e0312639c0e02f) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision cf61c7736f11f4b75a4e2df803f29bdc7769db53) @@ -104,25 +104,9 @@ ScreenItem { id: _treatmentTrending } //// Treatment Adjustment Dialogs - TreatmentAdjustmentFlow { id: _treatmentAdjustmentFlow } - TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits - arterialPressureMinimum : vTreatmentRanges.arterialPressureMonitorMin - arterialPressureMaximum : vTreatmentRanges.arterialPressureMonitorMax - venousPressureMinimum : vTreatmentRanges.venousPressureMonitorMin - venousPressureMaximum : vTreatmentRanges.venousPressureMonitorMax + TreatmentAdjustmentFlow { id: _treatmentAdjustmentFlow } + TreatmentAdjustmentPressuresLimits { id: _treatmentAdjustmentPressuresLimits } - arterialPressureLowerBound : vTreatmentAdjustmentPressuresLimits.arterialLimitLow - arterialPressureUpperBound : vTreatmentAdjustmentPressuresLimits.arterialLimitHigh - venousPressureLowerBound : vTreatmentAdjustmentPressuresLimits.venousLimitLow - venousPressureUpperBound : vTreatmentAdjustmentPressuresLimits.venousLimitHigh - - arterialPressureStep : vTreatmentRanges.arterialPressureLimitLowRes - arterialPressureValue : vTreatmentPressureOcclusion.arterialPressure - - venousPressureStep : vTreatmentRanges.venousPressureLimitLowRes - venousPressureValue : vTreatmentPressureOcclusion.venousPressure - } - Connections { target: _treatmentAdjustmentFlow function onConfirmClicked ( vValue ) { vTreatmentAdjustmentFlows.doAdjustment( _treatmentAdjustmentFlow.bloodFlowRateValue , @@ -131,10 +115,9 @@ } Connections { target: _treatmentAdjustmentPressuresLimits function onConfirmClicked ( vValue ) { vTreatmentAdjustmentPressuresLimits.doAdjustment( - _treatmentAdjustmentPressuresLimits.arterialPressureLowerBound , - _treatmentAdjustmentPressuresLimits.arterialPressureUpperBound , - _treatmentAdjustmentPressuresLimits.venousPressureLowerBound , - _treatmentAdjustmentPressuresLimits.venousPressureUpperBound ) + _treatmentAdjustmentPressuresLimits.arterialPressureLimitWindow , + _treatmentAdjustmentPressuresLimits.venousPressureLimitWindow , + _treatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc ) } } @@ -208,10 +191,9 @@ function onAdjustmentTriggered ( vValue ) { // values have to be update even when rejected HD is reverting back the values. // if accepted will be updated for later [may need refresh later] - _treatmentAdjustmentPressuresLimits.arterialPressureLowerBound = vTreatmentAdjustmentPressuresLimits.arterialLimitLow - _treatmentAdjustmentPressuresLimits.arterialPressureUpperBound = vTreatmentAdjustmentPressuresLimits.arterialLimitHigh - _treatmentAdjustmentPressuresLimits.venousPressureLowerBound = vTreatmentAdjustmentPressuresLimits.venousLimitLow - _treatmentAdjustmentPressuresLimits.venousPressureUpperBound = vTreatmentAdjustmentPressuresLimits.venousLimitHigh + _treatmentAdjustmentPressuresLimits.arterialPressureLimitWindow = vTreatmentAdjustmentPressuresLimits.arterialPressureLimitWindow + _treatmentAdjustmentPressuresLimits.venousPressureLimitWindow = vTreatmentAdjustmentPressuresLimits.venousPressureLimitWindow + _treatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc = vTreatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrc if (vTreatmentAdjustmentPressuresLimits.adjustment_Accepted) { _treatmentAdjustmentPressuresLimits.close()