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

diff --git a/Client/calculate.h b/Client/calculate.h
index ef000ba..0100502 100644
--- a/Client/calculate.h
+++ b/Client/calculate.h
@@ -1,7 +1,8 @@
 /*
  * Calculate class to process accelerometer data
  *
- * @author      Kai Rasilainen 
+ * @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
  */
@@ -11,6 +12,8 @@
 
 #include <QObject>
 #include <QTime>
+#include <QList>
+#include <QMap>
 
 class Calculate : public QObject
 {
@@ -23,6 +26,7 @@ public:
     void reset();
     void calculateParameters(double currentAcceleration, double seconds);
     void accelStoppedCheck(double currentAcceleration);
+    QMap<int,double> getValuesMap();
 
     double getAverageSpeed();
     void setAverageSpeed(double value);
@@ -51,17 +55,40 @@ public:
     double getTotalTime();
     void setTotalTime(double value);
 
+    double getCurrentPower();
+    void setCurrentPower(double value);
+
+    double getPeakPower();
+    void setPeakPower(double value);
+
+    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 checkPointCounter;
+    double peakPower;
+    double currentPower;
+    double averagePower;
+    QList<int> speedCheckPoints;
+
+    QMap<int,double> valuesMap;
+
+signals:
+    void checkPointReached(double totalTime, double currentSpeed);
 
 };