diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-10-11 13:26:57 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-10-11 13:32:21 +0300 |
| commit | 444878981185912f88155f27635b509b613a48e8 (patch) | |
| tree | 33506a21e7bc9189ea3b7ed1d83aef8916d7cd8e /tradeshow/iot-sensortag/sensortagdataprovider.h | |
| parent | 7f17ecb20a42dbf6ad2d994f9521e738b4b97a11 (diff) | |
| parent | 3302a40a4e4a83d53493a832bc9b8486b3ad549a (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
* origin/5.10:
iot-sensortag: Add Uuid fallback for device id
iot-sensortag: Use double-click to select connection
iot-sensortag: Add logging window
iot-sensortag: Do not enable MQTT by default
Merge remote-tracking branch 'origin/5.9' into 5.10
iot-sensortag: Disable dateview in portrait mode
iot-sensortag: Show fullscreen on Android
iot-sensortag: Align font sizes
iot-sensortag: Add support for MQTT
iot-sensortag: Redesign of example
Fix typo
Doc: Bump version to 5.10.0
Doc: Bump version to 5.9.2
Change-Id: Id006d6911a42db2a493f7b3f0eb891c791a5879c
Diffstat (limited to 'tradeshow/iot-sensortag/sensortagdataprovider.h')
| -rw-r--r-- | tradeshow/iot-sensortag/sensortagdataprovider.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tradeshow/iot-sensortag/sensortagdataprovider.h b/tradeshow/iot-sensortag/sensortagdataprovider.h index 523bd93..f3a6dcb 100644 --- a/tradeshow/iot-sensortag/sensortagdataprovider.h +++ b/tradeshow/iot-sensortag/sensortagdataprovider.h @@ -49,6 +49,7 @@ ****************************************************************************/ #ifndef SENSORTAGDATAPROVIDER_H #define SENSORTAGDATAPROVIDER_H + #include <QObject> #include <QString> #include <QColor> @@ -100,13 +101,19 @@ public: Altitude = 1 << 8 }; static const int tagTypeCount = 9; - enum ProviderState {NotFound = 0, Disconnected, Scanning, Connected, Error}; + enum ProviderState { + NotFound = 0, + Disconnected, + Scanning, + Connected, + Error + }; explicit SensorTagDataProvider(QObject *parent = 0); SensorTagDataProvider(QString id, QObject *parent = 0); - virtual bool startDataFetching() {return false;} - virtual void endDataFetching() {} + Q_INVOKABLE virtual bool startDataFetching() {return false;} + Q_INVOKABLE virtual void endDataFetching() {} QString getRelativeHumidityString() const; virtual double getRelativeHumidity() const; virtual double getInfraredAmbientTemperature() const; @@ -176,7 +183,6 @@ protected: double barometerCelsiusTemperature; double barometerTemperatureAverage; double barometerHPa; - //double temperatureAverage; float gyroscopeX_degPerSec; float gyroscopeY_degPerSec; float gyroscopeZ_degPerSec; |