Added getTotalTime method to Accelerometer class

[speedfreak] / Client / accelerometer.h

diff --git a/Client/accelerometer.h b/Client/accelerometer.h
index 2de12a7..31e5588 100644 (file)
--- a/Client/accelerometer.h
+++ b/Client/accelerometer.h
@@ -4,14 +4,20 @@
 #include <QObject>
 #include <QTime>
 #include <QTimer>
+#include <QFile>
+
+#include "calculate.h"
 
 class Accelerometer : public QObject
 {
     Q_OBJECT
 public:
     Accelerometer();
+    Accelerometer(int p_SampleRate);
     ~Accelerometer();
 
+    void calibrate();
+
     void start();
     void stop();
 
@@ -34,24 +40,37 @@ public:
     qreal getTotalAcceleration();
     qreal getPreviousTotalAcceleration();
 
-    qreal getintervalTime();
+    int calibrationX;
+    int calibrationY;
+    int calibrationZ;
+
+    qreal getIntervalTime();
+    qreal getTotalTime();
 
 private slots:
     void processData();
     void smoothData(qreal x, qreal y, qreal z);
 
 private:
+    Calculate *calculate;
+
     qreal accelerationX, accelerationY, accelerationZ;
     qreal trueAccelerationX,trueAccelerationY,trueAccelerationZ;
     qreal previousAccelerationX,previousAccelerationY,previousAccelerationZ;
     qreal previousSpeed, currentSpeed;
     qreal currentAcceleration, previousAcceleration, totalAcceleration;
+
     QTime now;
     QTimer *timer;
+
     double intervalTime;
     double totalTime;
-    double distanceTraveled,lastDistanceTraveled,averageSpeed;
+    double distanceTraveled;
+    double lastDistanceTraveled;
+    double averageSpeed;
     double sampleRate;
+
+    bool reverseAcceleration;
 };
 
 #endif // ACCELEROMETER_H