Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -r99e12314855a6b8dd46989b9c0e5263b74af5dc4 -r18c39727da06312b90d15751e6a27e03c7b6742a --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 99e12314855a6b8dd46989b9c0e5263b74af5dc4) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 18c39727da06312b90d15751e6a27e03c7b6742a) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2020-2023 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) 30-Jul-2020 - * \author (original) Behrouz NematiPour - * \date (original) 22-Mar-2020 + * \file TreatmentAdjustmentFlow.qml + * \author (last) Behrouz NematiPour + * \date (last) 23-Nov-2022 + * \author (original) Behrouz NematiPour + * \date (original) 22-Mar-2020 * */ @@ -67,11 +67,12 @@ } Connections { target: vTreatmentAdjustmentFlows - onAdjustmentTriggered: { + function onAdjustmentTriggered ( vValue ) { if ( vTreatmentAdjustmentFlows.adjustment_Accepted ) { accept() } else { resetFlows() + console.debug(vTreatmentAdjustmentFlows.text()) notification.text = vTreatmentAdjustmentFlows.text() } } @@ -81,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 @@ -95,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 @@ -123,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) + } } } }