|
[-]
[+]
|
Changed |
_service:tar_git:pedometer.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/kimmoli/pedometer.git</param>
<param name="branch">master</param>
- <param name="revision">087142619b39a6e83174d04dacd2c6c335df099d</param>
+ <param name="revision">839e6a532db2e9169a98cc633ed7c673fe8a4e7d</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:pedometer-0.0.3.tar.bz2/qml/cover/CoverPage.qml
^
|
| @@ -7,7 +7,15 @@
{
id: label
anchors.centerIn: parent
- text: "Count comes here"
+ text: stepcounter.steps
+ color: Theme.secondaryHighlightColor
+ font.bold: true
+ font.pixelSize: Theme.fontSizeExtraLarge
+ }
+
+ onStatusChanged:
+ {
+ coverStatus = status
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:pedometer-0.0.3.tar.bz2/qml/pages/Pedometer.qml
^
|
| @@ -34,7 +34,7 @@
Label
{
x: Theme.paddingLarge
- text: "Steps " + stepcounter.steps
+ text: stepcounter.steps + " steps"
color: Theme.secondaryHighlightColor
font.pixelSize: Theme.fontSizeExtraLarge
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:pedometer-0.0.3.tar.bz2/qml/pedometer.qml
^
|
| @@ -8,9 +8,12 @@
cover: Qt.resolvedUrl("cover/CoverPage.qml")
allowedOrientations: Orientation.All
+ property int coverStatus: 0
+
StepCounter
{
id: stepcounter
+ autoUpdate: coverStatus !== Cover.Inactive || applicationActive === true
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:pedometer-0.0.3.tar.bz2/src/stepcounter.cpp
^
|
| @@ -5,7 +5,7 @@
{
emit versionChanged();
- m_current_steps = -1;
+ m_currentSteps = -1;
emit stepsChanged();
SensorManagerInterface& sm = SensorManagerInterface::instance();
@@ -23,9 +23,8 @@
{
sensor->start();
sensor->setStandbyOverride(true);
- connect(sensor, SIGNAL(StepCounterChanged(const Unsigned&)), this, SLOT(dataChanged(const Unsigned&)));
- m_current_steps = sensor->steps().x();
- emit stepsChanged();
+ setConnected(true);
+ update();
}
}
@@ -33,21 +32,52 @@
{
if (sensor)
{
- disconnect(sensor, SIGNAL(StepCounterChanged(const Unsigned&)), this, SLOT(dataChanged(const Unsigned&)));
+ setConnected(false);
sensor->stop();
delete sensor;
}
}
+void StepCounter::update()
+{
+ if (sensor)
+ {
+ m_currentSteps = sensor->steps().x();
+ emit stepsChanged();
+ }
+}
+
void StepCounter::dataChanged(const Unsigned &data)
{
- m_current_steps = data.x();
+ m_currentSteps = data.x();
emit stepsChanged();
}
int StepCounter::readSteps()
{
- return m_current_steps;
+ return m_currentSteps;
+}
+
+void StepCounter::setConnected(const bool &value)
+{
+ if (sensor)
+ {
+ if (value == m_isConnected)
+ return;
+
+ if (value)
+ {
+ update();
+ connect(sensor, SIGNAL(StepCounterChanged(const Unsigned&)), this, SLOT(dataChanged(const Unsigned&)));
+ }
+ else
+ {
+ disconnect(sensor, SIGNAL(StepCounterChanged(const Unsigned&)), this, SLOT(dataChanged(const Unsigned&)));
+ }
+
+ m_isConnected = value;
+ qDebug() << "connected" << value;
+ }
}
QString StepCounter::readVersion()
|
|
[-]
[+]
|
Changed |
_service:tar_git:pedometer-0.0.3.tar.bz2/src/stepcounter.h
^
|
| @@ -4,12 +4,14 @@
#include <QObject>
#include <sensord-qt5/stepcountersensor_i.h>
#include <sensord-qt5/sensormanagerinterface.h>
+#include <QDBusConnection>
class StepCounter : public QObject
{
Q_OBJECT
Q_PROPERTY(QString version READ readVersion NOTIFY versionChanged())
Q_PROPERTY(int steps READ readSteps NOTIFY stepsChanged())
+ Q_PROPERTY(bool autoUpdate READ readAutoUpdate WRITE setAutoUpdate)
public:
explicit StepCounter(QObject *parent = 0);
@@ -17,6 +19,8 @@
QString readVersion();
int readSteps();
+ bool readAutoUpdate() { return m_isConnected; }
+ void setAutoUpdate(const bool& value) { setConnected(value); }
signals:
void versionChanged();
@@ -26,8 +30,12 @@
void dataChanged(const Unsigned& data);
private:
+ void setConnected(const bool& value);
+ void update();
+
StepCounterSensorChannelInterface* sensor;
- int m_current_steps;
+ int m_currentSteps;
+ bool m_isConnected;
};
#endif // STEPCOUNTER_H
|
