X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=blobdiff_plain;f=Client%2Fcarmainwindow.h;h=a00516cefa864ee809a08fb943a43666637ebf20;hp=dfb2402946bbf3e06008b2bb89eec47f9b646053;hb=7676af2d21d6b77b7eb8bbaefbacfdd6590f0578;hpb=e94a4eed987de3e484b85284f2d70ebc03e74727

diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h
index dfb2402..a00516c 100644
--- a/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@ -25,14 +25,16 @@
 #include <QBuffer>
 #include <QByteArray>
 #include <QDebug>
-#include "resultdialog.h"
-#include "measuredialog.h"
+//#include "resultdialog.h"
+//#include "measuredialog.h"
 #include "loginwindow.h"
 #include "registration.h"
 #include "xmlwriter.h"
 #include "xmlreader.h"
 #include "ui_carmainwindow.h"
 #include "stringlistmodel.h"
+#include "measures.h"
+#include "accelerometer.h"
 
 namespace Ui {
     class CarMainWindow;
@@ -54,8 +56,8 @@ protected:
 
 private:
     Ui::CarMainWindow *ui;
-    ResultDialog *result;
-    MeasureDialog *measure;
+    //ResultDialog *result;
+    //MeasureDialog *measure;
     XmlReader *xmlreader;
     XmlWriter *xmlwriter;
     QNetworkAccessManager* manager;
@@ -65,12 +67,26 @@ private:
     void initComboBoxStartTabUnits();    //Start-tab view
     void initListViewStartTabAccelerationCategories();   //Start-tab view
 
+    void initializeMeasures();
+
 private:
     QStringList accelerationCategoriesStartTab; //Start-tab view
     QStringList units;  //Start-tab view
     QStringList categories; //Top-tab view
 
+    QTimer *timer;
+    Accelerometer *accelerometer;
+    double time;
+    double speed;
+    Measures *measures;
+
+signals:
+void speedAchieved();
+void sendresult();
+
 private slots:
+    void on_pushButtonSendResult_clicked();
+    void on_pushButtonMeasureTabAbort_clicked();
     void on_manualStartButton_clicked();
     void on_setUserPushButton_clicked();
     void on_registratePushButton_clicked();
@@ -88,6 +104,8 @@ private slots:
     void sendXml();
     void ackOfResult();
     void ackOfRegistration();
+
+    void after_timeout();
 };
 
 #endif // CARMAINWINDOW_H