Index: sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp
===================================================================
diff -u -r5a0639ee020873025a536140b8c6b5507d173412 -rc77b29df6f38fe6db54d2f54768c5fb80210879f
--- sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp	(.../VPreTreatmentDisposablesPrimeData.cpp)	(revision 5a0639ee020873025a536140b8c6b5507d173412)
+++ sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp	(.../VPreTreatmentDisposablesPrimeData.cpp)	(revision c77b29df6f38fe6db54d2f54768c5fb80210879f)
@@ -36,43 +36,17 @@
     pauseCountDown  (vData.mPauseCountdown                      );
     elapsed         (vData.mTotalDuration - vData.mCountDown    );
 
-    // Prime States
-//    ENUM_CHECK_O( GuiPreTreatmentPrimeStates, vData.mPrimeState                                                 ) {
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_START_STATE                                                 )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_BC_INITIAL_REVERSE_STATE                                    )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_BC_AIR_TRAP_LOWER_STATE                                     )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_BC_INITIAL_DIALYZER_STATE                                   )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_BC_FILL_STATE                                               )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_BC_CLEAR_STATE1                                             )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_BC_CLEAR_STATE2                                             )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_BC_CLEAR_STATE3                                             )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_WAIT_FOR_DIALYSATE_READY_STATE                              )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_DC_INITIAL_DIALYSATE_STATE                                  )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_DC_DEPRESSURIZE_STATE                                       )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_WAIT_FOR_AIR_TRAP_FILL_STATE                                )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_BC2_FORWARD_RECIRC_STATE                                    )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_BC2_PAUSE_TO_ROTATE_OPP_DIR_STATE                           )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_BC2_REVERSE_RECIRC_STATE                                    )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE                          )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_PAUSE_STATE                                                 )
-//    ENUM_CHECK  ( GuiPreTreatmentPrimeStates, PRIME_COMPLETE_STATE                                              )
-//    ENUM_CHECK_C( GuiPreTreatmentPrimeStates, NUM_OF_PRIME_STATES                                               ) }
+    primeBloodCircuit       (   vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_BC_INITIAL_REVERSE_STATE             &&
+                                vData.mPrimeState <  GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_DIALYSATE_READY_STATE       );
 
+    primeDialysateCircuit   (   vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_DIALYSATE_READY_STATE       &&
+                                vData.mPrimeState <  GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_AIR_TRAP_FILL_STATE         );
 
-//    ENUM_READ   ( GuiPreTreatmentPrimeStates, PRIME_BC_INITIAL_REVERSE_STATE                , primeBloodCircuitStart        );
-//    ENUM_READ   ( GuiPreTreatmentPrimeStates, PRIME_BC_CLEAR_STATE3                         , primeBloodCircuitEnd          );
-//    ENUM_READ   ( GuiPreTreatmentPrimeStates, PRIME_DC_INITIAL_DIALYSATE_STATE              , primeDialysateCircuitStart    );
-//    ENUM_READ   ( GuiPreTreatmentPrimeStates, PRIME_BC2_FORWARD_RECIRC_STATE                , primeDialysateCircuitEnd      );
-//    ENUM_READ   ( GuiPreTreatmentPrimeStates, PRIME_BC2_FORWARD_RECIRC_STATE                , primeDialysatePurgeStart      );
-//    ENUM_READ   ( GuiPreTreatmentPrimeStates, PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE      , primeDialysatePurgeEnd        );
-//    ENUM_READ   ( GuiPreTreatmentPrimeStates, PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE      , primePrimingFluidDiscardStart );
-//    ENUM_READ   ( GuiPreTreatmentPrimeStates, PRIME_COMPLETE_STATE                          , primePrimingFluidDiscardEnd   );
-//    ENUM_READ   ( GuiPreTreatmentPrimeStates, PRIME_COMPLETE_STATE                          , primeComplete                 );
+    primeDialysatePurge     (   vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_AIR_TRAP_FILL_STATE         &&
+                                vData.mPrimeState <  GuiPreTreatmentPrimeStates::PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE   );
 
-//    emit state(vData.mPrimeState);
+    primePrimingFluidDiscard(   vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE   &&
+                                vData.mPrimeState <  GuiPreTreatmentPrimeStates::PRIME_COMPLETE_STATE                       );
 
-
-
-    primeBloodCircuit(vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_START_STATE                    &&
-                      vData.mPrimeState <= GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_DIALYSATE_READY_STATE );
+    primeComplete           (   vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_COMPLETE_STATE                       );
 }