Index: sources/model/MModel.h =================================================================== diff -u -r7077e38c74db9cccb5496ffefcf8936c0916de76 -rb3eb8bc9696c4db9867ad1cf13b47c455a94e0fe --- sources/model/MModel.h (.../MModel.h) (revision 7077e38c74db9cccb5496ffefcf8936c0916de76) +++ sources/model/MModel.h (.../MModel.h) (revision b3eb8bc9696c4db9867ad1cf13b47c455a94e0fe) @@ -23,6 +23,7 @@ #include "MAlarmTriggered.h" #include "MAlarmCleared.h" #include "MAlarmClearedCondition.h" +#include "MAlarmActiveList.h" // States Messages #include "MHDOperationModeData.h" @@ -100,7 +101,11 @@ // Post-Treatment #include "MPostTreatmentAdjustRequests.h" #include "MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h" +// Treatment Log #include "MPostTreatmentAdjustTreatmentLogResponse.h" +#include "MTreatmentLogAvrgeData.h" +#include "MTreatmentLogAlarmData.h" +#include "MTreatmentLogEventData.h" // Disinfection #include "MDisinfectAdjustRequests.h" @@ -229,10 +234,10 @@ \details Registers the models in the Qt MetaType so it can be used in signal/slots between threads. */ #define REGISTER_MODEL_METATYPES \ - \ + /* Settings */ \ REGISTER_METATYPE( SettingsData ) \ REGISTER_METATYPE( WifiNetworkData ) \ - \ + /* Data */ \ REGISTER_METATYPE( HDOperationModeData ) \ REGISTER_METATYPE( PreTreatmentStatesData ) \ REGISTER_METATYPE( TreatmentStatesData ) \ @@ -251,7 +256,11 @@ REGISTER_METATYPE( TreatmentRecirculateData ) \ REGISTER_METATYPE( TreatmentBloodPrimeData ) \ REGISTER_METATYPE( HDAccelerometerData ) \ - \ + /* Treatment Log */ \ + REGISTER_METATYPE( TreatmentLogAvrgeData ) \ + REGISTER_METATYPE( TreatmentLogAlarmData ) \ + REGISTER_METATYPE( TreatmentLogEventData ) \ + /* Alarms */ \ REGISTER_METATYPE( AlarmStatusData ) \ REGISTER_METATYPE( AlarmTriggeredData ) \ REGISTER_METATYPE( AlarmClearedData ) \ @@ -303,8 +312,10 @@ REGISTER_METATYPE( AdjustDisinfectRequestData ) \ REGISTER_METATYPE( AdjustChemicalConfirmRequestData ) \ \ + /* Alarms */ \ REGISTER_METATYPE( AlarmSilenceRequestData ) \ REGISTER_METATYPE( AlarmUserActionRequestData ) \ + REGISTER_METATYPE( AlarmActiveListRequestData ) \ /* coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. REGISTER_METATYPE( AlarmClearedConditionRequestData ) \ coco end*/ \ @@ -355,8 +366,11 @@ REGISTER_METATYPE( AdjustDGVersionsResponseData ) \ REGISTER_METATYPE( AdjustHDDateTimeResponseData ) \ REGISTER_METATYPE( AdjustDGDateTimeResponseData ) \ + /* Alarms - Active List Response */ \ + REGISTER_METATYPE( AlarmActiveListResponseData ) \ + //===============================================================================// /*! \def ACTION_RECEIVE_MODEL_BRIDGE_CONNECTIONS @@ -392,7 +406,11 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, HDAccelerometerData ) \ - \ + /* Treatment Log */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAvrgeData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogAlarmData ) \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, TreatmentLogEventData ) \ + /* Alarms */ \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmClearedData ) \ @@ -453,7 +471,10 @@ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGVersionsResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustHDDateTimeResponseData ) \ ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AdjustDGDateTimeResponseData ) \ + /* Alarms - Active List Response */ \ + ACTION_RECEIVE_BRIDGE_CONNECTION(vSOURCE, AlarmActiveListResponseData ) \ + // /* Request */ ---------------------------------------------------------// #define ADJUST_TRANSMT_MODEL_BRIDGE_CONNECTIONS(vSOURCE) \ \ @@ -494,6 +515,7 @@ /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmUserActionRequestData ) \ + ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmActiveListRequestData ) \ /* coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_TRANSMT_BRIDGE_CONNECTION(vSOURCE, AlarmClearedConditionRequestData ) \ coco end */ \ @@ -536,7 +558,11 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentRecirculateData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( HDAccelerometerData ) \ - \ + /* Treatment Log */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAvrgeData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogAlarmData ) \ + ACTION_RECEIVE_BRIDGE_DEFINITION( TreatmentLogEventData ) \ + /* Alarms */ \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmStatusData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmTriggeredData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmClearedData ) \ @@ -597,7 +623,10 @@ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGVersionsResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustHDDateTimeResponseData ) \ ACTION_RECEIVE_BRIDGE_DEFINITION( AdjustDGDateTimeResponseData ) \ + /* Alarms - Active List Response */ \ + ACTION_RECEIVE_BRIDGE_DEFINITION( AlarmActiveListResponseData ) \ + #define ADJUST_TRANSMT_MODEL_BRIDGE_DEFINITIONS \ /* Request --------------------------------------------------------- */ \ /* Post-Treatment */ \ @@ -635,9 +664,10 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AdjustDGDateTimeRequestData ) \ - \ + /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmUserActionRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmActiveListRequestData ) \ /* coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_TRANSMT_BRIDGE_DEFINITION( AlarmClearedConditionRequestData ) \ coco end */ \ @@ -679,9 +709,10 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AdjustDGDateTimeRequestData ) \ - \ + /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmUserActionRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmActiveListRequestData ) \ /* coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_TRANSMT_BRIDGE_DEFINITION_NOEMIT( AlarmClearedConditionRequestData ) \ coco end */ \ @@ -723,9 +754,10 @@ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustVersionsRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustHDDateTimeRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AdjustDGDateTimeRequestData ) \ - \ + /* Alarms */ \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmSilenceRequestData ) \ ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmUserActionRequestData ) \ + ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmActiveListRequestData ) \ /* coco begin validated: Manually tested. This model class is a placeholder and there is no use case for this now. ADJUST_TRANSMT_BRIDGE_DEFINITION_PUBLIC( AlarmClearedConditionRequestData ) \ coco end */ \ @@ -753,11 +785,16 @@ ACTION_RECEIVE_SIGNAL( TreatmentRecirculateData ) \ ACTION_RECEIVE_SIGNAL( TreatmentBloodPrimeData ) \ ACTION_RECEIVE_SIGNAL( HDAccelerometerData ) \ - \ + /* Alarms */ \ ACTION_RECEIVE_SIGNAL( AlarmStatusData ) \ ACTION_RECEIVE_SIGNAL( AlarmTriggeredData ) \ ACTION_RECEIVE_SIGNAL( AlarmClearedData ) \ ACTION_RECEIVE_SIGNAL( AlarmClearedConditionData ) \ + /* Treatment Log */ \ + ACTION_RECEIVE_SIGNAL( TreatmentLogAvrgeData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentLogAlarmData ) \ + ACTION_RECEIVE_SIGNAL( TreatmentLogEventData ) \ + \ ACTION_RECEIVE_SIGNAL( DGROPumpData ) \ ACTION_RECEIVE_SIGNAL( DGPressuresData ) \ ACTION_RECEIVE_SIGNAL( DGDrainPumpData ) \ @@ -812,6 +849,9 @@ ACTION_RECEIVE_SIGNAL( AdjustDGVersionsResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustHDDateTimeResponseData ) \ ACTION_RECEIVE_SIGNAL( AdjustDGDateTimeResponseData ) \ + /* Alarms */ \ + ACTION_RECEIVE_SIGNAL( AlarmActiveListResponseData ) \ + //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------//