Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -rfc329c788fe9453983072bee937ccbc95b4ed6e4 -raa8f2c87c14c68d1fda6da2540d47144990a596c --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision fc329c788fe9453983072bee937ccbc95b4ed6e4) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision aa8f2c87c14c68d1fda6da2540d47144990a596c) @@ -19,6 +19,7 @@ // Project #include "main.h" // Doxygen : do not remove #include "VAdjustmentResponseBase.h" +#include "MUIBloodPressureData.h" namespace View { @@ -36,7 +37,7 @@ friend class ::tst_views; int _timerId = 0; - int _timerCounter = 0; + int _timerCounter = 1; // coco begin validated: // The property adjustment_Triggered has to be always true @@ -68,29 +69,19 @@ PROPERTY( QString , lastRead , "") // vitals - PROPERTY( quint32 , systolic , 0) - PROPERTY( quint32 , diastolic , 0) - PROPERTY( quint32 , heartRate , 0) + PROPERTY( quint16 , systolic , 0) + PROPERTY( quint16 , diastolic , 0) + PROPERTY( quint16 , heartRate , 0) - // placeholder for later connection and receiving data from BtCuff [Not used Yet] - struct VitalsData_PlaceHolder { - quint32 mAccepted = 0; - quint32 mReason = 0; + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentVitals, UIBloodPressureData) - quint32 mSystolic = 0; - quint32 mDiastolic = 0; - quint32 mHeartRate = 0; - }; - typedef VitalsData_PlaceHolder AdjustVitalsResposeData; - - VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentVitals, AdjustVitalsResposeData) - - void update (quint32 vSystolic, quint32 vDiastolic, quint32 vHeartRate); + void update (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); void treatmentLog(); // timer - void start(); - void stop (); + void timerStart(); + void timerReset(); + void timerStop (); void timerEvent(QTimerEvent *) override; @@ -99,7 +90,7 @@ public slots: // vitals - void doConfirm (quint32 vSystolic, quint32 vDiastolic, quint32 vHeartRate); + void doConfirm (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); void doSkip (); void doTimeout (); void doReset ();