Index: SDDs/Treatment_Logs.png =================================================================== diff -u -ref7ded49d368a1002b73819d7d71673519b1ae29 -r98f1043b23038c234374c04416e538cd6a749df0 Binary files differ Index: SDDs/Treatment_Logs.puml =================================================================== diff -u -ref7ded49d368a1002b73819d7d71673519b1ae29 -r98f1043b23038c234374c04416e538cd6a749df0 --- SDDs/Treatment_Logs.puml (.../Treatment_Logs.puml) (revision ef7ded49d368a1002b73819d7d71673519b1ae29) +++ SDDs/Treatment_Logs.puml (.../Treatment_Logs.puml) (revision 98f1043b23038c234374c04416e538cd6a749df0) @@ -21,20 +21,20 @@ '[x ,# certain amount of parameters according to the content] \n '[x ,X The rest of the parameters do not matter.] \n - == Log Data Collection == - alt Treatment Log Alarm Data + == Log Data Collection during Treatment == + loop Treatment Log Alarm Data TD -> SW: MSG: [x6A: #3] Event: \ \n\t(U32) mAlarmID \ \n\t(F32) mParam1 \ \n\t(F32) mParam2 end - alt Treatment Log Event Data + loop Treatment Log Event Data TD -> SW: MSG: [x6B: #3] Event: \ \n\t(U32) mEventID \ \n\t(F32) mOldValue \ \n\t(F32) mNewValue end - alt Treatment Log Average Periodic Data + loop Treatment Log Average Periodic Data TD -> SW: MSG: [xAD: #7] Event: \ \n\t(U32) mBloodFlowRate \ \n\t(F32) mDialysateFlowRate \ @@ -44,16 +44,76 @@ \n\t(F32) mTMPPressure \ \n\t(F32) mDialysateTemp end - alt Post Treatment Logs - UI -> SW: ACT: Post Treatment logs Request - SW -> TD: MSG: [xA9: #0] Req: Post Treatment logs Request - TD -> SW: MSG: [xAA: #62] Rsp: \ - \n\t(U32) mAccepted\ - \n\t(U32) mReason \ - \n\t ... Tx review data - end - == Write to Log == + == Post Treatment == + UI -> SW: ACT: Post Treatment logs Request + SW -> TD: MSG: [xA9: #0] Req: Post Treatment logs Request + TD -> SW: MSG: [xAA: #62] Rsp: \ + \n\t(U32) mAccepted \ + \n\t(U32) mReason \ + \n\t(U32) mBloodFlowRate \ + \n\t(U32) mBloodFlowRateActual \ + \n\t(U32) mDialysateFlowRate \ + \n\t(U32) mDialysateFlowRateActual \ + \n\t(U32) mTreatmentDuration \ + \n\t(U32) mTreatmentDurationActual \ + \n\t(U32) mAcidConcentrateType \ + \n\t(U32) mAcidConcentrateTypeActual \ + \n\t(U32) mBicarbonateCartridgeSize \ + \n\t(U32) mBicarbonateCartridgeSizeActual \ + \n\t(U32) mPotassiumConcentration \ + \n\t(U32) mPotassiumConcentrationActual \ + \n\t(U32) mCalciumConcentration \ + \n\t(U32) mCalciumConcentrationActual \ + \n\t(U32) mBicarbonateConcentration \ + \n\t(U32) mBicarbonateConcentrationActual \ + \n\t(U32) mSodiumConcentration \ + \n\t(U32) mSodiumConcentrationActual \ + \n\t(U32) mVitalsInterval \ + \n\t(U32) mVitalsIntervalActual \ + \n\t(U32) mDialyzerType \ + \n\t(U32) mTreatmentStartEpoch \ + \n\t(U32) mTreatmentEndEpoch \ + \n\t(U32) mFluidBolusVolume \ + \n\t(U32) mFluidBolusVolumeActual \ + \n\t(U32) mHeparinType \ + \n\t(U32) mHeparinDeliveryDuration \ + \n\t(U32) mHeparinDeliveryDurationActual + TD -> SW: ... \ + \n\t(U32) mTreatmentModality \ + \n\t(U32) mTreatmentModalityActual \ + \n\t(U32) mHDFOperatingMode \ + \n\t(U32) mHDFOperatingModeActual \ + \n\t(U32) mHepatitisStatus \ + \n\t(F32) mDialysateTemperature \ + \n\t(F32) mDialysateTemperatureActual \ + \n\t(F32) mDialysateVolumeUsed \ + \n\t(F32) mHeparinBolusVolume \ + \n\t(F32) mHeparinBolusVolumeActual \ + \n\t(F32) mHeparinDispenseRate \ + \n\t(F32) mHeparinDispenseRateActual \ + \n\t(F32) mHeparinDeliveredVolume \ + \n\t(F32) mUFVolume \ + \n\t(F32) mUFVolumeActual \ + \n\t(F32) mUFVolumeTarget \ + \n\t(F32) mUFRate \ + \n\t(F32) mUFRateActual \ + \n\t(F32) mUFRateTarget \ + \n\t(F32) mSubstitutionVolume \ + \n\t(F32) mSubstitutionVolumeActual \ + \n\t(F32) mSubstitutionVolumeTarget \ + \n\t(F32) mSubstitutionRate \ + \n\t(F32) mSubstitutionRateActual \ + \n\t(F32) mSubstitutionRateTarget \ + \n\t(F32) mIsoUfVolume \ + \n\t(F32) mIsoUfVolumeActual \ + \n\t(F32) mIsoUfVolumeTarget \ + \n\t(F32) mIsoUfRate \ + \n\t(F32) mIsoUfRateActual \ + \n\t(F32) mIsoUfRateTarget + TD -> SW: ... \ + \n\t(F32) mWaterSampleTestResult + SW -> SW: ACT: Populate data model with collected data \ \n\t Write data to log file \ \n\t Save log file with unique name Index: sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp =================================================================== diff -u -ref7ded49d368a1002b73819d7d71673519b1ae29 -r98f1043b23038c234374c04416e538cd6a749df0 --- sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp (.../MTreatmentLogAvrgeData.cpp) (revision ef7ded49d368a1002b73819d7d71673519b1ae29) +++ sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp (.../MTreatmentLogAvrgeData.cpp) (revision 98f1043b23038c234374c04416e538cd6a749df0) @@ -26,6 +26,8 @@ _data.mUFRate .value, _data.mArterialPressure .value, _data.mVenousPressure .value, + _data.mTMPPressure .value, + _data.mDialysateTemp .value, }; } @@ -36,6 +38,8 @@ if ( ! GetValue(vByteArray, index, _data.mUFRate )) goto lError; if ( ! GetValue(vByteArray, index, _data.mArterialPressure )) goto lError; if ( ! GetValue(vByteArray, index, _data.mVenousPressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTMPPressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateTemp )) goto lError; return true ; @@ -58,5 +62,7 @@ data.mUFRate = _data.mUFRate .value; data.mArterialPressure = _data.mArterialPressure .value; data.mVenousPressure = _data.mVenousPressure .value; + data.mTMPPressure = _data.mTMPPressure .value; + data.mDialysateTemp = _data.mDialysateTemp .value; return data; } Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -r1eedad37ea1cad5c9aa41ac082614d082f525a7f -r98f1043b23038c234374c04416e538cd6a749df0 --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 1eedad37ea1cad5c9aa41ac082614d082f525a7f) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 98f1043b23038c234374c04416e538cd6a749df0) @@ -411,6 +411,8 @@ line += csv.arg(item.mUFRate ,FLOAT3 ); line += csv.arg(item.mArterialPressure ,FLOAT3 ); line += csv.arg(item.mVenousPressure ,FLOAT3 ); + line += csv.arg(item.mTMPPressure ,FLOAT3 ); + line += csv.arg(item.mDialysateTempPressure,FLOAT3 ); line += csv.arg(item.mSystolic ); line += csv.arg(item.mDiastolic ); line += end.arg(item.mHeartRate ); Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -rdc8969f6c7bbdb46d2de22622e58e457ceb37df4 -r98f1043b23038c234374c04416e538cd6a749df0 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision dc8969f6c7bbdb46d2de22622e58e457ceb37df4) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 98f1043b23038c234374c04416e538cd6a749df0) @@ -75,9 +75,6 @@ QString _tdSerialNumber = ""; - PROPERTY(bool , heparinDispensingRateOff , true) - PROPERTY(bool , heparinBolusVolumeOff , true) - VALUESET(quint32 , treatmentModality , 0) VALUESET(quint32 , hdfTreatmentMode , 0) VALUESET(quint32 , bloodFlowRate , 0)