Merge remote branch 'remotes/origin/master' into server

[speedfreak] / Client / accelerometer.h

diff --git a/Client/accelerometer.h b/Client/accelerometer.h
index bb5d3aa..2ee3ec9 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
 
@@ -40,31 +49,40 @@ public:
     qreal getTotalAcceleration();
     qreal getPreviousTotalAcceleration();
 
-    int sstatex, sstatey, sstatez;
+    int getCalibrationX();
+    int getCalibrationY();
+    int getCalibrationZ();
 
     qreal getIntervalTime();
+    qreal getTotalTime();
 
 private slots:
     void processData();
     void smoothData(qreal x, qreal y, qreal z);
 
-public:
+private:
     Calculate *calculate;
 
-private:
     qreal accelerationX, accelerationY, accelerationZ;
     qreal trueAccelerationX,trueAccelerationY,trueAccelerationZ;
     qreal previousAccelerationX,previousAccelerationY,previousAccelerationZ;
     qreal previousSpeed, currentSpeed;
     qreal currentAcceleration, previousAcceleration, totalAcceleration;
+
+    int calibrationX, calibrationY, calibrationZ;
+
     QTime now;
     QTimer *timer;
+
     double intervalTime;
     double totalTime;
-    double distanceTraveled,lastDistanceTraveled,averageSpeed;
+    double distanceTraveled;
+    double lastDistanceTraveled;
+    double averageSpeed;
     double sampleRate;
 
-    bool reverseAcceleration;
+    bool firstRun;
 };
 
 #endif // ACCELEROMETER_H
+