Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -rd5e9940fa96373f6cc118dfa9761d95f361689a5 -rc3ccffd6df1e4c2c42ebaa80e751895a82cf7460 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision d5e9940fa96373f6cc118dfa9761d95f361689a5) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision c3ccffd6df1e4c2c42ebaa80e751895a82cf7460) @@ -28,17 +28,30 @@ * To adjust the treatment inline blood pressure ranges of Arterial and venous */ TreatmentAdjustmentBase { id: _root - objectName: "_TreatmentAdjustmentPressures" // SquishQt testability + objectName: "_TreatmentAdjustmentPressuresLimits" // SquishQt testability readonly property alias arterialPressureLimitWindow : _arterialWindow.value readonly property alias venousPressureLimitWindow : _venousWindow.value readonly property alias venousPressureLimitAsymtrc : _venousAsymmetricWindow.value - readonly property alias tmpPressureLimitWindow : _tmpWindow.value + readonly property alias tmpLimitWindow : _tmpWindow.value titleText: qsTr("Pressure Window Limit Settings") - contentItem: Item { id: _contentItem + onAboutToShow: { + _arterialWindow.value = vTreatmentCreate.arterialPressureLimitWindow + _venousWindow.value = vTreatmentCreate.venousPressureLimitWindow + _venousAsymmetricWindow.value = vTreatmentCreate.venousPressureLimitAsymtrc + _tmpWindow.value = vTreatmentCreate.trancembrncPressureLimitWindow + } + + Item { id: _contentItem objectName: "_contentItem" + anchors { + top: parent.top + bottom: notification.top + left: parent.left + right: parent.right + } Item { id: _contentArea objectName: "_contentArea" @@ -60,10 +73,13 @@ titleFontPixelSize : Fonts.fontPixelContainerTitleSmall unitText : Variables.unitTextPressure unitFontPixelSize : Fonts.fontPixelContainerUnitSmall + isActive : true minimum : vTreatmentRanges.arterialPressureLimitWindowMin maximum : vTreatmentRanges.arterialPressureLimitWindowMax step : vTreatmentRanges.arterialPressureLimitWindowRes value : { value = vTreatmentRanges.arterialPressureLimitWindowDef } // set without binding + + onDidChange : function(vValue) { value = vValue } } LabelUnitValueAdjuster { id: _venousWindow @@ -72,10 +88,13 @@ titleFontPixelSize : _arterialWindow.titleFontPixelSize unitText : Variables.unitTextPressure unitFontPixelSize : _arterialWindow.unitFontPixelSize + isActive : true minimum : vTreatmentRanges.venousPressureLimitWindowMin maximum : vTreatmentRanges.venousPressureLimitWindowMax step : vTreatmentRanges.venousPressureLimitWindowRes value : { value = vTreatmentRanges.venousPressureLimitWindowDef } // set without binding + + onDidChange : function(vValue) { value = vValue } } LabelUnitValueAdjuster { id: _venousAsymmetricWindow @@ -84,10 +103,13 @@ titleFontPixelSize : _arterialWindow.titleFontPixelSize unitText : Variables.unitTextPressure unitFontPixelSize : _arterialWindow.unitFontPixelSize + isActive : true minimum : vTreatmentRanges.venousPressureLimitAsymtrcMin maximum : vTreatmentRanges.venousPressureLimitAsymtrcMax step : vTreatmentRanges.venousPressureLimitAsymtrcRes value : { value = vTreatmentRanges.venousPressureLimitAsymtrcDef } // set without binding + + onDidChange : function(vValue) { value = vValue } } LabelUnitValueAdjuster { id: _tmpWindow @@ -96,10 +118,13 @@ titleFontPixelSize : _arterialWindow.titleFontPixelSize unitText : Variables.unitTextPressure unitFontPixelSize : _arterialWindow.unitFontPixelSize - minimum : vTreatmentRanges.trancembrncPressureLimitWindowMin - maximum : vTreatmentRanges.trancembrncPressureLimitWindowMax - step : vTreatmentRanges.trancembrncPressureLimitWindowRes - value : { value = vTreatmentRanges.trancembrncPressureLimitWindowDef } // set without binding + isActive : true + minimum : vTreatmentRanges.trancembrncPressureLimitWindowMin + maximum : vTreatmentRanges.trancembrncPressureLimitWindowMax + step : vTreatmentRanges.trancembrncPressureLimitWindowRes + value : { value = vTreatmentRanges.trancembrncPressureLimitWindowDef } // set without binding + + onDidChange : function(vValue) { value = vValue } } } } @@ -108,6 +133,7 @@ objectName : "_confirmButton" anchors { bottom : parent.bottom + bottomMargin : Variables.defaultMargin horizontalCenter: parent.horizontalCenter } width : Variables.defaultButtonWidth @@ -119,14 +145,8 @@ isDefault : true onClicked : { - _root.onConfirmClicked() + _root.confirmClicked() } } } - - footer: Item { id: _footerItem - objectName : "_footerItem" - width : parent.width - height : Variables.notificationHeight - } }