Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -r73da05e9b761c559cd4d6741e574fc0f40475ebc -r83d2e1a9625c2035214bf6604d1603736877dab8 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision 73da05e9b761c559cd4d6741e574fc0f40475ebc) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision 83d2e1a9625c2035214bf6604d1603736877dab8) @@ -14,6 +14,7 @@ */ #pragma once +#include #include // Project @@ -37,8 +38,7 @@ friend class ::tst_views; int _timerId = 0; // 0 means no timer started or failed to start. - int _counter_sec = 0; - int _counter_min = 0; + QDateTime _now ; // Vitals data // constant range variables / units / ... @@ -50,7 +50,8 @@ CONSTANT( quint16 , heartRateMax , 180) // timer - PROPERTY( bool , enableDialog , 0) // enable the vital Dialog being triggered (pre-treatment is screen not a dialog) + PROPERTY( bool , canStartInterval , 0) + PROPERTY( bool , enableBPCuff , 0) // TODO: PRS 343 enable/ disable Integrated Blood Pressure Cuff PROPERTY( quint8 , interval , 0) // show the vital screen in min // timestamp @@ -68,10 +69,6 @@ PROPERTY( quint16 , diastolic_rt , 0) PROPERTY( quint16 , heartRate_rt , 0) - // For Debugging purposes - PROPERTY( quint8 , min_left , 0) - PROPERTY( quint8 , sec_left , 0) - VIEW_DEC(VTreatmentVitals, TreatmentVitalsData) void update (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); @@ -81,8 +78,8 @@ // timer void timerStart(); - void timerReset(); void timerStop (); + void updateTimer(); void timerEvent(QTimerEvent *) override; @@ -108,6 +105,11 @@ void didTrigger(); /*! + * \brief didTimeout + * \details the signal to trigger the Gui to notify the user for time has timed out + */ + void didTimeout(); + /*! * \brief didAdjustment * \details the notification signal to request vitals * \param vData - data model for the duration adjustment request