Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -rbea36be2766046e63c4e82539a630b5cee7ce1c6 -rdf03df4194214017799598ad8836e694db195d42 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision bea36be2766046e63c4e82539a630b5cee7ce1c6) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision df03df4194214017799598ad8836e694db195d42) @@ -35,15 +35,20 @@ readonly property alias venousPressureLimitAsymtrc : _venousAsymmetricWindow.value readonly property alias tmpLimitWindow : _tmpWindow.value + readonly property bool isValid : _arterialWindow.valid && + _venousWindow.valid && + _venousAsymmetricWindow.valid && + _tmpWindow.valid + titleText: qsTr("Pressure Window Limit Settings") height : Variables.smallDialogHeight width : Variables.smallDialogWidth onAboutToShow: { - _arterialWindow.value = vTreatmentPressureOcclusion.arterialPressure - _venousWindow.value = vTreatmentPressureOcclusion.venousPressure - _venousAsymmetricWindow.value = 0 // vTreatmentPressureOcclusion.venousLongPressure - _tmpWindow.value = vTreatmentPressureOcclusion.tmpPressure + _arterialWindow.value = vTreatmentRanges.arterialPressureLimitWindowDef + _venousWindow.value = vTreatmentRanges.venousPressureLimitWindowDef + _venousAsymmetricWindow.value = vTreatmentRanges.venousPressureLimitAsymtrcDef + _tmpWindow.value = vTreatmentRanges.transmembranePressureLimitWindowDef } Item { id: _contentItem @@ -76,11 +81,16 @@ unitText : Variables.unitTextPressure unitFontSize : Fonts.fontPixelContainerUnitSmall isActive : true - minimum : vTreatmentPressureOcclusion.arterialMin - maximum : vTreatmentPressureOcclusion.arterialMax + minimum : vTreatmentRanges.arterialPressureLimitWindowMin + maximum : vTreatmentRanges.arterialPressureLimitWindowMax step : vTreatmentRanges.arterialPressureLimitWindowRes + value : vTreatmentRanges.arterialPressureLimitWindowDef + valid : ! vTreatmentAdjustmentPressuresLimits.arterialPressureLimitWindowRejectionReason - onDidChange : function(vValue) { value = vValue } + onDidChange : function(vValue) { + if ( ! _arterialWindow.valid ) { vTreatmentAdjustmentPressuresLimits.arterialPressureLimitWindowRejectionReason = Variables.noRejectReason } + value = vValue + } } LabelUnitValueAdjuster { id: _venousWindow @@ -90,11 +100,16 @@ unitText : Variables.unitTextPressure unitFontSize : _arterialWindow.unitFontSize isActive : true - minimum : vTreatmentPressureOcclusion.venousMin - maximum : vTreatmentPressureOcclusion.venousMax + minimum : vTreatmentRanges.venousPressureLimitWindowMin + maximum : vTreatmentRanges.venousPressureLimitWindowMax step : vTreatmentRanges.venousPressureLimitWindowRes + value : vTreatmentRanges.venousPressureLimitWindowDef + valid : ! vTreatmentAdjustmentPressuresLimits.venousPressureLimitWindowRejectionReason - onDidChange : function(vValue) { value = vValue } + onDidChange : function(vValue) { + if ( ! _venousWindow.valid ) { vTreatmentAdjustmentPressuresLimits.venousPressureLimitWindowRejectionReason = Variables.noRejectReason } + value = vValue + } } LabelUnitValueAdjuster { id: _venousAsymmetricWindow @@ -107,8 +122,13 @@ minimum : vTreatmentRanges.venousPressureLimitAsymtrcMin maximum : vTreatmentRanges.venousPressureLimitAsymtrcMax step : vTreatmentRanges.venousPressureLimitAsymtrcRes + value : vTreatmentRanges.venousPressureLimitAsymtrcDef + valid : ! vTreatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrcRejectionReason - onDidChange : function(vValue) { value = vValue } + onDidChange : function(vValue) { + if ( ! _venousAsymmetricWindow.valid ) { vTreatmentAdjustmentPressuresLimits.venousPressureLimitAsymtrcRejectionReason = Variables.noRejectReason } + value = vValue + } } LabelUnitValueAdjuster { id: _tmpWindow @@ -118,11 +138,16 @@ unitText : Variables.unitTextPressure unitFontSize : _arterialWindow.unitFontSize isActive : true - minimum : vTreatmentPressureOcclusion.tmpMin - maximum : vTreatmentPressureOcclusion.tmpMax + minimum : vTreatmentRanges.transmembranePressureLimitWindowMin + maximum : vTreatmentRanges.transmembranePressureLimitWindowMax step : vTreatmentRanges.transmembranePressureLimitWindowRes + value : vTreatmentRanges.transmembranePressureLimitWindowDef + valid : ! vTreatmentAdjustmentPressuresLimits.tmpPressureLimitWindowRejectionReason - onDidChange : function(vValue) { value = vValue } + onDidChange : function(vValue) { + if ( ! _tmpWindow.valid ) { vTreatmentAdjustmentPressuresLimits.tmpPressureLimitWindowRejectionReason = Variables.noRejectReason } + value = vValue + } } } } @@ -141,6 +166,7 @@ font.weight : Font.Medium } isDefault : true + enabled : _root.isValid onClicked : { _root.confirmClicked()