X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=blobdiff_plain;f=Client%2Fcarmainwindow.h;h=934a48c200c029b1fa2b1c25872ad4fcc7524df5;hp=8366c46c2eebf388f7239145540f468680e24a86;hb=b7181562db15557c9e2bc2a49fb9aea266d881e9;hpb=431e1a47738b2f723789de366eead08c4e2b5fd2

diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h
index 8366c46..934a48c 100644
--- a/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@ -5,6 +5,8 @@
  * @author     Janne Änäkkälä <janne.anakkala@fudeco.com>
  * @author     Tiina Kivilinna-Korhola <tiina.kivilinna-korhola@fudeco.com>
  * @author     Olavi Pulkkinen <olavi.pulkkinen@fudeco.com>
+ * @author     Rikhard Kuutti <rikhard.kuutti@fudeco.com>
+ * @author     Kai Rasilainen <kai.rasilainen@fudeco.com>
  * @copyright  (c) 2010 Speed Freak team
  * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
  */
@@ -25,7 +27,8 @@
 #include <QBuffer>
 #include <QByteArray>
 #include <QDebug>
-//#include "resultdialog.h"
+#include <qdatetime.h>
+#include "resultdialog.h"
 //#include "measuredialog.h"
 #include "welcomedialog.h"
 #include "loginwindow.h"
@@ -39,6 +42,7 @@
 #include "categorylist.h"
 #include "httpclient.h"
 #include "routedialog.h"
+#include "calculate.h"
 #include "gpsdata.h"
 #include <maemo5location.h>
 
@@ -64,7 +68,7 @@ protected:
 
 private:
     Ui::CarMainWindow *ui;
-    //ResultDialog *result;
+    ResultDialog *result;
     //MeasureDialog *measure;
     WelcomeDialog *welcomeDialog;
     CategoryList *categorylist;
@@ -77,6 +81,9 @@ private:
     void initComboBoxStartTabUnits();                   //Start-tab view
     void initListViewStartTabAccelerationCategories();  //Start-tab view
     void initializeMeasures();
+    void resetAccelerometerMeasurements();
+    void calibrateAccelerometer();
+    void setTimeAxisGapAndShowResult(double pTime);
 
 private:
     QStringList accelerationCategoriesStartTab;         //Start-tab view
@@ -89,11 +96,42 @@ private:
     double speed;
     Measures *measures;
 
+    QModelIndex choice;
+    int choiceInt;
+
+    Calculate *calculate;
+
+    bool reverseAccelerationFlag;
+    bool vehicleStartedMoving;
+    bool isNewRun;
+    bool isSetup;
+
+    double stopTime;
+    double accelerationStartThreshold;
+    double currentAcceleration;
+    double currentTime;
+    double previousTime;
+    double firstAcceleration;
+
+    QTimer *accelerometerTimer;
+    QTime stopWatch;
+
+    QString currentAccelerationString;
+    QString currentSpeed;
+    QString distanceTraveled;
+    QString horsepower;
+    QString totalTime;
+
+    QDateTime *gpsTime;
+
+    int counterForSaveResults;
+
 signals:
     void speedAchieved();
     void userNameChanged();
 
 private slots:
+    void on_pushButtonShowResultDialog_clicked();
     void on_gpsOnCheckBox_stateChanged(int GPSState);   //Route-tab view
     void gpsStatus();                                   //Route-tab view
     void on_drawRoutePushButton_clicked();
@@ -114,6 +152,8 @@ private slots:
     void updateUserName();
     void regUserToServer();
     void userLogin();
+    void readAccelerometerData();
+    void handleCheckPoint(double totalTime, double currentSpeed);
 };
 
 #endif // CARMAINWINDOW_H