Index: leahi.pro =================================================================== diff -u -r59a1b4dceeb629ed08a434775d819ce108fe894b -r2624ed8acc30847fb38816fb4ae6073518b091f9 --- leahi.pro (.../leahi.pro) (revision 59a1b4dceeb629ed08a434775d819ce108fe894b) +++ leahi.pro (.../leahi.pro) (revision 2624ed8acc30847fb38816fb4ae6073518b091f9) @@ -109,7 +109,6 @@ 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/post \ sources/model/dg/data/pretreatment \ @@ -153,6 +152,7 @@ \ # Controllers sources/ApplicationController.h \ sources/device/DeviceController.h \ + sources/model/confirm/MDuetConfirmTDi.h \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.h \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.h \ sources/model/dd/data/MDDBloodLeakData.h \ @@ -219,6 +219,7 @@ \ # ---------- Models - TD - Data - Treatment Log sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \ + sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.h \ \ # ---------- Models - TD - Adjustment - In-Treatment //// ----- @LEAHIZED sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \ @@ -336,7 +337,6 @@ sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustDisposablesRemovalConfirmResponse.h \ sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h \ \ # ---------- Models - confirm - sources/model/confirm/MDuetConfirmHDi.h \ \ # ---------- Models - POST sources/model/dg/data/post/MDGPostFinalResultData.h \ sources/model/dg/data/post/MDGPostSingleResultData.h \ @@ -362,7 +362,6 @@ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.h \ \ # ---------- Models - HD - Adjustment sources/model/hd/adjustment/MAdjustRequestsBase.h \ - sources/model/hd/adjustment/MAdjustPowerOff.h \ sources/model/hd/adjustment/settings/MAdjustHDRequests.h \ \ # ---------- Models - HD - Adjustment - Settings sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.h \ @@ -401,8 +400,6 @@ sources/model/hd/data/treatment/MTreatmentRecirculateData.h \ sources/model/hd/data/post/MHDRTCEpochData.h \ sources/model/hd/data/MHDUsageInfoResponse.h \ - \ # ---------- Models - HD - Data - Treatment Log - sources/model/hd/data/treatmentlog/MTreatmentLogAvrgeData.h \ \ # ---------- Models - DG - Adjustment sources/model/dg/adjustment/settings/MAdjustDGRequests.h \ sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h \ @@ -526,6 +523,7 @@ \ # Controllers sources/ApplicationController.cpp \ sources/device/DeviceController.cpp \ + sources/model/confirm/MDuetConfirmTDi.cpp \ sources/model/dd/adjustment/settings/MAdjustDDSerialNumberResponse.cpp \ sources/model/dd/adjustment/settings/MAdjustDDVersionsResponse.cpp \ sources/model/dd/data/MDDBloodLeakData.cpp \ @@ -613,6 +611,9 @@ \ # ---------- Models - TD - Data - Treatment Log sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp \ sources/model/td/data/treatmentlog/MTreatmentLogEventData.cpp \ + sources/model/td/data/treatmentlog/MTreatmentLogAvrgeData.cpp \ + \ # ---------- Models - TD - Adjustment + sources/model/td/adjustment/MAdjustPowerOff.h \ \ # ---------- Models - TD - Adjustment - In-Treatment sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \ @@ -635,7 +636,6 @@ sources/model/td/adjustment/treatment/MTreatmentAdjustVitalsResponse.cpp \ sources/model/td/adjustment/treatment/MTreatmentAdjustRinsebackResponse.cpp \ \ # ---------- Models - CONFIRM - sources/model/confirm/MDuetConfirmHDi.cpp \ \ # ---------- Models - POST sources/model/dg/data/post/MDGPostFinalResultData.cpp \ sources/model/dg/data/post/MDGPostSingleResultData.cpp \ @@ -658,6 +658,8 @@ \ # ---------- Models - Data - States sources/model/hd/data/pretreatment/MPreTreatmentStatesData.cpp \ sources/model/hd/data/posttreatment/MPostTreatmentStatesData.cpp \ + \ # ---------- Models - TD - Adjustment + sources/model/td/adjustment/MAdjustPowerOff.cpp \ \ # ---------- Models - TD - Adjustment - Settings sources/model/td/adjustment/settings/MAdjustTDDateTimeResponse.cpp \ sources/model/td/adjustment/settings/MTDInstitutionalRecordResponse.cpp \ @@ -674,8 +676,6 @@ sources/model/td/adjustment/treatment/MTreatmentAdjustRecirculateResponse.cpp \ \ # ---------- Models - DD - Adjustment - Settings sources/model/dd/adjustment/settings/MAdjustDDDateTimeResponse.cpp \ - \ # ---------- Models - HD - Adjustment - sources/model/hd/adjustment/MAdjustPowerOff.cpp \ \ # ---------- Models - HD - Adjustment - Settings sources/model/hd/adjustment/settings/MAdjustHDAlarmVolumeResponse.cpp \ \ # ---------- Models - HD - Adjustment - Pre-Treatment @@ -709,9 +709,6 @@ 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/MTreatmentLogAvrgeData.cpp \ - \ # ---------- Models - DG - Adjustment \ # ---------- Models - DG - Adjustment - Settings sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.cpp \ \ # ---------- Models - DG - Data - Pre-Treatment - Progress