Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r73da05e9b761c559cd4d6741e574fc0f40475ebc --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision 73da05e9b761c559cd4d6741e574fc0f40475ebc) @@ -18,8 +18,8 @@ // Project #include "main.h" // Doxygen : do not remove +#include "MTreatmentVitalsData.h" #include "VAdjustmentResponseBase.h" -#include "MUIBloodPressureData.h" namespace View { @@ -30,7 +30,7 @@ * \sa Model::TreatmentLogAvrgeData * */ -class VTreatmentVitals : public VAdjustmentResponseBase { +class VTreatmentVitals : public QObject { Q_OBJECT // friends @@ -40,10 +40,6 @@ int _counter_sec = 0; int _counter_min = 0; - // The property adjustment_Triggered has to be always true - // and to always trigger the change event to work as a notifier for GUI - TRIGGER( bool , adjustment , 0) - // Vitals data // constant range variables / units / ... CONSTANT( quint16 , systolicMin , 60) @@ -53,15 +49,15 @@ CONSTANT( quint16 , heartRateMin , 40) CONSTANT( quint16 , heartRateMax , 180) - // 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 // timestamp PROPERTY( quint64 , epoch , 0) - PROPERTY( QString , lastRead , "") - PROPERTY( QString , countdown , "") + READONLY( QString , lastRead , "") + READONLY( QString , countdown , "") + READONLY( int , totalCount , 0) // vitals PROPERTY( quint16 , systolic , 0) @@ -76,7 +72,7 @@ PROPERTY( quint8 , min_left , 0) PROPERTY( quint8 , sec_left , 0) - VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentVitals, UIBloodPressureData) + VIEW_DEC(VTreatmentVitals, TreatmentVitalsData) void update (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); void update_rt (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); @@ -109,7 +105,15 @@ * \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); + void didTrigger(); + + /*! + * \brief didAdjustment + * \details the notification signal to request vitals + * \param vData - data model for the duration adjustment request + */ + void didAdjustment(const AdjustVitalsRequestData &vData); + }; }