X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=blobdiff_plain;f=Client%2Fcalculate.h;h=010050257bc34a2f1b3704ee4e7182321ce39ea7;hp=55069d2b6e34fdf9e945918dcb6b2c698fc7d888;hb=d07fff46e25495a5e3737804e4217ad363b4a040;hpb=eb78a4845dcb1666d1552731f5da4519b194178f

diff --git a/Client/calculate.h b/Client/calculate.h
index 55069d2..0100502 100644
--- a/Client/calculate.h
+++ b/Client/calculate.h
@@ -2,6 +2,7 @@
  * Calculate class to process accelerometer data
  *
  * @author      Kai Rasilainen
+ * @author      Jukka Kurttila <jukka.kurttila@fudeco.com>
  * @copyright   (c) 2010 Speed Freak team
  * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
  */
@@ -12,6 +13,7 @@
 #include <QObject>
 #include <QTime>
 #include <QList>
+#include <QMap>
 
 class Calculate : public QObject
 {
@@ -23,7 +25,8 @@ public:
 
     void reset();
     void calculateParameters(double currentAcceleration, double seconds);
-    //void accelStoppedCheck(double currentAcceleration);
+    void accelStoppedCheck(double currentAcceleration);
+    QMap<int,double> getValuesMap();
 
     double getAverageSpeed();
     void setAverageSpeed(double value);
@@ -61,22 +64,29 @@ public:
     double getAveragePower();
     void setAveragePower(double value);
 
+    double getMaxSpeed();
+    void setMaxSpeed(double value);
+
 private:
     double averageSpeed;
     double currentSpeed;
+    double maxSpeed;
     double distanceTraveled;
     double lastAcceleration;
-    double lastCheckpoint;
     double lastDistance;
     double lastSpeed;
+    double checkPoint;
     long numOfIterations;
     double totalTime;
-    //int count;
+    int count;
+    int checkPointCounter;
     double peakPower;
     double currentPower;
     double averagePower;
     QList<int> speedCheckPoints;
 
+    QMap<int,double> valuesMap;
+
 signals:
     void checkPointReached(double totalTime, double currentSpeed);