Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -rba15fce14caf76166c286da95974c69f8a24d4b8 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision ba15fce14caf76166c286da95974c69f8a24d4b8) @@ -85,10 +85,6 @@ */ void MessageDispatcher::initConnections() { - // From GUI - connect(&_ApplicationController, SIGNAL(didActionTransmit(GuiActionType , const QVariantList &)), - this , SLOT( onActionTransmit(GuiActionType , const QVariantList &))); - // From HD connect(&_FrameInterface , SIGNAL(didFrameReceive (Can_Id , const QByteArray &)), this , SLOT( onFrameReceive (Can_Id , const QByteArray &))); @@ -200,18 +196,6 @@ } /*! - * \brief MessageDispatcher::onActionTransmit - * \details This slot will be called by ApplicationController::didActionTransmit - * upon UI message transmit request and calls MessageDispatcher::actionTransmit method. - * \param vActionId - The ActionID of the message - * \param vData - The data of the Message - */ -void MessageDispatcher::onActionTransmit(GuiActionType vActionId, const QVariantList &vData) -{ - actionTransmit(vActionId, vData); -} - -/*! * \brief MessageDispatcher::onSettingsDone * \details The slot to handle didSettingsDone signal of the ApplicationController */ @@ -232,7 +216,7 @@ { QVariantList mData; mData += vData.command; - onActionTransmit(GuiActionType::ID_AdjustBloodPrimeReq, mData); + actionTransmit(GuiActionType::ID_AdjustBloodPrimeReq, mData); } /*! @@ -247,7 +231,7 @@ QVariantList mData; mData += vData.bloodFlow; mData += vData.dialysateFlow; - onActionTransmit(GuiActionType::ID_AdjustBloodDialysateReq, mData); + actionTransmit(GuiActionType::ID_AdjustBloodDialysateReq, mData); } /*! @@ -260,7 +244,7 @@ { QVariantList mData; mData += vData.duration; - onActionTransmit(GuiActionType::ID_AdjustDurationEditReq, mData); + actionTransmit(GuiActionType::ID_AdjustDurationEditReq, mData); } /*! @@ -275,7 +259,7 @@ mData += vData.duration ; mData += vData.heparinDuration ; mData += vData.rate ; - onActionTransmit(GuiActionType::ID_AdjustDurationConfirmReq, mData); + actionTransmit(GuiActionType::ID_AdjustDurationConfirmReq, mData); } /*! @@ -297,7 +281,7 @@ mData += vData.hepatitus ; mData += vData.sodium ; mData += vData.bicarbonate ; - onActionTransmit(GuiActionType::ID_AdjustSetPointsReq, mData); + actionTransmit(GuiActionType::ID_AdjustSetPointsReq, mData); } /*! @@ -314,7 +298,7 @@ mData += vData.heartRateLowAlarmLimit ; mData += vData.heartRateHighAlarmLimit ; mData += vData.vitalsInterval ; - onActionTransmit(GuiActionType::ID_AdjustVitalsAlarmLimitsReq, mData); + actionTransmit(GuiActionType::ID_AdjustVitalsAlarmLimitsReq, mData); } /*! @@ -327,7 +311,7 @@ { QVariantList mData; mData += vData.dialysateTemperature; - onActionTransmit(GuiActionType::ID_AdjustDialysateTemperatureReq, mData); + actionTransmit(GuiActionType::ID_AdjustDialysateTemperatureReq, mData); } /*! @@ -340,7 +324,7 @@ { QVariantList mData; mData += vData.dialysateFlowRate; - onActionTransmit(GuiActionType::ID_AdjustDialysateFlowRateReq, mData); + actionTransmit(GuiActionType::ID_AdjustDialysateFlowRateReq, mData); } /*! @@ -353,7 +337,7 @@ { QVariantList mData; mData += vData.bloodFlowRate; - onActionTransmit(GuiActionType::ID_AdjustBloodFlowRateReq, mData); + actionTransmit(GuiActionType::ID_AdjustBloodFlowRateReq, mData); } /*! @@ -379,7 +363,7 @@ { QVariantList mData; mData += vData.volume; - onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationEditReq, mData); + actionTransmit(GuiActionType::ID_AdjustUltrafiltrationEditReq, mData); } /*! @@ -393,7 +377,7 @@ QVariantList mData; mData += vData.volume; mData += vData.rate; - onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationConfirmReq, mData); + actionTransmit(GuiActionType::ID_AdjustUltrafiltrationConfirmReq, mData); } /*! @@ -406,7 +390,7 @@ { QVariantList mData; mData += vData.duration; - onActionTransmit(GuiActionType::ID_AdjustIsolatedUFDurationEditReq, mData); + actionTransmit(GuiActionType::ID_AdjustIsolatedUFDurationEditReq, mData); } /*! @@ -420,7 +404,7 @@ QVariantList mData; mData += vData.duration; mData += vData.volume; - onActionTransmit(GuiActionType::ID_AdjustIsolatedUFVolumeEditReq, mData); + actionTransmit(GuiActionType::ID_AdjustIsolatedUFVolumeEditReq, mData); } /*! @@ -432,7 +416,7 @@ void MessageDispatcher::onAdjustment(const AdjustIsolatedUFConfirmRequestData &vData) { Q_UNUSED(vData) - onActionTransmit(GuiActionType::ID_AdjustIsolatedUFConfirmReq, QVariantList()); + actionTransmit(GuiActionType::ID_AdjustIsolatedUFConfirmReq, QVariantList()); } /*! @@ -445,7 +429,7 @@ { QVariantList mData; mData += vData.silence; - onActionTransmit(GuiActionType::ID_AlarmSilenceReq, mData); + actionTransmit(GuiActionType::ID_AlarmSilenceReq, mData); } /** @@ -458,7 +442,7 @@ { QVariantList mData; mData += vData.action; - onActionTransmit(GuiActionType::ID_AlarmUserActionReq, mData); + actionTransmit(GuiActionType::ID_AlarmUserActionReq, mData); } /** @@ -470,7 +454,7 @@ void MessageDispatcher::onAdjustment(const AlarmActiveListRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AlarmActiveListReq, mData); + actionTransmit(GuiActionType::ID_AlarmActiveListReq, mData); } /*! @@ -484,7 +468,7 @@ { QVariantList mData; mData += vData.volume2HD(); - onActionTransmit(GuiActionType::ID_AlarmVolumeSetReq, mData); + actionTransmit(GuiActionType::ID_AlarmVolumeSetReq, mData); } /** @@ -496,7 +480,7 @@ { QVariantList mData; mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustSalineReq, mData); + actionTransmit(GuiActionType::ID_AdjustSalineReq, mData); } /** @@ -507,7 +491,7 @@ void MessageDispatcher::onAdjustment(const AdjustVitalsRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustVitalsReq, mData); + actionTransmit(GuiActionType::ID_AdjustVitalsReq, mData); } /** @@ -519,7 +503,7 @@ { QVariantList mData; mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustHeparinReq, mData); + actionTransmit(GuiActionType::ID_AdjustHeparinReq, mData); } /** @@ -531,7 +515,7 @@ { QVariantList mData; mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustRinsebackReq, mData); + actionTransmit(GuiActionType::ID_AdjustRinsebackReq, mData); } /** @@ -543,7 +527,7 @@ { QVariantList mData; mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustRecirculateReq, mData); + actionTransmit(GuiActionType::ID_AdjustRecirculateReq, mData); } /** @@ -554,7 +538,7 @@ void MessageDispatcher::onAdjustment(const AdjustTreatmentEndRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustTreatmentEndReq, mData); + actionTransmit(GuiActionType::ID_AdjustTreatmentEndReq, mData); } /*! @@ -571,7 +555,7 @@ mData += QVariant::fromValue(vData.ver_micro); mData += QVariant::fromValue(vData.ver_revis); mData += QVariant::fromValue(vData.ver_comp ); - onActionTransmit(GuiActionType::ID_AdjustVersionsUIReq, mData); + actionTransmit(GuiActionType::ID_AdjustVersionsUIReq, mData); } /*! @@ -588,7 +572,7 @@ mData += QVariant::fromValue(vData.ver_micro); mData += QVariant::fromValue(vData.ver_revis); mData += QVariant::fromValue(vData.ver_comp ); - onActionTransmit(GuiActionType::ID_AdjustVersionsUIRsp, mData); + actionTransmit(GuiActionType::ID_AdjustVersionsUIRsp, mData); } /*! @@ -600,7 +584,7 @@ void MessageDispatcher::onAdjustment(const AdjustServiceDatesRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustServiceDatesReq, mData); + actionTransmit(GuiActionType::ID_AdjustServiceDatesReq, mData); } /*! @@ -612,7 +596,7 @@ void MessageDispatcher::onAdjustment(const AdjustServiceModeRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustServiceModeReq, mData); + actionTransmit(GuiActionType::ID_AdjustServiceModeReq, mData); } /*! @@ -625,7 +609,7 @@ { QVariantList mData; mData += vData.mBolusVolume; - onActionTransmit(GuiActionType::ID_AdjustBolusVolumeReq, mData); + actionTransmit(GuiActionType::ID_AdjustBolusVolumeReq, mData); } /*! @@ -641,7 +625,7 @@ mData += vData.mVenousPressureLimitWindow ; mData += vData.mVenousPressureLimitAsymtrc ; mData += vData.mTmpLimitWindow ; - onActionTransmit(GuiActionType::ID_AdjustPressuresLimitsReq, mData); + actionTransmit(GuiActionType::ID_AdjustPressuresLimitsReq, mData); } /*! @@ -652,7 +636,7 @@ void MessageDispatcher::onAdjustment(const AdjustPressuresWideningRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPressuresWideningReq, mData); + actionTransmit(GuiActionType::ID_AdjustPressuresWideningReq, mData); } /*! @@ -665,7 +649,7 @@ { QVariantList mData; mData += vData.requestedState; - onActionTransmit(GuiActionType::ID_AdjustInitTreatmentReq, mData); + actionTransmit(GuiActionType::ID_AdjustInitTreatmentReq, mData); } /** @@ -702,7 +686,7 @@ mData += vData.mUFEstimatedTargetWeight ; mData += vData.mUFVolume ; - onActionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData); + actionTransmit(GuiActionType::ID_AdjustParametersValidationReq, mData); } @@ -716,7 +700,7 @@ { QVariantList mData; mData += vData.result; - onActionTransmit(GuiActionType::ID_AdjustWaterSampleResultReq, mData); + actionTransmit(GuiActionType::ID_AdjustWaterSampleResultReq, mData); } /*! @@ -728,7 +712,7 @@ void MessageDispatcher::onAdjustment(const AdjustConsumablesConfirmRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustConsumablesConfirmReq, mData); + actionTransmit(GuiActionType::ID_AdjustConsumablesConfirmReq, mData); } /*! @@ -740,7 +724,7 @@ void MessageDispatcher::onAdjustment(const AdjustDisposablesConfirmRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDisposablesConfirmReq, mData); + actionTransmit(GuiActionType::ID_AdjustDisposablesConfirmReq, mData); } /*! @@ -752,7 +736,7 @@ void MessageDispatcher::onAdjustment(const AdjustDisposablesPrimeRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDisposablesPrimeReq, mData); + actionTransmit(GuiActionType::ID_AdjustDisposablesPrimeReq, mData); } /*! @@ -764,7 +748,7 @@ void MessageDispatcher::onAdjustment(const AdjustPatientConnectionBeginRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientConnectionBeginReq, mData); + actionTransmit(GuiActionType::ID_AdjustPatientConnectionBeginReq, mData); } /*! @@ -777,7 +761,7 @@ { QVariantList mData; mData += vData.volume; - onActionTransmit(GuiActionType::ID_AdjustUltrafiltrationInitReq, mData); + actionTransmit(GuiActionType::ID_AdjustUltrafiltrationInitReq, mData); } /*! @@ -789,7 +773,7 @@ void MessageDispatcher::onAdjustment(const AdjustPatientConnectionConfirmRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientConnectionConfirmReq, mData); + actionTransmit(GuiActionType::ID_AdjustPatientConnectionConfirmReq, mData); } /*! @@ -801,7 +785,7 @@ void MessageDispatcher::onAdjustment(const AdjustStartTreatmentRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustStartTreatmentReq, mData); + actionTransmit(GuiActionType::ID_AdjustStartTreatmentReq, mData); } /*! @@ -813,7 +797,7 @@ void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionNotifyRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectNotifyReq, mData); + actionTransmit(GuiActionType::ID_AdjustPatientDisconnectNotifyReq, mData); } /*! @@ -825,7 +809,7 @@ void MessageDispatcher::onAdjustment(const AdjustPatientDisconnectionConfirmRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustPatientDisconnectConfirmReq, mData); + actionTransmit(GuiActionType::ID_AdjustPatientDisconnectConfirmReq, mData); } /*! @@ -837,7 +821,7 @@ void MessageDispatcher::onAdjustment(const AdjustDisposablesRemovalConfirmRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDisposablesRemovalConfirmReq, mData); + actionTransmit(GuiActionType::ID_AdjustDisposablesRemovalConfirmReq, mData); } /*! @@ -849,7 +833,7 @@ void MessageDispatcher::onAdjustment(const AdjustTreatmentLogRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustTreatmentLogReq, mData); + actionTransmit(GuiActionType::ID_AdjustTreatmentLogReq, mData); } /*! @@ -862,7 +846,7 @@ { QVariantList mData; mData += vData.mEpoch ; - onActionTransmit(GuiActionType::ID_AdjustTDDateTimeReq, mData); + actionTransmit(GuiActionType::ID_AdjustTDDateTimeReq, mData); } /*! @@ -875,7 +859,7 @@ { QVariantList mData; mData += vData.mEpoch ; - onActionTransmit(GuiActionType::ID_AdjustDDDateTimeReq, mData); + actionTransmit(GuiActionType::ID_AdjustDDDateTimeReq, mData); } /*! @@ -886,7 +870,7 @@ void MessageDispatcher::onAdjustment(const AdjustDGCleaningUsageRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdjustDGCleaningUsageReq, mData); + actionTransmit(GuiActionType::ID_AdjustDGCleaningUsageReq, mData); } /*! @@ -899,7 +883,7 @@ { QVariantList mData; mData += vData.mState; - onActionTransmit(GuiActionType::ID_AdjustDisinfectStartReq, mData); + actionTransmit(GuiActionType::ID_AdjustDisinfectStartReq, mData); } /*! @@ -912,7 +896,7 @@ { QVariantList mData; mData += vData.mInititate; - onActionTransmit(GuiActionType::ID_AdjustDisinfectModeReq, mData); + actionTransmit(GuiActionType::ID_AdjustDisinfectModeReq, mData); } /*! @@ -925,7 +909,7 @@ { QVariantList mData; mData += vData.mResult; - onActionTransmit(GuiActionType::ID_UIPostFinalResultData, mData); + actionTransmit(GuiActionType::ID_UIPostFinalResultData, mData); } /*! @@ -939,7 +923,7 @@ QVariantList mData; mData += vData.mId; mData += vData.mConfirm; - onActionTransmit(GuiActionType::ID_DuetConfirmUIr, mData); + actionTransmit(GuiActionType::ID_DuetConfirmUIr, mData); } /*! @@ -952,7 +936,7 @@ { QVariantList mData; mData += vData.mStatus; - onActionTransmit(GuiActionType::ID_DuetRoWaterModeUIi, mData); + actionTransmit(GuiActionType::ID_DuetRoWaterModeUIi, mData); } /*! @@ -964,7 +948,7 @@ void MessageDispatcher::onAdjustment(const HDUsageInfoRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_HDUsageInfoReq, mData); + actionTransmit(GuiActionType::ID_HDUsageInfoReq, mData); } /*! @@ -1035,7 +1019,7 @@ mData += vData.mSubstitutionVolumeMax ; mData += vData.mSubstitutionVolumeDef ; - onActionTransmit(GuiActionType::ID_AdjustInstitutionalRecordReq, mData); + actionTransmit(GuiActionType::ID_AdjustInstitutionalRecordReq, mData); } /*! @@ -1047,7 +1031,7 @@ void MessageDispatcher::onAdjustment(const InstitutionalRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_InstitutionalRecordReq, mData); + actionTransmit(GuiActionType::ID_InstitutionalRecordReq, mData); } /*! @@ -1059,7 +1043,7 @@ void MessageDispatcher::onAdjustment(const AdvancedInstitutionalRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_AdvancedInstitutionalRecordReq, mData); + actionTransmit(GuiActionType::ID_AdvancedInstitutionalRecordReq, mData); } /*! @@ -1094,7 +1078,7 @@ mData += vData.mChlorineWaterSampleCheckDef ; mData += vData.mWaterSampleTestResultRequiredDef ; - onActionTransmit(GuiActionType::ID_AdjustAdvancedInstitutionalRecordReq, mData); + actionTransmit(GuiActionType::ID_AdjustAdvancedInstitutionalRecordReq, mData); } /*! @@ -1106,15 +1090,12 @@ void MessageDispatcher::onAdjustment(const AdjustHDResetInSrvcRequestData &) { QVariantList mData; - onActionTransmit(GuiActionType::ID_ResetHDInServiceModeReq, mData); + actionTransmit(GuiActionType::ID_ResetHDInServiceModeReq, mData); } // ---------------------------------------------------------------------------------------------------- /*! * \brief MessageDispatcher::actionTransmit - * \details This method is called by slot MessageDispatcher::onActionTransmit - * which emits didFrameTransmit on successful interpretation of the requested message - * and successfully creating of frame(s). * \param vActionId - The ActionID of the message * \param vData - The data of the Message */