Added new tab "Measure" in main window

[speedfreak] / Client / calculate.h

diff --git a/Client/calculate.h b/Client/calculate.h
index 0008a87..ef000ba 100644 (file)
--- a/Client/calculate.h
+++ b/Client/calculate.h
@@ -1,3 +1,11 @@
+/*
+ * 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
 
@@ -13,34 +21,35 @@ 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 CurrentSpeed();
-    void CurrentSpeed(double value);
+    double getCurrentSpeed();
+    void setCurrentSpeed(double value);
 
-    double DistanceTraveled();
-    void DistanceTraveled(double value);
+    double getDistanceTraveled();
+    void setDistanceTraveled(double value);
 
-    double LastAcceleration();
-    void LastAcceleration(double value);
+    double getLastAcceleration();
+    void setLastAcceleration(double value);
 
-    double LastCheckpoint();
-    void LastCheckpoint(double value);
+    double getLastCheckpoint();
+    void setLastCheckpoint(double value);
 
-    double LastDistance();
-    void LastDistance(double value);
+    double getLastDistance();
+    void setLastDistance(double value);
 
-    double LastSpeed();
-    void LastSpeed(double value);
+    double getLastSpeed();
+    void setLastSpeed(double value);
 
-    long NumOfIterations();
-    void NumOfIterations(long value);
+    long getNumOfIterations();
+    void setNumOfIterations(long value);
 
-    double TotalTime();
-    void TotalTime(double value);
+    double getTotalTime();
+    void setTotalTime(double value);
 
 private:
     double averageSpeed;
@@ -52,7 +61,7 @@ private:
     double lastSpeed;
     long numOfIterations;
     double totalTime;
-
+    int count;
 
 };