Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf6b5ddb9a15690504163abe71e2e70a33ae0d68c --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision f6b5ddb9a15690504163abe71e2e70a33ae0d68c) @@ -112,8 +112,10 @@ _values[eTreatmentEndDateTime ] = mTreatmentEndDateTime ; _values[eWaterSampleTestResult ] = mWaterSampleTestResult ; _values[eDialysateVolumeUsed ] = mStrText.arg(vData.mDialysateVolumeUsed ,FLOAT3 ); + _values[eOriginUFVolume ] = mStrText.arg(vData.mOriginUFVolume ,FLOAT3 ); _values[eTargetUFVolume ] = mStrText.arg(vData.mTargetUFVolume ,FLOAT3 ); _values[eActualUFVolume ] = mStrText.arg(vData.mActualUFVolume ,FLOAT3 ); + _values[eOriginUFRate ] = mStrText.arg(vData.mOriginUFRate ,FLOAT3 ); _values[eTargetUFRate ] = mStrText.arg(vData.mTargetUFRate ,FLOAT3 ); _values[eActualUFRate ] = mStrText.arg(vData.mActualUFRate ,FLOAT3 ); _values[eSalineBolusVolume ] = mStrText.arg(vData.mSalineBolusVolume ); @@ -237,13 +239,15 @@ ADDTITLE("Post-Treatment Data" ); ADDTOLOG( eDialysateVolumeUsed ); + ADDTOLOG( eOriginUFVolume ); ADDTOLOG( eTargetUFVolume ); ADDTOLOG( eActualUFVolume ); ADDTOLOG( eSalineBolusVolume ); ADDTOLOG( eHeparinDeliveredVolume ); ADDTITLE("Extra" ); ADDTOLOG( eWaterSampleTestResult ); + ADDTOLOG( eOriginUFRate ); ADDTOLOG( eTargetUFRate ); ADDTOLOG( eActualUFRate ); ADDTOLOG( eAverageBloodFlow ); Index: sources/storage/TreatmentLog.h =================================================================== diff -u -r4e035c96c971fb8ec19fb030d9120046697b6e71 -rf6b5ddb9a15690504163abe71e2e70a33ae0d68c --- sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 4e035c96c971fb8ec19fb030d9120046697b6e71) +++ sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision f6b5ddb9a15690504163abe71e2e70a33ae0d68c) @@ -109,8 +109,10 @@ eTreatmentEndDateTime , eWaterSampleTestResult , eDialysateVolumeUsed , + eOriginUFVolume , eTargetUFVolume , eActualUFVolume , + eOriginUFRate , eTargetUFRate , eActualUFRate , eSalineBolusVolume , @@ -148,8 +150,10 @@ tr("Treatment End DateTime" ), // eTreatmentEndDateTime tr("Water Sample Test Result" ), // eWaterSampleTestResult tr("Dialysate Volume Used" ), // eDialysateVolumeUsed + tr("Prescribed UF Volume" ), // eOriginUFVolume tr("Target UF Volume" ), // eTargetUFVolume tr("Actual UF Volume" ), // eActualUFVolume + tr("Prescribed UF Rate" ), // eOriginUFRate tr("Target UF Rate" ), // eTargetUFRate tr("Actual UF Rate" ), // eActualUFRate tr("Saline Bolus Volume" ), // eSalineBolusVolume @@ -185,8 +189,10 @@ "" , // eTreatmentEndDateTime "" , // eWaterSampleTestResult _unitTextVolume , // eDialysateVolumeUsed + _unitTextVolume , // eOriginUFVolume _unitTextVolume , // eTargetUFVolume _unitTextVolume , // eActualUFVolume + _unitTextFlowRate , // eOriginUFRate _unitTextFlowRate , // eTargetUFRate _unitTextFlowRate , // eActualUFRate _unitTextFluid , // eSalineBolusVolume Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf6b5ddb9a15690504163abe71e2e70a33ae0d68c --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision f6b5ddb9a15690504163abe71e2e70a33ae0d68c) @@ -90,8 +90,10 @@ averageDialysateFlow ( vData.mAverageDialysateFlow ); dialysateVolumeUsed ( vData.mDialysateVolumeUsed ); averageDialysateTemp ( vData.mAverageDialysateTemp ); + originUFVolume ( vData.mOriginUFVolume ); targetUFVolume ( vData.mTargetUFVolume ); actualUFVolume ( vData.mActualUFVolume ); + originUFRate ( vData.mOriginUFRate ); targetUFRate ( vData.mTargetUFRate ); actualUFRate ( vData.mActualUFRate ); salineBolusVolume ( vData.mSalineBolusVolume ); Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h =================================================================== diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rf6b5ddb9a15690504163abe71e2e70a33ae0d68c --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 27cc308ff5113a9386899d3c8f8b29962a8498e1) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision f6b5ddb9a15690504163abe71e2e70a33ae0d68c) @@ -70,8 +70,10 @@ PROPERTY(float , averageDialysateFlow , 0 ) PROPERTY(float , dialysateVolumeUsed , 0 ) PROPERTY(float , averageDialysateTemp , 0 ) + PROPERTY(float , originUFVolume , 0 ) PROPERTY(float , targetUFVolume , 0 ) PROPERTY(float , actualUFVolume , 0 ) + PROPERTY(float , originUFRate , 0 ) PROPERTY(float , targetUFRate , 0 ) PROPERTY(float , actualUFRate , 0 ) PROPERTY(quint32 , salineBolusVolume , 0 )