Index: denali.pro.user =================================================================== diff -u -rf7394a2cb3477d81896b9993308dd9654cd3e42e -re8afa846df4a66f2c5048416ec2763b0a138bc53 --- denali.pro.user (.../denali.pro.user) (revision f7394a2cb3477d81896b9993308dd9654cd3e42e) +++ denali.pro.user (.../denali.pro.user) (revision e8afa846df4a66f2c5048416ec2763b0a138bc53) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c -re8afa846df4a66f2c5048416ec2763b0a138bc53 --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision e8afa846df4a66f2c5048416ec2763b0a138bc53) @@ -25,87 +25,97 @@ * \brief Slider component with a title and the currently selected value */ Rectangle { id: _root - // TODO: This Component needs a cleanup - property alias text: _text.text - property var units: "" - property alias min: _slider.minimum - property alias max: _slider.maximum - property alias value: _slider.value - property alias diameter: _slider.diameter - property alias selectedValue: _selected_value - property alias step: _slider.step - property alias stepSnap: _slider.stepSnap - property alias sliderWidth: _slider.width - property alias isActive: _slider.isActive + property Flickable flickable: null - signal pressed() + property alias label : _label.text + property alias minimum : _slider.minimum + property alias maximum : _slider.maximum + property alias value : _slider.value + property alias step : _slider.step + + property string zeroLabel : qsTr("OFF") + + property string unit : "" + property bool active : false + property bool valid : true + + signal pressed () signal released() - height: Variables.createTreatmentSliderHeight - width: Variables.createTreatmentSliderWidth + height : Variables.createTreatmentSliderHeight + width : Variables.createTreatmentSliderWidth + color : "transparent" + anchors.horizontalCenter: parent.horizontalCenter - color: "transparent" - function setValid(valid) { - if (valid) { - _selected_value.color = Colors.textMain - _text.color = Colors.textMain - } else { - _selected_value.color = Colors.createTreatmentInvalidParam - _text.color = Colors.createTreatmentInvalidParam + function setColor() { + let color = Colors.textDisableButton + if ( _root.active ) { + if ( _root.valid ) { + color = Colors.textMain + } + else { + color = Colors.createTreatmentInvalidParam + } } + return color } - Text { - id: _text - text: "" - anchors.top: parent.top - anchors.left: parent.left - font.pixelSize: Fonts.fontPixelFluidText - color: Colors.textMain + function setValue() { + let value = "__" + let unit = " " + _root.unit + if ( _root.active ) { + if ( _slider.value ) { + value = _slider.value + } + else { + if ( zeroLabel ) { + return _root.zeroLabel + } + } + } + return value + unit + } + function setInteractive( vInteractive ) { + if ( _root.flickable ) _root.flickable.interactive = false } - Text { id: _selected_value - objectName: _root.objectName + "Value" - anchors.top: parent.top - anchors.right: parent.right - text: qsTr("__") + " " + _root.units - font.pixelSize: Fonts.fontPixelFluidUnit - color: Colors.textDisableButton + Text { id: _label + text : "" + anchors.top : parent.top + anchors.left : parent.left + font.pixelSize : Fonts.fontPixelFluidText + color : _root.setColor() } + Text { id: _value + objectName : _root.objectName + "Value" + text : _root.setValue() + anchors.top : parent.top + anchors.right : parent.right + font.pixelSize : Fonts.fontPixelFluidUnit + color : _root.setColor() + } + Slider { id : _slider - objectName: _root.objectName + "Slider" + objectName : _root.objectName + "Slider" anchors.horizontalCenter: parent.horizontalCenter anchors.bottom : parent.bottom - width : Variables.createTreatmentSliderWidth - diameter : Variables.sliderCircleDiameter - color : Colors.createTreatmentInactive - handlerColor: Colors.createTreatmentInactive - touchMargin : Variables.createTreatmentSliderMargin - height : 5 - isActive : false - ticks : true - onValueChanged: { - if (isActive) - _selected_value.text = value + " " + _root.units - } - onActiveChanged: { - if (isActive) { - _selected_value.text = value + " " + _root.units - _selected_value.color = Colors.textMain - _text.color = Colors.textMain - } else { - _selected_value.color = Colors.textDisableButton - _text.color = Colors.textDisableButton - } - } - onProgressRectClicked : { setActive (true); setValid(true); } - onProgressRectDragged : { setActive (true); setValid(true); } - onPressed : { _root.pressed ( ); } - onReleased : { _root.released ( ); } - onDragged : { setActive (true); setValid(true); } - onClicked : { setActive (true); setValid(true); } + width : Variables.createTreatmentSliderWidth + diameter : Variables.sliderCircleDiameter + touchMargin : Variables.createTreatmentSliderMargin + color : Colors.createTreatmentInactive + handlerColor : Colors.createTreatmentInactive + height : Variables.progressbarFluidHeight + isActive : _root.active + ticks : true + onPressed : { setInteractive(false) ; _root.pressed () } + onReleased : { setInteractive(true ) ; _root.released() } + + onDragged : { _root.active = _root.valid = true } + onClicked : { _root.active = _root.valid = true } + onProgressRectClicked : { _root.active = _root.valid = true } + onProgressRectDragged : { _root.active = _root.valid = true } } } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c -re8afa846df4a66f2c5048416ec2763b0a138bc53 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision e8afa846df4a66f2c5048416ec2763b0a138bc53) @@ -71,31 +71,32 @@ } SliderCreateTreatment { id: _bloodFlowRate - objectName: "_bloodFlowRate" - value : vTreatmentCreate.bloodFlowRate - min : vTreatmentCreate.bloodFlowRateMin - max : vTreatmentCreate.bloodFlowRateMax - step : vTreatmentCreate.bloodFlowRateRes - text : qsTr("Blood Flow Rate") - units : Variables.unitTextFlowRate - onPressed: { - setInteractive(false) + objectName : "_bloodFlowRate" + flickable : _flickable + value : vTreatmentCreate.bloodFlowRate + minimum : vTreatmentCreate.bloodFlowRateMin + maximum : vTreatmentCreate.bloodFlowRateMax + step : vTreatmentCreate.bloodFlowRateRes + label : qsTr("Blood Flow Rate") + unit : Variables.unitTextFlowRate + onPressed : { + //setInteractive(false) vTreatmentCreate.bloodFlowRate = value } onReleased: { vTreatmentCreate.bloodFlowRate = value - setInteractive(true) + //setInteractive(true) } } SliderCreateTreatment { id: _dialysateFlowRate objectName: "_dialysateFlowRate" value : vTreatmentCreate.dialysateFlowRate - min : vTreatmentCreate.dialysateFlowRateMin - max : vTreatmentCreate.dialysateFlowRateMax + minimum : vTreatmentCreate.dialysateFlowRateMin + maximum : vTreatmentCreate.dialysateFlowRateMax step : vTreatmentCreate.dialysateFlowRateRes - text : qsTr("Dialysate Flow Rate") - units : Variables.unitTextFlowRate + label : qsTr("Dialysate Flow Rate") + unit : Variables.unitTextFlowRate onPressed: { setInteractive(false) vTreatmentCreate.dialysateFlowRate = value @@ -109,11 +110,11 @@ SliderCreateTreatment { id: _duration objectName: "_duration" value : vTreatmentCreate.duration - min : vTreatmentCreate.durationMin - max : vTreatmentCreate.durationMax + minimum : vTreatmentCreate.durationMin + maximum : vTreatmentCreate.durationMax step : vTreatmentCreate.durationRes - text : qsTr("Duration") - units : Variables.unitTextDuration + label : qsTr("Duration") + unit : Variables.unitTextDuration onPressed: { setInteractive(false) vTreatmentCreate.duration = value @@ -127,11 +128,11 @@ SliderCreateTreatment { id: _heparinDispensingRate objectName: "_heparinDispensingRate" value : vTreatmentCreate.heparinDispensingRate - min : vTreatmentCreate.heparinDispensingRateMin - max : vTreatmentCreate.heparinDispensingRateMax + minimum : vTreatmentCreate.heparinDispensingRateMin + maximum : vTreatmentCreate.heparinDispensingRateMax step : vTreatmentCreate.heparinDispensingRateRes - text : qsTr("Heparin Dispensing Rate") - units : Variables.unitTextDispencingRate + label : qsTr("Heparin Dispensing Rate") + unit : Variables.unitTextDispencingRate onPressed: { setInteractive(false) vTreatmentCreate.heparinDispensingRate = value @@ -145,11 +146,11 @@ SliderCreateTreatment { id: _heparinBolusVolume objectName: "_heparinBolusVolume" value : vTreatmentCreate.heparinBolusVolume - min : vTreatmentCreate.heparinBolusVolumeMin - max : vTreatmentCreate.heparinBolusVolumeMax + minimum : vTreatmentCreate.heparinBolusVolumeMin + maximum : vTreatmentCreate.heparinBolusVolumeMax step : vTreatmentCreate.heparinBolusVolumeRes - text : qsTr("Heparin Bolus Volume") - units : Variables.unitTextFluid + label : qsTr("Heparin Bolus Volume") + unit : Variables.unitTextFluid onPressed: { setInteractive(false) vTreatmentCreate.heparinBolusVolume = value @@ -163,11 +164,11 @@ SliderCreateTreatment { id: _heparinStopTime objectName: "_heparinStopTime" value : vTreatmentCreate.heparinStopTime - min : vTreatmentCreate.heparinStopTimeMin - max : vTreatmentCreate.heparinStopTimeMax + minimum : vTreatmentCreate.heparinStopTimeMin + maximum : vTreatmentCreate.heparinStopTimeMax step : vTreatmentCreate.heparinStopTimeRes - text : qsTr("Heparin Stop Time") - units : Variables.unitTextDuration + label : qsTr("Heparin Stop Time") + unit : Variables.unitTextDuration onPressed: { setInteractive(false) vTreatmentCreate.heparinStopTime = value @@ -181,11 +182,11 @@ SliderCreateTreatment { id: _salineBolus objectName: "_salineBolus" value : vTreatmentCreate.salineBolusVolume - min : vTreatmentCreate.salineBolusVolumeMin - max : vTreatmentCreate.salineBolusVolumeMax + minimum : vTreatmentCreate.salineBolusVolumeMin + maximum : vTreatmentCreate.salineBolusVolumeMax step : vTreatmentCreate.salineBolusVolumeRes - text : "Saline Bolus" - units : Variables.unitTextFluid + label : "Saline Bolus" + unit : Variables.unitTextFluid onPressed: { setInteractive(false) vTreatmentCreate.salineBolusVolume = value @@ -248,11 +249,11 @@ SliderCreateTreatment { id: _dialysateTemperature objectName: "_dialysateTemperature" value : vTreatmentCreate.dialysateTemp - min : vTreatmentCreate.dialysateTempMin - max : vTreatmentCreate.dialysateTempMax + minimum : vTreatmentCreate.dialysateTempMin + maximum : vTreatmentCreate.dialysateTempMax step : vTreatmentCreate.dialysateTempRes - text : qsTr("Dialysate Temperature") - units : Variables.unitTextTemperature + label : qsTr("Dialysate Temperature") + unit : Variables.unitTextTemperature onPressed: { setInteractive(false) vTreatmentCreate.dialysateTemp = value @@ -398,12 +399,11 @@ SliderCreateTreatment { id: _bloodPressureMeasurementInterval objectName: "_bloodPressureMeasurementInterval" value : vTreatmentCreate.bloodPressureMeasureInterval - min : vTreatmentCreate.bloodPressureMeasureIntervalMin - max : vTreatmentCreate.bloodPressureMeasureIntervalMax + minimum : vTreatmentCreate.bloodPressureMeasureIntervalMin + maximum : vTreatmentCreate.bloodPressureMeasureIntervalMax step : vTreatmentCreate.bloodPressureMeasureIntervalRes - text : qsTr("Blood Pressure Measurement Interval") - units : Variables.unitTextDuration - stepSnap: true + label : qsTr("Blood Pressure Measurement Interval") + unit : Variables.unitTextDuration onPressed: { setInteractive(false) vTreatmentCreate.bloodPressureMeasureInterval = value @@ -417,12 +417,11 @@ SliderCreateTreatment { id: _rinsebackFlowRate objectName: "_rinsebackFlowRate" value : vTreatmentCreate.rinsebackFlowRate - min : vTreatmentCreate.rinsebackFlowRateMin - max : vTreatmentCreate.rinsebackFlowRateMax + minimum : vTreatmentCreate.rinsebackFlowRateMin + maximum : vTreatmentCreate.rinsebackFlowRateMax step : vTreatmentCreate.rinsebackFlowRateRes - text : qsTr("Rinseback Flow Rate") - units : Variables.unitTextFlowRate - stepSnap: true + label : qsTr("Rinseback Flow Rate") + unit : Variables.unitTextFlowRate onPressed: { setInteractive(false) vTreatmentCreate.rinsebackFlowRate = value @@ -441,22 +440,22 @@ Connections { target: vTreatmentCreate onResetCreateTreatment: { - _bloodFlowRate.isActive = false - _dialysateFlowRate.isActive = false - _duration.isActive = false - _heparinDispensingRate.isActive = false + _bloodFlowRate.active = false + _dialysateFlowRate.active = false + _duration.active = false + _heparinDispensingRate.active = false - _heparinBolusVolume.isActive = false - _heparinStopTime.isActive = false + _heparinBolusVolume.active = false + _heparinStopTime.active = false - _salineBolus.isActive = false + _salineBolus.active = false _acidConcentrate.setActive(false) _bicarbonateConcentrate.setActive(false) _dialyzerType.setActive(false) - _dialysateTemperature.isActive = false - _bloodPressureMeasurementInterval.isActive = false - _rinsebackFlowRate.isActive = false + _dialysateTemperature.active = false + _bloodPressureMeasurementInterval.active = false + _rinsebackFlowRate.active = false // TODO : Will be addressed in sub-task DEN-6686. // _arterialPressureLimits.isLowActive = false