Merge branch 'changes/UI'

[speedfreak] / Client / accelerometer.h

diff --git a/Client/accelerometer.h b/Client/accelerometer.h
index 3b74cb0..616c2ac 100644 (file)
--- a/Client/accelerometer.h
+++ b/Client/accelerometer.h
@@ -1,3 +1,12 @@
+/*
+ * Accelerometer class to access the device accelerometer
+ *
+ * @author      Rikhard Kuutti <rikhard.kuutti@fudeco.com>
+ * @author      Kai Rasilainen 
+ * @copyright   (c) 2010 Speed Freak team
+ * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
 #ifndef ACCELEROMETER_H
 #define ACCELEROMETER_H
 
@@ -25,6 +34,7 @@ public:
 
     void setSampleRate(int pSampleRate);
     int getSampleRate();
+    void getAcceleration(qreal &x, qreal &y, qreal &z);
 
     qreal getTrueAccelerationX();
     qreal getTrueAccelerationY();
@@ -40,11 +50,12 @@ public:
     qreal getTotalAcceleration();
     qreal getPreviousTotalAcceleration();
 
-    int calibrationX;
-    int calibrationY;
-    int calibrationZ;
+    qreal getCalibrationX();
+    qreal getCalibrationY();
+    qreal getCalibrationZ();
 
     qreal getIntervalTime();
+    qreal getTotalTime();
 
 private slots:
     void processData();
@@ -58,6 +69,7 @@ private:
     qreal previousAccelerationX,previousAccelerationY,previousAccelerationZ;
     qreal previousSpeed, currentSpeed;
     qreal currentAcceleration, previousAcceleration, totalAcceleration;
+    qreal calibrationX, calibrationY, calibrationZ;
 
     QTime now;
     QTimer *timer;
@@ -69,7 +81,8 @@ private:
     double averageSpeed;
     double sampleRate;
 
-    bool reverseAcceleration;
+    bool firstRun;
 };
 
 #endif // ACCELEROMETER_H
+