Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -r73da05e9b761c559cd4d6741e574fc0f40475ebc -r9bd436782039b50ac45eb38f561a36706517271b --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision 73da05e9b761c559cd4d6741e574fc0f40475ebc) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision 9bd436782039b50ac45eb38f561a36706517271b) @@ -14,6 +14,7 @@ */ #pragma once +#include #include // Project @@ -39,6 +40,7 @@ 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,14 +52,15 @@ 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( quint8 , interval , 0) // show the vital screen in min // timestamp PROPERTY( quint64 , epoch , 0) READONLY( QString , lastRead , "") READONLY( QString , countdown , "") READONLY( int , totalCount , 0) + PROPERTY( int , total_sec_left , 0) // vitals PROPERTY( quint16 , systolic , 0) @@ -68,10 +71,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); @@ -83,6 +82,7 @@ void timerStart(); void timerReset(); void timerStop (); + void updateTimer(); void timerEvent(QTimerEvent *) override;