summaryrefslogtreecommitdiffstats
path: root/tradeshow/iot-sensortag/sensortagdataprovider.h
diff options
context:
space:
mode:
authorOtto Ryynänen <otto.ryynanen@qt.io>2017-01-31 15:17:53 +0200
committerKari Hautamäki <kari.hautamaki@qt.io>2017-02-01 07:54:44 +0000
commit518c73c59a71911b65ae5d3240b22ea9f5878961 (patch)
treecccf04cbcc16bad01a6dbbbffc15bdefecbbc1e7 /tradeshow/iot-sensortag/sensortagdataprovider.h
parent4a7c0e5841b2bb69ddaef2c9620c443934d194ee (diff)
GyroChart and Magnetometerchart grid removal
Removed grids from charts. changed magnetometer chart type. Removed old IR Temp from cloud IF. New signal(s) for Ambient and object temperatures. Change-Id: If9f215f33197ca1dc03b2a55187464fdb7a05cd9 Reviewed-by: Kari Hautamäki <kari.hautamaki@qt.io>
Diffstat (limited to 'tradeshow/iot-sensortag/sensortagdataprovider.h')
-rw-r--r--tradeshow/iot-sensortag/sensortagdataprovider.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/tradeshow/iot-sensortag/sensortagdataprovider.h b/tradeshow/iot-sensortag/sensortagdataprovider.h
index 7ee4a0d..30e59e5 100644
--- a/tradeshow/iot-sensortag/sensortagdataprovider.h
+++ b/tradeshow/iot-sensortag/sensortagdataprovider.h
@@ -64,8 +64,8 @@ class SensorTagDataProvider : public QObject
Q_PROPERTY(QString providerId MEMBER m_id CONSTANT)
Q_PROPERTY(QString relativeHumidityString READ getRelativeHumidityString NOTIFY relativeHumidityChanged)
Q_PROPERTY(double relativeHumidity READ getRelativeHumidity NOTIFY relativeHumidityChanged)
- Q_PROPERTY(double infraredAmbientTemperature READ getInfraredAmbientTemperature NOTIFY infraredCelsiusTemperatureChanged)
- Q_PROPERTY(double infraredObjectTemperature READ getInfraredObjectTemperature NOTIFY infraredCelsiusTemperatureChanged)
+ Q_PROPERTY(double infraredAmbientTemperature READ getInfraredAmbientTemperature NOTIFY infraredAmbientTemperatureChanged)
+ Q_PROPERTY(double infraredObjectTemperature READ getInfraredObjectTemperature NOTIFY infraredObjectTemperatureChanged)
Q_PROPERTY(QString lightIntensityLuxString READ getLightIntensityLuxString NOTIFY lightIntensityChanged)
Q_PROPERTY(double lightIntensityLux READ getLightIntensityLux NOTIFY lightIntensityChanged)
Q_PROPERTY(double barometerCelsiusTemperature READ getBarometerCelsiusTemperature NOTIFY barometerCelsiusTemperatureChanged)
@@ -138,7 +138,8 @@ public:
signals:
void stateChanged();
void relativeHumidityChanged();
- void infraredCelsiusTemperatureChanged();
+ void infraredAmbientTemperatureChanged();
+ void infraredObjectTemperatureChanged();
void lightIntensityChanged();
void barometerCelsiusTemperatureChanged();
void barometerCelsiusTemperatureAverageChanged();