Index: sources/gui/qml/components/RangeRect.qml =================================================================== diff -u -rf8321d4b6a5489f797122321a4821b4eeaaa50cb -rd47617a89c852ffc38d6a0c62eb18ea41ae27d29 --- sources/gui/qml/components/RangeRect.qml (.../RangeRect.qml) (revision f8321d4b6a5489f797122321a4821b4eeaaa50cb) +++ sources/gui/qml/components/RangeRect.qml (.../RangeRect.qml) (revision d47617a89c852ffc38d6a0c62eb18ea41ae27d29) @@ -26,9 +26,9 @@ Rectangle { id: _root signal clicked(var vMouseEvent) signal dragged(var vMouseEvent) - signal pressChanged() + signal released(var vMouseEvent) + signal pressed(var vMouseEvent) - property int decimal : 0 property real minimum : 0 property real maximum : 0 @@ -87,12 +87,14 @@ onPositionChanged: { _root.dragged(mouse) } - onClicked: { _root.clicked(mouse) } - onPressedChanged: { - _root.pressChanged(); + onReleased: { + _root.released(mouse) } + onPressed: { + _root.pressed(mouse) + } } } Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -rf8321d4b6a5489f797122321a4821b4eeaaa50cb -rd47617a89c852ffc38d6a0c62eb18ea41ae27d29 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision f8321d4b6a5489f797122321a4821b4eeaaa50cb) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision d47617a89c852ffc38d6a0c62eb18ea41ae27d29) @@ -135,9 +135,12 @@ setValue(vMouseEvent.x) progressRectClicked() } - onPressChanged: { - _root.pressChanged() + onPressed: { + _root.pressed(vMouseEvent) } + onReleased: { + _root.released(vMouseEvent) + } } // used loader for performance since it may not always be required. Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -r9f63306043e9a184ce3e71c573ef0a15d8644f95 -rd47617a89c852ffc38d6a0c62eb18ea41ae27d29 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 9f63306043e9a184ce3e71c573ef0a15d8644f95) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision d47617a89c852ffc38d6a0c62eb18ea41ae27d29) @@ -39,7 +39,8 @@ property alias isActive: _slider.isActive property alias sliderObjectName: _slider.objectName property alias selectedValueObjectName: _selected_value.objectName - signal sliderChanged() + signal pressed() + signal released() height: Variables.progressbarRectHeight width: Variables.progressbarRectWidth @@ -105,7 +106,8 @@ onProgressRectClicked: { setActive(true); setValid(true); } onProgressRectDragged: { setActive(true); setValid(true); } - onPressChanged: { _root.sliderChanged(); } + onPressed: { _root.pressed(); } + onReleased: { _root.released(); } onDragged: { setActive(true); setValid(true); } onClicked: { setActive(true); setValid(true); } } Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -rf8321d4b6a5489f797122321a4821b4eeaaa50cb -rd47617a89c852ffc38d6a0c62eb18ea41ae27d29 --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision f8321d4b6a5489f797122321a4821b4eeaaa50cb) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision d47617a89c852ffc38d6a0c62eb18ea41ae27d29) @@ -87,9 +87,12 @@ min: vTreatmentBegin.ufVolumeMin max: vTreatmentBegin.ufVolumeMax step: vTreatmentBegin.ufVolumeRes - onSliderChanged: { + onPressed: { vTreatmentBegin.ufVolume = value; } + onReleased: { + vTreatmentBegin.ufVolume = value; + } } TouchRect { id : _continueRect Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml =================================================================== diff -u -rf8321d4b6a5489f797122321a4821b4eeaaa50cb -rd47617a89c852ffc38d6a0c62eb18ea41ae27d29 --- sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision f8321d4b6a5489f797122321a4821b4eeaaa50cb) +++ sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision d47617a89c852ffc38d6a0c62eb18ea41ae27d29) @@ -93,9 +93,14 @@ step: vTreatmentCreate.bloodFlowRateRes text: qsTr("Blood Flow Rate") units: qsTr("mL/min") - onSliderChanged: { + onPressed: { + console.debug("Pressed blood flow rate.") vTreatmentCreate.bloodFlowRate = value; } + onReleased: { + console.debug("Released blood flow rate.") + vTreatmentCreate.bloodFlowRate = value; + } } SliderCreateTreatment { id: _dialysateFlowRate @@ -107,9 +112,12 @@ step: vTreatmentCreate.dialysateFlowRateRes text: qsTr("Dialysate Flow Rate") units: qsTr("mL/min") - onSliderChanged: { + onPressed: { vTreatmentCreate.dialysateFlowRate = value; } + onReleased: { + vTreatmentCreate.dialysateFlowRate = value; + } } SliderCreateTreatment { id: _duration @@ -121,9 +129,12 @@ step: vTreatmentCreate.durationRes text: qsTr("Duration") units: qsTr("min") - onSliderChanged: { + onPressed: { vTreatmentCreate.duration = value; } + onReleased: { + vTreatmentCreate.duration = value; + } } SliderCreateTreatment { id: _heparinDispensingRate @@ -135,9 +146,12 @@ step: vTreatmentCreate.heparinDispensingRateRes text: qsTr("Heparin Dispensing Rate") units: qsTr("mL/hr") - onSliderChanged: { + onPressed: { vTreatmentCreate.heparinDispensingRate = value; } + onReleased: { + vTreatmentCreate.heparinDispensingRate = value; + } } SliderCreateTreatment { id: _heparinBolusVolume @@ -150,9 +164,12 @@ text: qsTr("Heparin Bolus Volume") units: qsTr("mL") - onSliderChanged: { + onPressed: { vTreatmentCreate.heparinBolusVolume = value; } + onReleased: { + vTreatmentCreate.heparinBolusVolume = value; + } } SliderCreateTreatment { id: _heparinStopTime @@ -164,9 +181,12 @@ step: vTreatmentCreate.heparinStopTimeRes text: qsTr("Heparin Stop Time") units: qsTr("min") - onSliderChanged: { + onPressed: { vTreatmentCreate.heparinStopTime = value; } + onReleased: { + vTreatmentCreate.heparinStopTime = value; + } } SliderCreateTreatment { @@ -177,9 +197,12 @@ min: vTreatmentCreate.salineBolusVolumeMin max: vTreatmentCreate.salineBolusVolumeMax step: vTreatmentCreate.salineBolusVolumeRes - onSliderChanged: { + onPressed: { vTreatmentCreate.salineBolusVolume = value; } + onReleased: { + vTreatmentCreate.salineBolusVolume = value; + } } GridSelection { @@ -223,9 +246,12 @@ step: vTreatmentCreate.dialysateTempRes text: qsTr("Dialysate Temperature") units: qsTr("C") - onSliderChanged: { + onPressed: { vTreatmentCreate.dialysateTemp = value; } + onReleased: { + vTreatmentCreate.dialysateTemp = value; + } } Text { id: _arterialPressureLimitsTitle @@ -307,9 +333,12 @@ max: vTreatmentCreate.bloodPressureMeasureIntervalMax step: vTreatmentCreate.bloodPressureMeasureIntervalRes stepSnap: true - onSliderChanged: { + onPressed: { vTreatmentCreate.bloodPressureMeasureInterval = value } + onReleased: { + vTreatmentCreate.bloodPressureMeasureInterval = value + } } SliderCreateTreatment { id: _rinsebackFlowRate @@ -322,9 +351,12 @@ max: vTreatmentCreate.rinsebackFlowRateMax step: vTreatmentCreate.rinsebackFlowRateRes stepSnap: true - onSliderChanged: { + onPressed: { vTreatmentCreate.rinsebackFlowRate = value } + onReleased: { + vTreatmentCreate.rinsebackFlowRate = value + } } TouchRect { id : _continueRect Index: sources/model/MTreatmentParametersResp.cpp =================================================================== diff -u -rf7b3e0bcd926f8aabc5caa1e76fce04aa8c5eb89 -rd47617a89c852ffc38d6a0c62eb18ea41ae27d29 --- sources/model/MTreatmentParametersResp.cpp (.../MTreatmentParametersResp.cpp) (revision f7b3e0bcd926f8aabc5caa1e76fce04aa8c5eb89) +++ sources/model/MTreatmentParametersResp.cpp (.../MTreatmentParametersResp.cpp) (revision d47617a89c852ffc38d6a0c62eb18ea41ae27d29) @@ -4,24 +4,24 @@ QVariantList MTreatmentParametersResponse::parameters() const { return { - _data.requestValid.value, - _data.bloodFlowRate.value, - _data.dialysateFlowRate.value, - _data.duration.value, - _data.heparinDispensingRate.value, - _data.heparinBolusVolume.value, - _data.heparinStopTime.value, - _data.salineBolus.value, - _data.acidConcentrate.value, - _data.bicarbonateConcentrate.value, - _data.dialyzerType.value, - _data.dialysateTemp.value, - _data.arterialPressureLimitLow.value, - _data.arterialPressureLimitHigh.value, - _data.venousPressureLimitLow.value, - _data.venousPressureLimitHigh.value, - _data.bloodPressureMeasureInterval.value, - _data.rinsebackFlowRate.value, + _data.requestValid .value, + _data.bloodFlowRate .value, + _data.dialysateFlowRate .value, + _data.duration .value, + _data.heparinStopTime .value, + _data.salineBolus .value, + _data.acidConcentrate .value, + _data.bicarbonateConcentrate .value, + _data.dialyzerType .value, + _data.bloodPressureMeasureInterval .value, + _data.rinsebackFlowRate .value, + _data.arterialPressureLimitLow .value, + _data.arterialPressureLimitHigh .value, + _data.venousPressureLimitLow .value, + _data.venousPressureLimitHigh .value, + _data.heparinDispensingRate .value, + _data.heparinBolusVolume .value, + _data.dialysateTemp .value }; } @@ -68,23 +68,23 @@ MTreatmentParametersResponse::Data MTreatmentParametersResponse::data() const { Data data; - data.requestValid = _data.requestValid.value; - data.bloodFlowRate = _data.bloodFlowRate.value; - data.dialysateFlowRate = _data.dialysateFlowRate.value; - data.duration = _data.duration.value; - data.heparinDispensingRate = _data.heparinDispensingRate.value; - data.heparinBolusVolume = _data.heparinBolusVolume.value; - data.heparinStopTime = _data.heparinStopTime.value; - data.salineBolus = _data.salineBolus.value; - data.acidConcentrate = _data.acidConcentrate.value; - data.bicarbonateConcentrate = _data.bicarbonateConcentrate.value; - data.dialyzerType = _data.dialyzerType.value; - data.dialysateTemp = _data.dialysateTemp.value; - data.arterialPressureLimitLow = _data.arterialPressureLimitLow.value; - data.arterialPressureLimitHigh = _data.arterialPressureLimitHigh.value; - data.venousPressureLimitLow = _data.venousPressureLimitLow.value; - data.venousPressureLimitHigh = _data.venousPressureLimitHigh.value; - data.bloodPressureMeasureInterval = _data.bloodPressureMeasureInterval.value; - data.rinsebackFlowRate = _data.rinsebackFlowRate.value; + data.requestValid = _data.requestValid .value; + data.bloodFlowRate = _data.bloodFlowRate .value; + data.dialysateFlowRate = _data.dialysateFlowRate .value; + data.duration = _data.duration .value; + data.heparinStopTime = _data.heparinStopTime .value; + data.salineBolus = _data.salineBolus .value; + data.acidConcentrate = _data.acidConcentrate .value; + data.bicarbonateConcentrate = _data.bicarbonateConcentrate .value; + data.dialyzerType = _data.dialyzerType .value; + data.bloodPressureMeasureInterval = _data.bloodPressureMeasureInterval .value; + data.rinsebackFlowRate = _data.rinsebackFlowRate .value; + data.arterialPressureLimitLow = _data.arterialPressureLimitLow .value; + data.arterialPressureLimitHigh = _data.arterialPressureLimitHigh .value; + data.venousPressureLimitLow = _data.venousPressureLimitLow .value; + data.venousPressureLimitHigh = _data.venousPressureLimitHigh .value; + data.heparinDispensingRate = _data.heparinDispensingRate .value; + data.heparinBolusVolume = _data.heparinBolusVolume .value; + data.dialysateTemp = _data.dialysateTemp .value; return data; } Index: sources/model/MTreatmentParametersResp.h =================================================================== diff -u -rf7b3e0bcd926f8aabc5caa1e76fce04aa8c5eb89 -rd47617a89c852ffc38d6a0c62eb18ea41ae27d29 --- sources/model/MTreatmentParametersResp.h (.../MTreatmentParametersResp.h) (revision f7b3e0bcd926f8aabc5caa1e76fce04aa8c5eb89) +++ sources/model/MTreatmentParametersResp.h (.../MTreatmentParametersResp.h) (revision d47617a89c852ffc38d6a0c62eb18ea41ae27d29) @@ -17,24 +17,24 @@ QVariantList parameters() const override; struct { - Types::U32 requestValid ; - Types::U32 bloodFlowRate ; - Types::U32 dialysateFlowRate ; - Types::U32 duration ; - Types::U32 heparinDispensingRate ; - Types::U32 heparinBolusVolume ; - Types::U32 heparinStopTime ; - Types::U32 salineBolus ; - Types::U32 acidConcentrate ; - Types::U32 bicarbonateConcentrate ; - Types::U32 dialyzerType ; - Types::U32 dialysateTemp ; - Types::U32 arterialPressureLimitLow ; - Types::U32 arterialPressureLimitHigh ; - Types::U32 venousPressureLimitLow ; - Types::U32 venousPressureLimitHigh ; - Types::U32 bloodPressureMeasureInterval ; - Types::U32 rinsebackFlowRate ; + Types::U32 requestValid ; + Types::U32 bloodFlowRate ; + Types::U32 dialysateFlowRate ; + Types::U32 duration ; + Types::U32 heparinStopTime ; + Types::U32 salineBolus ; + Types::U32 acidConcentrate ; + Types::U32 bicarbonateConcentrate ; + Types::U32 dialyzerType ; + Types::U32 bloodPressureMeasureInterval ; + Types::U32 rinsebackFlowRate ; + Types::U32 arterialPressureLimitLow ; + Types::U32 arterialPressureLimitHigh ; + Types::U32 venousPressureLimitLow ; + Types::U32 venousPressureLimitHigh ; + Types::U32 heparinDispensingRate ; + Types::U32 heparinBolusVolume ; + Types::U32 dialysateTemp ; } _data; public: @@ -44,24 +44,24 @@ QString infoText () const override { return QString("OpMode"); } struct Data { - quint32 requestValid = 0; - quint32 bloodFlowRate = 0; - quint32 dialysateFlowRate = 0; - quint32 duration = 0; - quint32 heparinDispensingRate = 0; - quint32 heparinBolusVolume = 0; - quint32 heparinStopTime = 0; - quint32 salineBolus = 0; - quint32 acidConcentrate = 0; - quint32 bicarbonateConcentrate = 0; - quint32 dialyzerType = 0; - quint32 dialysateTemp = 0; - quint32 arterialPressureLimitLow = 0; - quint32 arterialPressureLimitHigh = 0; - quint32 venousPressureLimitLow = 0; - quint32 venousPressureLimitHigh = 0; - quint32 bloodPressureMeasureInterval = 0; - quint32 rinsebackFlowRate = 0; + quint32 requestValid = 0; + quint32 bloodFlowRate = 0; + quint32 dialysateFlowRate = 0; + quint32 duration = 0; + quint32 heparinStopTime = 0; + quint32 salineBolus = 0; + quint32 acidConcentrate = 0; + quint32 bicarbonateConcentrate = 0; + quint32 dialyzerType = 0; + quint32 bloodPressureMeasureInterval = 0; + quint32 rinsebackFlowRate = 0; + quint32 arterialPressureLimitLow = 0; + quint32 arterialPressureLimitHigh = 0; + quint32 venousPressureLimitLow = 0; + quint32 venousPressureLimitHigh = 0; + quint32 heparinDispensingRate = 0; + quint32 heparinBolusVolume = 0; + quint32 dialysateTemp = 0; }; MTreatmentParametersResponse () {}