From 6f8846a20d7e9f2358e69db1d1982d96c7d8ba75 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Janne=20=C3=84n=C3=A4kk=C3=A4l=C3=A4?=
 <Janne_anakkala@hotmail.com>
Date: Wed, 3 Mar 2010 10:33:53 +0200
Subject: [PATCH] gets speed and time from accelerometer.

---
 Client/measuredialog.cpp |   11 ++++++-----
 Client/measuredialog.h   |    2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Client/measuredialog.cpp b/Client/measuredialog.cpp
index 892b9b9..528018e 100644
--- a/Client/measuredialog.cpp
+++ b/Client/measuredialog.cpp
@@ -17,9 +17,9 @@ MeasureDialog::MeasureDialog(QWidget *parent) :
     timer = new QTimer();
 
     accelerometer = new Accelerometer();
-    //accelerometer->start();
+    accelerometer->start();
 
-    timer->setInterval(1000);
+    timer->setInterval(100);
     timer->start();
     connect(this->timer, SIGNAL(timeout()), this, SLOT(after_timeout()));
 }
@@ -50,14 +50,15 @@ void MeasureDialog::changeEvent(QEvent *e)
 void MeasureDialog::after_timeout()
 {
     QString timeString, speedString;
-    time++;
+    //time++;
+    time = accelerometer->getIntervalTime();
     speed = accelerometer->getCurrentSpeed();
 
     // If speed is over 100 km/h emits speedAchieved() signal and close this dialog.
     if(speed>=100.0)
     {
         timer->stop();
-        //accelerometer->stop();
+        accelerometer->stop();
         time = 0;
         speed = 0;
         emit this->speedAchieved();
@@ -82,7 +83,7 @@ void MeasureDialog::after_timeout()
 void MeasureDialog::on_pushButtonAbort_clicked()
 {
     timer->stop();
-    //accelerometer->stop();
+    accelerometer->stop();
     time = 0;
     speed = 0;
     this->close();
diff --git a/Client/measuredialog.h b/Client/measuredialog.h
index b33450a..abddf06 100644
--- a/Client/measuredialog.h
+++ b/Client/measuredialog.h
@@ -25,7 +25,7 @@ private:
     Accelerometer *accelerometer;
 
 
-    int time;
+    qreal time;
     qreal speed;
 
     signals:
-- 
1.7.9.5