Index: sources/view/td/data/treatment/VTreatmentTrends.cpp
===================================================================
diff -u -rbae1ae230d8b41f90b1fcd34b9bccdfa87bf3cd9 -r83f808d0f503ea847c27c1fbc65c2b95d2e5d6b0
--- sources/view/td/data/treatment/VTreatmentTrends.cpp	(.../VTreatmentTrends.cpp)	(revision bae1ae230d8b41f90b1fcd34b9bccdfa87bf3cd9)
+++ sources/view/td/data/treatment/VTreatmentTrends.cpp	(.../VTreatmentTrends.cpp)	(revision 83f808d0f503ea847c27c1fbc65c2b95d2e5d6b0)
@@ -76,15 +76,14 @@
 {
     ACTION_VIEW_CONNECTION(DDConductivityData               )
     ACTION_VIEW_CONNECTION(PressureOcclusionData            )
+    ACTION_VIEW_CONNECTION(TreatmentLogAlarmData            )
+    ACTION_VIEW_CONNECTION(TreatmentLogEventData            )
     ACTION_VIEW_CONNECTION(TreatmentParametersSetPointData  )
     ACTION_VIEW_CONNECTION(TreatmentSalineData              )
     ACTION_VIEW_CONNECTION(TreatmentStatesData              )
     ACTION_VIEW_CONNECTION(TreatmentTimeData                )
     ACTION_VIEW_CONNECTION(TreatmentUltrafiltrationData     )
     ACTION_VIEW_CONNECTION(TreatmentVitalsData              )
-
-    ACTION_VIEW_CONNECTION(TreatmentLogAlarmData            )
-    ACTION_VIEW_CONNECTION(TreatmentLogEventData            )
 }
 
 void VTreatmentTrends::onActionReceive(const DDConductivityData &vData)
@@ -99,6 +98,28 @@
     _latestData[eDataRole_TMP               ]   = vData.mTmpPressure;
 }
 
+void View::VTreatmentTrends::onActionReceive(const TreatmentLogAlarmData &vData)
+{
+    TrendEntry entry;
+    entry[eHistoryRole_Timestamp]   = QDateTime::currentDateTime();
+    entry[eHistoryRole_EntryID]     = vData.mAlarmID;
+    entry[eHistoryRole_Priority]    = 0;
+    entry[eHistoryRole_Message]     = _TreatmentLog.alarmTitle(vData.mAlarmID, false);
+
+    _history.insertRow(0, entry);
+}
+
+void View::VTreatmentTrends::onActionReceive(const TreatmentLogEventData &vData)
+{
+    TrendEntry entry;
+    entry[eHistoryRole_Timestamp]   = QDateTime::currentDateTime();
+    entry[eHistoryRole_EntryID]     = vData.mEventID;
+    entry[eHistoryRole_Priority]    = 0;
+    entry[eHistoryRole_Message]     = _TreatmentLog.eventTitle(vData.mEventID, false);
+
+    _history.insertRow(0, entry);
+}
+
 void VTreatmentTrends::onActionReceive(const TreatmentParametersSetPointData &vData)
 {
     _latestData[eDataRole_BloodFlowRate         ]   = vData.mBloodFlow;
@@ -163,7 +184,7 @@
     _latestData.clear();
 }
 
-void VTreatmentTrends::onRequestVitals()
+void VTreatmentTrends::onIntervalRequestVitals()
 {
     _savedData = _latestData;
     _savedData[eDataRole_Timestamp]     = QDateTime::currentDateTime();
@@ -172,34 +193,30 @@
     _savedData[eDataRole_PulseRate ]    = QVariant();
 }
 
-void VTreatmentTrends::onReceiveVitals()
+void VTreatmentTrends::onIntervalTimeoutVitals()
 {
+    _data.insertRow(0, _savedData);
+    _latestData.clear();
 }
 
-void VTreatmentTrends::onTimeoutVitals()
+void VTreatmentTrends::onManualVitals(const quint16 vSystolic, const quint16 vDiastolic, const quint16 vHeartRate)
 {
+    _latestData[eDataRole_Timestamp ]   = QDateTime::currentDateTime();
+    _latestData[eDataRole_Systolic  ]   = vSystolic;
+    _latestData[eDataRole_Diastolic ]   = vDiastolic;
+    _latestData[eDataRole_PulseRate ]   = vHeartRate;
+
     _data.insertRow(0, _latestData);
     _latestData.clear();
 }
 
-void View::VTreatmentTrends::onActionReceive(const TreatmentLogAlarmData &vData)
+void VTreatmentTrends::onNoVitalsRecord()
 {
-    TrendEntry entry;
-    entry[eHistoryRole_Timestamp]   = QDateTime::currentDateTime();
-    entry[eHistoryRole_EntryID]     = vData.mAlarmID;
-    entry[eHistoryRole_Priority]    = 0;
-    entry[eHistoryRole_Message]     = _TreatmentLog.alarmTitle(vData.mAlarmID, false);
+    _latestData[eDataRole_Timestamp ]   = QDateTime::currentDateTime();
+    _latestData[eDataRole_Systolic  ]   = QVariant();
+    _latestData[eDataRole_Diastolic ]   = QVariant();
+    _latestData[eDataRole_PulseRate ]   = QVariant();
 
-    _history.insertRow(0, entry);
+    _data.insertRow(0, _latestData);
+    _latestData.clear();
 }
-
-void View::VTreatmentTrends::onActionReceive(const TreatmentLogEventData &vData)
-{
-    TrendEntry entry;
-    entry[eHistoryRole_Timestamp]   = QDateTime::currentDateTime();
-    entry[eHistoryRole_EntryID]     = vData.mEventID;
-    entry[eHistoryRole_Priority]    = 0;
-    entry[eHistoryRole_Message]     = _TreatmentLog.eventTitle(vData.mEventID, false);
-
-    _history.insertRow(0, entry);
-}