Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -rff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5 -r1aa53e9869f4c27d53dd9052271ca38befbe22e9 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision ff8553ddbd24f3b7e4727e78bc74c13e8eb7eeb5) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision 1aa53e9869f4c27d53dd9052271ca38befbe22e9) @@ -48,40 +48,6 @@ titleText: qsTr("PRESSURES") - //// Note : The slider values are not bound and will be set by user freely - //// and will be used to be sent for adjustment - //// if accepted will not changed and - //// if rejected then will be reset to the values passed by adjustment response - //// - //// reset the flow values to the current flow values - //// function currentFlows() { - //// _bloodFlowSlider.value = vTreatmentBloodFlow. bloodFlow_FlowSetPoint - //// _dialysateFlowSlider.value = vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint - //// } - //// - //// // reset the flow values to the values of the adjustment response - //// function resetFlows() { - //// _bloodFlowSlider.value = vTreatmentAdjustmentFlows. bloodFlow_FlowSetPoint - //// _dialysateFlowSlider.value = vTreatmentAdjustmentFlows.dialysateFlow_FlowSetPoint - //// } - //// - //// onAboutToShow: { - //// // TODO : When Testing data on Setting screen is removed - //// // This needs to be moved into the Treatment______.qml - //// currentFlows() - //// } - //// - //// Connections { target: vTreatmentAdjustmentFlows - //// onAdjustmentTriggered: { - //// if ( vTreatmentAdjustmentFlows.adjustment_Accepted ) { - //// accept() - //// } else { - //// resetFlows() - //// notification.text = vTreatmentAdjustmentFlows.text() - //// } - //// } - //// } - Column { id : _pressuresColumn spacing: 100 anchors.centerIn: parent @@ -90,8 +56,9 @@ anchors.horizontalCenter: parent.horizontalCenter progressColor : Colors.pressuresArterialBar - minimumMargin : 0 - maximumMargin : 25 + minimumMargin : Math.abs(Variables.arterialValueMin - Variables.arterialLimitLowMin ) + maximumMargin : Math.abs(Variables.arterialValueMax - Variables.arterialLimitHighMax) + step: arterialPressureStep } Line { @@ -105,8 +72,9 @@ anchors.horizontalCenter: parent.horizontalCenter progressColor : Colors.pressuresVenousBar - minimumMargin : 50 - maximumMargin : 75 + minimumMargin : Math.abs(Variables.venousValueMin - Variables.venousLimitLowMin ) + maximumMargin : Math.abs(Variables.venousValueMax - Variables.venousLimitHighMax) + step: venousPressureStep } } }