Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -r73da05e9b761c559cd4d6741e574fc0f40475ebc -rb12853c86ef9e517667516dc3e47bca07349cedf --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision 73da05e9b761c559cd4d6741e574fc0f40475ebc) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision b12853c86ef9e517667516dc3e47bca07349cedf) @@ -14,6 +14,7 @@ */ #pragma once +#include #include // Project @@ -36,9 +37,9 @@ // friends friend class ::tst_views; - int _timerId = 0; // 0 means no timer started or failed to start. - int _counter_sec = 0; - int _counter_min = 0; + int _timerId = 0 ; // 0 means no timer started or failed to start. + const int _defaultInterval= 15; + QDateTime _now ; // Vitals data // constant range variables / units / ... @@ -50,7 +51,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,9 +70,7 @@ PROPERTY( quint16 , diastolic_rt , 0) PROPERTY( quint16 , heartRate_rt , 0) - // For Debugging purposes - PROPERTY( quint8 , min_left , 0) - PROPERTY( quint8 , sec_left , 0) + TRIGGER( bool , adjustment , 0 ) VIEW_DEC(VTreatmentVitals, TreatmentVitalsData) @@ -81,14 +81,11 @@ // timer void timerStart(); - void timerReset(); void timerStop (); + void updateTimer(); void timerEvent(QTimerEvent *) override; -private slots: - void onIntervalChanged(); - public slots: // vitals void doConfirm (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); @@ -100,13 +97,11 @@ void doTimerStop () { timerStop (); } signals: - /*! - * \brief didTrigger - * \details the signal to trigger the Gui to notify the user for the vitals measurement + * \brief didTimeout + * \details the signal to trigger the Gui to notify the user for time has timed out */ - void didTrigger(); - + void didTimeout(); /*! * \brief didAdjustment * \details the notification signal to request vitals