Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r83acad721bd36d2c88a15feddd6812d2e591bef3 -r676ec71574416b57c5263b1a4acc66d6904751e7 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 83acad721bd36d2c88a15feddd6812d2e591bef3) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 676ec71574416b57c5263b1a4acc66d6904751e7) @@ -291,7 +291,7 @@ // ---- Treatment Log {Gui::GuiActionType::ID_AdjustTreatmentLogReq , 0 * 4 }, // 0 parameter - {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 36 * 4 }, //36 parameter each 4bytes + {Gui::GuiActionType::ID_AdjustTreatmentLogRsp , 66 * 4 }, // 66 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 -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r676ec71574416b57c5263b1a4acc66d6904751e7 --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.cpp (.../MPostTreatmentAdjustTreatmentLogResponse.cpp) (revision 676ec71574416b57c5263b1a4acc66d6904751e7) @@ -18,88 +18,145 @@ QVariantList MAdjustTreatmentLogResponse::parameters() const { return { - _data.mAccepted .value, - _data.mReason .value, - - _data.mBloodFlowRate .value, - _data.mDialysateFlowRate .value, - _data.mTreatmentDuration .value, - _data.mActualTreatmentDuration .value, - _data.mAcidConcentrateType .value, - _data.mBicarbonateConcentrateType .value, - _data.mPotassiumConcentration .value, - _data.mCalciumConcentration .value, - _data.mBicarbonateConcentration .value, - _data.mSodiumConcentration .value, - _data.mDialysateTemperature .value, - _data.mDialyzerType .value, - _data.mTreatmentStartEpoch .value, - _data.mTreatmentEndEpoch .value, - _data.mAverageBloodFlow .value, - _data.mAverageDialysateFlow .value, - _data.mDialysateVolumeUsed .value, - _data.mAverageDialysateTemp .value, - _data.mTargetUFVolume .value, - _data.mActualUFVolume .value, - _data.mTargetUFRate .value, - _data.mActualUFRate .value, - _data.mSalineBolusVolume .value, - _data.mHeparinBolusVolume .value, - _data.mHeparinDispenseRate .value, - _data.mHeparinStop .value, - _data.mHeparinDeliveredVolume .value, - _data.mAverageArterialPressure .value, - _data.mAverageVenousPressure .value, - _data.mDeviceID .value, - _data.mWaterSampleTestResult .value, - - _data.mHeparinType .value, - _data.mHeparinConcentration .value, + _data.mAccepted .value, + _data.mReason .value, + _data.mBloodFlowRate .value, + _data.mBloodFlowRateActual .value, + _data.mDialysateFlowRate .value, + _data.mDialysateFlowRateActual .value, + _data.mTreatmentDuration .value, + _data.mTreatmentDurationActual .value, + _data.mAcidConcentrateType .value, + _data.mAcidConcentrateTypeActual .value, + _data.mBicarbonateConcentrateType .value, + _data.mBicarbonateConcentrateTypeActual .value, + _data.mPotassiumConcentration .value, + _data.mPotassiumConcentrationActual .value, + _data.mCalciumConcentration .value, + _data.mCalciumConcentrationActual .value, + _data.mBicarbonateConcentration .value, + _data.mBicarbonateConcentrationActual .value, + _data.mSodiumConcentration .value, + _data.mSodiumConcentrationActual .value, + _data.mVitalsInterval .value, + _data.mVitalsIntervalActual .value, + _data.mDialyzerType .value, + _data.mTreatmentStartEpoch .value, + _data.mTreatmentEndEpoch .value, + _data.mFluidBolusVolume .value, + _data.mFluidBolusVolumeActual .value, + _data.mPatientID .value, + _data.mSecondaryPatientID .value, + _data.mHeparinType .value, + _data.mHeparinDeliveryDuration .value, + _data.mHeparinDeliveryDurationActual .value, + _data.mTreatmentModality .value, + _data.mTreatmentModalityActual .value, + _data.mHDFOperatingMode .value, + _data.mHDFOperatingModeActual .value, + _data.mHepatitisStatus .value, + _data.mDialysateTemperature .value, + _data.mDialysateTemperatureActual .value, + _data.mDialysateVolumeUsed .value, + _data.mHeparinBolusVolume .value, + _data.mHeparinBolusVolumeActual .value, + _data.mHeparinDispenseRate .value, + _data.mHeparinDispenseRateActual .value, + _data.mHeparinDeliveredVolume .value, + _data.mAverageArterialPressure .value, + _data.mAverageVenousPressure .value, + _data.mUFVolume .value, + _data.mUFVolumeActual .value, + _data.mUFVolumeTarget .value, + _data.mUFRate .value, + _data.mUFRateActual .value, + _data.mUFRateTarget .value, + _data.mSubstitutionVolume .value, + _data.mSubstitutionVolumeActual .value, + _data.mSubstitutionVolumeTarget .value, + _data.mSubstitutionRate .value, + _data.mSubstitutionRateActual .value, + _data.mSubstitutionRateTarget .value, + _data.mIsoUfVolume .value, + _data.mIsoUfVolumeActual .value, + _data.mIsoUfVolumeTarget .value, + _data.mIsoUfRate .value, + _data.mIsoUfRateActual .value, + _data.mIsoUfRateTarget .value, + _data.mWaterSampleTestResult .value, }; } bool MAdjustTreatmentLogResponse::fromByteArray(const QByteArray &vByteArray, int *vIndex) { - _data.mHeparinType .value = 0; - _data.mHeparinConcentration .value = 1000; - int index = 0; // message data start position - 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 + if ( ! GetValue(vByteArray, index, _data.mAccepted )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodFlowRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBloodFlowRateActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateFlowRateActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTreatmentDuration )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTreatmentDurationActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAcidConcentrateType )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAcidConcentrateTypeActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbonateConcentrateType )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbonateConcentrateTypeActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPotassiumConcentration )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPotassiumConcentrationActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalciumConcentration )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mCalciumConcentrationActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbonateConcentration )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mBicarbonateConcentrationActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSodiumConcentration )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSodiumConcentrationActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mVitalsInterval )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mVitalsIntervalActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialyzerType )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTreatmentStartEpoch )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTreatmentEndEpoch )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFluidBolusVolume )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mFluidBolusVolumeActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mPatientID )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSecondaryPatientID )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinType )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinDeliveryDuration )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinDeliveryDurationActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTreatmentModality )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTreatmentModalityActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHDFOperatingMode )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHDFOperatingModeActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHepatitisStatus )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateTemperature )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateTemperatureActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mDialysateVolumeUsed )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinBolusVolume )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinBolusVolumeActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinDispenseRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinDispenseRateActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mHeparinDeliveredVolume )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAverageArterialPressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mAverageVenousPressure )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFVolume )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFVolumeActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFVolumeTarget )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFRateActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mUFRateTarget )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSubstitutionVolume )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSubstitutionVolumeActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSubstitutionVolumeTarget )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSubstitutionRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSubstitutionRateActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mSubstitutionRateTarget )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mIsoUfVolume )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mIsoUfVolumeActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mIsoUfVolumeTarget )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mIsoUfRate )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mIsoUfRateActual )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mIsoUfRateTarget )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mWaterSampleTestResult )) goto lError; + return true ; lError: @@ -115,45 +172,72 @@ */ AdjustTreatmentLogResponseData MAdjustTreatmentLogResponse::data() const { Data data; - data.mAccepted = _data.mAccepted .value; - data.mReason = _data.mReason .value; + data.mAccepted = _data.mAccepted .value; + data.mReason = _data.mReason .value; + data.mBloodFlowRate = _data.mBloodFlowRate .value; + data.mBloodFlowRateActual = _data.mBloodFlowRateActual .value; + data.mDialysateFlowRate = _data.mDialysateFlowRate .value; + data.mDialysateFlowRateActual = _data.mDialysateFlowRateActual .value; + data.mTreatmentDuration = _data.mTreatmentDuration .value; + data.mTreatmentDurationActual = _data.mTreatmentDurationActual .value; + data.mAcidConcentrateType = _data.mAcidConcentrateType .value; + data.mAcidConcentrateTypeActual = _data.mAcidConcentrateTypeActual .value; + data.mBicarbonateConcentrateType = _data.mBicarbonateConcentrateType .value; + data.mBicarbonateConcentrateTypeActual = _data.mBicarbonateConcentrateTypeActual .value; + data.mPotassiumConcentration = _data.mPotassiumConcentration .value; + data.mPotassiumConcentrationActual = _data.mPotassiumConcentrationActual .value; + data.mCalciumConcentration = _data.mCalciumConcentration .value; + data.mCalciumConcentrationActual = _data.mCalciumConcentrationActual .value; + data.mBicarbonateConcentration = _data.mBicarbonateConcentration .value; + data.mBicarbonateConcentrationActual = _data.mBicarbonateConcentrationActual .value; + data.mSodiumConcentration = _data.mSodiumConcentration .value; + data.mSodiumConcentrationActual = _data.mSodiumConcentrationActual .value; + data.mVitalsInterval = _data.mVitalsInterval .value; + data.mVitalsIntervalActual = _data.mVitalsIntervalActual .value; + data.mDialyzerType = _data.mDialyzerType .value; + data.mTreatmentStartEpoch = _data.mTreatmentStartEpoch .value; + data.mTreatmentEndEpoch = _data.mTreatmentEndEpoch .value; + data.mFluidBolusVolume = _data.mFluidBolusVolume .value; + data.mFluidBolusVolumeActual = _data.mFluidBolusVolumeActual .value; + data.mPatientID = _data.mPatientID .value; + data.mSecondaryPatientID = _data.mSecondaryPatientID .value; + data.mHeparinType = _data.mHeparinType .value; + data.mHeparinDeliveryDuration = _data.mHeparinDeliveryDuration .value; + data.mHeparinDeliveryDurationActual = _data.mHeparinDeliveryDurationActual .value; + data.mTreatmentModality = _data.mTreatmentModality .value; + data.mTreatmentModalityActual = _data.mTreatmentModalityActual .value; + data.mHDFOperatingMode = _data.mHDFOperatingMode .value; + data.mHDFOperatingModeActual = _data.mHDFOperatingModeActual .value; + data.mHepatitisStatus = _data.mHepatitisStatus .value; + data.mDialysateTemperature = _data.mDialysateTemperature .value; + data.mDialysateTemperatureActual = _data.mDialysateTemperatureActual .value; + data.mDialysateVolumeUsed = _data.mDialysateVolumeUsed .value; + data.mHeparinBolusVolume = _data.mHeparinBolusVolume .value; + data.mHeparinBolusVolumeActual = _data.mHeparinBolusVolumeActual .value; + data.mHeparinDispenseRate = _data.mHeparinDispenseRate .value; + data.mHeparinDispenseRateActual = _data.mHeparinDispenseRateActual .value; + data.mHeparinDeliveredVolume = _data.mHeparinDeliveredVolume .value; + data.mAverageArterialPressure = _data.mAverageArterialPressure .value; + data.mAverageVenousPressure = _data.mAverageVenousPressure .value; + data.mUFVolume = _data.mUFVolume .value; + data.mUFVolumeActual = _data.mUFVolumeActual .value; + data.mUFVolumeTarget = _data.mUFVolumeTarget .value; + data.mUFRate = _data.mUFRate .value; + data.mUFRateActual = _data.mUFRateActual .value; + data.mUFRateTarget = _data.mUFRateTarget .value; + data.mSubstitutionVolume = _data.mSubstitutionVolume .value; + data.mSubstitutionVolumeActual = _data.mSubstitutionVolumeActual .value; + data.mSubstitutionVolumeTarget = _data.mSubstitutionVolumeTarget .value; + data.mSubstitutionRate = _data.mSubstitutionRate .value; + data.mSubstitutionRateActual = _data.mSubstitutionRateActual .value; + data.mSubstitutionRateTarget = _data.mSubstitutionRateTarget .value; + data.mIsoUfVolume = _data.mIsoUfVolume .value; + data.mIsoUfVolumeActual = _data.mIsoUfVolumeActual .value; + data.mIsoUfVolumeTarget = _data.mIsoUfVolumeTarget .value; + data.mIsoUfRate = _data.mIsoUfRate .value; + data.mIsoUfRateActual = _data.mIsoUfRateActual .value; + data.mIsoUfRateTarget = _data.mIsoUfRateTarget .value; + data.mWaterSampleTestResult = _data.mWaterSampleTestResult .value; - data.mBloodFlowRate = _data.mBloodFlowRate .value; - data.mDialysateFlowRate = _data.mDialysateFlowRate .value; - data.mTreatmentDuration = _data.mTreatmentDuration .value; - data.mActualTreatmentDuration = _data.mActualTreatmentDuration .value; - data.mAcidConcentrateType = _data.mAcidConcentrateType .value; - data.mBicarbonateConcentrateType = _data.mBicarbonateConcentrateType .value; - data.mPotassiumConcentration = _data.mPotassiumConcentration .value; - data.mCalciumConcentration = _data.mCalciumConcentration .value; - data.mBicarbonateConcentration = _data.mBicarbonateConcentration .value; - data.mSodiumConcentration = _data.mSodiumConcentration .value; - data.mDialysateTemperature = _data.mDialysateTemperature .value; - data.mDialyzerType = _data.mDialyzerType .value; - data.mTreatmentStartEpoch = _data.mTreatmentStartEpoch .value; - data.mTreatmentEndEpoch = _data.mTreatmentEndEpoch .value; - data.mAverageBloodFlow = _data.mAverageBloodFlow .value; - 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.mHeparinConcentration = _data.mHeparinConcentration .value; - return data; } Index: sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r676ec71574416b57c5263b1a4acc66d6904751e7 --- sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/adjustment/posttreatment/MPostTreatmentAdjustTreatmentLogResponse.h (.../MPostTreatmentAdjustTreatmentLogResponse.h) (revision 676ec71574416b57c5263b1a4acc66d6904751e7) @@ -32,46 +32,77 @@ * * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:---------: | - * |0x7600| 0x020 | 6 | Rsp | Y | HD | UI | TreatmentLog Response | + * |0xAA00| 0x020 | 6 | Rsp | Y | TD | UI | TreatmentLog Response | * * | Payload || * | || - * | 01 - (U32) | \ref Data::mAccepted | The accept or reject bool flag | | - * | 02 - (U32) | \ref Data::mReason | The rejection reason | | - * | 03 - (U32) | \ref Data::mBloodFlowRate | Blood Flow Rate | (mL/min) | - * | 04 - (U32) | \ref Data::mDialysateFlowRate | Dialysate Flow Rate | (mL/min) | - * | 05 - (U32) | \ref Data::mTreatmentDuration | Treatment Duration | (sec) | - * | 06 - (U32) | \ref Data::mActualTreatmentDuration | Actual Treatment Duration | (sec) | - * | 07 - (U32) | \ref Data::mAcidConcentrateType | Acid Concentrate Type | | - * | 08 - (U32) | \ref Data::mBicarbonateConcentrateType | Bicarbonate Concentrate Type | | - * | 09 - (U32) | \ref Data::mPotassiumConcentration | Potassium Concentration | (mEq/L) | - * | 10 - (U32) | \ref Data::mCalciumConcentration | Calcium Concentration | (mEq/L) | - * | 11 - (U32) | \ref Data::mBicarbonateConcentration | Bicarbonate Concentration | (mEq/L) | - * | 12 - (U32) | \ref Data::mSodiumConcentration | SodiumConcentration | (mEq/L) | - * | 13 - (F32) | \ref Data::mDialysateTemperature | Dialysate Temperature | (Celsius | - * | 14 - (U32) | \ref Data::mDialyzerType | Dialyzer Type | | - * | 15 - (U32) | \ref Data::mTreatmentStartEpoch | Treatment Start Date and Time | (epoch) | - * | 16 - (U32) | \ref Data::mTreatmentEndEpoch | Treatment End Date and Time | (epoch) | - * | 17 - (F32) | \ref Data::mAverageBloodFlow | Average Blood Flow | (mL/min) | - * | 18 - (F32) | \ref Data::mAverageDialysateFlow | Average Dialysate Flow | (mL/min) | - * | 19 - (F32) | \ref Data::mDialysateVolumeUsed | Dialysate Volume Used | (L) | - * | 20 - (F32) | \ref Data::mAverageDialysateTemp | Average Dialysate Temp | (Celsius | - * | 21 - (F32) | \ref Data::mOriginUFVolume | Origin UF Volume | (L) | - * | 22 - (F32) | \ref Data::mTargetUFVolume | Target UF Volume | (L) | - * | 23 - (F32) | \ref Data::mActualUFVolume | Actual UF Volume | (L) | - * | 24 - (F32) | \ref Data::mOriginUFRate | Origin UF Rate | (mL/min) | - * | 25 - (F32) | \ref Data::mTargetUFRate | Target UF Rate | (mL/min) | - * | 26 - (F32) | \ref Data::mActualUFRate | Actual UF Rate | (mL/min) | - * | 27 - (U32) | \ref Data::mSalineBolusVolume | Saline Bolus Volume | (mL) | - * | 28 - (F32) | \ref Data::mHeparinBolusVolume | Heparin Bolus Volume | (mL) | - * | 29 - (F32) | \ref Data::mHeparinDispenseRate | Heparin Dispense Rate | (mL/hr) | - * | 30 - (U32) | \ref Data::mHeparinStop | Heparin Stop | (min) | - * | 31 - (F32) | \ref Data::mHeparinDeliveredVolume | Heparin Delivered Volume | (mL) | - * | 32 - (U32) | \ref Data::mHeparinType | Heparin Type | | - * | 33 - (F32) | \ref Data::mAverageArterialPressure | Average Arterial Pressure | (mmHg) | - * | 34 - (F32) | \ref Data::mAverageVenousPressure | Average Venous Pressure | (mmHg) | - * | 35 - (U32) | \ref Data::mDeviceID | Device ID | | - * | 36 - (U32) | \ref Data::mWaterSampleTestResult | Water Sample Test Result | | + * | 01 - (U32) | \ref Data::mAccepted + * | 02 - (U32) | \ref Data::mReason + * | 03 - (U32) | \ref Data::mBloodFlowRate + * | 04 - (U32) | \ref Data::mBloodFlowRateActual + * | 05 - (U32) | \ref Data::mDialysateFlowRate + * | 06 - (U32) | \ref Data::mDialysateFlowRateActual + * | 07 - (U32) | \ref Data::mTreatmentDuration + * | 08 - (U32) | \ref Data::mTreatmentDurationActual + * | 09 - (U32) | \ref Data::mAcidConcentrateType + * | 10 - (U32) | \ref Data::mAcidConcentrateTypeActual + * | 11 - (U32) | \ref Data::mBicarbonateConcentrateType + * | 12 - (U32) | \ref Data::mBicarbonateConcentrateTypeActual + * | 13 - (U32) | \ref Data::mPotassiumConcentration + * | 14 - (U32) | \ref Data::mPotassiumConcentrationActual + * | 15 - (U32) | \ref Data::mCalciumConcentration + * | 16 - (U32) | \ref Data::mCalciumConcentrationActual + * | 17 - (U32) | \ref Data::mBicarbonateConcentration + * | 18 - (U32) | \ref Data::mBicarbonateConcentrationActual + * | 19 - (U32) | \ref Data::mSodiumConcentration + * | 20 - (U32) | \ref Data::mSodiumConcentrationActual + * | 21 - (U32) | \ref Data::mVitalsInterval + * | 22 - (U32) | \ref Data::mVitalsIntervalActual + * | 23 - (U32) | \ref Data::mDialyzerType + * | 24 - (U32) | \ref Data::mTreatmentStartEpoch + * | 25 - (U32) | \ref Data::mTreatmentEndEpoch + * | 26 - (U32) | \ref Data::mFluidBolusVolume + * | 27 - (U32) | \ref Data::mFluidBolusVolumeActual + * | 28 - (U32) | \ref Data::mPatientID + * | 29 - (U32) | \ref Data::mSecondaryPatientID + * | 30 - (U32) | \ref Data::mHeparinType + * | 31 - (U32) | \ref Data::mHeparinDeliveryDuration + * | 32 - (U32) | \ref Data::mHeparinDeliveryDurationActual + * | 33 - (U32) | \ref Data::mTreatmentModality + * | 34 - (U32) | \ref Data::mTreatmentModalityActual + * | 35 - (U32) | \ref Data::mHDFOperatingMode + * | 36 - (U32) | \ref Data::mHDFOperatingModeActual + * | 37 - (U32) | \ref Data::mHepatitisStatus + * | 38 - (F32) | \ref Data::mDialysateTemperature + * | 39 - (F32) | \ref Data::mDialysateTemperatureActual + * | 40 - (F32) | \ref Data::mDialysateVolumeUsed + * | 41 - (F32) | \ref Data::mHeparinBolusVolume + * | 42 - (F32) | \ref Data::mHeparinBolusVolumeActual + * | 43 - (F32) | \ref Data::mHeparinDispenseRate + * | 44 - (F32) | \ref Data::mHeparinDispenseRateActual + * | 45 - (F32) | \ref Data::mHeparinDeliveredVolume + * | 46 - (F32) | \ref Data::mAverageArterialPressure + * | 47 - (F32) | \ref Data::mAverageVenousPressure + * | 48 - (F32) | \ref Data::mUFVolume + * | 49 - (F32) | \ref Data::mUFVolumeActual + * | 50 - (F32) | \ref Data::mUFVolumeTarget + * | 51 - (F32) | \ref Data::mUFRate + * | 52 - (F32) | \ref Data::mUFRateActual + * | 53 - (F32) | \ref Data::mUFRateTarget + * | 54 - (F32) | \ref Data::mSubstitutionVolume + * | 55 - (F32) | \ref Data::mSubstitutionVolumeActual + * | 56 - (F32) | \ref Data::mSubstitutionVolumeTarget + * | 57 - (F32) | \ref Data::mSubstitutionRate + * | 58 - (F32) | \ref Data::mSubstitutionRateActual + * | 59 - (F32) | \ref Data::mSubstitutionRateTarget + * | 60 - (F32) | \ref Data::mIsoUfVolume + * | 61 - (F32) | \ref Data::mIsoUfVolumeActual + * | 62 - (F32) | \ref Data::mIsoUfVolumeTarget + * | 63 - (F32) | \ref Data::mIsoUfRate + * | 64 - (F32) | \ref Data::mIsoUfRateActual + * | 65 - (F32) | \ref Data::mIsoUfRateTarget + * | 66 - (F32) | \ref Data::mWaterSampleTestResult + * \sa Data * \sa MAdjustTreatmentLogReq : TreatmentLog Request * \sa MTreatmentTreatmentLog : TreatmentLog Data @@ -92,43 +123,72 @@ QVariantList parameters() const override; struct { - Types::U32 mAccepted ; ///< 01 - (U32) The accept or reject bool flag - Types::U32 mReason ; ///< 02 - (U32) The rejection reason - Types::U32 mBloodFlowRate ; ///< 03 - (U32) Blood Flow Rate (mL/min) - Types::U32 mDialysateFlowRate ; ///< 04 - (U32) Dialysate Flow Rate (mL/min) - Types::U32 mTreatmentDuration ; ///< 05 - (U32) Treatment Duration (sec) - Types::U32 mActualTreatmentDuration ; ///< 06 - (U32) Actual Treatment Duration (sec) - Types::U32 mAcidConcentrateType ; ///< 07 - (U32) Acid Concentrate Type - Types::U32 mBicarbonateConcentrateType ; ///< 08 - (U32) Bicarbonate Concentrate Type - Types::U32 mPotassiumConcentration ; ///< 09 - (U32) Potassium Concentration (mEq/L) - Types::U32 mCalciumConcentration ; ///< 10 - (U32) Calcium Concentration (mEq/L) - Types::U32 mBicarbonateConcentration ; ///< 11 - (U32) Bicarbonate Concentration (mEq/L) - Types::U32 mSodiumConcentration ; ///< 12 - (U32) SodiumConcentration (mEq/L) - Types::F32 mDialysateTemperature ; ///< 13 - (F32) Dialysate Temperature (Celsius) - Types::U32 mDialyzerType ; ///< 14 - (U32) Dialyzer Type - Types::U32 mTreatmentStartEpoch ; ///< 15 - (U32) Treatment Start Date and Time (epoch) - Types::U32 mTreatmentEndEpoch ; ///< 16 - (U32) Treatment End Date and Time (epoch) - Types::F32 mAverageBloodFlow ; ///< 17 - (F32) Average Blood Flow (mL/min) - 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 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 + Types::U32 mAccepted ; + Types::U32 mReason ; + Types::U32 mBloodFlowRate ; + Types::U32 mBloodFlowRateActual ; + Types::U32 mDialysateFlowRate ; + Types::U32 mDialysateFlowRateActual ; + Types::U32 mTreatmentDuration ; + Types::U32 mTreatmentDurationActual ; + Types::U32 mAcidConcentrateType ; + Types::U32 mAcidConcentrateTypeActual ; + Types::U32 mBicarbonateConcentrateType ; + Types::U32 mBicarbonateConcentrateTypeActual ; + Types::U32 mPotassiumConcentration ; + Types::U32 mPotassiumConcentrationActual ; + Types::U32 mCalciumConcentration ; + Types::U32 mCalciumConcentrationActual ; + Types::U32 mBicarbonateConcentration ; + Types::U32 mBicarbonateConcentrationActual ; + Types::U32 mSodiumConcentration ; + Types::U32 mSodiumConcentrationActual ; + Types::U32 mVitalsInterval ; + Types::U32 mVitalsIntervalActual ; + Types::U32 mDialyzerType ; + Types::U32 mTreatmentStartEpoch ; + Types::U32 mTreatmentEndEpoch ; + Types::U32 mFluidBolusVolume ; + Types::U32 mFluidBolusVolumeActual ; + Types::U32 mPatientID ; + Types::U32 mSecondaryPatientID ; + Types::U32 mHeparinType ; + Types::U32 mHeparinDeliveryDuration ; + Types::U32 mHeparinDeliveryDurationActual ; + Types::U32 mTreatmentModality ; + Types::U32 mTreatmentModalityActual ; + Types::U32 mHDFOperatingMode ; + Types::U32 mHDFOperatingModeActual ; + Types::U32 mHepatitisStatus ; + Types::F32 mDialysateTemperature ; + Types::F32 mDialysateTemperatureActual ; + Types::F32 mDialysateVolumeUsed ; + Types::F32 mHeparinBolusVolume ; + Types::F32 mHeparinBolusVolumeActual ; + Types::F32 mHeparinDispenseRate ; + Types::F32 mHeparinDispenseRateActual ; + Types::F32 mHeparinDeliveredVolume ; + Types::F32 mAverageArterialPressure ; + Types::F32 mAverageVenousPressure ; + Types::F32 mUFVolume ; + Types::F32 mUFVolumeActual ; + Types::F32 mUFVolumeTarget ; + Types::F32 mUFRate ; + Types::F32 mUFRateActual ; + Types::F32 mUFRateTarget ; + Types::F32 mSubstitutionVolume ; + Types::F32 mSubstitutionVolumeActual ; + Types::F32 mSubstitutionVolumeTarget ; + Types::F32 mSubstitutionRate ; + Types::F32 mSubstitutionRateActual ; + Types::F32 mSubstitutionRateTarget ; + Types::F32 mIsoUfVolume ; + Types::F32 mIsoUfVolumeActual ; + Types::F32 mIsoUfVolumeTarget ; + Types::F32 mIsoUfRate ; + Types::F32 mIsoUfRateActual ; + Types::F32 mIsoUfRateTarget ; + Types::F32 mWaterSampleTestResult ; } _data; public: @@ -138,43 +198,72 @@ QString infoText () const override { return QString("AdjustTreatmentLog") ; } struct Data { - bool mAccepted = 0; ///< 01 - (U32) The accept or reject bool flag - quint32 mReason = 0; ///< 02 - (U32) The rejection reason - quint32 mBloodFlowRate = 0; ///< 03 - (U32) Blood Flow Rate (mL/min) - quint32 mDialysateFlowRate = 0; ///< 04 - (U32) Dialysate Flow Rate (mL/min) - quint32 mTreatmentDuration = 0; ///< 05 - (U32) Treatment Duration (sec) - quint32 mActualTreatmentDuration = 0; ///< 06 - (U32) Actual Treatment Duration (sec) - quint32 mAcidConcentrateType = 0; ///< 07 - (U32) Acid Concentrate Type - quint32 mBicarbonateConcentrateType = 0; ///< 08 - (U32) Bicarbonate Concentrate Type - quint32 mPotassiumConcentration = 0; ///< 09 - (U32) Potassium Concentration (mEq/L) - quint32 mCalciumConcentration = 0; ///< 10 - (U32) Calcium Concentration (mEq/L) - quint32 mBicarbonateConcentration = 0; ///< 11 - (U32) Bicarbonate Concentration (mEq/L) - quint32 mSodiumConcentration = 0; ///< 12 - (U32) SodiumConcentration (mEq/L) - float mDialysateTemperature = 0; ///< 13 - (F32) Dialysate Temperature (Celsius) - quint32 mDialyzerType = 0; ///< 14 - (U32) Dialyzer Type - quint32 mTreatmentStartEpoch = 0; ///< 15 - (U32) Treatment Start Date and Time (epoch) - 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 mAverageDialysateTemp = 0; ///< 20 - (F32) Average Dialysate Temp (Celsius) - 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 + quint32 mAccepted = 0; + quint32 mReason = 0; + quint32 mBloodFlowRate = 0; + quint32 mBloodFlowRateActual = 0; + quint32 mDialysateFlowRate = 0; + quint32 mDialysateFlowRateActual = 0; + quint32 mTreatmentDuration = 0; + quint32 mTreatmentDurationActual = 0; + quint32 mAcidConcentrateType = 0; + quint32 mAcidConcentrateTypeActual = 0; + quint32 mBicarbonateConcentrateType = 0; + quint32 mBicarbonateConcentrateTypeActual = 0; + quint32 mPotassiumConcentration = 0; + quint32 mPotassiumConcentrationActual = 0; + quint32 mCalciumConcentration = 0; + quint32 mCalciumConcentrationActual = 0; + quint32 mBicarbonateConcentration = 0; + quint32 mBicarbonateConcentrationActual = 0; + quint32 mSodiumConcentration = 0; + quint32 mSodiumConcentrationActual = 0; + quint32 mVitalsInterval = 0; + quint32 mVitalsIntervalActual = 0; + quint32 mDialyzerType = 0; + quint32 mTreatmentStartEpoch = 0; + quint32 mTreatmentEndEpoch = 0; + quint32 mFluidBolusVolume = 0; + quint32 mFluidBolusVolumeActual = 0; + quint32 mPatientID = 0; + quint32 mSecondaryPatientID = 0; + quint32 mHeparinType = 0; + quint32 mHeparinDeliveryDuration = 0; + quint32 mHeparinDeliveryDurationActual = 0; + quint32 mTreatmentModality = 0; + quint32 mTreatmentModalityActual = 0; + quint32 mHDFOperatingMode = 0; + quint32 mHDFOperatingModeActual = 0; + quint32 mHepatitisStatus = 0; + float mDialysateTemperature = 0; + float mDialysateTemperatureActual = 0; + float mDialysateVolumeUsed = 0; + float mHeparinBolusVolume = 0; + float mHeparinBolusVolumeActual = 0; + float mHeparinDispenseRate = 0; + float mHeparinDispenseRateActual = 0; + float mHeparinDeliveredVolume = 0; + float mAverageArterialPressure = 0; + float mAverageVenousPressure = 0; + float mUFVolume = 0; + float mUFVolumeActual = 0; + float mUFVolumeTarget = 0; + float mUFRate = 0; + float mUFRateActual = 0; + float mUFRateTarget = 0; + float mSubstitutionVolume = 0; + float mSubstitutionVolumeActual = 0; + float mSubstitutionVolumeTarget = 0; + float mSubstitutionRate = 0; + float mSubstitutionRateActual = 0; + float mSubstitutionRateTarget = 0; + float mIsoUfVolume = 0; + float mIsoUfVolumeActual = 0; + float mIsoUfVolumeTarget = 0; + float mIsoUfRate = 0; + float mIsoUfRateActual = 0; + float mIsoUfRateTarget = 0; + float mWaterSampleTestResult = 0; }; MAdjustTreatmentLogResponse () { } Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -r0681b6cf3d718e1129388115de19f57dac5e32cf -r676ec71574416b57c5263b1a4acc66d6904751e7 --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 0681b6cf3d718e1129388115de19f57dac5e32cf) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 676ec71574416b57c5263b1a4acc66d6904751e7) @@ -227,10 +227,11 @@ bool isHeparinOff = vHeparinBolusVolumeOff && vHeparinDispensingRateOff; - QString mTreatmentDurationFmt = QTime (0, 0).addSecs(int(vData.mTreatmentDuration )).toString(_timeFormat); - QString mActualTreatmentDurationFmt = QTime (0, 0).addSecs(int(vData.mActualTreatmentDuration )).toString(_timeFormat); - QString mTreatmentDuration = QString::number(vData.mTreatmentDuration / 60 ); // Converted seconds to minutes. - QString mActualTreatmentDuration = QString::number(vData.mActualTreatmentDuration / 60 ); // Converted seconds to minutes. + // TODO LDT-2500 or LDT-2506 +// QString mTreatmentDurationFmt = QTime (0, 0).addSecs(int(vData.mTreatmentDuration )).toString(_timeFormat); +// QString mActualTreatmentDurationFmt = QTime (0, 0).addSecs(int(vData.mActualTreatmentDuration )).toString(_timeFormat); +// QString mTreatmentDuration = QString::number(vData.mTreatmentDuration / 60 ); // Converted seconds to minutes. +// QString mActualTreatmentDuration = QString::number(vData.mActualTreatmentDuration / 60 ); // Converted seconds to minutes. QString mTreatmentStartDateTime = Format::fromEpoch( vData.mTreatmentStartEpoch , _datetimeFormat); QString mTreatmentEndDateTime = Format::fromEpoch( vData.mTreatmentEndEpoch , _datetimeFormat); @@ -248,36 +249,37 @@ // init/fill/clear the _values clearModel(); + // TODO in treatment log story LDT-2500 or LDT-2506 _values[ePatientID ] = vPatientID.trimmed() ; - _values[eBloodFlowRate ] = mStrText.arg(vData.mBloodFlowRate ); - _values[eDialysateFlowRate ] = mStrText.arg(vData.mDialysateFlowRate ); - _values[eTreatmentDuration ] = mTreatmentDuration ; - _values[eActualTreatmentDuration ] = mActualTreatmentDuration ; - _values[eAcidConcentrateType ] = mAcidConcentrateType ; - _values[eBicarbonateConcentrateType ] = mBicarbonateConcentrateType ; - _values[ePotassiumConcentration ] = mStrText.arg(vData.mPotassiumConcentration ); - _values[eCalciumConcentration ] = mStrText.arg(vData.mCalciumConcentration ); - _values[eBicarbonateConcentration ] = mStrText.arg(vData.mBicarbonateConcentration ); - _values[eSodiumConcentration ] = mStrText.arg(vData.mSodiumConcentration ); - _values[eDialysateTemperature ] = mStrText.arg(vData.mDialysateTemperature ,FLOAT3 ); - _values[eDialyzerType ] = mDialyzerType ; - _values[eTreatmentStartDateTime ] = mTreatmentStartDateTime ; - _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 ); +// _values[eBloodFlowRate ] = mStrText.arg(vData.mBloodFlowRate ); +// _values[eDialysateFlowRate ] = mStrText.arg(vData.mDialysateFlowRate ); +// _values[eTreatmentDuration ] = mTreatmentDuration ; +// _values[eActualTreatmentDuration ] = mActualTreatmentDuration ; +// _values[eAcidConcentrateType ] = mAcidConcentrateType ; +// _values[eBicarbonateConcentrateType ] = mBicarbonateConcentrateType ; +// _values[ePotassiumConcentration ] = mStrText.arg(vData.mPotassiumConcentration ); +// _values[eCalciumConcentration ] = mStrText.arg(vData.mCalciumConcentration ); +// _values[eBicarbonateConcentration ] = mStrText.arg(vData.mBicarbonateConcentration ); +// _values[eSodiumConcentration ] = mStrText.arg(vData.mSodiumConcentration ); +// _values[eDialysateTemperature ] = mStrText.arg(vData.mDialysateTemperature ,FLOAT3 ); +// _values[eDialyzerType ] = mDialyzerType ; +// _values[eTreatmentStartDateTime ] = mTreatmentStartDateTime ; +// _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 ); _values[eHeparinType ] = isHeparinOff ? tr("NONE") : mHeparinType ; - _values[eHeparinConcentration ] = isHeparinOff ? tr("NONE") : mStrText.arg(vData.mHeparinConcentration ); +// _values[eHeparinConcentration ] = isHeparinOff ? tr("NONE") : mStrText.arg(vData.mHeparinConcentration ); _values[eHeparinBolusVolume ] = vHeparinBolusVolumeOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinBolusVolume ,FLOAT3 ); _values[eHeparinDispenseRate ] = vHeparinDispensingRateOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinDispenseRate ,FLOAT3 ); - _values[eHeparinStop ] = vHeparinDispensingRateOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinStop ); +// _values[eHeparinStop ] = vHeparinDispensingRateOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinStop ); _values[eHeparinDeliveredVolume ] = isHeparinOff ? tr("OFF" ) : mStrText.arg(vData.mHeparinDeliveredVolume ,FLOAT3 ); emit didTxCodeReceive(""); Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r676ec71574416b57c5263b1a4acc66d6904751e7 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 676ec71574416b57c5263b1a4acc66d6904751e7) @@ -37,8 +37,8 @@ ACTION_VIEW_CONNECTION(TreatmentLogAlarmData); ACTION_VIEW_CONNECTION(TreatmentLogEventData); - connect(&_TreatmentLog , &TreatmentLog::isIdleNotified, - [=](bool vIdle) { isIdle(vIdle); } ); +// connect(&_TreatmentLog , &TreatmentLog::didTxCodeReceive, +// [=](const QString &vTxCode) { txCode( vTxCode ); } ); connect(&_TreatmentLog , &TreatmentLog::didTxCodeReceive, [=](const QString &vTxCode) { txCode( vTxCode ); } ); @@ -53,7 +53,7 @@ */ void View::VPostTreatmentAdjustmentTreatmentLog::doRequest() { _TreatmentLog.clearModel(); - parametersText ( {} ); +// parametersText ( {} ); AdjustTreatmentLogRequestData data; emit didAdjustment(data); @@ -79,59 +79,73 @@ // init the TreatmentLog model _TreatmentLog.initModel ( vData, _patientID.trimmed(), heparinBolusVolumeOff(), heparinDispensingRateOff()); - if ( vData.mAccepted ) { - //TODO Commented out for now - // It is needed to display NONE for the heparin items if the heparin set to off on Create Treatment Parameters screen. - // The problem is the data comes from the _TreatmentLog model - // But if that model changes to have the NONE values, then the CloudSync or Cloud may reject the TxLog. - // When the Cloud is updated we can as well update the entire flow. - // For now it will only updates the display/Gui value. - // Look for the https://diality.atlassian.net/browse/DEN-15911 - // to know were to update for full model the view update. - // When the model updated the valueGui() can be removed and valuesLog() can be used. - parametersText ( _TreatmentLog.values() ); - } else { - parametersText ( {} ); - } // raw values - bloodFlowRate ( vData.mBloodFlowRate ); - dialysateFlowRate ( vData.mDialysateFlowRate ); - treatmentDuration ( vData.mTreatmentDuration ); - actualTreatmentDuration ( vData.mActualTreatmentDuration ); - acidConcentrateType ( vData.mAcidConcentrateType ); - bicarbonateConcentrateType ( vData.mBicarbonateConcentrateType ); - potassiumConcentration ( vData.mPotassiumConcentration ); - calciumConcentration ( vData.mCalciumConcentration ); - bicarbonateConcentration ( vData.mBicarbonateConcentration ); - sodiumConcentration ( vData.mSodiumConcentration ); - dialysateTemperature ( vData.mDialysateTemperature ); - dialyzerType ( vData.mDialyzerType ); - treatmentStartEpoch ( vData.mTreatmentStartEpoch ); - treatmentEndEpoch ( vData.mTreatmentEndEpoch ); - averageBloodFlow ( vData.mAverageBloodFlow ); - 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 ); - heparinBolusVolume ( vData.mHeparinBolusVolume ); - heparinDispenseRate ( vData.mHeparinDispenseRate ); - heparinStop ( vData.mHeparinStop ); - heparinDeliveredVolume ( vData.mHeparinDeliveredVolume ); - averageArterialPressure ( vData.mAverageArterialPressure ); - averageVenousPressure ( vData.mAverageVenousPressure ); - deviceID ( vData.mDeviceID ); - waterSampleTestResult ( vData.mWaterSampleTestResult ); + bloodFlowRate ( vData.mBloodFlowRate ); + bloodFlowRateActual ( vData.mBloodFlowRateActual ); + dialysateFlowRate ( vData.mDialysateFlowRate ); + dialysateFlowRateActual ( vData.mDialysateFlowRateActual ); + treatmentDuration ( vData.mTreatmentDuration ); + treatmentDurationActual ( vData.mTreatmentDurationActual ); + acidConcentrateType ( vData.mAcidConcentrateType ); + acidConcentrateTypeActual ( vData.mAcidConcentrateTypeActual ); + bicarbonateConcentrateType ( vData.mBicarbonateConcentrateType ); + bicarbonateConcentrateTypeActual ( vData.mBicarbonateConcentrateTypeActual ); + potassiumConcentration ( vData.mPotassiumConcentration ); + potassiumConcentrationActual ( vData.mPotassiumConcentrationActual ); + calciumConcentration ( vData.mCalciumConcentration ); + calciumConcentrationActual ( vData.mCalciumConcentrationActual ); + bicarbonateConcentration ( vData.mBicarbonateConcentration ); + bicarbonateConcentrationActual ( vData.mBicarbonateConcentrationActual ); + sodiumConcentration ( vData.mSodiumConcentration ); + sodiumConcentrationActual ( vData.mSodiumConcentrationActual ); + vitalsInterval ( vData.mVitalsInterval ); + vitalsIntervalActual ( vData.mVitalsIntervalActual ); + dialyzerType ( vData.mDialyzerType ); + treatmentStartEpoch ( vData.mTreatmentStartEpoch ); + treatmentEndEpoch ( vData.mTreatmentEndEpoch ); + fluidBolusVolume ( vData.mFluidBolusVolume ); + fluidBolusVolumeActual ( vData.mFluidBolusVolumeActual ); + patientID ( vData.mPatientID ); + secondaryPatientID ( vData.mSecondaryPatientID ); + heparinType ( vData.mHeparinType ); + heparinDeliveryDuration ( vData.mHeparinDeliveryDuration ); + heparinDeliveryDurationActual ( vData.mHeparinDeliveryDurationActual ); + treatmentModality ( vData.mTreatmentModality ); + treatmentModalityActual ( vData.mTreatmentModalityActual ); + hDFOperatingMode ( vData.mHDFOperatingMode ); + hDFOperatingModeActual ( vData.mHDFOperatingModeActual ); + hepatitisStatus ( vData.mHepatitisStatus ); + dialysateTemperature ( vData.mDialysateTemperature ); + dialysateTemperatureActual ( vData.mDialysateTemperatureActual ); + dialysateVolumeUsed ( vData.mDialysateVolumeUsed ); + heparinBolusVolume ( vData.mHeparinBolusVolume ); + heparinBolusVolumeActual ( vData.mHeparinBolusVolumeActual ); + heparinDispenseRate ( vData.mHeparinDispenseRate ); + heparinDispenseRateActual ( vData.mHeparinDispenseRateActual ); + heparinDeliveredVolume ( vData.mHeparinDeliveredVolume ); + averageArterialPressure ( vData.mAverageArterialPressure ); + averageVenousPressure ( vData.mAverageVenousPressure ); + uFVolume ( vData.mUFVolume ); + uFVolumeActual ( vData.mUFVolumeActual ); + uFVolumeTarget ( vData.mUFVolumeTarget ); + uFRate ( vData.mUFRate ); + uFRateActual ( vData.mUFRateActual ); + uFRateTarget ( vData.mUFRateTarget ); + substitutionVolume ( vData.mSubstitutionVolume ); + substitutionVolumeActual ( vData.mSubstitutionVolumeActual ); + substitutionVolumeTarget ( vData.mSubstitutionVolumeTarget ); + substitutionRate ( vData.mSubstitutionRate ); + substitutionRateActual ( vData.mSubstitutionRateActual ); + substitutionRateTarget ( vData.mSubstitutionRateTarget ); + isoUfVolume ( vData.mIsoUfVolume ); + isoUfVolumeActual ( vData.mIsoUfVolumeActual ); + isoUfVolumeTarget ( vData.mIsoUfVolumeTarget ); + isoUfRate ( vData.mIsoUfRate ); + isoUfRateActual ( vData.mIsoUfRateActual ); + isoUfRateTarget ( vData.mIsoUfRateTarget ); + waterSampleTestResult ( vData.mWaterSampleTestResult ); - heparinType ( vData.mHeparinType ); - heparinConcentration ( vData.mHeparinConcentration ); - if (adjustment_Accepted()) _TreatmentLog.doSave(); Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r676ec71574416b57c5263b1a4acc66d6904751e7 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h (.../VPostTreatmentAdjustTreatmentLog.h) (revision 676ec71574416b57c5263b1a4acc66d6904751e7) @@ -50,54 +50,74 @@ PROPERTY(bool , heparinDispensingRateOff , true) PROPERTY(bool , heparinBolusVolumeOff , true) - PROPERTY(QString , patientID , "") + PROPERTY(quint32 , bloodFlowRate , 0 ) + PROPERTY(quint32 , bloodFlowRateActual , 0 ) + PROPERTY(quint32 , dialysateFlowRate , 0 ) + PROPERTY(quint32 , dialysateFlowRateActual , 0 ) + PROPERTY(quint32 , treatmentDuration , 0 ) + PROPERTY(quint32 , treatmentDurationActual , 0 ) + PROPERTY(quint32 , acidConcentrateType , 0 ) + PROPERTY(quint32 , acidConcentrateTypeActual , 0 ) + PROPERTY(quint32 , bicarbonateConcentrateType , 0 ) + PROPERTY(quint32 , bicarbonateConcentrateTypeActual , 0 ) + PROPERTY(quint32 , potassiumConcentration , 0 ) + PROPERTY(quint32 , potassiumConcentrationActual , 0 ) + PROPERTY(quint32 , calciumConcentration , 0 ) + PROPERTY(quint32 , calciumConcentrationActual , 0 ) + PROPERTY(quint32 , bicarbonateConcentration , 0 ) + PROPERTY(quint32 , bicarbonateConcentrationActual , 0 ) + PROPERTY(quint32 , sodiumConcentration , 0 ) + PROPERTY(quint32 , sodiumConcentrationActual , 0 ) + PROPERTY(quint32 , vitalsInterval , 0 ) + PROPERTY(quint32 , vitalsIntervalActual , 0 ) + PROPERTY(quint32 , dialyzerType , 0 ) + PROPERTY(quint32 , treatmentStartEpoch , 0 ) + PROPERTY(quint32 , treatmentEndEpoch , 0 ) + PROPERTY(quint32 , fluidBolusVolume , 0 ) + PROPERTY(quint32 , fluidBolusVolumeActual , 0 ) + PROPERTY(quint32 , patientID , 0 ) + PROPERTY(quint32 , secondaryPatientID , 0 ) + PROPERTY(quint32 , heparinType , 0 ) + PROPERTY(quint32 , heparinDeliveryDuration , 0 ) + PROPERTY(quint32 , heparinDeliveryDurationActual , 0 ) + PROPERTY(quint32 , treatmentModality , 0 ) + PROPERTY(quint32 , treatmentModalityActual , 0 ) + PROPERTY(quint32 , hDFOperatingMode , 0 ) + PROPERTY(quint32 , hDFOperatingModeActual , 0 ) + PROPERTY(quint32 , hepatitisStatus , 0 ) + PROPERTY(float , dialysateTemperature , 0 ) + PROPERTY(float , dialysateTemperatureActual , 0 ) + PROPERTY(float , dialysateVolumeUsed , 0 ) + PROPERTY(float , heparinBolusVolume , 0 ) + PROPERTY(float , heparinBolusVolumeActual , 0 ) + PROPERTY(float , heparinDispenseRate , 0 ) + PROPERTY(float , heparinDispenseRateActual , 0 ) + PROPERTY(float , heparinDeliveredVolume , 0 ) + PROPERTY(float , averageArterialPressure , 0 ) + PROPERTY(float , averageVenousPressure , 0 ) + PROPERTY(float , uFVolume , 0 ) + PROPERTY(float , uFVolumeActual , 0 ) + PROPERTY(float , uFVolumeTarget , 0 ) + PROPERTY(float , uFRate , 0 ) + PROPERTY(float , uFRateActual , 0 ) + PROPERTY(float , uFRateTarget , 0 ) + PROPERTY(float , substitutionVolume , 0 ) + PROPERTY(float , substitutionVolumeActual , 0 ) + PROPERTY(float , substitutionVolumeTarget , 0 ) + PROPERTY(float , substitutionRate , 0 ) + PROPERTY(float , substitutionRateActual , 0 ) + PROPERTY(float , substitutionRateTarget , 0 ) + PROPERTY(float , isoUfVolume , 0 ) + PROPERTY(float , isoUfVolumeActual , 0 ) + PROPERTY(float , isoUfVolumeTarget , 0 ) + PROPERTY(float , isoUfRate , 0 ) + PROPERTY(float , isoUfRateActual , 0 ) + PROPERTY(float , isoUfRateTarget , 0 ) + PROPERTY(float , waterSampleTestResult , 0 ) - PROPERTY(quint32 , bloodFlowRate , 0 ) - PROPERTY(quint32 , dialysateFlowRate , 0 ) - PROPERTY(quint32 , treatmentDuration , 0 ) - PROPERTY(quint32 , actualTreatmentDuration , 0 ) - PROPERTY(quint32 , acidConcentrateType , 0 ) - PROPERTY(quint32 , bicarbonateConcentrateType , 0 ) - PROPERTY(quint32 , potassiumConcentration , 0 ) - PROPERTY(quint32 , calciumConcentration , 0 ) - PROPERTY(quint32 , bicarbonateConcentration , 0 ) - PROPERTY(quint32 , sodiumConcentration , 0 ) - PROPERTY(float , dialysateTemperature , 0 ) - PROPERTY(quint32 , dialyzerType , 0 ) - PROPERTY(quint32 , treatmentStartEpoch , 0 ) - PROPERTY(quint32 , treatmentEndEpoch , 0 ) - PROPERTY(float , averageBloodFlow , 0 ) - 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 ) - PROPERTY(float , heparinBolusVolume , 0 ) - PROPERTY(float , heparinDispenseRate , 0 ) - PROPERTY(quint32 , heparinStop , 0 ) - PROPERTY(float , heparinDeliveredVolume , 0 ) - PROPERTY(float , averageArterialPressure , 0 ) - PROPERTY(float , averageVenousPressure , 0 ) - PROPERTY(quint32 , deviceID , 0 ) - PROPERTY(quint32 , waterSampleTestResult , 0 ) - - PROPERTY(quint32 , heparinType , 0 ) - PROPERTY(quint32 , heparinConcentration , 0 ) - - PROPERTY(QStringList , parametersTitle , _TreatmentLog.titles()) - PROPERTY(QStringList , parametersUnit , _TreatmentLog.units ()) - PROPERTY(QStringList , parametersText , {}) - - PROPERTY(QString , txCode , "") + PROPERTY(QString , txCode , "TEST-1231123212") PROPERTY(QString , notification , "") - PROPERTY(bool , isIdle , true ) - PROPERTY(bool , isReady , false ) VIEW_DEC_CLASS (VPostTreatmentAdjustmentTreatmentLog) VIEW_DEC_SLOT (AdjustTreatmentLogResponseData)