Index: leahi.pro
===================================================================
diff -u -r1be319981e75689fbbef03c77f99d788b7e296a1 -re511dffa01d9614b59f8a2600ed0f8e62bf90883
--- leahi.pro	(.../leahi.pro)	(revision 1be319981e75689fbbef03c77f99d788b7e296a1)
+++ leahi.pro	(.../leahi.pro)	(revision e511dffa01d9614b59f8a2600ed0f8e62bf90883)
@@ -60,6 +60,7 @@
     sources/model/td \
     sources/model/td/data \
     sources/model/td/data/treatment \
+    sources/model/td/data/treatmentlog \
     sources/model/td/alarm \
     sources/model/td/adjustment \
     sources/model/td/adjustment/settings \
@@ -211,6 +212,9 @@
     sources/device/DeviceModels.h \
     \ # ---------- Models - TD - Data                                           //// ----- @LEAHIZED
     sources/model/td/data/MTDOpModeData.h \
+    \ # ---------- Models - TD - Data - Treatment Log
+    sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.h \
+    sources/model/td/data/treatmentlog/MTreatmentLogEventData.h \
     \ # ---------- Models - TD - Adjustment - In-Treatment                      //// ----- @LEAHIZED
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.h \
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.h \
@@ -271,6 +275,7 @@
     sources/view/td/data/treatment/VTreatmentPressureOcclusion.h \
     sources/view/td/data/treatment/VTreatmentSalineData.h \
     sources/view/td/data/treatment/VTreatmentTime.h \
+    sources/view/td/data/treatment/VTreatmentTrends.h \
     sources/view/td/data/treatment/VTreatmentUltrafiltrationData.h \
     sources/view/td/data/treatment/VTreatmentStopData.h \
     \ # ---------- Views - TD - Adjustment - In-Treatment
@@ -384,9 +389,7 @@
     sources/model/hd/data/post/MHDRTCEpochData.h \
     sources/model/hd/data/MHDUsageInfoResponse.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 \
     sources/model/dg/adjustment/settings/MAdjustDGCleaningUsageResponse.h \
@@ -594,6 +597,9 @@
     sources/device/DeviceModels.cpp \
     \ # ---------- Models - TD - Data - States
     sources/model/td/data/MTDOpModeData.cpp \
+    \ # ---------- Models - TD - Data - Treatment Log
+    sources/model/td/data/treatmentlog/MTreatmentLogAlarmData.cpp \
+    sources/model/td/data/treatmentlog/MTreatmentLogEventData.cpp \
     \ # ---------- Models - TD - Adjustment - In-Treatment
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodPrimeResponse.cpp \
     sources/model/td/adjustment/treatment/MTreatmentAdjustBloodFlowRateResponse.cpp \
@@ -691,9 +697,7 @@
     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/MAdjustDGCleaningUsageResponse.cpp \
@@ -750,6 +754,7 @@
     sources/view/td/data/treatment/VTreatmentPressureOcclusion.cpp \
     sources/view/td/data/treatment/VTreatmentSalineData.cpp \
     sources/view/td/data/treatment/VTreatmentTime.cpp \
+    sources/view/td/data/treatment/VTreatmentTrends.cpp \
     sources/view/td/data/treatment/VTreatmentUltrafiltrationData.cpp \
     sources/view/td/data/treatment/VTreatmentStopData.cpp \
     \ # ---------- Views - TD - Adjustment - In-Treatment
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r1be319981e75689fbbef03c77f99d788b7e296a1 -re511dffa01d9614b59f8a2600ed0f8e62bf90883
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 1be319981e75689fbbef03c77f99d788b7e296a1)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision e511dffa01d9614b59f8a2600ed0f8e62bf90883)
@@ -327,8 +327,8 @@
             ID_AdjustTreatmentLogRsp                    = 0x760F, // 118 //// ----- @CRAPIZED: had to change to avoid duplication
             // Treatment Log Data
             ID_TreatmentLogAvrgeData                    = 0x940F, // 148 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_TreatmentLogAlarmData                    = 0x950F, // 149 //// ----- @CRAPIZED: had to change to avoid duplication
-            ID_TreatmentLogEventData                    = 0x960F, // 150 //// ----- @CRAPIZED: had to change to avoid duplication
+            ID_TreatmentLogAlarmData                    = 0x6A00, // 106  //// ----- @LEAHIZED
+            ID_TreatmentLogEventData                    = 0x6B00, // 107  //// ----- @LEAHIZED
 
             // Disinfect
             ID_AdjustDisinfectModeReq                   = 0x9A0F, // 154    //// ----- @CRAPIZED: had to change to avoid duplication