Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -rf06b3645936db64dff09721cf625a6a8530e3f0a -r3ce84d6c0217d317811f3807807397f241b81bc4 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision f06b3645936db64dff09721cf625a6a8530e3f0a) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 3ce84d6c0217d317811f3807807397f241b81bc4) @@ -127,13 +127,18 @@ alarm_Flag_noResume (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_RESUME )); alarm_Flag_noRinseback (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK )); alarm_Flag_noEndTreatment (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT )); - // alarm_Flag_noNewTreatment (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_NEW_TREATMENT )); // TODO : recently removed. 3/7/22 +// alarm_Flag_noNewTreatment (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS____AVAILABLE )); // recently removed. 3/7/22, and is Availabe for later use. alarm_Flag_UserMustAck (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_OK_BUTTON_ONLY )); alarm_Flag_alarmsToEscalate (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_ALARMS_TO_ESCALATE )); +// alarm_Flag_alarmsSilenced (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED )); // look at the note @L112 alarm_Flag_alarmsLampOn (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_LAMP_ON )); - // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_1 )); - // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_2 )); - // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_3 )); + alarm_Flag_noRetrigger (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_RETRIGGER )); // Added but not used yet. + alarm_Flag_bloodRecirc (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_BLOOD_RECIRC )); // Added but not used yet. + alarm_Flag_dialysateRecirc (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_DIALYSATE_RECIRC )); // Added but not used yet. +// alarm_Flag_noMinimize (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE )); // Used in the if's else block. +// alarm_Flag_alarmsCondition (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION )); // Is moved to be after the NoMinimize + + if ( gDisableAlarmNoMinimize ) { alarm_Flag_noMinimize (false); } Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -rf06b3645936db64dff09721cf625a6a8530e3f0a -r3ce84d6c0217d317811f3807807397f241b81bc4 --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision f06b3645936db64dff09721cf625a6a8530e3f0a) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 3ce84d6c0217d317811f3807807397f241b81bc4) @@ -72,15 +72,19 @@ PROPERTY( bool , alarm_Flag_noResume , false) PROPERTY( bool , alarm_Flag_noRinseback , false) PROPERTY( bool , alarm_Flag_noEndTreatment , false) - PROPERTY( bool , alarm_Flag_noNewTreatment , false) +// PROPERTY( bool , alarm_Flag_noNewTreatment , false) // TODO : recently removed. 3/7/22 PROPERTY( bool , alarm_Flag_UserMustAck , false) PROPERTY( bool , alarm_Flag_alarmsToEscalate , false) PROPERTY( bool , alarm_Flag_alarmsSilenced , false) PROPERTY( bool , alarm_Flag_alarmsLampOn , false) - // 3 reserved flags are here... // + PROPERTY( bool , alarm_Flag_noMinimize , false) PROPERTY( bool , alarm_Flag_alarmsCondition , false) + PROPERTY( bool , alarm_Flag_noRetrigger , false) // Added but not used yet. + PROPERTY( bool , alarm_Flag_bloodRecirc , false) // Added but not used yet. + PROPERTY( bool , alarm_Flag_dialysateRecirc , false) // Added but not used yet. + // ********** STATIC PROPERTIES: The properties which need to be updated by each alarm message received. ********** // Q_PROPERTY(QString title READ title NOTIFY alarm_AlarmIDChanged ) Q_PROPERTY(QString text READ text NOTIFY alarm_AlarmIDChanged )