Index: sources/view/hd/data/VHDTreatmentStatesData.cpp
===================================================================
diff -u -ra2e7e903bf3fdc242ba77d99f3daa9c4208cc1f1 -rae1042a0c14d6d27556730183cc2cbe1a00bc0a7
--- sources/view/hd/data/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision a2e7e903bf3fdc242ba77d99f3daa9c4208cc1f1)
+++ sources/view/hd/data/VHDTreatmentStatesData.cpp	(.../VHDTreatmentStatesData.cpp)	(revision ae1042a0c14d6d27556730183cc2cbe1a00bc0a7)
@@ -31,8 +31,9 @@
  */
 void VHDTreatmentStates::initConnections() {
     ACTION_VIEW_CONNECTION(TreatmentStatesData                      );
-    ACTION_VIEW_CONNECTION(AdjustSalineResponseData                 );
     ACTION_VIEW_CONNECTION(AdjustUltrafiltrationStateResponseData   );
+    ACTION_VIEW_CONNECTION(AdjustSalineResponseData                 );
+    ACTION_VIEW_CONNECTION(AdjustHeparinResponseData                );
 }
 
 /*!
@@ -47,61 +48,85 @@
     salineState             ( vData.mSalineState );
 
     // Ultrafiltration states
-    ufStart                 ( vData.mUFState     == GuiUFStates         ::UF_START_STATE                            );
-    ufPaused                ( vData.mUFState     == GuiUFStates         ::UF_PAUSED_STATE                           );
-    ufRunning               ( vData.mUFState     == GuiUFStates         ::UF_RUNNING_STATE                          );
-    ufOff                   ( vData.mUFState     == GuiUFStates         ::UF_OFF_STATE                              );
-    ufCompleted             ( vData.mUFState     == GuiUFStates         ::UF_COMPLETED_STATE                        );
+    ufStart                 ( vData.mUFState        == GuiUFStates         ::UF_START_STATE                            );
+    ufPaused                ( vData.mUFState        == GuiUFStates         ::UF_PAUSED_STATE                           );
+    ufRunning               ( vData.mUFState        == GuiUFStates         ::UF_RUNNING_STATE                          );
+    ufOff                   ( vData.mUFState        == GuiUFStates         ::UF_OFF_STATE                              );
+    ufCompleted             ( vData.mUFState        == GuiUFStates         ::UF_COMPLETED_STATE                        );
 
     // Saline Bolus states
-    sbIdle                  ( vData.mSalineState == GuiSalineStates     ::SALINE_BOLUS_STATE_IDLE                   );
-    sbWaitPump              ( vData.mSalineState == GuiSalineStates     ::SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP    );
-    sbRunning               ( vData.mSalineState == GuiSalineStates     ::SALINE_BOLUS_STATE_IN_PROGRESS            );
-    sbMaxReached            ( vData.mSalineState == GuiSalineStates     ::SALINE_BOLUS_STATE_MAX_DELIVERED          );
+    sbIdle                  ( vData.mSalineState    == GuiSalineStates     ::SALINE_BOLUS_STATE_IDLE                   );
+    sbWaitPump              ( vData.mSalineState    == GuiSalineStates     ::SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP    );
+    sbRunning               ( vData.mSalineState    == GuiSalineStates     ::SALINE_BOLUS_STATE_IN_PROGRESS            );
+    sbMaxReached            ( vData.mSalineState    == GuiSalineStates     ::SALINE_BOLUS_STATE_MAX_DELIVERED          );
 
+    // Heparin States
+    hpOff                   ( vData.mHeparinState   == GuiHeparinStates    ::HEPARIN_STATE_OFF                         );
+    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                       );
+
     // Treatment states
     // Treatment states - Basics
-    txStart                 ( vData.mSubMode     == GuiTreatmentStates  ::TREATMENT_START_STATE                     );
-    txStop                  ( vData.mSubMode     == GuiTreatmentStates  ::TREATMENT_STOP_STATE                      );
-    txEnd                   ( vData.mSubMode     == GuiTreatmentStates  ::TREATMENT_END_STATE                       );
+    txStart                 ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_START_STATE                     );
+    txStop                  ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_STOP_STATE                      );
+    txEnd                   ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_END_STATE                       );
     // Treatment states - Dialysis
-    txDialysis_Running      ( vData.mSubMode     == GuiTreatmentStates  ::TREATMENT_DIALYSIS_STATE                  );
-    txDialysis_End          ( vData.mSubMode     == GuiTreatmentStates  ::TREATMENT_DIALYSIS_END_STATE              );
+    txDialysis_Running      ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_DIALYSIS_STATE                  );
+    txDialysis_End          ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_DIALYSIS_END_STATE              );
     // Treatment states - Rinse back
-    txRinseback_Running     ( vData.mSubMode     == GuiTreatmentStates  ::TREATMENT_RINSEBACK_STATE                 );
-    txRinseback_Pause       ( vData.mSubMode     == GuiTreatmentStates  ::TREATMENT_RINSEBACK_PAUSE_STATE           );
+    txRinseback_Running     ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RINSEBACK_STATE                 );
+    txRinseback_Pause       ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RINSEBACK_PAUSE_STATE           );
     // Treatment states - Recirculate
-    txRecirculate_Setup     ( vData.mSubMode     == GuiTreatmentStates  ::TREATMENT_RECIRC_SETUP_STATE              );
-    txRecirculate_Running   ( vData.mSubMode     == GuiTreatmentStates  ::TREATMENT_RECIRC_STATE                    );
-    txRecirculate_Pause     ( vData.mSubMode     == GuiTreatmentStates  ::TREATMENT_RECIRC_PAUSE_STATE              );
-    txRecirculate_Stop      ( vData.mSubMode     == GuiTreatmentStates  ::TREATMENT_RECIRC_STOP_STATE               );
+    txRecirculate_Setup     ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RECIRC_SETUP_STATE              );
+    txRecirculate_Running   ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RECIRC_STATE                    );
+    txRecirculate_Pause     ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RECIRC_PAUSE_STATE              );
+    txRecirculate_Stop      ( vData.mSubMode        == GuiTreatmentStates  ::TREATMENT_RECIRC_STOP_STATE               );
 }
 
 /*!
  * \brief   VHDTreatmentStates::onActionReceive
  * \details message handler for the message AdjustUltrafiltrationStateResponse data
  * \param   vData - AdjustUltrafiltrationStateResponse data
  */
