Index: leahi.pro
===================================================================
diff -u -r85ccb77b7343cb0ba133b6c13585e95a23ac237e -r3da801fd23f007886f7fda5e9b45d17d565150d2
--- leahi.pro	(.../leahi.pro)	(revision 85ccb77b7343cb0ba133b6c13585e95a23ac237e)
+++ leahi.pro	(.../leahi.pro)	(revision 3da801fd23f007886f7fda5e9b45d17d565150d2)
@@ -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 \
@@ -198,6 +199,7 @@
     sources/model/td/data/treatment/MTreatmentTimeData.h \
     sources/model/td/data/treatment/MTreatmentUltrafiltrationData.h \
     sources/model/td/data/treatment/MTreatmentVitalsData.h \
+    sources/model/td/data/treatment/MTreatmentStopData.h \
     sources/storage/Settings.h \
     sources/storage/TreatmentLog.h \
     sources/bluetooth/BluetoothInterface.h \
@@ -210,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 \
@@ -270,7 +275,9 @@
     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
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.h \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodPrime.h \
@@ -378,13 +385,10 @@
     sources/model/hd/data/treatment/MTreatmentHeparinData.h \
     sources/model/hd/data/treatment/MTreatmentRinsebackData.h \
     sources/model/hd/data/treatment/MTreatmentRecirculateData.h \
-    sources/model/hd/data/treatment/MTreatmentStopData.h \
     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 \
@@ -481,7 +485,6 @@
     sources/view/hd/data/treatment/VTreatmentHeparinData.h \
     sources/view/hd/data/treatment/VTreatmentRinsebackData.h \
     sources/view/hd/data/treatment/VTreatmentRecirculateData.h \
-    sources/view/hd/data/treatment/VTreatmentStopData.h \
     \ # ---------- Views - DG - Data - Pre-Treatment - Progress
     sources/view/dg/data/pretreatment/VDGFilterFlushData.h \
     \ # ---------- Views - DG - Data - Disinfection - Progress
@@ -561,6 +564,7 @@
     sources/model/td/data/treatment/MTreatmentTimeData.cpp \
     sources/model/td/data/treatment/MTreatmentUltrafiltrationData.cpp \
     sources/model/td/data/treatment/MTreatmentVitalsData.cpp \
+    sources/model/td/data/treatment/MTreatmentStopData.cpp \
     sources/model/ui/data/MUIBloodPressureData.cpp \
     sources/storage/Settings.cpp \
     sources/storage/TreatmentLog.cpp \
@@ -592,6 +596,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 \
@@ -682,17 +689,14 @@
     sources/model/hd/data/treatment/MTreatmentHeparinData.cpp \
     sources/model/hd/data/treatment/MTreatmentRinsebackData.cpp \
     sources/model/hd/data/treatment/MTreatmentRecirculateData.cpp \
-    sources/model/hd/data/treatment/MTreatmentStopData.cpp \
     sources/model/hd/data/post/MHDRTCEpochData.cpp \
     sources/model/hd/data/MHDUsageInfoResponse.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/MAdjustDGCleaningUsageResponse.cpp \
@@ -749,7 +753,9 @@
     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
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodFlowRate.cpp \
     sources/view/td/adjustment/treatment/VTreatmentAdjustmentBloodPrime.cpp \
@@ -835,7 +841,6 @@
     \ # ---------- Views - HD - Data - End-Treatment
     sources/view/hd/data/treatment/VTreatmentRinsebackData.cpp \
     sources/view/hd/data/treatment/VTreatmentRecirculateData.cpp \
-    sources/view/hd/data/treatment/VTreatmentStopData.cpp \
     \ # ---------- Views - DG - Data - Pre-Treatment - Progress
     sources/view/dg/data/pretreatment/VDGFilterFlushData.cpp \
     \ # ---------- Views - DG - Data - Disinfect - Progress
Index: leahi.qrc
===================================================================
diff -u -rf7bc98de488100270b004af851174e1329028d9a -r3da801fd23f007886f7fda5e9b45d17d565150d2
--- leahi.qrc	(.../leahi.qrc)	(revision f7bc98de488100270b004af851174e1329028d9a)
+++ leahi.qrc	(.../leahi.qrc)	(revision 3da801fd23f007886f7fda5e9b45d17d565150d2)
@@ -171,6 +171,7 @@
         <file alias="Footer.qml">sources/gui/qml/components/Footer.qml</file>
         <file alias="TextEntry.qml">sources/gui/qml/components/TextEntry.qml</file>
         <file alias="ScrollBar.qml">sources/gui/qml/components/ScrollBar.qml</file>
+        <file alias="ScrollBar2.qml">sources/gui/qml/components/ScrollBar2.qml</file>
         <file alias="FooterStatic.qml">sources/gui/qml/components/FooterStatic.qml</file>
         <file alias="TimeEntry.qml">sources/gui/qml/components/TimeEntry.qml</file>
         <file alias="Label.qml">sources/gui/qml/components/Label.qml</file>
@@ -281,6 +282,7 @@
         <file alias="TreatmentSectionHeader.qml">sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml</file>
         <file alias="TreatmentHeparin.qml">sources/gui/qml/pages/treatment/TreatmentHeparin.qml</file>
         <file alias="TreatmentHDF.qml">sources/gui/qml/pages/treatment/TreatmentHDF.qml</file>
+        <file alias="TreatmentTrends.qml">sources/gui/qml/pages/treatment/TreatmentTrends.qml</file>
     </qresource>
     <qresource prefix="/pages/treatment/sections">
         <file alias="TreatmentFlows.qml">sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml</file>
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r1da0c41020664b642359f3cd5d58a2fdc36774a2 -r3da801fd23f007886f7fda5e9b45d17d565150d2
--- sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 1da0c41020664b642359f3cd5d58a2fdc36774a2)
+++ sources/gui/GuiGlobals.h	(.../GuiGlobals.h)	(revision 3da801fd23f007886f7fda5e9b45d17d565150d2)
@@ -141,7 +141,7 @@
             ID_Rinseback                                = 0x8F00, // 143    //// ----- @LEAHIZED
             ID_Recirculate                              = 0xA800, // 168
             ID_BloodPrime                               = 0x9700, // 151
-            ID_TreatmentStop                            = 0x4900, // 73
+            ID_TreatmentStop                            = 0x5B00, // 91
             ID_Vitals                                   = 0x6500, // 101
 
             // Alarm Messages
@@ -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