Index: sources/view/VVitals.h =================================================================== diff -u -readda1cc1ad9d62aecf6b0a8e64330fad438ee0d -r510ea07f96362a18f9961f41b5b91740df075c1f --- sources/view/VVitals.h (.../VVitals.h) (revision eadda1cc1ad9d62aecf6b0a8e64330fad438ee0d) +++ sources/view/VVitals.h (.../VVitals.h) (revision 510ea07f96362a18f9961f41b5b91740df075c1f) @@ -1,6 +1,6 @@ -#ifndef VVITALS_H -#define VVITALS_H +#pragma once + // Qt #include #include @@ -10,8 +10,6 @@ #include "main.h" #include "GuiController.h" -#define UNSET 9999 - // forward declarations class tst_views; @@ -30,33 +28,31 @@ // friends friend class ::tst_views; + bool _inTreatmentMode = false; + bool _enterManually = false; + QDateTime _lastNotification; + public: explicit VVitals(QObject *parent = nullptr); protected: // coco begin validated: Has been validated manually - PROPERTY(quint32, bloodPressureSystolic, UNSET) - PROPERTY(quint32, bloodPressureDiastolic, UNSET) - PROPERTY(quint32, pulseBPM, UNSET) - PROPERTY(quint32, bloodPressureMeasureIntervalMinutes, UNSET) + PROPERTY(quint32, bloodPressureSystolic, 0) + PROPERTY(quint32, bloodPressureDiastolic, 0) + PROPERTY(quint32, pulseBPM, 0) + PROPERTY(quint32, bloodPressureMeasureIntervalMinutes, 0) // coco end public slots: - void doUpdateBPMeasureInterval(const quint32 &intervalMinutes); - void doManualBPMeasureEntry(const quint32 &systolic, const quint32 &diastolic, const quint32 &pulse_rate); + void doUpdateBPMeasureInterval(const quint32 &vIntervalMinutes); + void doManualBPMeasureEntry(const quint32 &vSystolic, const quint32 &vDiastolic, const quint32 &vPulseRate); signals: - void didRequestShowAlert(GuiAlertRequestData); + void didRequestShowAlert(const GuiAlertRequestData &alert); void didManualEntryRequest(); private slots: - void onReceiveBPMeasurement(BLEMeasurementData measurement); - void onReceiveAlertResponse(GuiAlertResponseData response); - void onActionReceive(const TreatmentStartResponseData &response); - void onHDOperationModeUpdate(HDOperationModeData hdOpMode); + void onReceiveBPMeasurement(const BLEMeasurementData &vMeasurement); + void onReceiveAlertResponse(const GuiAlertResponseData &vResponse); + void onActionReceive(const TreatmentStartResponseData &vResponse); + void onHDOperationModeUpdate(const HDOperationModeData &vHDOpMode); void onTimeout(); - -private: - bool _inTreatmentMode = false; - bool _enterManually = false; - QDateTime _lastNotification; }; } -#endif // VVITALS_H