Index: en_US.udic =================================================================== diff -u -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c -r7b34653589ba6e4f4705fb4026fcd9319c41c352 --- en_US.udic (.../en_US.udic) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) +++ en_US.udic (.../en_US.udic) (revision 7b34653589ba6e4f4705fb4026fcd9319c41c352) @@ -199,3 +199,4 @@ bluetooth vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv dialyzer +deviceID Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c -r7b34653589ba6e4f4705fb4026fcd9319c41c352 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 7b34653589ba6e4f4705fb4026fcd9319c41c352) @@ -201,7 +201,7 @@ // ---- Treatment Log {Gui::GuiActionType::ID_AdjustTreatmentLogReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 33 * 4 }, //33 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 36 * 4 }, //36 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogAvrgeData , 5 * 4 }, // 5 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogAlarmData , 3 * 4 }, // 3 parameter each 4bytes {Gui::GuiActionType::ID_TreatmentLogEventData , 3 * 4 }, // 3 parameter each 4bytes Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp =================================================================== diff -u -r1c18f738693756ca1f0342c2cc158e32bc28f90b -r7b34653589ba6e4f4705fb4026fcd9319c41c352 --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision 7b34653589ba6e4f4705fb4026fcd9319c41c352) @@ -65,37 +65,40 @@ int index = 0; // message data start position if (GetValue(vByteArray, index, _data.mAccepted )) if (GetValue(vByteArray, index, _data.mReason )) - if (GetValue(vByteArray, index, _data.mBloodFlowRate )) - if (GetValue(vByteArray, index, _data.mDialysateFlowRate )) - if (GetValue(vByteArray, index, _data.mTreatmentDuration )) - if (GetValue(vByteArray, index, _data.mActualTreatmentDuration )) - if (GetValue(vByteArray, index, _data.mAcidConcentrateType )) - if (GetValue(vByteArray, index, _data.mBicarbonateConcentrateType )) - if (GetValue(vByteArray, index, _data.mPotassiumConcentration )) - if (GetValue(vByteArray, index, _data.mCalciumConcentration )) - if (GetValue(vByteArray, index, _data.mBicarbonateConcentration )) - if (GetValue(vByteArray, index, _data.mSodiumConcentration )) - if (GetValue(vByteArray, index, _data.mDialysateTemperature )) - if (GetValue(vByteArray, index, _data.mDialyzerType )) - if (GetValue(vByteArray, index, _data.mTreatmentStartEpoch )) - if (GetValue(vByteArray, index, _data.mTreatmentEndEpoch )) - if (GetValue(vByteArray, index, _data.mAverageBloodFlow )) - if (GetValue(vByteArray, index, _data.mAverageDialysateFlow )) - if (GetValue(vByteArray, index, _data.mDialysateVolumeUsed )) - if (GetValue(vByteArray, index, _data.mAverageDialysateTemp )) - if (GetValue(vByteArray, index, _data.mTargetUFVolume )) - if (GetValue(vByteArray, index, _data.mActualUFVolume )) - if (GetValue(vByteArray, index, _data.mTargetUFRate )) - if (GetValue(vByteArray, index, _data.mActualUFRate )) - if (GetValue(vByteArray, index, _data.mSalineBolusVolume )) - if (GetValue(vByteArray, index, _data.mHeparinBolusVolume )) - if (GetValue(vByteArray, index, _data.mHeparinDispenseRate )) - if (GetValue(vByteArray, index, _data.mHeparinStop )) - if (GetValue(vByteArray, index, _data.mHeparinDeliveredVolume )) - if (GetValue(vByteArray, index, _data.mAverageArterialPressure )) - if (GetValue(vByteArray, index, _data.mAverageVenousPressure )) - if (GetValue(vByteArray, index, _data.mDeviceID )) - if (GetValue(vByteArray, index, _data.mWaterSampleTestResult )) + if (GetValue(vByteArray, index, _data.mBloodFlowRate )) // U32 bloodFlowRate_mL_min; ///< Blood flow rate (in mL/min) + if (GetValue(vByteArray, index, _data.mDialysateFlowRate )) // U32 dialysateFlowRate_mL_min; ///< Dialysate flow rate (in mL/min) + if (GetValue(vByteArray, index, _data.mTreatmentDuration )) // U32 treatmentDuration_sec; ///< Selected treatment duration (in sec) + if (GetValue(vByteArray, index, _data.mActualTreatmentDuration )) // U32 actualTreatmentDur_sec; ///< Actual treatment duration (in sec) + if (GetValue(vByteArray, index, _data.mAcidConcentrateType )) // U32 acidConcentrate; ///< Acid concentrate option + if (GetValue(vByteArray, index, _data.mBicarbonateConcentrateType )) // U32 bicarbConcentrate; ///< Bicarbonate concentrate option + if (GetValue(vByteArray, index, _data.mPotassiumConcentration )) // U32 potassiumConcentration; ///< Potassium concentration value in mEq/L. + if (GetValue(vByteArray, index, _data.mCalciumConcentration )) // U32 calciumConcentration; ///< Calcium concentration value in mEq/L. + if (GetValue(vByteArray, index, _data.mBicarbonateConcentration )) // U32 bicarbonateConcentration; ///< Bicarbonate concentration value in mEq/L. + if (GetValue(vByteArray, index, _data.mSodiumConcentration )) // U32 sodiumConcentration; ///< Sodium concentration value in mEq/L. + if (GetValue(vByteArray, index, _data.mDialysateTemperature )) // F32 dialysateTemperature_degC; ///< Dialysate temperature (in deg C) + if (GetValue(vByteArray, index, _data.mDialyzerType )) // U32 dialyzerType; ///< Dialyzer type option + if (GetValue(vByteArray, index, _data.mTreatmentStartEpoch )) // U32 treatmentStartDateAndTime; ///< Treatment start date and time in epoch time (in seconds) + if (GetValue(vByteArray, index, _data.mTreatmentEndEpoch )) // U32 treatmentEndDateAndTime; ///< Treatment end date and time in epoch time (in seconds) + if (GetValue(vByteArray, index, _data.mAverageBloodFlow )) // F32 avgBloodFlow_mL_min; ///< Average blood flow rate during treatment (in mL/min) + if (GetValue(vByteArray, index, _data.mAverageDialysateFlow )) // F32 avgDialysateFlow_mL_min; ///< Average dialysate flow rate during treatment (in mL/min) + if (GetValue(vByteArray, index, _data.mDialysateVolumeUsed )) // F32 dialysateVolumeUsed_L; ///< Dialysate volume used during treatment (in L) + if (GetValue(vByteArray, index, _data.mAverageDialysateTemp )) // F32 avgDialysateTemperature_degC; ///< Average dialysate temperature (in deg C) + if (GetValue(vByteArray, index, _data.mOriginUFVolume )) // F32 originUFVolume_L; ///< Origin ultrafiltration volume (in L) + if (GetValue(vByteArray, index, _data.mTargetUFVolume )) // F32 targetUFVolume_L; ///< Target ultrafiltration volume (in L) + if (GetValue(vByteArray, index, _data.mActualUFVolume )) // F32 actualUFVolume_L; ///< Actual ultrafiltration volume (in L) + if (GetValue(vByteArray, index, _data.mOriginUFRate )) // F32 originUFRate_mL_min; ///< Origin ultrafiltration rate (in mL/min) + if (GetValue(vByteArray, index, _data.mTargetUFRate )) // F32 targetUFRate_mL_min; ///< Target ultrafiltration rate (in mL/min) + if (GetValue(vByteArray, index, _data.mActualUFRate )) // F32 actualUFRate_mL_min; ///< Actual ultrafiltration rate (in mL/min) + if (GetValue(vByteArray, index, _data.mSalineBolusVolume )) // U32 salineBolusVolume_mL; ///< Saline bolus volume (in mL) + if (GetValue(vByteArray, index, _data.mHeparinBolusVolume )) // F32 heparinBolusVolume_mL; ///< Heparin bolus volume (in mL) + if (GetValue(vByteArray, index, _data.mHeparinDispenseRate )) // F32 heparinDispenseRate_mL_hr; ///< Heparin dispense rate (in mL/hr) + if (GetValue(vByteArray, index, _data.mHeparinStop )) // U32 heparinPreStop_min; ///< Heparin pre-stop time (in min) + if (GetValue(vByteArray, index, _data.mHeparinDeliveredVolume )) // F32 heparinDeliveredVolume_mL; ///< Heparin delivered volume (in mL) + if (GetValue(vByteArray, index, _data.mHeparinType )) // U32 heparinType; ///< Heparin type option + if (GetValue(vByteArray, index, _data.mAverageArterialPressure )) // F32 avgArterialPressure_mmHg; ///< Average arterial pressure (in mmHg) + if (GetValue(vByteArray, index, _data.mAverageVenousPressure )) // F32 avgVenousPressure_mmHg; ///< Average venous pressure (in mmHg) + if (GetValue(vByteArray, index, _data.mDeviceID )) // U32 deviceID; ///< Serial number or UID + if (GetValue(vByteArray, index, _data.mWaterSampleTestResult )) // U32 waterSampleTestResult; ///< Pass or fail return true ; else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } @@ -130,6 +133,9 @@ else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } + else { if(vIndex) *vIndex = index; return false; } } /*! @@ -160,21 +166,23 @@ data.mAverageDialysateFlow = _data.mAverageDialysateFlow .value; data.mDialysateVolumeUsed = _data.mDialysateVolumeUsed .value; data.mAverageDialysateTemp = _data.mAverageDialysateTemp .value; + data.mOriginUFVolume = _data.mOriginUFVolume .value; data.mTargetUFVolume = _data.mTargetUFVolume .value; data.mActualUFVolume = _data.mActualUFVolume .value; + data.mOriginUFRate = _data.mOriginUFRate .value; data.mTargetUFRate = _data.mTargetUFRate .value; data.mActualUFRate = _data.mActualUFRate .value; data.mSalineBolusVolume = _data.mSalineBolusVolume .value; data.mHeparinBolusVolume = _data.mHeparinBolusVolume .value; data.mHeparinDispenseRate = _data.mHeparinDispenseRate .value; data.mHeparinStop = _data.mHeparinStop .value; data.mHeparinDeliveredVolume = _data.mHeparinDeliveredVolume .value; + data.mHeparinType = _data.mHeparinType .value; data.mAverageArterialPressure = _data.mAverageArterialPressure .value; data.mAverageVenousPressure = _data.mAverageVenousPressure .value; data.mDeviceID = _data.mDeviceID .value; data.mWaterSampleTestResult = _data.mWaterSampleTestResult .value; - data.mHeparinType = _data.mHeparinType .value; data.mHeparinConcentration = _data.mHeparinConcentration .value; return data; Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h =================================================================== diff -u -r1c18f738693756ca1f0342c2cc158e32bc28f90b -r7b34653589ba6e4f4705fb4026fcd9319c41c352 --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 1c18f738693756ca1f0342c2cc158e32bc28f90b) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 7b34653589ba6e4f4705fb4026fcd9319c41c352) @@ -110,20 +110,22 @@ Types::F32 mAverageDialysateFlow ; ///< 18 - (F32) Average Dialysate Flow (mL/min) Types::F32 mDialysateVolumeUsed ; ///< 19 - (F32) Dialysate Volume Used (L) Types::F32 mAverageDialysateTemp ; ///< 20 - (F32) Average Dialysate Temp (Celsius) - Types::F32 mTargetUFVolume ; ///< 21 - (F32) Target UF Volume (L) - Types::F32 mActualUFVolume ; ///< 22 - (F32) Actual UF Volume (L) - Types::F32 mTargetUFRate ; ///< 23 - (F32) Target UF Rate (mL/min) - Types::F32 mActualUFRate ; ///< 24 - (F32) Actual UF Rate (mL/min) - Types::U32 mSalineBolusVolume ; ///< 25 - (U32) Saline Bolus Volume (mL) - Types::F32 mHeparinBolusVolume ; ///< 26 - (F32) Heparin Bolus Volume (mL) - Types::F32 mHeparinDispenseRate ; ///< 27 - (F32) Heparin Dispense Rate (mL/hr) - Types::U32 mHeparinStop ; ///< 28 - (U32) Heparin Stop (min) - Types::F32 mHeparinDeliveredVolume ; ///< 29 - (F32) Heparin Delivered Volume (mL) - Types::F32 mAverageArterialPressure ; ///< 30 - (F32) Average Arterial Pressure (mmHg) - Types::F32 mAverageVenousPressure ; ///< 31 - (F32) Average Venous Pressure (mmHg) - Types::U32 mDeviceID ; ///< 32 - (U32) Device ID - Types::U32 mWaterSampleTestResult ; ///< 33 - (U32) Water Sample Test Result - Types::U32 mHeparinType ; ///< Heparin Type // is filled by UI, for now + Types::F32 mOriginUFVolume ; ///< 21 - (F32) Origin UF Volume (L) + Types::F32 mTargetUFVolume ; ///< 22 - (F32) Target UF Volume (L) + Types::F32 mActualUFVolume ; ///< 23 - (F32) Actual UF Volume (L) + Types::F32 mOriginUFRate ; ///< 24 - (F32) Origin UF Rate (mL/min) + Types::F32 mTargetUFRate ; ///< 25 - (F32) Target UF Rate (mL/min) + Types::F32 mActualUFRate ; ///< 26 - (F32) Actual UF Rate (mL/min) + Types::U32 mSalineBolusVolume ; ///< 27 - (U32) Saline Bolus Volume (mL) + Types::F32 mHeparinBolusVolume ; ///< 28 - (F32) Heparin Bolus Volume (mL) + Types::F32 mHeparinDispenseRate ; ///< 29 - (F32) Heparin Dispense Rate (mL/hr) + Types::U32 mHeparinStop ; ///< 30 - (U32) Heparin Stop (min) + Types::F32 mHeparinDeliveredVolume ; ///< 31 - (F32) Heparin Delivered Volume (mL) + Types::U32 mHeparinType ; ///< 32 - (U32) Heparin Type + Types::F32 mAverageArterialPressure ; ///< 33 - (F32) Average Arterial Pressure (mmHg) + Types::F32 mAverageVenousPressure ; ///< 34 - (F32) Average Venous Pressure (mmHg) + Types::U32 mDeviceID ; ///< 35 - (U32) Device ID + Types::U32 mWaterSampleTestResult ; ///< 36 - (U32) Water Sample Test Result Types::U32 mHeparinConcentration ; ///< Heparin Concentration (IU/mL) // is filled by UI, for now } _data; @@ -152,23 +154,25 @@ quint32 mTreatmentEndEpoch = 0; ///< 16 - (U32) Treatment End Date and Time (epoch) float mAverageBloodFlow = 0; ///< 17 - (F32) Average Blood Flow (mL/min) float mAverageDialysateFlow = 0; ///< 18 - (F32) Average Dialysate Flow (mL/min) - float mDialysateVolumeUsed = 0; ///< 19 - (F32) Dialysate Volume Used (L) + float mDialysateVolumeUsed = 0; ///< 19 - (F32) Dialysate Volume Used (L) float mAverageDialysateTemp = 0; ///< 20 - (F32) Average Dialysate Temp (Celsius) - float mTargetUFVolume = 0; ///< 21 - (F32) Target UF Volume (L) - float mActualUFVolume = 0; ///< 22 - (F32) Actual UF Volume (L) - float mTargetUFRate = 0; ///< 23 - (F32) Target UF Rate (mL/min) - float mActualUFRate = 0; ///< 24 - (F32) Actual UF Rate (mL/min) - quint32 mSalineBolusVolume = 0; ///< 25 - (U32) Saline Bolus Volume (mL) - float mHeparinBolusVolume = 0; ///< 26 - (F32) Heparin Bolus Volume (mL) - float mHeparinDispenseRate = 0; ///< 27 - (F32) Heparin Dispense Rate (mL/hr) - quint32 mHeparinStop = 0; ///< 28 - (U32) Heparin Stop (min) - float mHeparinDeliveredVolume = 0; ///< 29 - (F32) Heparin Delivered Volume (mL) - float mAverageArterialPressure = 0; ///< 30 - (F32) Average Arterial Pressure (mmHg) - float mAverageVenousPressure = 0; ///< 31 - (F32) Average Venous Pressure (mmHg) - quint32 mDeviceID = 0; ///< 32 - (U32) Device ID - quint32 mWaterSampleTestResult = 0; ///< 33 - (U32) Water Sample Test Result - quint32 mHeparinType = 0; ///< Heparin Type // is filled by UI, for now - quint32 mHeparinConcentration = 0; ///< Heparin Concentration (IU/mL) // is filled by UI, for now + float mOriginUFVolume = 0; ///< 21 - (F32) Origin UF Volume (L) + float mTargetUFVolume = 0; ///< 22 - (F32) Target UF Volume (L) + float mActualUFVolume = 0; ///< 23 - (F32) Actual UF Volume (L) + float mOriginUFRate = 0; ///< 24 - (F32) Origin UF Rate (mL/min) + float mTargetUFRate = 0; ///< 25 - (F32) Target UF Rate (mL/min) + float mActualUFRate = 0; ///< 26 - (F32) Actual UF Rate (mL/min) + quint32 mSalineBolusVolume = 0; ///< 27 - (U32) Saline Bolus Volume (mL) + float mHeparinBolusVolume = 0; ///< 28 - (F32) Heparin Bolus Volume (mL) + float mHeparinDispenseRate = 0; ///< 29 - (F32) Heparin Dispense Rate (mL/hr) + quint32 mHeparinStop = 0; ///< 30 - (U32) Heparin Stop (min) + float mHeparinDeliveredVolume = 0; ///< 31 - (F32) Heparin Delivered Volume (mL) + quint32 mHeparinType = 0; ///< 32 - (U32) Heparin Type + float mAverageArterialPressure = 0; ///< 33 - (F32) Average Arterial Pressure (mmHg) + float mAverageVenousPressure = 0; ///< 34 - (F32) Average Venous Pressure (mmHg) + quint32 mDeviceID = 0; ///< 35 - (U32) Device ID + quint32 mWaterSampleTestResult = 0; ///< 36 - (U32) Water Sample Test Result + quint32 mHeparinConcentration = 0; ///< UI - Heparin Concentration (IU/mL) // is filled by UI, for now }; MAdjustTreatmentLogResponse () { } Index: sources/storage/TreatmentLog.h =================================================================== diff -u -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 -r7b34653589ba6e4f4705fb4026fcd9319c41c352 --- sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision c4bd7072571428744e11dd24d5da1d1a3e1d1686) +++ sources/storage/TreatmentLog.h (.../TreatmentLog.h) (revision 7b34653589ba6e4f4705fb4026fcd9319c41c352) @@ -108,77 +108,77 @@ }; const QStringList _titles { - tr("Patient ID" ), - tr("Device ID" ), - tr("Blood Flow Rate" ), - tr("Dialysate Flow Rate" ), - tr("Treatment Duration" ), - tr("Actual Treatment Duration" ), - tr("Acid ConcentrateType" ), - tr("Bicarbonate Concentrate Type" ), - tr("Potassium Concentration" ), - tr("Calcium Concentration" ), - tr("Bicarbonate Concentration" ), - tr("Sodium Concentration" ), - tr("Dialysate Temperature" ), - tr("Dialyzer Type" ), - tr("Heparin Type" ), - tr("Heparin Concentration" ), - tr("Heparin Bolus Volume" ), - tr("Heparin Dispense Rate" ), - tr("Heparin Stop" ), - tr("Heparin Delivered Volume" ), - tr("Treatment Start DateTime" ), - tr("Treatment End DateTime" ), - tr("Water Sample Test Result" ), - tr("Dialysate Volume Used" ), - tr("Target UF Volume" ), - tr("Actual UF Volume" ), - tr("Target UF Rate" ), - tr("Actual UF Rate" ), - tr("Saline Bolus Volume" ), - tr("Average Blood Flow" ), - tr("Average Dialysate Flow" ), - tr("Average Dialysate Temp" ), - tr("Average Arterial Pressure" ), - tr("Average Venous Pressure" ), + tr("Patient ID" ), // ePatientID + tr("Device ID" ), // eDeviceID + tr("Blood Flow Rate" ), // eBloodFlowRate + tr("Dialysate Flow Rate" ), // eDialysateFlowRate + tr("Treatment Duration" ), // eTreatmentDuration + tr("Actual Treatment Duration" ), // eActualTreatmentDuration + tr("Acid ConcentrateType" ), // eAcidConcentrateType + tr("Bicarbonate Concentrate Type" ), // eBicarbonateConcentrateType + tr("Potassium Concentration" ), // ePotassiumConcentration + tr("Calcium Concentration" ), // eCalciumConcentration + tr("Bicarbonate Concentration" ), // eBicarbonateConcentration + tr("Sodium Concentration" ), // eSodiumConcentration + tr("Dialysate Temperature" ), // eDialysateTemperature + tr("Dialyzer Type" ), // eDialyzerType + tr("Heparin Type" ), // eHeparinType + tr("Heparin Concentration" ), // eHeparinConcentration + tr("Heparin Bolus Volume" ), // eHeparinBolusVolume + tr("Heparin Dispense Rate" ), // eHeparinDispenseRate + tr("Heparin Stop" ), // eHeparinStop + tr("Heparin Delivered Volume" ), // eHeparinDeliveredVolume + tr("Treatment Start DateTime" ), // eTreatmentStartDateTime + tr("Treatment End DateTime" ), // eTreatmentEndDateTime + tr("Water Sample Test Result" ), // eWaterSampleTestResult + tr("Dialysate Volume Used" ), // eDialysateVolumeUsed + tr("Target UF Volume" ), // eTargetUFVolume + tr("Actual UF Volume" ), // eActualUFVolume + tr("Target UF Rate" ), // eTargetUFRate + tr("Actual UF Rate" ), // eActualUFRate + tr("Saline Bolus Volume" ), // eSalineBolusVolume + tr("Average Blood Flow" ), // eAverageBloodFlow + tr("Average Dialysate Flow" ), // eAverageDialysateFlow + tr("Average Dialysate Temp" ), // eAverageDialysateTemp + tr("Average Arterial Pressure" ), // eAverageArterialPressure + tr("Average Venous Pressure" ), // eAverageVenousPressure }; const QStringList _units { - "" , - "" , - _unitTextFlowRate , - _unitTextFlowRate , - _unitTextDurationMin , - _unitTextDurationMin , - "" , - "" , - _unitTextConcentration , - _unitTextConcentration , - _unitTextConcentration , - _unitTextConcentration , - _unitTextTemperature , - "" , - "" , - _unitTextHeparinConcentration , - _unitTextFluid , - _unitTextDispencingRate , - _unitTextDurationMin , - _unitTextFluid , - "" , - "" , - "" , - _unitTextVolume , - _unitTextVolume , - _unitTextVolume , - _unitTextFlowRate , - _unitTextFlowRate , - _unitTextFluid , - _unitTextFlowRate , - _unitTextFlowRate , - _unitTextTemperature , - _unitTextBloodPressure , - _unitTextBloodPressure , + "" , // ePatientID + "" , // eDeviceID + _unitTextFlowRate , // eBloodFlowRate + _unitTextFlowRate , // eDialysateFlowRate + _unitTextDurationMin , // eTreatmentDuration + _unitTextDurationMin , // eActualTreatmentDuration + "" , // eAcidConcentrateType + "" , // eBicarbonateConcentrateType + _unitTextConcentration , // ePotassiumConcentration + _unitTextConcentration , // eCalciumConcentration + _unitTextConcentration , // eBicarbonateConcentration + _unitTextConcentration , // eSodiumConcentration + _unitTextTemperature , // eDialysateTemperature + "" , // eDialyzerType + "" , // eHeparinType + _unitTextHeparinConcentration , // eHeparinConcentration + _unitTextFluid , // eHeparinBolusVolume + _unitTextDispencingRate , // eHeparinDispenseRate + _unitTextDurationMin , // eHeparinStop + _unitTextFluid , // eHeparinDeliveredVolume + "" , // eTreatmentStartDateTime + "" , // eTreatmentEndDateTime + "" , // eWaterSampleTestResult + _unitTextVolume , // eDialysateVolumeUsed + _unitTextVolume , // eTargetUFVolume + _unitTextVolume , // eActualUFVolume + _unitTextFlowRate , // eTargetUFRate + _unitTextFlowRate , // eActualUFRate + _unitTextFluid , // eSalineBolusVolume + _unitTextFlowRate , // eAverageBloodFlow + _unitTextFlowRate , // eAverageDialysateFlow + _unitTextTemperature , // eAverageDialysateTemp + _unitTextBloodPressure , // eAverageArterialPressure + _unitTextBloodPressure , // eAverageVenousPressure }; QString title(quint8 vIndex) const {