Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -re8afa846df4a66f2c5048416ec2763b0a138bc53 -rdb92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision e8afa846df4a66f2c5048416ec2763b0a138bc53) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision db92783a0a9dab0ddf2b68c51d15b1ae1cb3ddcc) @@ -32,8 +32,8 @@ header.confirmEnabled: vTreatmentCreate.continueEnabled - function setInteractive(isInteractive) { - _flickable.interactive = isInteractive + function setInteractive(vInteractive) { + _flickable.interactive = vInteractive } ScrollBar { @@ -72,218 +72,169 @@ SliderCreateTreatment { id: _bloodFlowRate objectName : "_bloodFlowRate" + label : qsTr("Blood Flow Rate") flickable : _flickable + unit : Variables.unitTextFlowRate 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) - } + onPressed : vTreatmentCreate.bloodFlowRate = value + onReleased : vTreatmentCreate.bloodFlowRate = value } SliderCreateTreatment { id: _dialysateFlowRate - objectName: "_dialysateFlowRate" - value : vTreatmentCreate.dialysateFlowRate - minimum : vTreatmentCreate.dialysateFlowRateMin - maximum : vTreatmentCreate.dialysateFlowRateMax - step : vTreatmentCreate.dialysateFlowRateRes - label : qsTr("Dialysate Flow Rate") - unit : Variables.unitTextFlowRate - 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" - value : vTreatmentCreate.duration - minimum : vTreatmentCreate.durationMin - maximum : vTreatmentCreate.durationMax - step : vTreatmentCreate.durationRes - label : qsTr("Duration") - unit : Variables.unitTextDuration - 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" - value : vTreatmentCreate.heparinDispensingRate - minimum : vTreatmentCreate.heparinDispensingRateMin - maximum : vTreatmentCreate.heparinDispensingRateMax - step : vTreatmentCreate.heparinDispensingRateRes - label : qsTr("Heparin Dispensing Rate") - unit : Variables.unitTextDispencingRate - onPressed: { - setInteractive(false) - vTreatmentCreate.heparinDispensingRate = value - } - onReleased: { - vTreatmentCreate.heparinDispensingRate = value - setInteractive(true) - } + objectName : "_heparinDispensingRate" + label : qsTr("Heparin Dispensing Rate") + flickable : _flickable + unit : Variables.unitTextDispencingRate + value : vTreatmentCreate.heparinDispensingRate + minimum : vTreatmentCreate.heparinDispensingRateMin + maximum : vTreatmentCreate.heparinDispensingRateMax + step : vTreatmentCreate.heparinDispensingRateRes + onPressed : vTreatmentCreate.heparinDispensingRate = value + onReleased : vTreatmentCreate.heparinDispensingRate = value } SliderCreateTreatment { id: _heparinBolusVolume - objectName: "_heparinBolusVolume" - value : vTreatmentCreate.heparinBolusVolume - minimum : vTreatmentCreate.heparinBolusVolumeMin - maximum : vTreatmentCreate.heparinBolusVolumeMax - step : vTreatmentCreate.heparinBolusVolumeRes - label : qsTr("Heparin Bolus Volume") - unit : Variables.unitTextFluid - 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 + minimum : vTreatmentCreate.heparinBolusVolumeMin + maximum : vTreatmentCreate.heparinBolusVolumeMax + step : vTreatmentCreate.heparinBolusVolumeRes + onPressed : vTreatmentCreate.heparinBolusVolume = value + onReleased : vTreatmentCreate.heparinBolusVolume = value } SliderCreateTreatment { id: _heparinStopTime - objectName: "_heparinStopTime" - value : vTreatmentCreate.heparinStopTime - minimum : vTreatmentCreate.heparinStopTimeMin - maximum : vTreatmentCreate.heparinStopTimeMax - step : vTreatmentCreate.heparinStopTimeRes - label : qsTr("Heparin Stop Time") - unit : Variables.unitTextDuration - 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" - value : vTreatmentCreate.salineBolusVolume - minimum : vTreatmentCreate.salineBolusVolumeMin - maximum : vTreatmentCreate.salineBolusVolumeMax - step : vTreatmentCreate.salineBolusVolumeRes - label : "Saline Bolus" - unit : Variables.unitTextFluid - onPressed: { - setInteractive(false) - vTreatmentCreate.salineBolusVolume = value - } - onReleased: { - vTreatmentCreate.salineBolusVolume = value - setInteractive(true) - } + 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 + text : qsTr("OPERATING PARAMETERS") + color : Colors.textMain font.pixelSize: Fonts.fontPixelButton - font.bold: true + font.bold : true } - GridSelection { id: _heparinType - objectName: "_heparinTypeRect" - name: qsTr("Heparin Type") - numRows: 1 - buttonNames: vTreatmentCreate.heparinTypeOptions - onButtonClicked: { - vTreatmentCreate.heparinType = selectedIndex - } + GridSelection { id : _heparinType + objectName : "_heparinTypeRect" + title : qsTr("Heparin Type") + rowCount : 1 + labels : vTreatmentCreate.heparinTypeOptions + onClicked : vTreatmentCreate.heparinType = curIndex } - GridSelection { id: _acidConcentrate - objectName : "_acidConcentrateRect" - name : qsTr("Acid Concentrate") - buttonNames : vTreatmentCreate.acidConcentrateOptions - onButtonClicked: { - vTreatmentCreate.acidConcentrate = selectedIndex - } + 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 - } + 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" - value : vTreatmentCreate.dialysateTemp - minimum : vTreatmentCreate.dialysateTempMin - maximum : vTreatmentCreate.dialysateTempMax - step : vTreatmentCreate.dialysateTempRes - label : qsTr("Dialysate Temperature") - unit : Variables.unitTextTemperature - 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 } Column { id: _arterialColumn spacing: 45 anchors.horizontalCenter: parent.horizontalCenter Text { id: _arterialLabel - visible : true - color : Colors.textMain - text: qsTr("Arterial Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")" + visible : true + color : Colors.textMain + text : qsTr("Arterial Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")" font.pixelSize : Fonts.fontPixelFluidText anchors.left : _arterialPressureLimits.left } 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 + hasAdjusted : true // Texts lowerText.visible : true @@ -299,12 +250,12 @@ upperTextHorizontalCenter : true minText.visible : true - // minText.font.pixelSize : Fonts.fontPixelFluidText + // minText.font.pixelSize : Fonts.fontPixelFluidText minText.font.bold : false minVerticalEdgeVisible : false maxText.visible : true - // maxText.font.pixelSize : Fonts.fontPixelFluidText + // maxText.font.pixelSize : Fonts.fontPixelFluidText maxText.font.bold : false maxVerticalEdgeVisible : false @@ -320,36 +271,36 @@ 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 } - onClicked : { if ( minAdjusted ) vTreatmentCreate.arterialPressureLimitLow = minValue - 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 } } } Column { id: _venousColumn spacing: 45 anchors.horizontalCenter: parent.horizontalCenter Text { id: _venousLabel - visible : true - color : Colors.textMain - text: qsTr("Venous Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")" + visible : true + color : Colors.textMain + text : qsTr("Venous Pressure Limits") + " " + "(" + Variables.unitTextBloodPressure + ")" font.pixelSize : Fonts.fontPixelFluidText anchors.left : _venousPressureLimits.left } 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 + hasAdjusted : true // Texts lowerText.visible : true @@ -386,50 +337,40 @@ 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 } - onClicked : { if ( minAdjusted ) vTreatmentCreate.venousPressureLimitLow = minValue - 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" - value : vTreatmentCreate.bloodPressureMeasureInterval - minimum : vTreatmentCreate.bloodPressureMeasureIntervalMin - maximum : vTreatmentCreate.bloodPressureMeasureIntervalMax - step : vTreatmentCreate.bloodPressureMeasureIntervalRes - label : qsTr("Blood Pressure Measurement Interval") - unit : Variables.unitTextDuration - 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" - value : vTreatmentCreate.rinsebackFlowRate - minimum : vTreatmentCreate.rinsebackFlowRateMin - maximum : vTreatmentCreate.rinsebackFlowRateMax - step : vTreatmentCreate.rinsebackFlowRateRes - label : qsTr("Rinseback Flow Rate") - unit : Variables.unitTextFlowRate - 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 } Item { width : 50 @@ -440,22 +381,22 @@ Connections { target: vTreatmentCreate onResetCreateTreatment: { - _bloodFlowRate.active = false - _dialysateFlowRate.active = false - _duration.active = false - _heparinDispensingRate.active = false + _bloodFlowRate .active = false + _dialysateFlowRate .active = false + _duration .active = false + _heparinDispensingRate .active = false - _heparinBolusVolume.active = false - _heparinStopTime.active = false + _heparinBolusVolume .active = false + _heparinStopTime .active = false - _salineBolus.active = false - _acidConcentrate.setActive(false) - _bicarbonateConcentrate.setActive(false) - _dialyzerType.setActive(false) + _salineBolus .active = false + _acidConcentrate .setActive(false) + _bicarbonateConcentrate .setActive(false) + _dialyzerType .setActive(false) - _dialysateTemperature.active = false - _bloodPressureMeasurementInterval.active = false - _rinsebackFlowRate.active = false + _dialysateTemperature .active = false + _bloodPressureInterval .active = false + _rinsebackFlowRate .active = false // TODO : Will be addressed in sub-task DEN-6686. // _arterialPressureLimits.isLowActive = false @@ -466,21 +407,21 @@ } 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. @@ -490,77 +431,24 @@ // _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 @@ -608,7 +496,7 @@ 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