Index: sources/model/hd/data/treatment/MTreatmentOutletFlowData.h =================================================================== diff -u -r53b262fea2d4b5bd78ff878fda0848f3737e7b74 -rc8410000d1df9d63a3cfa457c1832d2ccff66490 --- sources/model/hd/data/treatment/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision 53b262fea2d4b5bd78ff878fda0848f3737e7b74) +++ sources/model/hd/data/treatment/MTreatmentOutletFlowData.h (.../MTreatmentOutletFlowData.h) (revision c8410000d1df9d63a3cfa457c1832d2ccff66490) @@ -46,6 +46,8 @@ * | # :(F32) | \ref Data::mDopCorrOffset | * | # :(F32) | \ref Data::mDopCalcRate | * | # :(F32) | \ref Data::mUfCalcRate | + * | # :(U32) | \ref Data::mRotorHall | + * | # :(F32) | \ref Data::mCurrentSetUFRate| * * \sa Data * @@ -75,6 +77,8 @@ Types::F32 mDopCorrOffset ; Types::F32 mDopCalcRate ; Types::F32 mUfCalcRate ; + Types::U32 mRotorHall ; + Types::F32 mCurrentSetUFRate ; } _data; public: @@ -94,6 +98,8 @@ float mDopCorrOffset = 0; ///< float mDopCalcRate = 0; ///< float mUfCalcRate = 0; ///< + int mRotorHall = 0; ///< + float mCurrentSetUFRate = 0; ///< Current Set UF Rate }; MOutletFlow () { } Index: sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp =================================================================== diff -u -r53b262fea2d4b5bd78ff878fda0848f3737e7b74 -rc8410000d1df9d63a3cfa457c1832d2ccff66490 --- sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp (.../VTreatmentUltrafiltration.cpp) (revision 53b262fea2d4b5bd78ff878fda0848f3737e7b74) +++ sources/view/hd/data/treatment/VTreatmentUltrafiltration.cpp (.../VTreatmentUltrafiltration.cpp) (revision c8410000d1df9d63a3cfa457c1832d2ccff66490) @@ -31,4 +31,5 @@ ultrafiltration_DopCorrOffset ( vData.mDopCorrOffset ); ultrafiltration_DopCalcRate ( vData.mDopCalcRate ); ultrafiltration_UfCalcRate ( vData.mUfCalcRate ); + ultrafiltration_UfCurrentRate ( vData.mCurrentSetUFRate / 1000 ); // mL => L } Index: sources/view/hd/data/treatment/VTreatmentUltrafiltration.h =================================================================== diff -u -r53b262fea2d4b5bd78ff878fda0848f3737e7b74 -rc8410000d1df9d63a3cfa457c1832d2ccff66490 --- sources/view/hd/data/treatment/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision 53b262fea2d4b5bd78ff878fda0848f3737e7b74) +++ sources/view/hd/data/treatment/VTreatmentUltrafiltration.h (.../VTreatmentUltrafiltration.h) (revision c8410000d1df9d63a3cfa457c1832d2ccff66490) @@ -51,6 +51,7 @@ PROPERTY( float, ultrafiltration_DopCorrOffset , 0) PROPERTY( float, ultrafiltration_DopCalcRate , 0) PROPERTY( float, ultrafiltration_UfCalcRate , 0) + PROPERTY( float, ultrafiltration_UfCurrentRate , 0) VIEW_DEC(VTreatmentUltrafiltration, OutletFlowData) };