Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r73091a6f5717c0fc88e236c06c618ad361f30a3c -r4e035c96c971fb8ec19fb030d9120046697b6e71 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 4e035c96c971fb8ec19fb030d9120046697b6e71) @@ -1,15 +1,15 @@ /*! * - * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2022 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 PreTreatmentCreate.qml * \author (last) Behrouz NematiPour - * \date (last) 01-Mar-2021 + * \date (last) 01-Feb-2022 * \author (original) Behrouz NematiPour - * \date (original) 27-Jan-2020 + * \date (original) 12-Jan-2021 * */ @@ -28,276 +28,237 @@ * \details which contains the components to let user set values of the treatment parameters. */ PreTreatmentBase { id: _root - objectName: "_PreTreatmentCreate"; // SquishQt testability + objectName: "_PreTreatmentCreate" // SquishQt testability - signal continueClicked() + header.confirmEnabled: vTreatmentCreate.continueEnabled - function setInteractive(isInteractive) { - _flickable.interactive = isInteractive + function setInteractive(vInteractive) { + _flickable.interactive = vInteractive } - header.stepName : Variables.preTreatmentStepLabelCreate + ScrollBar { + flickable : _flickable + anchors.fill: _flickable + anchors.rightMargin : Variables.minVGap + } Flickable { id: _flickable objectName: "TreatmentCreateFlickable" + clip: true anchors { - top : parent.top - topMargin : header.height - bottom : parent.bottom - bottomMargin : 75 + top : _root.title.bottom + topMargin : Variables.minVGap + bottom : _root.bottom + bottomMargin : Variables.notificationHeight + Variables.minVGap horizontalCenter: parent.horizontalCenter } width: parent.width contentWidth: parent.width contentHeight: _column.implicitHeight - clip: true flickDeceleration: Variables.createTreatmentFlickableDeceleration - ScrollBar.vertical: ScrollBar { id: _scrollBar - anchors.right: _flickable.right - anchors.rightMargin: 3 - contentItem: Rectangle { - color: Colors.backgroundRangeRect - implicitWidth: 6 - radius: width / 2 - width: 3 - } - } - Column { id: _column spacing: Variables.treatmentSpacing - anchors.horizontalCenter: parent.horizontalCenter; - anchors.fill: parent; + anchors.horizontalCenter: parent.horizontalCenter + anchors.fill: parent - Text { id: _titleText - anchors.horizontalCenter: parent.horizontalCenter; - text: qsTr("Create a Custom Treatment") - color: Colors.textMain - font.pixelSize: Fonts.fontPixelTitle - } - Text { id: _titleTextPrescription - anchors.horizontalCenter: parent.horizontalCenter; - text: qsTr("PRESCRIPTION"); - color: Colors.textMain; + anchors.horizontalCenter: parent.horizontalCenter + text: qsTr("PRESCRIPTION") + color: Colors.textMain font.pixelSize: Fonts.fontPixelButton font.bold: true } SliderCreateTreatment { id: _bloodFlowRate - objectName: "_bloodFlowRate" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.bloodFlowRateMin - max: vTreatmentCreate.bloodFlowRateMax - step: vTreatmentCreate.bloodFlowRateRes - text: qsTr("Blood Flow Rate") - units: qsTr("mL/min") - onPressed: { - setInteractive(false) - vTreatmentCreate.bloodFlowRate = value - } - onReleased: { - vTreatmentCreate.bloodFlowRate = value - setInteractive(true) - } + objectName : "_bloodFlowRate" + label : qsTr("Blood Flow Rate") + flickable : _flickable + unit : Variables.unitTextFlowRate + value : vTreatmentCreate.bloodFlowRate + minimum : vTreatmentCreate.bloodFlowRateMin + maximum : vTreatmentCreate.bloodFlowRateMax + step : vTreatmentCreate.bloodFlowRateRes + onPressed : vTreatmentCreate.bloodFlowRate = value + onReleased : vTreatmentCreate.bloodFlowRate = value } SliderCreateTreatment { id: _dialysateFlowRate - objectName: "_dialysateFlowRate" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.dialysateFlowRateMin - max: vTreatmentCreate.dialysateFlowRateMax - step: vTreatmentCreate.dialysateFlowRateRes - text: qsTr("Dialysate Flow Rate") - units: qsTr("mL/min") - onPressed: { - setInteractive(false) - vTreatmentCreate.dialysateFlowRate = value; - } - onReleased: { - vTreatmentCreate.dialysateFlowRate = value; - setInteractive(true) - } + objectName : "_dialysateFlowRate" + label : qsTr("Dialysate Flow Rate") + flickable : _flickable + unit : Variables.unitTextFlowRate + value : vTreatmentCreate.dialysateFlowRate + minimum : vTreatmentCreate.dialysateFlowRateMin + maximum : vTreatmentCreate.dialysateFlowRateMax + step : vTreatmentCreate.dialysateFlowRateRes + onPressed : vTreatmentCreate.dialysateFlowRate = value + onReleased : vTreatmentCreate.dialysateFlowRate = value } SliderCreateTreatment { id: _duration - objectName: "_duration" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.durationMin - max: vTreatmentCreate.durationMax - step: vTreatmentCreate.durationRes - text: qsTr("Duration") - units: qsTr("min") - onPressed: { - setInteractive(false) - vTreatmentCreate.duration = value; - } - onReleased: { - vTreatmentCreate.duration = value; - setInteractive(true) - } + objectName : "_duration" + label : qsTr("Duration") + flickable : _flickable + unit : Variables.unitTextDuration + value : vTreatmentCreate.duration + minimum : vTreatmentCreate.durationMin + maximum : vTreatmentCreate.durationMax + step : vTreatmentCreate.durationRes + onPressed : vTreatmentCreate.duration = value + onReleased : vTreatmentCreate.duration = value } SliderCreateTreatment { id: _heparinDispensingRate - objectName: "_heparinDispensingRate" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.heparinDispensingRateMin - max: vTreatmentCreate.heparinDispensingRateMax - step: vTreatmentCreate.heparinDispensingRateRes - text: qsTr("Heparin Dispensing Rate") - units: qsTr("mL/hr") - onPressed: { - setInteractive(false) - vTreatmentCreate.heparinDispensingRate = value - } - onReleased: { - vTreatmentCreate.heparinDispensingRate = value - setInteractive(true) - } + objectName : "_heparinDispensingRate" + label : qsTr("Heparin Dispensing Rate") + flickable : _flickable + unit : Variables.unitTextDispensingRate + value : vTreatmentCreate.heparinDispensingRate + decimal : Variables.heparinPrecision + minimum : vTreatmentCreate.heparinDispensingRateMin + maximum : vTreatmentCreate.heparinDispensingRateMax + step : vTreatmentCreate.heparinDispensingRateRes + onPressed : vTreatmentCreate.heparinDispensingRate = value + onReleased : vTreatmentCreate.heparinDispensingRate = value } SliderCreateTreatment { id: _heparinBolusVolume - objectName: "_heparinBolusVolume" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.heparinBolusVolumeMin - max: vTreatmentCreate.heparinBolusVolumeMax - step: vTreatmentCreate.heparinBolusVolumeRes - - text: qsTr("Heparin Bolus Volume") - units: qsTr("mL") - onPressed: { - setInteractive(false) - vTreatmentCreate.heparinBolusVolume = value - } - onReleased: { - vTreatmentCreate.heparinBolusVolume = value - setInteractive(true) - } + objectName : "_heparinBolusVolume" + label : qsTr("Heparin Bolus Volume") + flickable : _flickable + unit : Variables.unitTextFluid + value : vTreatmentCreate.heparinBolusVolume + decimal : Variables.heparinPrecision + minimum : vTreatmentCreate.heparinBolusVolumeMin + maximum : vTreatmentCreate.heparinBolusVolumeMax + step : vTreatmentCreate.heparinBolusVolumeRes + onPressed : vTreatmentCreate.heparinBolusVolume = value + onReleased : vTreatmentCreate.heparinBolusVolume = value } SliderCreateTreatment { id: _heparinStopTime - objectName: "_heparinStopTime" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.heparinStopTimeMin - max: vTreatmentCreate.heparinStopTimeMax - step: vTreatmentCreate.heparinStopTimeRes - text: qsTr("Heparin Stop Time") - units: qsTr("min") - onPressed: { - setInteractive(false) - vTreatmentCreate.heparinStopTime = value - } - onReleased: { - vTreatmentCreate.heparinStopTime = value - setInteractive(true) - } + objectName : "_heparinStopTime" + label : qsTr("Heparin Stop Time") + flickable : _flickable + unit : Variables.unitTextDuration + value : vTreatmentCreate.heparinStopTime + minimum : vTreatmentCreate.heparinStopTimeMin + maximum : vTreatmentCreate.heparinStopTimeMax + step : vTreatmentCreate.heparinStopTimeRes + onPressed : vTreatmentCreate.heparinStopTime = value + onReleased : vTreatmentCreate.heparinStopTime = value } - SliderCreateTreatment { - id: _salineBolus - objectName: "_salineBolus" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - text: "Saline Bolus" - units: qsTr("mL") - min: vTreatmentCreate.salineBolusVolumeMin - max: vTreatmentCreate.salineBolusVolumeMax - step: vTreatmentCreate.salineBolusVolumeRes - onPressed: { - setInteractive(false) - vTreatmentCreate.salineBolusVolume = value - } - onReleased: { - vTreatmentCreate.salineBolusVolume = value - setInteractive(true) - } + SliderCreateTreatment { id: _salineBolus + objectName : "_salineBolus" + label : "Saline Bolus" + flickable : _flickable + unit : Variables.unitTextFluid + value : vTreatmentCreate.salineBolusVolume + minimum : vTreatmentCreate.salineBolusVolumeMin + maximum : vTreatmentCreate.salineBolusVolumeMax + step : vTreatmentCreate.salineBolusVolumeRes + onPressed : vTreatmentCreate.salineBolusVolume = value + onReleased : vTreatmentCreate.salineBolusVolume = value } Text { id: _titleTextOperation - anchors.horizontalCenter: parent.horizontalCenter; - text: qsTr("OPERATING PARAMETERS"); - color: Colors.textMain; + anchors.horizontalCenter: parent.horizontalCenter + text : qsTr("OPERATING PARAMETERS") + color : Colors.textMain font.pixelSize: Fonts.fontPixelButton - font.bold: true + font.bold : true } - GridSelection { - id: _acidConcentrate - objectName: "_acidConcentrateRect" - name: qsTr("Acid Concentrate") - buttonNames: vTreatmentCreate.acidConcentrateOptions - onButtonClicked: { - vTreatmentCreate.acidConcentrate = selectedIndex - } + GridSelection { id : _heparinType + objectName : "_heparinTypeRect" + title : qsTr("Heparin Type") + rowCount : 1 + labels : vTreatmentCreate.heparinTypeOptions + onClicked : vTreatmentCreate.heparinType = curIndex } + GridSelection { id : _acidConcentrate + objectName : "_acidConcentrateRect" + title : qsTr("Acid Concentrate") + labels : vTreatmentCreate.acidConcentrateOptions + onClicked : vTreatmentCreate.acidConcentrate = curIndex + } + GridSelection { id: _bicarbonateConcentrate - objectName: "_bicarbonateConcentrateRect" - name: qsTr("Bicarbonate Concentrate") - numRows: 1 - numCols: 2 - buttonNames: vTreatmentCreate.bicarbonateConcentrateOptions; - onButtonClicked: { - vTreatmentCreate.bicarbonateConcentrate = selectedIndex; - } + objectName : "_bicarbonateConcentrateRect" + title : qsTr("Bicarbonate Concentrate") + rowCount : 1 + colCount : 2 + labels : vTreatmentCreate.bicarbonateConcentrateOptions + onClicked : vTreatmentCreate.bicarbonateConcentrate = curIndex } GridSelection { id: _dialyzerType - objectName: "_dialyzerTypeRect" - name: qsTr("Dialyzer Type") - numRows: 3 - numCols: 2 - buttonNames: vTreatmentCreate.dialyzerTypeOptions; - onButtonClicked: { - vTreatmentCreate.dialyzerType = selectedIndex; - } + objectName : "_dialyzerTypeRect" + title : qsTr("Dialyzer Type") + rowCount : 3 + colCount : 2 + labels : vTreatmentCreate.dialyzerTypeOptions + onClicked : vTreatmentCreate.dialyzerType = curIndex } SliderCreateTreatment { id: _dialysateTemperature - objectName: "_dialysateTemperature" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - min: vTreatmentCreate.dialysateTempMin - max: vTreatmentCreate.dialysateTempMax - step: vTreatmentCreate.dialysateTempRes - text: qsTr("Dialysate Temperature") - units: qsTr("C") - onPressed: { - setInteractive(false) - vTreatmentCreate.dialysateTemp = value - } - onReleased: { - vTreatmentCreate.dialysateTemp = value - setInteractive(true) - } + objectName : "_dialysateTemperature" + label : qsTr("Dialysate Temperature") + flickable : _flickable + unit : Variables.unitTextTemperature + value : vTreatmentCreate.dialysateTemp + minimum : vTreatmentCreate.dialysateTempMin + maximum : vTreatmentCreate.dialysateTempMax + step : vTreatmentCreate.dialysateTempRes + onPressed : vTreatmentCreate.dialysateTemp = value + onReleased : vTreatmentCreate.dialysateTemp = value } + // TODO : This has to be a Component Column { id: _arterialColumn spacing: 45 anchors.horizontalCenter: parent.horizontalCenter - Text { id: _arterialLabel - visible : true - color : "white" - text: qsTr("Arterial Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")" - font.pixelSize : Fonts.fontPixelFluidText - anchors.left : _arterialPressureLimits.left + Row { id: _arterialTitleRow + function setColor() { + let slider = _arterialPressureLimits + let color = Colors.textDisableButton + if ( slider.minAdjusted && slider.maxAdjusted ) { + color = Colors.textMain + } + return color + } + width : parent.width + height : _arterialLabel.height + anchors.left: parent.left + Text { id: _arterialLabel + visible : true + width : parent.width/2 + color : _arterialTitleRow.setColor() + text : qsTr("Arterial Pressure Limits") + font.pixelSize : Fonts.fontPixelFluidText + } + Text { id: _arterialUnit + visible : true + width : parent.width/2 + color : _arterialLabel.color + text : Variables.unitTextBloodPressure + font.pixelSize : Fonts.fontPixelFluidText + horizontalAlignment: Text.AlignRight + } } RangeSlider { id: _arterialPressureLimits - objectName: "_arterialPressureLimitsSlider" + objectName : "_arterialPressureLimitsSlider" // dimension - height : 5 - width : Variables.createTreatmentSliderWidth - diameter : Variables.sliderCircleDiameter + height : Variables.progressbarFluidHeight + width : Variables.createTreatmentSliderWidth + diameter : Variables.sliderCircleDiameter anchors.horizontalCenter: parent.horizontalCenter - ticks : true - stepSnap : true - hasAdjusted : true + ticks : true + stepSnap : true + hasAdjust : true // Texts lowerText.visible : true @@ -313,12 +274,10 @@ upperTextHorizontalCenter : true minText.visible : true - // minText.font.pixelSize : Fonts.fontPixelFluidText minText.font.bold : false minVerticalEdgeVisible : false maxText.visible : true - // maxText.font.pixelSize : Fonts.fontPixelFluidText maxText.font.bold : false maxVerticalEdgeVisible : false @@ -334,34 +293,58 @@ maxValueLowerBound : vTreatmentCreate.arterialPressureLimitHighMin maxValueUpperBound : vTreatmentCreate.arterialPressureLimitHighMax // scroll handling and value updates - onPressed : { setInteractive(false) } - onDragged : { setInteractive(false) } - onReleased: { setInteractive(true ) } - onMinValueChanged: if (minAdjusted) vTreatmentCreate.arterialPressureLimitLow = minValue - onMaxValueChanged: if (maxAdjusted) vTreatmentCreate.arterialPressureLimitHigh = maxValue + onPressed : { setInteractive(false) } + onDragged : { setInteractive(false) } + onReleased : { setInteractive(true ) } + onMinValueChanged : { if ( minAdjusted ) vTreatmentCreate.arterialPressureLimitLow = minValue } + onMaxValueChanged : { if ( maxAdjusted ) vTreatmentCreate.arterialPressureLimitHigh = maxValue } + onClicked : { if ( minAdjusted ) vTreatmentCreate.arterialPressureLimitLow = minValue + if ( maxAdjusted ) vTreatmentCreate.arterialPressureLimitHigh = maxValue } } } + // TODO : This has to be a Component Column { id: _venousColumn spacing: 45 anchors.horizontalCenter: parent.horizontalCenter - Text { id: _venousLabel - visible : true - color : "white" - text: qsTr("Venous Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")" - font.pixelSize : Fonts.fontPixelFluidText - anchors.left : _venousPressureLimits.left + Row { id: _venousTitleRow + function setColor() { + let slider = _venousPressureLimits + let color = Colors.textDisableButton + if ( slider.minAdjusted && slider.maxAdjusted ) { + color = Colors.textMain + } + return color + } + width : parent.width + height : _venousLabel.height + anchors.left: parent.left + Text { id: _venousLabel + visible : true + width : parent.width/2 + color : _venousTitleRow.setColor() + text : qsTr("Venous Pressure Limits") + font.pixelSize : Fonts.fontPixelFluidText + } + Text { id: _venousUnit + visible : true + width : parent.width/2 + color : _venousTitleRow.setColor() + text : Variables.unitTextBloodPressure + font.pixelSize : Fonts.fontPixelFluidText + horizontalAlignment: Text.AlignRight + } } RangeSlider { id: _venousPressureLimits objectName: "_venousPressureLimitsSlider" // dimension - height : 5 - width : Variables.createTreatmentSliderWidth - diameter : Variables.sliderCircleDiameter + height : Variables.progressbarFluidHeight + width : Variables.createTreatmentSliderWidth + diameter : Variables.sliderCircleDiameter anchors.horizontalCenter: parent.horizontalCenter - ticks : true - stepSnap : true - hasAdjusted : true + ticks : true + stepSnap : true + hasAdjust : true // Texts lowerText.visible : true @@ -377,12 +360,10 @@ upperTextHorizontalCenter : true minText.visible : true - // minText.font.pixelSize : Fonts.fontPixelFluidText minText.font.bold : false minVerticalEdgeVisible : false maxText.visible : true - // maxText.font.pixelSize : Fonts.fontPixelFluidText maxText.font.bold : false maxVerticalEdgeVisible : false @@ -398,134 +379,91 @@ maxValueLowerBound : vTreatmentCreate.venousPressureLimitHighMin maxValueUpperBound : vTreatmentCreate.venousPressureLimitHighMax // scroll handling and value updates - onPressed : { setInteractive(false) } - onDragged : { setInteractive(false) } - onReleased: { setInteractive(true ) } - onMinValueChanged: if (minAdjusted) vTreatmentCreate.venousPressureLimitLow = minValue - onMaxValueChanged: if (maxAdjusted) vTreatmentCreate.venousPressureLimitHigh = maxValue + onPressed : { setInteractive(false) } + onDragged : { setInteractive(false) } + onReleased : { setInteractive(true ) } + onMinValueChanged : { if ( minAdjusted ) vTreatmentCreate.venousPressureLimitLow = minValue } + onMaxValueChanged : { if ( maxAdjusted ) vTreatmentCreate.venousPressureLimitHigh = maxValue } + onClicked : { if ( minAdjusted ) vTreatmentCreate.venousPressureLimitLow = minValue + if ( maxAdjusted ) vTreatmentCreate.venousPressureLimitHigh = maxValue } } } - SliderCreateTreatment { id: _bloodPressureMeasurementInterval - objectName: "_bloodPressureMeasurementInterval" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - text: qsTr("Blood Pressure Measurement Interval") - units: Variables.unitTextBPMeasurementInterval - min: vTreatmentCreate.bloodPressureMeasureIntervalMin - max: vTreatmentCreate.bloodPressureMeasureIntervalMax - step: vTreatmentCreate.bloodPressureMeasureIntervalRes - stepSnap: true - onPressed: { - setInteractive(false) - vTreatmentCreate.bloodPressureMeasureInterval = value - } - onReleased: { - vTreatmentCreate.bloodPressureMeasureInterval = value - setInteractive(true) - } + SliderCreateTreatment { id: _bloodPressureInterval + objectName : "_bloodPressureMeasurementInterval" + label : qsTr("Blood Pressure Measurement Interval") + flickable : _flickable + unit : Variables.unitTextDuration + value : vTreatmentCreate.bloodPressureMeasureInterval + minimum : vTreatmentCreate.bloodPressureMeasureIntervalMin + maximum : vTreatmentCreate.bloodPressureMeasureIntervalMax + step : vTreatmentCreate.bloodPressureMeasureIntervalRes + onPressed : vTreatmentCreate.bloodPressureMeasureInterval = value + onReleased : vTreatmentCreate.bloodPressureMeasureInterval = value } SliderCreateTreatment { id: _rinsebackFlowRate - objectName: "_rinsebackFlowRate" - sliderObjectName: objectName + "Slider" - selectedValueObjectName: objectName + "Value" - text: qsTr("Rinseback Flow Rate") - units: Variables.unitTextFlowRate - min: vTreatmentCreate.rinsebackFlowRateMin - max: vTreatmentCreate.rinsebackFlowRateMax - step: vTreatmentCreate.rinsebackFlowRateRes - stepSnap: true - onPressed: { - setInteractive(false) - vTreatmentCreate.rinsebackFlowRate = value - } - onReleased: { - vTreatmentCreate.rinsebackFlowRate = value - setInteractive(true) - } + objectName : "_rinsebackFlowRate" + label : qsTr("Rinseback Flow Rate") + flickable : _flickable + unit : Variables.unitTextFlowRate + value : vTreatmentCreate.rinsebackFlowRate + minimum : vTreatmentCreate.rinsebackFlowRateMin + maximum : vTreatmentCreate.rinsebackFlowRateMax + step : vTreatmentCreate.rinsebackFlowRateRes + onPressed : vTreatmentCreate.rinsebackFlowRate = value + onReleased : vTreatmentCreate.rinsebackFlowRate = value } - - TouchRect { id : _continueRect - objectName: "_continueButton" - anchors.horizontalCenter: parent.horizontalCenter - text.text: qsTr("CONTINUE") - backgroundColor: Colors.createTreatmentNotReady - borderColor: Colors.createTreatmentNotReady - textColor: Colors.createTreatmentTextNotReady - onClicked: { - vTreatmentCreate.saveTreatmentProfile = false; - if (vTreatmentCreate.continueEnabled) { - _root.continueClicked() - } - } - - function toggleEnabled(enabled) { - if (enabled) { - backgroundColor = Colors.createTreatmentActive - borderColor = Colors.createTreatmentActive - textColor = Colors.createTreatmentTextReady - } else { - backgroundColor = Colors.createTreatmentNotReady - borderColor = Colors.createTreatmentNotReady - textColor = Colors.createTreatmentTextNotReady - } - } + Item { + width : 50 + height : 50 } } } Connections { target: vTreatmentCreate - onContinueEnabledChanged: { - if (vTreatmentCreate.continueEnabled) { - _continueRect.toggleEnabled(true) - } else { - _continueRect.toggleEnabled(false) - } - } - 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; - _acidConcentrate.setActive(false); - _bicarbonateConcentrate.setActive(false); - _dialyzerType.setActive(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 + _bloodPressureInterval .active = false + _rinsebackFlowRate .active = false // TODO : Will be addressed in sub-task DEN-6686. - // _arterialPressureLimits.isLowActive = false; - // _arterialPressureLimits.isHighActive = false; - // _venousPressureLimits.isLowActive = false; - // _venousPressureLimits.isHighActive = false; + // _arterialPressureLimits.isLowActive = false + // _arterialPressureLimits.isHighActive = false + // _venousPressureLimits.isLowActive = false + // _venousPressureLimits.isHighActive = false } onFwValidationSuccess: { - _bloodFlowRate .setValid (true) - _dialysateFlowRate .setValid (true) - _duration .setValid (true) - _heparinDispensingRate .setValid (true) + _bloodFlowRate .valid = true + _dialysateFlowRate .valid = true + _duration .valid = true + _heparinDispensingRate .valid = true - _heparinBolusVolume .setValid (true) - _heparinStopTime .setValid (true) + _heparinBolusVolume .valid = true + _heparinStopTime .valid = true - _salineBolus .setValid (true) + _salineBolus .valid = true //_acidConcentrate .setValid (true) // _bicarbonateConcentrate .setValid (true) // _dialyzerType .setValid (true) // // _dialysateTemperature .setValid (true) - // _bloodPressureMeasurementInterval .setValid (true) + // _bloodPressureInterval .setValid (true) // _rinsebackFlowRate .setValid (true) // TODO : Will be addressed in sub-task DEN-6686. @@ -535,133 +473,80 @@ // _venousPressureLimits .setHighValid(true) } - onFwValidationFailed: { - } - - onBloodFlowRate_ValidationFailed: { - _bloodFlowRate.setValid(false) - } - - onDialysateFlowRate_ValidationFailed: { - _dialysateFlowRate.setValid(false) - } - - onDuration_ValidationFailed: { - _duration.setValid(false) - } - - onHeparinDispensingRate_ValidationFailed: { - _heparinDispensingRate.setValid(false) - } - - onHeparinBolusVolume_ValidationFailed: { - _heparinBolusVolume.setValid(false) - } - - onHeparinStopTime_ValidationFailed: { - _heparinStopTime.setValid(false) - } - - onSalineBolusVolume_ValidationFailed: { - _salineBolus.setValid(false) - } - - onAcidConcentrate_ValidationFailed: { - _acidConcentrate.setValid(false) - } - - onBicarbonateConcentrate_ValidationFailed: { - _bicarbonateConcentrate.setValid(false) - } - - onDialyzerType_ValidationFailed: { - _dialyzerType.setValid(false) - } - - onDialysateTemp_ValidationFailed: { - _dialysateTemperature.setValid(false) - } - - onArterialPressureLimitLow_ValidationFailed: { - _arterialPressureLimits.setLowValid(false) - } - - onArterialPressureLimitHigh_ValidationFailed: { - _arterialPressureLimits.setHighValid(false) - } - - onVenousPressureLimitLow_ValidationFailed: { - _venousPressureLimits.setLowValid(false) - } - - onVenousPressureLimitHigh_ValidationFailed: { - _venousPressureLimits.setHighValid(false) - } - - onBloodPressureMeasureInterval_ValidationFailed: { - _bloodPressureMeasurementInterval.setValid(false) - } - - onRinsebackFlowRate_ValidationFailed: { - _rinsebackFlowRate.setValid(false) - } - + onFwValidationFailed : { } + onBloodFlowRate_ValidationFailed : _bloodFlowRate .valid = false + onDialysateFlowRate_ValidationFailed : _dialysateFlowRate .valid = false + onDuration_ValidationFailed : _duration .valid = false + onHeparinDispensingRate_ValidationFailed : _heparinDispensingRate .valid = false + onHeparinBolusVolume_ValidationFailed : _heparinBolusVolume .valid = false + onHeparinStopTime_ValidationFailed : _heparinStopTime .valid = false + onSalineBolusVolume_ValidationFailed : _salineBolus .valid = false + onAcidConcentrate_ValidationFailed : _acidConcentrate .valid = false + onBicarbonateConcentrate_ValidationFailed : _bicarbonateConcentrate .valid = false + onDialyzerType_ValidationFailed : _dialyzerType .valid = false + onDialysateTemp_ValidationFailed : _dialysateTemperature .valid = false + onArterialPressureLimitLow_ValidationFailed : _arterialPressureLimits .setLowValid ( false ) + onArterialPressureLimitHigh_ValidationFailed : _arterialPressureLimits .setHighValid ( false ) + onVenousPressureLimitLow_ValidationFailed : _venousPressureLimits .setLowValid ( false ) + onVenousPressureLimitHigh_ValidationFailed : _venousPressureLimits .setHighValid ( false ) + onBloodPressureMeasureInterval_ValidationFailed : _bloodPressureInterval .valid = false + onRinsebackFlowRate_ValidationFailed : _rinsebackFlowRate .valid = false onScrollToParameter: { - let prefix = "data."; - let contentYMargin = 80; - let newContentY = 0; + let prefix = "data." + let contentYMargin = 80 + let newContentY = 0 if (parameter === prefix+"bloodFlowRate") { - newContentY = _bloodFlowRate.mapToItem(_bloodFlowRate.parent, 0, 0).y; + newContentY = _bloodFlowRate.mapToItem(_bloodFlowRate.parent, 0, 0).y } else if (parameter === prefix+"dialysateFlowRate") { - newContentY = _dialysateFlowRate.mapToItem(_dialysateFlowRate.parent, 0, 0).y; + newContentY = _dialysateFlowRate.mapToItem(_dialysateFlowRate.parent, 0, 0).y } else if (parameter === prefix+"duration") { - newContentY = _duration.mapToItem(_duration.parent, 0, 0).y; + newContentY = _duration.mapToItem(_duration.parent, 0, 0).y } else if (parameter === prefix+"heparinDispensingRate") { - newContentY = _heparinDispensingRate.mapToItem(_heparinDispensingRate.parent, 0, 0).y; + newContentY = _heparinDispensingRate.mapToItem(_heparinDispensingRate.parent, 0, 0).y } else if (parameter === prefix+"heparinBolusVolume") { - newContentY = _heparinBolusVolume.mapToItem(_heparinBolusVolume.parent, 0, 0).y; + newContentY = _heparinBolusVolume.mapToItem(_heparinBolusVolume.parent, 0, 0).y } else if (parameter === prefix+"heparinStopTime") { - newContentY = _heparinStopTime.mapToItem(_heparinStopTime.parent, 0, 0).y; + newContentY = _heparinStopTime.mapToItem(_heparinStopTime.parent, 0, 0).y } else if (parameter === prefix+"salineBolus") { - newContentY = _salineBolus.mapToItem(_salineBolus.parent, 0, 0).y; + newContentY = _salineBolus.mapToItem(_salineBolus.parent, 0, 0).y } else if (parameter === prefix+"acidConcentrate") { - newContentY = _acidConcentrate.mapToItem(_acidConcentrate.parent, 0, 0).y; + newContentY = _acidConcentrate.mapToItem(_acidConcentrate.parent, 0, 0).y } else if (parameter === prefix+"bicarbonateConcentrate") { - newContentY = _bicarbonateConcentrate.mapToItem(_bicarbonateConcentrate.parent, 0, 0).y; + newContentY = _bicarbonateConcentrate.mapToItem(_bicarbonateConcentrate.parent, 0, 0).y } else if (parameter === prefix+"dialyzerType") { - newContentY = _dialyzerType.mapToItem(_dialyzerType.parent, 0, 0).y; + newContentY = _dialyzerType.mapToItem(_dialyzerType.parent, 0, 0).y } else if (parameter === prefix+"dialysateTemp") { - newContentY = _dialysateTemperature.mapToItem(_dialysateTemperature.parent, 0, 0).y; + newContentY = _dialysateTemperature.mapToItem(_dialysateTemperature.parent, 0, 0).y } else if (parameter === prefix+"arterialPressureLimitLow" || parameter === prefix+"arterialPressureLimitHigh") { - newContentY = _arterialPressureLimits.mapToItem(_arterialPressureLimits.parent, 0, 0).y; + newContentY = _arterialPressureLimits.mapToItem(_arterialPressureLimits.parent, 0, 0).y } else if (parameter === prefix+"venousPressureLimitLow" || parameter === prefix+"venousPressureLimitHigh") { - newContentY = _venousPressureLimits.mapToItem(_venousPressureLimits.parent, 0, 0).y; + newContentY = _venousPressureLimits.mapToItem(_venousPressureLimits.parent, 0, 0).y } else if (parameter === prefix+"bloodPressureMeasureInterval") { - newContentY = _bloodPressureMeasurementInterval.mapToItem(_bloodPressureMeasurementInterval.parent, 0, 0).y; + newContentY = _bloodPressureInterval.mapToItem(_bloodPressureInterval.parent, 0, 0).y } else if (parameter === prefix+"rinsebackFlowRate") { - newContentY = _rinsebackFlowRate.mapToItem(_rinsebackFlowRate.parent, 0, 0).y; + newContentY = _rinsebackFlowRate.mapToItem(_rinsebackFlowRate.parent, 0, 0).y } else { - return; + return } - _flickable.contentY = newContentY - contentYMargin; + _flickable.contentY = newContentY - contentYMargin } } }