Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r679f72813050ba2ca4d9161746ef3a219b562a1c -r50a109da2a76b335793c2b95fa668733fb7df684 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 679f72813050ba2ca4d9161746ef3a219b562a1c) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684) @@ -123,6 +123,8 @@ readonly property int bloodFlowResolution : 25 readonly property int dialysateFlowResolution : 50 readonly property int durationResolution : 15 // PRS346 + // Precision + readonly property int ultrafiltrationPrecision : 3 // Inline Blood Pressures // - Artrial @@ -170,9 +172,9 @@ readonly property string unitTextBloodPressure : qsTr("mmHg") readonly property string unitTextHeartBeat : qsTr("BPM" ) // - Fluid - readonly property string unitTextFluid : qsTr("mL") - readonly property string unitTextSaline : unitTextFluid - readonly property string unitTextHeparin : unitTextFluid + readonly property string unitTextFluid : qsTr("mL") + readonly property string unitTextSaline : unitTextFluid + readonly property string unitTextHeparin : unitTextFluid // - Create Treatment - readonly property string unitTextBPMeasurementInterval : qsTr("min") + readonly property string unitTextBPMeasurementInterval : qsTr("min") } Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -r679f72813050ba2ca4d9161746ef3a219b562a1c -r50a109da2a76b335793c2b95fa668733fb7df684 --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 679f72813050ba2ca4d9161746ef3a219b562a1c) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684) @@ -78,7 +78,7 @@ Text { id: _textValue visible : true color : "white" - text : _root.ufVolume.toFixed(vTreatmentUltrafiltration.precision) + text : _root.ufVolume.toFixed(Variables.ultrafiltrationPrecision) font { pixelSize : Fonts.createTreatmentFontSize } @@ -102,7 +102,7 @@ stepSnap: true ticks : false diameter: Variables.sliderCircleDiameter - decimal : vTreatmentUltrafiltration.precision + decimal : Variables.ultrafiltrationPrecision minimum : _private.minimum maximum : _private.maximum minText.font.pixelSize: Fonts.fontPixelFluidText Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r50a109da2a76b335793c2b95fa668733fb7df684 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684) @@ -31,7 +31,7 @@ contentItem.objectName: "TreatmentAdjustmentUltrafiltrationConfirm" //SquishQt testability QtObject { id: _private - property int decimalVolume: vTreatmentUltrafiltration.precision + property int decimalVolume: Variables.ultrafiltrationPrecision property int decimalRate : 0 } property real ultrafiltrationVolume : 0.000 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) ) } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r50a109da2a76b335793c2b95fa668733fb7df684 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684) @@ -29,7 +29,6 @@ TreatmentAdjustmentBase { id: _root contentItem.objectName: "TreatmentAdjustmentUltrafiltrationPaused" //SquishQt testability QtObject { id: _private - property int decimal: vTreatmentUltrafiltration.precision property real minimum: vTreatmentUltrafiltration.minimum property real maximum: vTreatmentUltrafiltration.maximum property real value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol @@ -56,7 +55,7 @@ topMargin: 250 horizontalCenter: parent.horizontalCenter } - decimal : _private.decimal + decimal : Variables.ultrafiltrationPrecision minimum : _private.minimum maximum : _private.maximum value : _private.value Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -r50a109da2a76b335793c2b95fa668733fb7df684 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684) @@ -30,7 +30,6 @@ contentItem.objectName: "TreatmentAdjustmentUltrafiltrationStart" //SquishQt testability QtObject { id: _private - property int decimal: vTreatmentUltrafiltration.precision property real minimum: vTreatmentUltrafiltration.minimum property real maximum: vTreatmentUltrafiltration.maximum property real value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol @@ -56,7 +55,7 @@ topMargin: 250 horizontalCenter: parent.horizontalCenter } - decimal : _private.decimal + decimal : Variables.ultrafiltrationPrecision minimum : _private.minimum maximum : _private.maximum value : _private.value Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -r153409973471214f29d5fad170a8b4ec0f4c4f2e -r50a109da2a76b335793c2b95fa668733fb7df684 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 153409973471214f29d5fad170a8b4ec0f4c4f2e) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 50a109da2a76b335793c2b95fa668733fb7df684) @@ -26,7 +26,6 @@ * \brief Treatment Screen Ultrafiltration section */ TouchArea { id: _root - readonly property int decimal : vTreatmentUltrafiltration.precision readonly property real minimum : vTreatmentUltrafiltration.minimum readonly property real maximum : vTreatmentUltrafiltration.maximum readonly property real value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol @@ -57,7 +56,7 @@ onProgressClicked : _root.clicked() onExtraClicked : _root.clicked() - decimal : _root.decimal + decimal : Variables.ultrafiltrationPrecision minimum : _root.minimum maximum : _root.maximum value : _root.value Index: sources/view/hd/data/VTreatmentUltrafiltration.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -r50a109da2a76b335793c2b95fa668733fb7df684 --- sources/view/hd/data/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/data/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision 50a109da2a76b335793c2b95fa668733fb7df684) @@ -37,13 +37,9 @@ Q_OBJECT // coco begin validated : Manually validated - PROPERTY( float, precision , 3) // Centralized Gui value : none model property - // ~~~~~ Prescription values which we currently don't have. - // TODO : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12) - PROPERTY( float, minimum , 0.000) - PROPERTY( float, maximum , 0.600) - // ~~~~~ + PROPERTY( float, minimum , 0.000 ) // no message to update this value and is 0 for now. // coco end + PROPERTY( float, maximum , 0.600 ) PROPERTY( float, ultrafiltration_RefUFVol , 0) PROPERTY( float, ultrafiltration_MeasUFVol , 0)