Merge branch 'changes/UI'

[speedfreak] / Client / calculate.h

diff --git a/Client/calculate.h b/Client/calculate.h
index 421990f..34fcaec 100644 (file)
--- 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>
 #ifndef CALCULATE_H
 #define CALCULATE_H
 
 #include <QObject>
 #include <QTime>

+#include <QList>

 
 class Calculate : public QObject
 {
 
 class Calculate : public QObject
 {

@@ -43,6 +52,15 @@ public:
     double getTotalTime();
     void setTotalTime(double value);
 
     double getTotalTime();
     void setTotalTime(double value);
 

+    double getCurrentPower();
+    void setCurrentPower(double value);
+
+    double getPeakPower();
+    void setPeakPower(double value);
+
+    double getAveragePower();
+    void setAveragePower(double value);
+

 private:
     double averageSpeed;
     double currentSpeed;
 private:
     double averageSpeed;
     double currentSpeed;

@@ -54,6 +72,13 @@ private:
     long numOfIterations;
     double totalTime;
     int count;
     long numOfIterations;
     double totalTime;
     int count;

+    double peakPower;
+    double currentPower;
+    double averagePower;
+    QList<int> speedCheckPoints;
+
+signals:
+    void checkPointReached(double totalTime, double currentSpeed);

 
 };
 
 
 };