Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp =================================================================== diff -u -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 -ra09c1a91b8eaf9d7164ba7f274d4ccd557c05f22 --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision a09c1a91b8eaf9d7164ba7f274d4ccd557c05f22) @@ -63,79 +63,49 @@ _data.mHeparinConcentration .value = 1000; 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 )) // 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; } - 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; } - 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; } - 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; } - 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; } - 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; } - 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; } + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodFlowRate )) goto lError; // U32 bloodFlowRate_mL_min; ///< Blood flow rate (in mL/min) + if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRate )) goto lError; // U32 dialysateFlowRate_mL_min; ///< Dialysate flow rate (in mL/min) + if ( ! GetValue(vByteArray, index, _data.mTreatmentDuration )) goto lError; // U32 treatmentDuration_sec; ///< Selected treatment duration (in sec) + if ( ! GetValue(vByteArray, index, _data.mActualTreatmentDuration )) goto lError; // U32 actualTreatmentDur_sec; ///< Actual treatment duration (in sec) + if ( ! GetValue(vByteArray, index, _data.mAcidConcentrateType )) goto lError; // U32 acidConcentrate; ///< Acid concentrate option + if ( ! GetValue(vByteArray, index, _data.mBicarbonateConcentrateType )) goto lError; // U32 bicarbConcentrate; ///< Bicarbonate concentrate option + if ( ! GetValue(vByteArray, index, _data.mPotassiumConcentration )) goto lError; // U32 potassiumConcentration; ///< Potassium concentration value in mEq/L. + if ( ! GetValue(vByteArray, index, _data.mCalciumConcentration )) goto lError; // U32 calciumConcentration; ///< Calcium concentration value in mEq/L. + if ( ! GetValue(vByteArray, index, _data.mBicarbonateConcentration )) goto lError; // U32 bicarbonateConcentration; ///< Bicarbonate concentration value in mEq/L. + if ( ! GetValue(vByteArray, index, _data.mSodiumConcentration )) goto lError; // U32 sodiumConcentration; ///< Sodium concentration value in mEq/L. + if ( ! GetValue(vByteArray, index, _data.mDialysateTemperature )) goto lError; // F32 dialysateTemperature_degC; ///< Dialysate temperature (in deg C) + if ( ! GetValue(vByteArray, index, _data.mDialyzerType )) goto lError; // U32 dialyzerType; ///< Dialyzer type option + if ( ! GetValue(vByteArray, index, _data.mTreatmentStartEpoch )) goto lError; // U32 treatmentStartDateAndTime; ///< Treatment start date and time in epoch time (in seconds) + if ( ! GetValue(vByteArray, index, _data.mTreatmentEndEpoch )) goto lError; // U32 treatmentEndDateAndTime; ///< Treatment end date and time in epoch time (in seconds) + if ( ! GetValue(vByteArray, index, _data.mAverageBloodFlow )) goto lError; // F32 avgBloodFlow_mL_min; ///< Average blood flow rate during treatment (in mL/min) + if ( ! GetValue(vByteArray, index, _data.mAverageDialysateFlow )) goto lError; // F32 avgDialysateFlow_mL_min; ///< Average dialysate flow rate during treatment (in mL/min) + if ( ! GetValue(vByteArray, index, _data.mDialysateVolumeUsed )) goto lError; // F32 dialysateVolumeUsed_L; ///< Dialysate volume used during treatment (in L) + if ( ! GetValue(vByteArray, index, _data.mAverageDialysateTemp )) goto lError; // F32 avgDialysateTemperature_degC; ///< Average dialysate temperature (in deg C) + if ( ! GetValue(vByteArray, index, _data.mOriginUFVolume )) goto lError; // F32 originUFVolume_L; ///< Origin ultrafiltration volume (in L) + if ( ! GetValue(vByteArray, index, _data.mTargetUFVolume )) goto lError; // F32 targetUFVolume_L; ///< Target ultrafiltration volume (in L) + if ( ! GetValue(vByteArray, index, _data.mActualUFVolume )) goto lError; // F32 actualUFVolume_L; ///< Actual ultrafiltration volume (in L) + if ( ! GetValue(vByteArray, index, _data.mOriginUFRate )) goto lError; // F32 originUFRate_mL_min; ///< Origin ultrafiltration rate (in mL/min) + if ( ! GetValue(vByteArray, index, _data.mTargetUFRate )) goto lError; // F32 targetUFRate_mL_min; ///< Target ultrafiltration rate (in mL/min) + if ( ! GetValue(vByteArray, index, _data.mActualUFRate )) goto lError; // F32 actualUFRate_mL_min; ///< Actual ultrafiltration rate (in mL/min) + if ( ! GetValue(vByteArray, index, _data.mSalineBolusVolume )) goto lError; // U32 salineBolusVolume_mL; ///< Saline bolus volume (in mL) + if ( ! GetValue(vByteArray, index, _data.mHeparinBolusVolume )) goto lError; // F32 heparinBolusVolume_mL; ///< Heparin bolus volume (in mL) + if ( ! GetValue(vByteArray, index, _data.mHeparinDispenseRate )) goto lError; // F32 heparinDispenseRate_mL_hr; ///< Heparin dispense rate (in mL/hr) + if ( ! GetValue(vByteArray, index, _data.mHeparinStop )) goto lError; // U32 heparinPreStop_min; ///< Heparin pre-stop time (in min) + if ( ! GetValue(vByteArray, index, _data.mHeparinDeliveredVolume )) goto lError; // F32 heparinDeliveredVolume_mL; ///< Heparin delivered volume (in mL) + if ( ! GetValue(vByteArray, index, _data.mHeparinType )) goto lError; // U32 heparinType; ///< Heparin type option + if ( ! GetValue(vByteArray, index, _data.mAverageArterialPressure )) goto lError; // F32 avgArterialPressure_mmHg; ///< Average arterial pressure (in mmHg) + if ( ! GetValue(vByteArray, index, _data.mAverageVenousPressure )) goto lError; // F32 avgVenousPressure_mmHg; ///< Average venous pressure (in mmHg) + if ( ! GetValue(vByteArray, index, _data.mDeviceID )) goto lError; // U32 deviceID; ///< Serial number or UID + if ( ! GetValue(vByteArray, index, _data.mWaterSampleTestResult )) goto lError; // U32 waterSampleTestResult; ///< Pass or fail + + return true ; + +lError: + if(vIndex) { *vIndex = index; } + + return false ; } /*!