Changed "registrate" to "register"

[speedfreak] / Client / calculate.h

diff --git a/Client/calculate.h b/Client/calculate.h
index 55069d2..bc3f81d 100644 (file)
--- a/Client/calculate.h
+++ b/Client/calculate.h
@@ -12,6 +12,7 @@
 #include <QObject>
 #include <QTime>
 #include <QList>
+#include <QMap>
 
 class Calculate : public QObject
 {
@@ -23,7 +24,7 @@ public:
 
     void reset();
     void calculateParameters(double currentAcceleration, double seconds);
-    //void accelStoppedCheck(double currentAcceleration);
+    void accelStoppedCheck(double currentAcceleration);
 
     double getAverageSpeed();
     void setAverageSpeed(double value);
@@ -61,21 +62,28 @@ 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;
+public:
+    QMap<int,double> valuesMap;
 
 signals:
     void checkPointReached(double totalTime, double currentSpeed);