Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp
===================================================================
diff -u -r59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e -r27331dcb133e4d400eef25d5595c3b277e79504c
--- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp	(.../VCommonAdjustmentVitals.cpp)	(revision 59fc5195a10eeb83ac60cf32a9123fb9c9f8ec8e)
+++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.cpp	(.../VCommonAdjustmentVitals.cpp)	(revision 27331dcb133e4d400eef25d5595c3b277e79504c)
@@ -46,19 +46,21 @@
  */
 void View::VTreatmentVitals::onActionReceive(const UIBloodPressureData &vData)
 {
-    if ( ! _enabled ) {
+    if ( ! ( _enableDialog || _enableUpdate ) ) {
         // if the vitals is disabled it means Gui is probably in an incorrect state and is unable to handle the vital information.
-        LOG_EVENT_UI(tr("Measured vital values ignored due to incorrect state"));
+        LOG_EVENT_UI(tr("Measured vital values ignored due to incorrect state [%1,%2,%3]")
+                     .arg(vData.mSystolic )
+                     .arg(vData.mDiastolic)
+                     .arg(vData.mPulseRate));
         return;
     }
 
     // Not used yet.
     // adjustment_Accepted         ( vData.mAccepted );
     // adjustment_Reason           ( vData.mReason   );
 
-    update(vData.mSystolic, vData.mDiastolic, vData.mPulseRate);
-    treatmentLog();
-    timerReset();
+    if ( _enableDialog ) { emit didTrigger(vData.mSystolic, vData.mDiastolic, vData.mPulseRate); }
+    if ( _enableUpdate ) {      update    (vData.mSystolic, vData.mDiastolic, vData.mPulseRate); }
 }
 
 /*!
@@ -68,7 +70,9 @@
  * \param   vDiastolic  - Blood Pressure Diastolic
  * \param   vHeartRate  - Heart Rate
  */
-void View::VTreatmentVitals::doConfirm(quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate) {
+void View::VTreatmentVitals::doConfirm( quint16 vSystolic,
+                                        quint16 vDiastolic,
+                                        quint16 vHeartRate) {
     adjustment_Accepted         ( true );
     adjustment_Reason           ( 0    );
 
@@ -106,14 +110,15 @@
  * \param   vEnabled - Disable or enable the vitals.
  * \note    it's still unknown that how to stop in case of the treatment ended by alarm or system fault.
  */
-void View::VTreatmentVitals::doReset(bool vEnabled)
+void View::VTreatmentVitals::doReset()
 {
-    epoch       ( 0 );
-    lastRead    ( "");
-    systolic    ( 0 );
-    diastolic   ( 0 );
-    heartRate   ( 0 );
-    enabled     (vEnabled);
+    epoch          ( 0 );
+    lastRead       ( "");
+    systolic       ( 0 );
+    diastolic      ( 0 );
+    heartRate      ( 0 );
+    enableDialog   ( 0 );
+    enableUpdate   ( 0 );
 
     // force notify the Gui
     emit epochChanged       ( 0 );
@@ -132,7 +137,7 @@
  */
 void View::VTreatmentVitals::update(quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate)
 {
-    QDateTime currentDateTime = QDateTime::currentDateTime();
+    QDateTime    currentDateTime = QDateTime::currentDateTime();
     epoch       (currentDateTime.toSecsSinceEpoch());
     lastRead    (currentDateTime.toString(_datetimeFormat));
     systolic    ( vSystolic  );
@@ -176,8 +181,8 @@
 
 void View::VTreatmentVitals::onTimerChanged()
 {
-    if ( _interval && _enabled ) timerStart();
-    else                         timerStop ();
+    if ( _interval && _enableDialog ) timerStart();
+    else                              timerStop ();
 }
 
 /*!