Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r08ffb068817ab0bb1c7f2fe2705986142ac68601 -rf723048b0efe2edf7cb08b9bba2ef67c55917503 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 08ffb068817ab0bb1c7f2fe2705986142ac68601) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision f723048b0efe2edf7cb08b9bba2ef67c55917503) @@ -224,6 +224,19 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Blood Prime Command message. + * \param vData - Data model contains Blood Prime Command + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustBloodPrimeRequestData &vData) +{ + QVariantList mData; + mData += vData.command; + onActionTransmit(GuiActionType::ID_AdjustBloodPrimeReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Blood/Dialysate Adjustment Denali message. * \param vData - Data model contains Blood Flow Rate and Dialysate Flow Rate @@ -239,19 +252,88 @@ /*! * \brief MessageDispatcher::onAdjustment - * \details This method transmits the treatment duration Adjustment Denali message. + * \details This method transmits the treatment duration adjustment message. * \param vData - Data model contains treatment duration adjustment value in minutes * \return void */ -void MessageDispatcher::onAdjustment(const AdjustDurationRequestData &vData) +void MessageDispatcher::onAdjustment(const AdjustDurationEditRequestData &vData) { QVariantList mData; mData += vData.duration; - onActionTransmit(GuiActionType::ID_AdjustDurationReq, mData); + onActionTransmit(GuiActionType::ID_AdjustDurationEditReq, mData); } /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the treatment duration adjustment confirm message. + * \param vData - Data model contains treatment duration adjustment value in minutes + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDurationConfirmRequestData &vData) +{ + QVariantList mData; + mData += vData.duration; + onActionTransmit(GuiActionType::ID_AdjustDurationConfirmReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the set points adjustment request message. + * \param vData - Data model contains set points adjustment values + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustSetPointsRequestData &vData) +{ + QVariantList mData; + mData += vData.bloodFlowRate ; + mData += vData.dialysateFlowRate ; + mData += vData.dialysateTemperature ; + mData += vData.acidConcentrate ; + mData += vData.bicarbConcentrate ; + onActionTransmit(GuiActionType::ID_AdjustSetPointsReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the dialysate temperature adjustment request message. + * \param vData - Data model contains dialysate temperature adjustment values + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDialysateTemperatureRequestData &vData) +{ + QVariantList mData; + mData += vData.dialysateTemperature; + onActionTransmit(GuiActionType::ID_AdjustDialysateTemperatureReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the dialysate rate adjustment request message. + * \param vData - Data model contains dialysate rate adjustment values + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustDialysateFlowRateRequestData &vData) +{ + QVariantList mData; + mData += vData.dialysateFlowRate; + onActionTransmit(GuiActionType::ID_AdjustDialysateFlowRateReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the blood flow rate adjustment request message. + * \param vData - Data model contains blood flow rate adjustment values + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustBloodFlowRateRequestData &vData) +{ + QVariantList mData; + mData += vData.bloodFlowRate; + onActionTransmit(GuiActionType::ID_AdjustBloodFlowRateReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Ultrafiltration State Adjustment Denali message. * \param vData - Data model contains treatment ultrafiltration state adjustment * \return void @@ -291,6 +373,45 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the IsolatedUF Adjustment Denali message. + * \param vData - Data model contains treatment ultrafiltration adjustment volume + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustIsolatedUFDurationEditRequestData &vData) +{ + QVariantList mData; + mData += vData.duration; + onActionTransmit(GuiActionType::ID_AdjustIsolatedUFDurationEditReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the IsolatedUF Adjustment Denali message. + * \param vData - Data model contains treatment ultrafiltration adjustment volume + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustIsolatedUFVolumeEditRequestData &vData) +{ + QVariantList mData; + mData += vData.duration; + mData += vData.volume; + onActionTransmit(GuiActionType::ID_AdjustIsolatedUFVolumeEditReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the IsolatedUF Adjustment User Confirm message. + * \param vData - treatment isolated UF adjustment user confirm data model + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustIsolatedUFConfirmRequestData &vData) +{ + Q_UNUSED(vData) + onActionTransmit(GuiActionType::ID_AdjustIsolatedUFConfirmReq, QVariantList()); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Alarm Request Silence message. * \param vData - Data model contains the silence request information. * \return void @@ -405,10 +526,9 @@ * \param vData - Data model contains treatment end adjustment state. * \return void */ -void MessageDispatcher::onAdjustment(const AdjustTreatmentEndRequestData &vData) +void MessageDispatcher::onAdjustment(const AdjustTreatmentEndRequestData &) { QVariantList mData; - mData += vData.requestedState; onActionTransmit(GuiActionType::ID_AdjustTreatmentEndReq, mData); } @@ -472,6 +592,19 @@ /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Bolus Volume Adjustment message. + * \param vData - Data model contains treatment bolus volume adjustment. + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustBolusVolumeRequestData &vData) +{ + QVariantList mData; + mData += vData.mBolusVolume; + onActionTransmit(GuiActionType::ID_AdjustBolusVolumeReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Pressures Limits Adjustment Denali message. * \param vData - Data model contains treatment Pressures Limits adjustment. * \return void @@ -482,11 +615,23 @@ mData += vData.mArterialPressureLimitWindow ; mData += vData.mVenousPressureLimitWindow ; mData += vData.mVenousPressureLimitAsymtrc ; + mData += vData.mTmpLimitWindow ; onActionTransmit(GuiActionType::ID_AdjustPressuresLimitsReq, mData); } /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the Pressures widening request + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustPressuresWideningRequestData &) +{ + QVariantList mData; + onActionTransmit(GuiActionType::ID_AdjustPressuresWideningReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the InitTreatment request message. * \param vData - Data model contains the init treatment request information. * \return void @@ -521,7 +666,7 @@ mData += vData.mArterialPressureLimitWindow ; mData += vData.mVenousPressureLimitWindow ; mData += vData.mVenousPressureLimitAsymtrc ; - mData += vData.mTrancembrncPressureLimitWindow ; + mData += vData.mTransmembranePressureLimitWindow; mData += vData.mDialysateTemp ; mData += vData.mHeparinDispensingRate ; mData += vData.mHeparinBolusVolume ; @@ -818,18 +963,136 @@ /*! * \brief MessageDispatcher::onAdjustment - * \details This method transmits the HD institutional record request to HD. + * \details This method transmits adjusting the TD institutional record request to TD. * \param vData - * \return void */ -void MessageDispatcher::onAdjustment(const AdjustInstitutionalRequestData &) +void MessageDispatcher::onAdjustment(const AdjustInstitutionalRequestData &vData) { - QVariantList mData; + QVariantList mData ; + mData += vData.mBloodFlowMin ; + mData += vData.mBloodFlowMax ; + mData += vData.mBloodFlowDef ; + mData += vData.mDialysateFlowMin ; + mData += vData.mDialysateFlowMax ; + mData += vData.mDialysateFlowDef ; + mData += vData.mTreatmentDurationMin ; + mData += vData.mTreatmentDurationMax ; + mData += vData.mTreatmentDurationDef ; + mData += vData.mHepBolusVolumeMin ; + mData += vData.mHepBolusVolumeMax ; + mData += vData.mHepBolusVolumeDef ; + mData += vData.mHepDispRateMin ; + mData += vData.mHepDispRateMax ; + mData += vData.mHepDispRateDef ; + mData += vData.mHepStopTimeMin ; + mData += vData.mHepStopTimeMax ; + mData += vData.mDialysateTempMin ; + mData += vData.mDialysateTempMax ; + mData += vData.mDialysateTempDef ; + mData += vData.mPotassiumMin ; + mData += vData.mPotassiumMax ; + mData += vData.mCalciumMin ; + mData += vData.mCalciumMax ; + mData += vData.mDialysateBicarbonateMin ; + mData += vData.mDialysateBicarbonateMax ; + mData += vData.mDialysateBicarbonateDef ; + mData += vData.mDialysateSodiumMin ; + mData += vData.mDialysateSodiumMax ; + mData += vData.mDialysateSodiumDef ; + mData += vData.mFluidBolusVolumeMin ; + mData += vData.mFluidBolusVolumeMax ; + mData += vData.mFluidBolusVolumeDef ; + mData += vData.mArterialWindowMin ; + mData += vData.mArterialWindowMax ; + mData += vData.mArterialWindowDef ; + mData += vData.mVenousWindowMin ; + mData += vData.mVenousWindowMax ; + mData += vData.mVenousWindowDef ; + mData += vData.mVenousAsymmetricMin ; + mData += vData.mVenousAsymmetricMax ; + mData += vData.mVenousAsymmetricDef ; + mData += vData.mTMPWindowMin ; + mData += vData.mTMPWindowMax ; + mData += vData.mTMPWindowDef ; + mData += vData.mUltrafiltrationVolumeMin ; + mData += vData.mUltrafiltrationVolumeMax ; + mData += vData.mUltrafiltrationVolumeDef ; + mData += vData.mVitalsIntervalDef ; + mData += vData.mRinsebackVolumeMin ; + mData += vData.mRinsebackVolumeMax ; + mData += vData.mRinsebackVolumeDef ; + mData += vData.mRinsebackFlowRateMin ; + mData += vData.mRinsebackFlowRateMax ; + mData += vData.mRinsebackFlowRateDef ; + mData += vData.mSubstitutionVolumeMin ; + mData += vData.mSubstitutionVolumeMax ; + mData += vData.mSubstitutionVolumeDef ; + onActionTransmit(GuiActionType::ID_AdjustInstitutionalRecordReq, mData); } /*! * \brief MessageDispatcher::onAdjustment + * \details This method transmits the TD institutional record request to TD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const InstitutionalRequestData &) +{ + QVariantList mData; + onActionTransmit(GuiActionType::ID_InstitutionalRecordReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits the TD institutional record request to TD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const AdvancedInstitutionalRequestData &) +{ + QVariantList mData; + onActionTransmit(GuiActionType::ID_AdvancedInstitutionalRecordReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment + * \details This method transmits adjusting the TD advanced institutional record request to TD. + * \param vData - + * \return void + */ +void MessageDispatcher::onAdjustment(const AdjustAdvancedInstitutionalRequestData &vData) +{ + QVariantList mData ; + mData += vData.mMinRORejectionRatioAlarmMin ; + mData += vData.mMinRORejectionRatioAlarmMax ; + mData += vData.mMinRORejectionRatioAlarmDef ; + mData += vData.mDisinfectionFrequencyMin ; + mData += vData.mDisinfectionFrequencyMax ; + mData += vData.mDisinfectionFrequencyDef ; + mData += vData.mDisinfectionParametersCycleTimeMin; + mData += vData.mDisinfectionParametersCycleTimeMax; + mData += vData.mDisinfectionParametersCycleTimeDef; + mData += vData.mMaxBloodPumpStopTimeMin ; + mData += vData.mMaxBloodPumpStopTimeMax ; + mData += vData.mMaxBloodPumpStopTimeDef ; + mData += vData.mInletWaterCondLowThresholdMin ; + mData += vData.mInletWaterCondLowThresholdMax ; + mData += vData.mInletWaterCondLowThresholdDef ; + mData += vData.mInletWaterCondHighThresholdMin ; + mData += vData.mInletWaterCondHighThresholdMax ; + mData += vData.mInletWaterCondHighThresholdDef ; + mData += vData.mChlorineWaterSampleCheckMin ; + mData += vData.mChlorineWaterSampleCheckMax ; + mData += vData.mChlorineWaterSampleCheckDef ; + mData += vData.mWaterSampleTestResultRequiredDef ; + + onActionTransmit(GuiActionType::ID_AdjustAdvancedInstitutionalRecordReq, mData); +} + +/*! + * \brief MessageDispatcher::onAdjustment * \details This method transmits the Disposables Removal Confirm Adjustment Denali message. * \param vData - Data model contains Service Mode adjustment. * \return void