Index: sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h =================================================================== diff -u -rc1d0546e2d1a51ff919b2172ce647003359f0853 -rc1358f289cb0b96fb75b9ae67659d8a550262f78 --- sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision c1d0546e2d1a51ff919b2172ce647003359f0853) +++ sources/view/hd/adjustment/common/VCommonAdjustmentVitals.h (.../VCommonAdjustmentVitals.h) (revision c1358f289cb0b96fb75b9ae67659d8a550262f78) @@ -18,10 +18,7 @@ // Project #include "main.h" // Doxygen : do not remove -//#include "MTreatmentAdjustVitalsResponse.h" -//#include "MUIBloodPressureData.h" #include "MTreatmentVitalsData.h" - #include "VAdjustmentResponseBase.h" namespace View { @@ -33,7 +30,7 @@ * \sa Model::TreatmentLogAvrgeData * */ -class VTreatmentVitals : public VAdjustmentResponseBase { +class VTreatmentVitals : public QObject { Q_OBJECT // friends @@ -56,7 +53,6 @@ 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 , 1) // show the vital screen in min @@ -79,9 +75,9 @@ PROPERTY( quint8 , min_left , 0) PROPERTY( quint8 , sec_left , 0) -// VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentVitals, UIBloodPressureData) -// VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentVitals, AdjustVitalsResponseData) +// VIEW_DEC_CLASS(VTreatmentVitals) VIEW_DEC(VTreatmentVitals, TreatmentVitalsData) +// VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentVitals, TreatmentVitalsData) void update (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate); void update_rt (quint16 vSystolic, quint16 vDiastolic, quint16 vHeartRate);