From: Janne Änäkkälä <Janne_anakkala@hotmail.com>
Date: Tue, 9 Mar 2010 09:04:12 +0000 (+0200)
Subject: Merge branch 'fix/InMeasureTab'
X-Git-Tag: v0.1~69^2~2
X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=commitdiff_plain;h=3a9bbdb9aa83483c47355baa6e794ae033f8f4d1;hp=9a81bc8fe5cb944592f815192817c4056cb168d9

Merge branch 'fix/InMeasureTab'
---

diff --git a/Client/carmainwindow.cpp b/Client/carmainwindow.cpp
index 8464b27..ee146ff 100644
--- a/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@ -40,12 +40,11 @@ CarMainWindow::CarMainWindow(QWidget *parent):QMainWindow(parent), ui(new Ui::Ca
 
     accelerometer = new Accelerometer();
     accelerometer->setSampleRate(100);
-    accelerometer->start();
 
     measures = new Measures();
     this->initializeMeasures();
 
-    timer->setInterval(1000);
+    timer->setInterval(300);
 
     connect(this->timer, SIGNAL(timeout()), this, SLOT(after_timeout()));
 
@@ -106,6 +105,7 @@ void CarMainWindow::on_autoStartButton_clicked()
     //measure = NULL;
     //measure = new MeasureDialog();
    // connect(measure, SIGNAL(speedAchieved()), this, SLOT(openResultView()));
+    accelerometer->start();
     timer->start();
     // Show measure dialog.
     //measure->show();