X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=blobdiff_plain;f=Client%2Fmeasuredialog.cpp;h=c469a7e7312c6741d4c317f744574c76cacb4014;hp=038116ac72e9801ede48cb7282f8e57b15f4ee8d;hb=acab884d9184ede381917fe2f4cd6786b7fc1ceb;hpb=004ab54a25868348ec5c1399e1c7b6e5889fe714

diff --git a/Client/measuredialog.cpp b/Client/measuredialog.cpp
index 038116a..c469a7e 100644
--- a/Client/measuredialog.cpp
+++ b/Client/measuredialog.cpp
@@ -1,10 +1,18 @@
+/*
+ * CarMainWindow main class
+ *
+ * @author     Janne Änäkkälä <janne.anakkala@fudeco.com>
+ * @copyright  (c) 2010 Speed Freak team
+ * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
+
 #include "measuredialog.h"
 #include "ui_measuredialog.h"
-
+#include "math.h"
 
 /**
-  *Constructor of this class.
-  *@param QWidget pointer to parent object. By default the value is NULL.
+  * Constructor of this class.
+  * @param QWidget pointer to parent object. By default the value is NULL.
   */
 MeasureDialog::MeasureDialog(QWidget *parent) :
     QDialog(parent),
@@ -17,8 +25,6 @@ MeasureDialog::MeasureDialog(QWidget *parent) :
     timer = new QTimer();
 
     accelerometer = new Accelerometer();
-    accelerometer->setSampleRate(100);
-    accelerometer->start();
 
     measures = new Measures();
     this->initializeMeasures();
@@ -49,62 +55,61 @@ void MeasureDialog::changeEvent(QEvent *e)
 }
 
 /**
-  *This slot function is called when timer gives timeout signal.
+  * This slot function is called when timer gives timeout signal. Checks current speed
+  * and stores times in measure class.
   */
 void MeasureDialog::after_timeout()
 {
     QString timeString, speedString;
-    //time++;
-    time = accelerometer->getTotalTime();
-    speed = accelerometer->getCurrentSpeed();
-    //speed = speed +10;
+    time++;
+    speed = speed +10;
 
-    if(speed > 9.7 && speed < 10.3)
+    if (floor(speed) == 10)
     {
         measures->setTime10kmh(time);
     }
 
-    else if (speed > 19.7 && speed < 20.3)
+    else if (floor(speed) == 20)
     {
         measures->setTime20kmh(time);
     }
 
-    else if (speed > 29.7 && speed < 30.3)
+    else if (floor(speed) == 30)
     {
         measures->setTime30kmh(time);
     }
 
-    else if (speed > 39.7 && speed < 40.3)
+    else if (floor(speed) == 40)
     {
         measures->setTime40kmh(time);
     }
 
-    else if (speed > 49.7 && speed < 50.3)
+    else if (floor(speed) == 50)
     {
         measures->setTime50kmh(time);
     }
 
-    else if (speed > 59.7 && speed < 60.3)
+    else if (floor(speed) == 60)
     {
         measures->setTime60kmh(time);
     }
 
-    else if (speed > 69.7 && speed < 70.3)
+    else if (floor(speed) == 70)
     {
         measures->setTime70kmh(time);
     }
 
-    else if (speed > 79.7 && speed < 80.3)
+    else if (floor(speed) == 80)
     {
         measures->setTime80kmh(time);
     }
 
-    else if (speed > 89.7 && speed < 90.3)
+    else if (floor(speed) == 90)
     {
         measures->setTime90kmh(time);
     }
 
-    else if (speed > 99.7 && speed < 100.3)
+    else if (floor(speed) == 100)
     {
         measures->setTime100kmh(time);
     }
@@ -118,7 +123,6 @@ void MeasureDialog::after_timeout()
     if (speed >= 40.0)
     {
         timer->stop();
-        accelerometer->stop();
         time = 0;
         speed = 0;
         emit this->speedAchieved();
@@ -139,7 +143,7 @@ void MeasureDialog::after_timeout()
 }
 
 /**
-  *This slot function is called when Abort button is clicked.
+  * This slot function is called when Abort button is clicked.
   */
 void MeasureDialog::on_pushButtonAbort_clicked()
 {
@@ -154,12 +158,14 @@ void MeasureDialog::on_pushButtonAbort_clicked()
     measures->setTime90kmh(0);
     measures->setTime100kmh(0);
     timer->stop();
-    accelerometer->stop();
     time = 0;
     speed = 0;
     this->close();
 }
 
+/**
+  * Initializes measures class's member variables.
+  */
 void MeasureDialog::initializeMeasures()
 {
     measures->setTime10kmh(0);