diff options
| author | Titta Heikkala <titta.heikkala@qt.io> | 2017-02-14 08:44:07 +0200 |
|---|---|---|
| committer | Titta Heikkala <titta.heikkala@qt.io> | 2017-02-14 09:35:33 +0000 |
| commit | f8aa599c5d3acc3ca52010837e4cbf9935908135 (patch) | |
| tree | 601aa99e6a6279e0de05301ecfb3dec9f3fb5bcd | |
| parent | 9ba4447a1cb2cf4b5d16a604012ddbb0a04e0328 (diff) | |
iot-sensortag: Add possibility to scan sensors
Added possibility to start scanning of sensors to SensorSettings.
Change-Id: I1ebb5da22a4e98d6c2220bb6d51f17641c7821ec
Reviewed-by: Otto Ryynänen <otto.ryynanen@qt.io>
| -rw-r--r-- | tradeshow/iot-sensortag/clouddataproviderpool.cpp | 3 | ||||
| -rw-r--r-- | tradeshow/iot-sensortag/demodataproviderpool.cpp | 3 | ||||
| -rw-r--r-- | tradeshow/iot-sensortag/resources/base/SensorSettings.qml | 5 |
3 files changed, 11 insertions, 0 deletions
diff --git a/tradeshow/iot-sensortag/clouddataproviderpool.cpp b/tradeshow/iot-sensortag/clouddataproviderpool.cpp index 3c1f6b2..ed6fbb1 100644 --- a/tradeshow/iot-sensortag/clouddataproviderpool.cpp +++ b/tradeshow/iot-sensortag/clouddataproviderpool.cpp @@ -58,6 +58,9 @@ CloudDataProviderPool::CloudDataProviderPool(QObject* parent) void CloudDataProviderPool::startScanning() { + qDeleteAll(m_dataProviders); + m_dataProviders.clear(); + m_dataProviders.push_back(new CloudDataProvider("CLOUD_PROVIDER", this)); m_dataProviders.at(0)->startDataFetching(); emit providerConnected("MS_AZURE_CLOUD"); diff --git a/tradeshow/iot-sensortag/demodataproviderpool.cpp b/tradeshow/iot-sensortag/demodataproviderpool.cpp index 14e1ffd..f31d869 100644 --- a/tradeshow/iot-sensortag/demodataproviderpool.cpp +++ b/tradeshow/iot-sensortag/demodataproviderpool.cpp @@ -59,6 +59,9 @@ DemoDataProviderPool::DemoDataProviderPool(QObject *parent) void DemoDataProviderPool::startScanning() { + qDeleteAll(m_dataProviders); + m_dataProviders.clear(); + if (m_mockData) { MockDataProvider* p = new MockDataProvider("MOCK_PROVIDER_1", this); p->setTagType(SensorTagDataProvider::ObjectTemperature | SensorTagDataProvider::AmbientTemperature | SensorTagDataProvider::Rotation); diff --git a/tradeshow/iot-sensortag/resources/base/SensorSettings.qml b/tradeshow/iot-sensortag/resources/base/SensorSettings.qml index bd13ef5..a2a8202 100644 --- a/tradeshow/iot-sensortag/resources/base/SensorSettings.qml +++ b/tradeshow/iot-sensortag/resources/base/SensorSettings.qml @@ -79,6 +79,11 @@ Rectangle { anchors.horizontalCenter: parent.horizontalCenter anchors.margins: 8 source: pathPrefix + "Toolbar/icon_topbar_sensor.png" + + MouseArea { + anchors.fill: parent + onClicked: dataProviderPool.startScanning() + } } ListView { |