X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=blobdiff_plain;f=Client%2Faccelerometer.h;h=31e55887e061797b1ab5d52c6e80acb5f1658125;hp=bb5d3aa9e4ec7bb83e2ee1d2c232a444047a3b81;hb=5d2032eb2635b7ae3ce8e20df1b2943241a8d3b2;hpb=0c54e49a827d3398115cd986293f17bd99db829a

diff --git a/Client/accelerometer.h b/Client/accelerometer.h
index bb5d3aa..31e5588 100644
--- a/Client/accelerometer.h
+++ b/Client/accelerometer.h
@@ -40,28 +40,34 @@ public:
     qreal getTotalAcceleration();
     qreal getPreviousTotalAcceleration();
 
-    int sstatex, sstatey, sstatez;
+    int calibrationX;
+    int calibrationY;
+    int calibrationZ;
 
     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;
+
     QTime now;
     QTimer *timer;
+
     double intervalTime;
     double totalTime;
-    double distanceTraveled,lastDistanceTraveled,averageSpeed;
+    double distanceTraveled;
+    double lastDistanceTraveled;
+    double averageSpeed;
     double sampleRate;
 
     bool reverseAcceleration;