Index: sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp
===================================================================
diff -u -r27cc308ff5113a9386899d3c8f8b29962a8498e1 -rdf0329c47627ceb1fe460cda2ae3ff8c9c851106
--- sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision 27cc308ff5113a9386899d3c8f8b29962a8498e1)
+++ sources/view/hd/data/treatment/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision df0329c47627ceb1fe460cda2ae3ff8c9c851106)
@@ -61,13 +61,15 @@
     sbMaxReached            ( vData.mSalineState        == GuiSalineStates     ::SALINE_BOLUS_STATE_MAX_DELIVERED           );
 
     // Heparin States
-    hpOff                   ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_OFF                          );
-    hpStopped               ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_STOPPED                      );
-    hpPaused                ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_PAUSED                       );
-    hpInitial_bolus         ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_INITIAL_BOLUS                );
-    hpDispensing            ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_DISPENSING                   );
-    hpCompleted             ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_COMPLETED                    );
-    hpEmpty                 ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_EMPTY                        );
+    _heparin                = false;
+    hpOff                   ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_OFF                          ); _heparin = _heparin || _hpOff            ;
+    hpStopped               ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_STOPPED                      ); _heparin = _heparin || _hpStopped        ;
+    hpPaused                ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_PAUSED                       ); _heparin = _heparin || _hpPaused         ;
+    hpInitial_bolus         ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_INITIAL_BOLUS                ); _heparin = _heparin || _hpInitial_bolus  ;
+    hpDispensing            ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_DISPENSING                   ); _heparin = _heparin || _hpDispensing     ;
+    hpCompleted             ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_COMPLETED                    ); _heparin = _heparin || _hpCompleted      ;
+    hpEmpty                 ( vData.mHeparinState       == GuiHeparinStates    ::HEPARIN_STATE_EMPTY                        ); _heparin = _heparin || _hpEmpty          ;
+    emit heparinChanged(_heparin);
 
     // Treatment states
     // Treatment states - Basics