Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -r634824d6fce314971aa236e508024bd154562c9d -r7045fd6002bdeb28e23a7af6a708a852d522ad12 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 634824d6fce314971aa236e508024bd154562c9d) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 7045fd6002bdeb28e23a7af6a708a852d522ad12) @@ -25,11 +25,6 @@ * \brief Treatment Screen Ultrafiltration section */ TouchArea { id: _root - property alias minimum : _progressbarex.minimum - property alias maximum : _progressbarex.maximum - property alias value : _progressbarex.value - property alias valueEx : _progressbarex.valueEx - clip: false x : 0 y : 0 @@ -40,18 +35,28 @@ title : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(mL)") Connections { target: vTreatmentAdjustmentsResponse - onAdjustmentDurationTriggered: { } - onUltrafiltrationChanged: { - // As a reminder for later use - console.debug("@",vTreatmentAdjustmentsResponse.ultrafiltration) + onAdjustmentDurationTriggered: { + // FIXME : HD units should be consistent(mL or L) but here is Litre + _progressbarex.maximum = vTreatmentAdjustmentsResponse.ultrafiltration * 1000 } } ProgressBarEx { id: _progressbarex y : 75 width : parent.width height : Variables.progressbarHeight - value : 0 + minimum : 0 // seems should always be 0 valueEx : 0 + onClicked: { + _root.clicked() + } + + // TEST : it has to be bound to MeasUFVol to get the actual values from pumps + // but since we have none in testing code bound to the refUFVal which + // is the calculated/expected volume. + //// value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); + value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol.toFixed(2); + // TEST : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12) + maximum : 600 // a constant Volume value for 1h treatment } }