X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=blobdiff_plain;f=Client%2Fcalculate.h;h=34fcaec896ea49eff832c3bc1255be44a0f823e0;hp=db86aed9841a84d71f760a012cf08d938b8ae92c;hb=d359e4d19b1a1cb68b8f602f243c68739e09a04c;hpb=46200e79ec53dc19e79b2cd6352b4b28ba894206

diff --git a/Client/calculate.h b/Client/calculate.h
index db86aed..34fcaec 100644
--- a/Client/calculate.h
+++ b/Client/calculate.h
@@ -1,8 +1,17 @@
+/*
+ * Calculate class to process accelerometer data
+ *
+ * @author      Kai Rasilainen
+ * @copyright   (c) 2010 Speed Freak team
+ * @license     http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
 #ifndef CALCULATE_H
 #define CALCULATE_H
 
 #include <QObject>
 #include <QTime>
+#include <QList>
 
 class Calculate : public QObject
 {
@@ -13,35 +22,44 @@ public:
     ~Calculate();
 
     void reset();
-    void CalculateParameters(double currentAcceleration, double seconds);
+    void calculateParameters(double currentAcceleration, double seconds);
     void accelStoppedCheck(double currentAcceleration);
 
-    double AverageSpeed();
-    void AverageSpeed(double value);
+    double getAverageSpeed();
+    void setAverageSpeed(double value);
+
+    double getCurrentSpeed();
+    void setCurrentSpeed(double value);
+
+    double getDistanceTraveled();
+    void setDistanceTraveled(double value);
 
-    double CurrentSpeed();
-    void CurrentSpeed(double value);
+    double getLastAcceleration();
+    void setLastAcceleration(double value);
 
-    double DistanceTraveled();
-    void DistanceTraveled(double value);
+    double getLastCheckpoint();
+    void setLastCheckpoint(double value);
 
-    double LastAcceleration();
-    void LastAcceleration(double value);
+    double getLastDistance();
+    void setLastDistance(double value);
 
-    double LastCheckpoint();
-    void LastCheckpoint(double value);
+    double getLastSpeed();
+    void setLastSpeed(double value);
 
-    double LastDistance();
-    void LastDistance(double value);
+    long getNumOfIterations();
+    void setNumOfIterations(long value);
 
-    double LastSpeed();
-    void LastSpeed(double value);
+    double getTotalTime();
+    void setTotalTime(double value);
 
-    long NumOfIterations();
-    void NumOfIterations(long value);
+    double getCurrentPower();
+    void setCurrentPower(double value);
 
-    double TotalTime();
-    void TotalTime(double value);
+    double getPeakPower();
+    void setPeakPower(double value);
+
+    double getAveragePower();
+    void setAveragePower(double value);
 
 private:
     double averageSpeed;
@@ -54,6 +72,13 @@ private:
     long numOfIterations;
     double totalTime;
     int count;
+    double peakPower;
+    double currentPower;
+    double averagePower;
+    QList<int> speedCheckPoints;
+
+signals:
+    void checkPointReached(double totalTime, double currentSpeed);
 
 };