Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -rf7b583937bad38cf4790a72fbc26db3f7d7df50c -r50a109da2a76b335793c2b95fa668733fb7df684 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision f7b583937bad38cf4790a72fbc26db3f7d7df50c) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684) @@ -29,19 +29,20 @@ TreatmentAdjustmentBase { id: _root contentItem.objectName: "TreatmentAdjustmentUltrafiltrationEdit" //SquishQt testability QtObject { id: _private - property int decimal : vTreatmentUltrafiltration.precision - property real minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min - property real maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max - property real value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol + property int decimal : Variables.ultrafiltrationPrecision + property real minAdjust : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min + property real valAdjust : _volumeSlider.value + property real maxAdjust : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max - property real current : vTreatmentUltrafiltration.maximum - property real adjusted : _volumeSlider.value + property real min : vTreatmentUltrafiltration.minimum + property real val : vTreatmentUltrafiltration.ultrafiltration_RefUFVol + property real max : vTreatmentUltrafiltration.maximum } signal nextClicked(real vVolume) function reset() { - _volumeSlider.value = _private.current + _volumeSlider.value = _private.max } closeVisible : false @@ -65,16 +66,10 @@ horizontalCenter: parent.horizontalCenter } decimal : _private.decimal - // TODO: I noticed an odd behaviour in UF adjustment and I believe this is the correct fix - // but since no one ever complained about that I'm not going to change it, - // and I might be wrong and FW is sending correct values and handling it. - // but if anyone ever notices I will use this fix. - // I am almost 100% sure this needs to be changed to 0. - // minimum : 0 //_private.minimum - minimum : _private.minimum - maximum : _private.maximum - value : _private.value - valueEx : _private.adjusted + minimum : _private.min // suppose to be always 0 // DEN-6022 // _private.maxAdjust => _private.min + maximum : _private.maxAdjust + value : _private.val + valueEx : _private.valAdjust progressEx.maxText.visible: false } @@ -101,19 +96,14 @@ stepSnap: true ticks : true decimal : _private.decimal - // TODO: I noticed an odd behaviour in UF adjustment and I believe this is the correct fix - // but since no one ever complained about that I am not going to change it, - // and I might be wrong and FW is sending correct values and handling it. - // but if anyone ever notices I will use this fix. - // minimum : _private.value /*_private.minimum*/ + minGapValue - minimum : _private.minimum + minGapValue - maximum : _private.maximum - maxGapValue + minimum : _private.minAdjust + minGapValue + maximum : _private.maxAdjust - maxGapValue } Text { id: _textVolume visible : true color : "white" - text : _private.adjusted.toFixed(_private.decimal) + text : _private.valAdjust.toFixed(_private.decimal) font { pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentEditValue } @@ -140,6 +130,6 @@ font.weight : Font .DemiBold font.pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentNextButton } - onClicked: nextClicked( _private.adjusted.toFixed(_private.decimal) ) + onClicked: nextClicked( _private.valAdjust.toFixed(_private.decimal) ) } }