Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -r32ca8b84563394e35720ec2da6e607d45a128f39 -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file TreatmentAdjustmentFlow.qml * \author (last) Behrouz NematiPour - * \date (last) 23-Nov-2022 + * \date (last) 11-Apr-2023 * \author (original) Behrouz NematiPour * \date (original) 22-Mar-2020 * @@ -50,14 +50,14 @@ // reset the flow values to the current flow values function currentFlows() { - _bloodFlowSlider.value = vTreatmentBloodFlow. bloodFlow_PresFlow - _dialysateFlowSlider.value = vTreatmentDialysateFlow.dialysateFlow_PresFlow + _bloodFlowSlider.reset ( vTreatmentBloodFlow. bloodFlow_PresFlow ) + _dialysateFlowSlider.reset ( vTreatmentDialysateFlow.dialysateFlow_PresFlow ) } // reset the flow values to the values of the adjustment response function resetFlows() { - _bloodFlowSlider.value = vTreatmentAdjustmentFlows. bloodFlow_FlowSetPoint - _dialysateFlowSlider.value = vTreatmentAdjustmentFlows.dialysateFlow_FlowSetPoint + _bloodFlowSlider.reset ( vTreatmentAdjustmentFlows. bloodFlow_FlowSetPoint ) + _dialysateFlowSlider.reset ( vTreatmentAdjustmentFlows.dialysateFlow_FlowSetPoint ) } onAboutToShow: { @@ -82,7 +82,7 @@ spacing: 100 anchors.centerIn: parent Row { id : _bloodFlowRow - spacing: 100 + spacing: 50 anchors.horizontalCenter: parent.horizontalCenter TextRect { id: _bloodFlowTextRect anchors.top: parent.top @@ -96,21 +96,26 @@ Slider { id : _bloodFlowSlider anchors.verticalCenter: parent.verticalCenter width : 600 - height : 5 minimum : Variables.bloodFlowMin maximum : Variables.bloodFlowMax + decimal : Variables.bloodFlowPrecision unit : Variables.unitTextFlowRate step : Variables.bloodFlowResolution ticks : true } + SliderArrows{ id:_bloodFlowSliderArrows + anchors.verticalCenter : _bloodFlowSlider.verticalCenter + onIncrementValue : _bloodFlowSlider.incrementValue(true) + onDecrementValue : _bloodFlowSlider.decrementValue(true) + } } Line { anchors.horizontalCenter: parent.horizontalCenter length : _root.width - 100 color : Colors.separatorLine } Row { id : _dialysateInletFlowRow - spacing: 100 + spacing: 50 anchors.horizontalCenter: parent.horizontalCenter TextRect { id: _dialysateInletFlowTextRect anchors.top: parent.top @@ -124,13 +129,17 @@ Slider { id : _dialysateFlowSlider anchors.verticalCenter: parent.verticalCenter width : 600 - height : 5 minimum : vTreatmentRanges.treatmentRanges_Dialysate_Flow_Min maximum : vTreatmentRanges.treatmentRanges_Dialysate_Flow_Max unit : Variables.unitTextFlowRate step : Variables.dialysateFlowResolution ticks : true } + SliderArrows{ id:_dialysateFlowSliderArrows + anchors.verticalCenter : _dialysateFlowSlider.verticalCenter + onIncrementValue : _dialysateFlowSlider.incrementValue(true) + onDecrementValue : _dialysateFlowSlider.decrementValue(true) + } } } }