Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r4b7b6f9506d7c7ad4f611b8c417ed37d5f9a48ac -rc1031c7f6901733253a1196afec347c197edb9d2 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 4b7b6f9506d7c7ad4f611b8c417ed37d5f9a48ac) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision c1031c7f6901733253a1196afec347c197edb9d2) @@ -74,7 +74,7 @@ {Gui::GuiActionType::ID_TreatmentTime , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_BloodFlow , 8 * 4 }, // 8 parameters each 4bytes {Gui::GuiActionType::ID_DialysateInletFlow , 7 * 4 }, // 7 parameters each 4bytes - {Gui::GuiActionType::ID_DialysateOutletFlow , 10 * 4 }, //10 parameters each 4bytes + {Gui::GuiActionType::ID_DialysateOutletFlow , 12 * 4 }, //10 parameters each 4bytes {Gui::GuiActionType::ID_PressureOcclusion , 8 * 4 }, // 8 parameters each 4bytes {Gui::GuiActionType::ID_Saline , 3 * 4 }, // 3 parameters each 4bytes {Gui::GuiActionType::ID_Heparin , 2 * 4 }, // 2 parameters each 4bytes Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803 -rc1031c7f6901733253a1196afec347c197edb9d2 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision c1031c7f6901733253a1196afec347c197edb9d2) @@ -76,6 +76,7 @@ readonly property int fontPixelUltrafiltrationAdjustmentNextButton : fontPixelUltrafiltrationAdjustmentButton readonly property int fontPixelUltrafiltrationAdjustmentConfirmButton : fontPixelUltrafiltrationAdjustmentButton readonly property int fontPixelUltrafiltrationAdjustmentEditValue : 46 + readonly property int fontPixelUltrafiltrationRateUnit : 13 readonly property int fontPixelRinsebackAdjustmentButton : 26 Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -r642f08650a7a88ad6a2305fdea6bd18365aab5c7 -rc1031c7f6901733253a1196afec347c197edb9d2 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 642f08650a7a88ad6a2305fdea6bd18365aab5c7) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision c1031c7f6901733253a1196afec347c197edb9d2) @@ -44,7 +44,21 @@ text : ufInfoText textColor : ufInfoTextColor } + Text { id: _ufCurrentRateText + anchors { + right: parent.right + rightMargin: Variables.arrowWidth + 2 // Aligning text to be beyond the arrow + top: parent.top + topMargin: 4 + } + horizontalAlignment: Text.AlignRight + text: qsTr("(%1 %2)").arg(vTreatmentUltrafiltration.ultrafiltration_UfCurrentRate.toFixed(2)) + .arg(Variables.unitTextUltrafiltrationRate ) + font.pixelSize: Fonts.fontPixelUltrafiltrationRateUnit + color: Colors.touchTextAreaTitle + } + ProgressBarEx { id: _progressbarex enabled : _root.isTouchable y : 75 Index: sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp =================================================================== diff -u -rc8410000d1df9d63a3cfa457c1832d2ccff66490 -rc1031c7f6901733253a1196afec347c197edb9d2 --- sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp (.../VTreatmentUltrafiltration.cpp) (revision c8410000d1df9d63a3cfa457c1832d2ccff66490) +++ sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp (.../VTreatmentUltrafiltration.cpp) (revision c1031c7f6901733253a1196afec347c197edb9d2) @@ -31,5 +31,6 @@ ultrafiltration_DopCorrOffset ( vData.mDopCorrOffset ); ultrafiltration_DopCalcRate ( vData.mDopCalcRate ); ultrafiltration_UfCalcRate ( vData.mUfCalcRate ); - ultrafiltration_UfCurrentRate ( vData.mCurrentSetUFRate / 1000 ); // mL => L + ultrafiltration_RotorHall ( vData.mRotorHall ); + ultrafiltration_UfCurrentRate ( vData.mCurrentSetUFRate); } Index: sources/view/hd/data/treatment/VTreatmentUltrafiltration.h =================================================================== diff -u -rc8410000d1df9d63a3cfa457c1832d2ccff66490 -rc1031c7f6901733253a1196afec347c197edb9d2 --- sources/view/hd/data/treatment/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision c8410000d1df9d63a3cfa457c1832d2ccff66490) +++ sources/view/hd/data/treatment/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision c1031c7f6901733253a1196afec347c197edb9d2) @@ -51,6 +51,7 @@ PROPERTY( float, ultrafiltration_DopCorrOffset , 0) PROPERTY( float, ultrafiltration_DopCalcRate , 0) PROPERTY( float, ultrafiltration_UfCalcRate , 0) + PROPERTY( int, ultrafiltration_RotorHall , 0) PROPERTY( float, ultrafiltration_UfCurrentRate , 0) VIEW_DEC(VTreatmentUltrafiltration, OutletFlowData)