X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=Client%2Faccelerometer.h;h=53e9ca0ea2850d4d1e2c47fec3daba578a5af3b3;hb=543d647c8aec54c4c730b46c47729b5f280b6a36;hp=2ee3ec99339841ee5a0adeb956217b5a9c8fae7d;hpb=ccd1461855b19ed581954e0a02f416b1bda3edb7;p=speedfreak

diff --git a/Client/accelerometer.h b/Client/accelerometer.h
index 2ee3ec9..53e9ca0 100644
--- a/Client/accelerometer.h
+++ b/Client/accelerometer.h
@@ -2,7 +2,8 @@
  * Accelerometer class to access the device accelerometer
  *
  * @author      Rikhard Kuutti <rikhard.kuutti@fudeco.com>
- * @author      Kai Rasilainen 
+ * @author      Kai Rasilainen <kai.rasilainen@fudeco.com>
+ * @author      Jukka Kurttila <jukka.kurttila@fudeco.com>
  * @copyright   (c) 2010 Speed Freak team
  * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
  */
@@ -11,78 +12,31 @@
 #define ACCELEROMETER_H
 
 #include <QObject>
-#include <QTime>
-#include <QTimer>
-#include <QFile>
 
 #include "calculate.h"
+#include "calibratedialog.h"
 
 class Accelerometer : public QObject
 {
     Q_OBJECT
 public:
     Accelerometer();
-    Accelerometer(int p_SampleRate);
     ~Accelerometer();
 
+    void getAcceleration(qreal &x, qreal &y, qreal &z);
+    void smoothData(qreal &x, qreal &y, qreal &z);
     void calibrate();
-
-    void start();
-    void stop();
-
     void initValues();
 
-    void setSampleRate(int pSampleRate);
-    int getSampleRate();
-
-    qreal getTrueAccelerationX();
-    qreal getTrueAccelerationY();
-    qreal getTrueAccelerationZ();
-    qreal getPreviousSpeed();
-    qreal getCurrentSpeed();
-
-    qreal getDistanceTraveled();
-    qreal getLastDistanceTraveled();
-    qreal getAverageSpeed();
-
-    qreal getCurrentAcceleration();
-    qreal getTotalAcceleration();
-    qreal getPreviousTotalAcceleration();
-
-    int getCalibrationX();
-    int getCalibrationY();
-    int getCalibrationZ();
-
-    qreal getIntervalTime();
-    qreal getTotalTime();
-
-private slots:
-    void processData();
-    void smoothData(qreal x, qreal y, qreal z);
+    qreal getCalibrationX();
+    qreal getCalibrationY();
+    qreal getCalibrationZ();
 
 private:
-    Calculate *calculate;
-
-    qreal accelerationX, accelerationY, accelerationZ;
-    qreal trueAccelerationX,trueAccelerationY,trueAccelerationZ;
-    qreal previousAccelerationX,previousAccelerationY,previousAccelerationZ;
-    qreal previousSpeed, currentSpeed;
-    qreal currentAcceleration, previousAcceleration, totalAcceleration;
-
-    int calibrationX, calibrationY, calibrationZ;
+    qreal previousAccelerationX, previousAccelerationY, previousAccelerationZ;
+    qreal calibrationX, calibrationY, calibrationZ;
 
-    QTime now;
-    QTimer *timer;
-
-    double intervalTime;
-    double totalTime;
-    double distanceTraveled;
-    double lastDistanceTraveled;
-    double averageSpeed;
-    double sampleRate;
-
-    bool firstRun;
+    CalibrateDialog *calibrateDialog;
 };
 
 #endif // ACCELEROMETER_H
-