Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7 -rd619b1355f03ab8e2e53956908bda66fea542224 --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision d619b1355f03ab8e2e53956908bda66fea542224) @@ -77,6 +77,7 @@ {Gui::GuiActionType::ID_AlarmCleared , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AlarmSilenceReq , 1 * 4 }, // 1 parameter each 4bytes {Gui::GuiActionType::ID_AlarmUserAckReq , 1 * 4 }, // 1 parameter each 4bytes + {Gui::GuiActionType::ID_AlarmUserActionReq , 1 * 4 }, // 1 parameter each 4bytes // ---- {Gui::GuiActionType::ID_StartTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes Index: sources/gui/qml/components/ImageLogoD.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rd619b1355f03ab8e2e53956908bda66fea542224 --- sources/gui/qml/components/ImageLogoD.qml (.../ImageLogoD.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/components/ImageLogoD.qml (.../ImageLogoD.qml) (revision d619b1355f03ab8e2e53956908bda66fea542224) @@ -24,7 +24,10 @@ * \brief Denali project simple logo (No 'Diality') */ Item { id : _root - height : Variables.headerHeight + // align it with the in-Treatment logo + // and also move it up to not to be covered + // by alarm dialog so changed from headerHeight to mainMenuHeight + height : Variables.mainMenuHeight anchors { top : parent.top left : parent.left Index: sources/gui/qml/main.qml =================================================================== diff -u -r45ce6e781782be5de1480a1e7acecd1d272bcc84 -rd619b1355f03ab8e2e53956908bda66fea542224 --- sources/gui/qml/main.qml (.../main.qml) (revision 45ce6e781782be5de1480a1e7acecd1d272bcc84) +++ sources/gui/qml/main.qml (.../main.qml) (revision d619b1355f03ab8e2e53956908bda66fea542224) @@ -192,8 +192,11 @@ // see also the "Connections { target: vAlarmStatus" implementation vAlarmStatus.alarm_KeepMinimized = true } - onOkClicked : vAlarmStatus.onRequestOkay(alarmID) - onMuteClicked : vAlarmStatus.onRequestSilence() + onMuteClicked : vAlarmStatus.doSilence() + onOkClicked : vAlarmStatus.doNotifyUserAction(true ,false, false, false) + onResumeClicked : vAlarmStatus.doNotifyUserAction(false,true , false, false) + onRinsebackClicked : vAlarmStatus.doNotifyUserAction(false,false, true , false) + onEndClicked : vAlarmStatus.doNotifyUserAction(false,false, false, true ) } // 9 - Others @@ -267,7 +270,7 @@ ] = Colors.alarmPriorityColors(vAlarmStatus.alarm_Priority) } - onRaiseAlarm: { + onDidAlarmRaise: { if (vAlarmStatus.alarm_Flag_alarmsSilenced) { // this is the response to the silence request // so the dialog should be closed when the request accepted @@ -282,6 +285,6 @@ } } - onNoAlarm: alarmHide() + onDidAlarmEmpty: alarmHide() } } Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -reb23f842f5b153622da276cdd167d98ea4d7ef04 -rd619b1355f03ab8e2e53956908bda66fea542224 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision eb23f842f5b153622da276cdd167d98ea4d7ef04) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision d619b1355f03ab8e2e53956908bda66fea542224) @@ -342,18 +342,18 @@ * \brief The MAlarmSilenceReq class * \details The model to request alarm silent * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:--------------------:| - * | | | | Req | Y | UI | HD | Alarm Silent Request | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------------------:| + * |0x3200| 0x100 | 9 | Req | Y | UI | HD | Alarm (de)Silent Request | * * | Payload || * | || - * | #1:(U32) | TBD | + * | #1:(U32) | state | * */ class MAlarmSilenceReq : public MModel { public: - quint8 state; + quint8 state = 1; // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { @@ -369,9 +369,9 @@ * \brief The MAlarmAcknowledgeReq class * \details The model to tell HD an alarm has been acknowledged * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:---:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * | 63 | 0x100 | N/A | Cmd | Y | UI | HD | Alarm Acknolwedge Request | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:----------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| + * |0x3F00| 0x001,2,4 | N/A | Cmd | Y | UI | HD | Alarm Acknowledge Request | * * | Payload || * | || @@ -380,25 +380,25 @@ */ class MAlarmAcknowledgeReq : public MModel { public: - quint32 alarmID; + GuiAlarmID alarmID = GuiAlarmID::ALARM_ID_NO_ALARM; // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. QString toString() { return toString({alarmID}); } // coco end static QString toString(const QVariantList &vParameters) { - return MModel::toString("AlarmAcknowledgeRequest", vParameters); + return MModel::toString("AlarmAcknowledge", vParameters); } }; /*! * \brief The MAlarmUserActionReq class * \details The model to tell HD an alarm action has been made by user * - * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | - * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-------------------------:| - * |0x4000| 0x100 | N/A | Cmd | Y | UI | HD | Alarm User Action | + * | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description | + * |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:------------------:| + * |0x4000| 0x100 | N/A | Cmd | Y | UI | HD | Alarm User Action | * * | Payload || * | || Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -re1eed343ea59863ce6f04253b85f3a636786dab2 -rd619b1355f03ab8e2e53956908bda66fea542224 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision e1eed343ea59863ce6f04253b85f3a636786dab2) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision d619b1355f03ab8e2e53956908bda66fea542224) @@ -14,26 +14,45 @@ */ #include "VAlarmStatus.h" -using namespace Gui; -using namespace View; +// Project +#include "GuiController.h" -VAlarmStatus::VAlarmStatus(QObject *parent) -{ - Q_UNUSED(parent); +VIEW_DEF_CLASS_ADJUSTMENT(VAlarmStatus, AlarmStatusData) - connect(&_GuiController, SIGNAL(didActionReceive(AlarmStatusData)), - this , SLOT(onActionReceive(AlarmStatusData))); +void VAlarmStatus::initConnections() { + ACTION_VIEW_CONNECTION(AlarmStatusData ); + ADJUST_VIEW_CONNECTION(AlarmAcknowledgeRequestData ); + ADJUST_VIEW_CONNECTION(AlarmSilenceRequestData ); + ADJUST_VIEW_CONNECTION(AlarmUserActionRequestData ); +} - connect(this, SIGNAL(requestActionTransmit(GuiActionType,QVariantList)), - &_GuiController, SLOT(doActionTransmit(GuiActionType,QVariantList))); +void View::VAlarmStatus::doNotifyUserAction( + bool vOK , + bool vResume , + bool vRinseback , + bool vEnd ) +{ + AlarmUserActionRequestData data; + if (vOK ) { data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_ACK ; goto lOut; } + if (vResume ) { data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_RESUME ; goto lOut; } + if (vRinseback ) { data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_RINSEBACK ; goto lOut; } + if (vEnd ) { data.action = Gui::GuiAlarmUserActions::ALARM_USER_ACTION_END_TREATMENT ; goto lOut; } +lOut: + emit didAdjustment(data); +} - connect(this, SIGNAL(requestAlarmAcknowledge(AlarmAcknowledgeRequestData)), - &_GuiController, SLOT(doAdjustment(AlarmAcknowledgeRequestData))); - - connect(this, SIGNAL(requestAlarmSilence(AlarmSilenceRequestData)), - &_GuiController, SLOT(doAdjustment(AlarmSilenceRequestData))); +/*! + * \brief VAlarmStatus::requestSilence + * Send out a request to silence alarms + */ +void View::VAlarmStatus::doSilence() +{ + AlarmSilenceRequestData data; + data.state = 1; + emit didAdjustment(data); } + void VAlarmStatus::onActionReceive(const AlarmStatusData &vData) { GuiAlarmID alarmID = static_cast(vData.mTop); @@ -44,7 +63,7 @@ } if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) { - emit noAlarm(); + emit didAlarmEmpty(); return; } @@ -76,7 +95,7 @@ // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_4 )); alarm_Flag_alarmsCondition (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION )); - emit raiseAlarm(); + emit didAlarmRaise(); } /*! @@ -132,25 +151,3 @@ return QString("%0").arg(static_cast(alarm_AlarmID())); // coco end } - -/*! - * \brief VAlarmStatus::requestOkay - * Send out a request to acknowledge this alarmID - */ -void VAlarmStatus::onRequestOkay(GuiAlarmID alarmID) -{ - AlarmAcknowledgeRequestData data; - data.alarmID = (quint32)alarmID; - emit requestAlarmAcknowledge(data); -} - -/*! - * \brief VAlarmStatus::requestSilence - * Send out a request to silence alarms - */ -void VAlarmStatus::onRequestSilence() -{ - AlarmSilenceRequestData data; - data.state = 1; - emit requestAlarmSilence(data); -} Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -r45ce6e781782be5de1480a1e7acecd1d272bcc84 -rd619b1355f03ab8e2e53956908bda66fea542224 --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 45ce6e781782be5de1480a1e7acecd1d272bcc84) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision d619b1355f03ab8e2e53956908bda66fea542224) @@ -29,9 +29,10 @@ // forward declarations class tst_views; -using namespace Can; -// namespace -using namespace Gui; +// Project +#include "main.h" // Doxygen : don't remove +#include "VTreatmentAdjustmentResponseBase.h" + namespace View { /*! @@ -41,17 +42,13 @@ * \sa Model::MAlarmStatus * */ -class VAlarmStatus : public QObject +class VAlarmStatus : public VTreatmentAdjustmentResponseBase { Q_OBJECT // friends friend class ::tst_views; -public: - VAlarmStatus(QObject *parent = NULL); - -private: // coco begin validated: Has been validated manually PROPERTY( quint32 , alarm_Priority , 0) PROPERTY( quint32 , alarm_AlarmID , 0) @@ -72,27 +69,27 @@ PROPERTY( bool , alarm_KeepMinimized , false) // coco end + Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged) Q_PROPERTY(QString id READ id NOTIFY alarm_AlarmIDChanged) -signals: - void raiseAlarm(); - void noAlarm(); - void requestActionTransmit(GuiActionType vAction, const QVariantList &vData); - void requestAlarmAcknowledge(AlarmAcknowledgeRequestData); - void requestAlarmSilence(AlarmSilenceRequestData); + VIEW_DEC_CLASS_ADJUSTMENT(VAlarmStatus, AlarmStatusData ) + ADJUST_TRANSMT_SIGNAL ( AlarmAcknowledgeRequestData ) + ADJUST_TRANSMT_SIGNAL ( AlarmSilenceRequestData ) + ADJUST_TRANSMT_SIGNAL ( AlarmUserActionRequestData ) private: + QString id (); + QString text (); QString alarmPriorityText (GuiAlarmPriority vEnum); QString alarmIDText (GuiAlarmID vEnum); -private slots: - void onActionReceive(const AlarmStatusData &vData); +signals: + void didAlarmRaise(); + void didAlarmEmpty(); public slots: - QString text(); - QString id(); - void onRequestOkay(GuiAlarmID alarmID); - void onRequestSilence(); + void doNotifyUserAction(bool vResume, bool vRinseback, bool vEnd, bool vOK); + void doSilence(); }; }