Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -rec7f919fdb70ff29a8de627937e4ad7008e59c1c -r2ef03b2ce51b4dc507f66e9671953a8e0824bde9 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision ec7f919fdb70ff29a8de627937e4ad7008e59c1c) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision 2ef03b2ce51b4dc507f66e9671953a8e0824bde9) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file VCommonAdjustmentVitals.h * \author (last) Behrouz NematiPour - * \date (last) 18-Apr-2022 + * \date (last) 10-Jan-2024 * \author (original) Behrouz NematiPour * \date (original) 23-Jun-2021 * @@ -36,9 +36,9 @@ // friends friend class ::tst_views; - int _timerId = 0; - int _timerCounter = 0; - int _secCounter = 0; + int _timerId = 0; // 0 means no timer started or failed to start. + int _counter_sec = 0; + int _counter_min = 0; // disabled coco begin validated: // The property adjustment_Triggered has to be always true @@ -64,15 +64,26 @@ // timestamp PROPERTY( quint64 , epoch , 0) PROPERTY( QString , lastRead , "") + PROPERTY( QString , countdown , "") // vitals PROPERTY( quint16 , systolic , 0) PROPERTY( quint16 , diastolic , 0) PROPERTY( quint16 , heartRate , 0) + PROPERTY( quint16 , systolic__rt , 0) + 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_CLASS_ADJUSTMENT(VTreatmentVitals, UIBloodPressureData) void update (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); + void update_rt (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); + void treatmentLog(); // timer @@ -83,7 +94,7 @@ void timerEvent(QTimerEvent *) override; private slots: - void onTimerChanged(); + void onIntervalChanged(); public slots: // vitals