+void VHDTreatmentStates::onActionReceive(const AdjustUltrafiltrationStateResponseData &vData)
+{
+    // Ultrafiltration states
+    ufStart                 ( vData.mState          == GuiUFStates         ::UF_START_STATE                            );
+    ufPaused                ( vData.mState          == GuiUFStates         ::UF_PAUSED_STATE                           );
+    ufRunning               ( vData.mState          == GuiUFStates         ::UF_RUNNING_STATE                          );
+    ufOff                   ( vData.mState          == GuiUFStates         ::UF_OFF_STATE                              );
+    ufCompleted             ( vData.mState          == GuiUFStates         ::UF_COMPLETED_STATE                        );
+}
+
+/*!
+ * \brief   VHDTreatmentStates::onActionReceive
+ * \details message handler for the message AdjustSalineResponseData data
+ * \param   vData - AdjustSalineResponseData data
+ */
 void VHDTreatmentStates::onActionReceive(const AdjustSalineResponseData &vData)
 {
     // Saline Bolus states
-    sbIdle                  ( vData.mState       == GuiSalineStates     ::SALINE_BOLUS_STATE_IDLE                   );
-    sbWaitPump              ( vData.mState       == GuiSalineStates     ::SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP    );
-    sbRunning               ( vData.mState       == GuiSalineStates     ::SALINE_BOLUS_STATE_IN_PROGRESS            );
-    sbMaxReached            ( vData.mState       == GuiSalineStates     ::SALINE_BOLUS_STATE_MAX_DELIVERED          );
+    sbIdle                  ( vData.mState          == GuiSalineStates     ::SALINE_BOLUS_STATE_IDLE                   );
+    sbWaitPump              ( vData.mState          == GuiSalineStates     ::SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP    );
+    sbRunning               ( vData.mState          == GuiSalineStates     ::SALINE_BOLUS_STATE_IN_PROGRESS            );
+    sbMaxReached            ( vData.mState          == GuiSalineStates     ::SALINE_BOLUS_STATE_MAX_DELIVERED          );
 }
 
 /*!
  * \brief   VHDTreatmentStates::onActionReceive
- * \details message handler for the message AdjustUltrafiltrationStateResponse data
- * \param   vData - AdjustUltrafiltrationStateResponse data
+ * \details message handler for the message AdjustHeparinResponseData data
+ * \param   vData - AdjustHeparinResponseData data
  */
-void VHDTreatmentStates::onActionReceive(const AdjustUltrafiltrationStateResponseData &vData)
+void VHDTreatmentStates::onActionReceive(const AdjustHeparinResponseData &vData)
 {
-    // Ultrafiltration states
-    ufStart                 ( vData.mState       == GuiUFStates         ::UF_START_STATE                            );
-    ufPaused                ( vData.mState       == GuiUFStates         ::UF_PAUSED_STATE                           );
-    ufRunning               ( vData.mState       == GuiUFStates         ::UF_RUNNING_STATE                          );
-    ufOff                   ( vData.mState       == GuiUFStates         ::UF_OFF_STATE                              );
-    ufCompleted             ( vData.mState       == GuiUFStates         ::UF_COMPLETED_STATE                        );
+    // Saline Bolus states
+    hpOff                   ( vData.mState          == GuiHeparinStates    ::HEPARIN_STATE_OFF                         );
+    hpPaused                ( vData.mState          == GuiHeparinStates    ::HEPARIN_STATE_PAUSED                      );
+    hpInitial_bolus         ( vData.mState          == GuiHeparinStates    ::HEPARIN_STATE_INITIAL_BOLUS               );
+    hpDispensing            ( vData.mState          == GuiHeparinStates    ::HEPARIN_STATE_DISPENSING                  );
+    hpCompleted             ( vData.mState          == GuiHeparinStates    ::HEPARIN_STATE_COMPLETED                   );
+    hpEmpty                 ( vData.mState          == GuiHeparinStates    ::HEPARIN_STATE_EMPTY                       );
 }