Index: denali.pro =================================================================== diff -u -r3508eb862db3d45a89ef17bd63f385c80fb52775 -r3c30d57c6cba7595b1e1d6b806d90ca151bc8db2 --- denali.pro (.../denali.pro) (revision 3508eb862db3d45a89ef17bd63f385c80fb52775) +++ denali.pro (.../denali.pro) (revision 3c30d57c6cba7595b1e1d6b806d90ca151bc8db2) @@ -63,6 +63,7 @@ sources/model/hd/data/pretreatment \ sources/model/hd/data/treatment \ sources/model/hd/data/posttreatment \ + sources/model/hd/data/treatmentlog \ sources/model/dg/data \ sources/model/dg/data/pretreatment \ sources/model/dg/data/disinfect \ @@ -114,6 +115,7 @@ sources/model/hd/alarm/MAlarmTriggered.h \ sources/model/hd/alarm/MAlarmCleared.h \ sources/model/hd/alarm/MAlarmClearedCondition.h \ + sources/model/hd/alarm/MAlarmActiveList.h \ \ # ---------- Models - States Data sources/model/hd/data/MHDOperationModeData.h \ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.h \ @@ -127,6 +129,7 @@ \ # ---------- Models - HD - Adjustment - Settings sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.h \ sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.h \ + sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.h \ @@ -177,6 +180,10 @@ sources/model/hd/data/treatment/MTreatmentRecirculateData.h \ sources/model/hd/data/treatment/MTreatmentBloodPrimeData.h \ sources/model/hd/data/MHDPostFinalResultData.h \ + \ # ---------- Models - HD - Data - Treatment Log + sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.h \ + sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h \ + sources/model/hd/data/treatmentlog/MTreatmentLogEventData.h \ \ # ---------- Models - DG - Adjustment sources/model/dg/adjustment/settings/MAdjustDGRequests.h \ \ # ---------- Models - DG - Adjustment - Settings @@ -228,6 +235,7 @@ sources/view/settings/VNetworkModel.h \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.h \ + sources/view/hd/alarm/VAlarmActiveList.h \ \ # ---------- Views - HD - Adjustment sources/view/VAdjustmentResponseBase.h \ \ # ---------- Views - HD - Adjustment - Pre-Treatment @@ -336,6 +344,7 @@ sources/model/hd/alarm/MAlarmTriggered.cpp \ sources/model/hd/alarm/MAlarmCleared.cpp \ sources/model/hd/alarm/MAlarmClearedCondition.cpp \ + sources/model/hd/alarm/MAlarmActiveList.cpp \ \ # ---------- Models - Data - States sources/model/hd/data/MHDOperationModeData.cpp \ sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ @@ -347,6 +356,7 @@ \ # ---------- Models - HD - Adjustment - Settings sources/model/hd/adjustment/settings/MAdjustHDVersionsResponse.cpp \ sources/model/hd/adjustment/settings/MAdjustHDDateTimeResponse.cpp \ + sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustInitTreatmentResponse.cpp \ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp \ @@ -376,11 +386,6 @@ sources/model/hd/adjustment/disinfect/MDisinfectAdjustResponse.cpp \ sources/model/hd/adjustment/disinfect/MDisinfectAdjustChemicalConfirmResponse.cpp \ \ # ---------- Models - HD - Data - \ # ---------- Models - HD - Data - Pre-Treatment - sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ - sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \ - sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \ - \ # ---------- Models - HD - Data sources/model/hd/data/MHDDebugText.cpp \ sources/model/hd/data/MHDAccelerometerData.cpp \ sources/model/hd/data/MTreatmentRangesData.cpp \ @@ -395,6 +400,14 @@ sources/model/hd/data/treatment/MTreatmentBloodPrimeData.cpp \ sources/model/hd/data/MHDPostSingleResultData.cpp \ sources/model/hd/data/MHDPostFinalResultData.cpp \ + \ # ---------- Models - HD - Data - Pre-Treatment + sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \ + sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \ + sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \ + \ # ---------- Models - HD - Data - Treatment Log + sources/model/hd/data/treatmentlog/MTreatmentLogAlarmData.cpp \ + sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.cpp \ + sources/model/hd/data/treatmentlog/MTreatmentLogEventData.cpp \ \ # ---------- Models - DG - Adjustment \ # ---------- Models - DG - Adjustment - Settings sources/model/dg/adjustment/settings/MAdjustDGVersionsResponse.cpp \ @@ -438,6 +451,7 @@ sources/view/VUIPostSingleResultData.cpp \ \ # ---------- Views - Alarm sources/view/hd/alarm/VAlarmStatus.cpp \ + sources/view/hd/alarm/VAlarmActiveList.cpp \ \ # ---------- Views - Settings sources/view/settings/VSettings.cpp \ sources/view/settings/VDateTime.cpp \