Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -r79a6cfcb10472261f3ec26eaf0baf6f1245cd311 -rec7f919fdb70ff29a8de627937e4ad7008e59c1c --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision 79a6cfcb10472261f3ec26eaf0baf6f1245cd311) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision ec7f919fdb70ff29a8de627937e4ad7008e59c1c) @@ -37,7 +37,8 @@ friend class ::tst_views; int _timerId = 0; - int _timerCounter = 1; + int _timerCounter = 0; + int _secCounter = 0; // disabled coco begin validated: // The property adjustment_Triggered has to be always true @@ -57,10 +58,8 @@ // timer - PROPERTY( bool , enableDialog , 0) // enable the vital screen timer - PROPERTY( bool , enableUpdate , 0) // enable the vital screen timer + PROPERTY( bool , enableDialog , 0) // enable the vital Dialog being triggered (pre-treatment is screen not a dialog) PROPERTY( quint8 , interval , 0) // show the vital screen in min - PROPERTY( quint8 , timeout , 1) // close the vital screen in min // timestamp PROPERTY( quint64 , epoch , 0) @@ -90,28 +89,19 @@ // vitals void doConfirm (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); void doSkip (); - void doTimeout (); void doReset (); + // timer + void doTimerStart () { timerStart(); } + void doTimerStop () { timerStop (); } + signals: - /*! - * \brief didAdjustment - * \details the notification signal to send the user's Request - * \param vData - data model includes request information - */ - void didAdjustment(const AdjustHDAlarmVolumeRequestData &vData); /*! * \brief didTrigger * \details the signal to trigger the Gui to notify the user for the vitals measurement */ void didTrigger(quint16 vSystolic = 0, quint16 vDiastolic = 0, quint16 vHeartRate = 0); - - /*! - * \brief didTrigger - * \details the signal to trigger the Gui to close the vitals measurement screen on no user interaction - */ - void didTimeout(); }; }