X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=blobdiff_plain;f=Client%2Fcarmainwindow.h;h=2c29c9a0cf75dcd93a2283c8473ebc93e2e8f5fc;hp=89868c601b6bd5ed2b7443b115f5f44b644432cb;hb=8d318c3fa452a8f0186425dcd85e217a4a1f3e07;hpb=8d7e314bca707295f0b439d0eafd01b8a6bd1a6a

diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h
index 89868c6..2c29c9a 100644
--- a/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@ -1,13 +1,13 @@
-/**
-  * CarMainWindow main class
-  *
-  * @author     Toni Jussila <toni.jussila@fudeco.com>
-  * @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>
-  * @copyright  (c) 2010 Speed Freak team
-  * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
-  */
+/*
+ * CarMainWindow main class
+ *
+ * @author     Toni Jussila <toni.jussila@fudeco.com>
+ * @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>
+ * @copyright  (c) 2010 Speed Freak team
+ * @license    http://opensource.org/licenses/gpl-license.php GNU Public License
+ */
 
 #ifndef CARMAINWINDOW_H
 #define CARMAINWINDOW_H
@@ -18,15 +18,24 @@
 #include <QStringList>
 #include <QString>
 #include <QNetworkAccessManager>
-#include <QStandardItemModel>
 #include <QNetworkRequest>
-#include "resultdialog.h"
-#include "measuredialog.h"
+#include <QNetworkReply>
+#include <QMessageBox>
+#include <QStandardItemModel>
+#include <QBuffer>
+#include <QByteArray>
+#include <QDebug>
+//#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"
+#include "categorylist.h"
 
 namespace Ui {
     class CarMainWindow;
@@ -40,7 +49,7 @@ public:
 
     void setComboBoxStartTabUnits(QStringList units);    //Start-tab view
     void setListViewStartTabAccelerationCategories(QStringList numbers); //Start-tab view
-    void setListViewTopList(QString category);  //Top-tab view
+    void setListViewTopList(QString category, int size);  //Top-tab view
     void setCategoryCompoBox(); //Top-tab
 
 protected:
@@ -48,9 +57,10 @@ protected:
 
 private:
     Ui::CarMainWindow *ui;
-    ResultDialog *result;
-    MeasureDialog *measure;
+    //ResultDialog *result;
+    //MeasureDialog *measure;
     XmlReader *xmlreader;
+    XmlWriter *xmlwriter;
     QNetworkAccessManager* manager;
     LoginWindow *myLogin;
     Registration *myRegistration;
@@ -58,24 +68,49 @@ 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
+    CategoryList *categorylist;
+
+    QTimer *timer;
+    Accelerometer *accelerometer;
+    double time;
+    double speed;
+    Measures *measures;
+
+signals:
+    void speedAchieved();
+    void userNameChanged();
 
 private slots:
+    void on_pushButtonSendResult_clicked();
+    void on_pushButtonMeasureTabAbort_clicked();
+    void on_manualStartButton_clicked();
     void on_setUserPushButton_clicked();
     void on_registratePushButton_clicked();
-    void on_loginLogoutButton_clicked();
     void on_comboBoxTopCategory_activated(QString );
-    void on_pushButton_clicked();
-    void networkResponse(QNetworkReply*);
+    //void on_pushButton_clicked();
     void on_comboBoxTopCategory_currentIndexChanged(QString category); //Top-tab view
     void on_listViewStartTabAccelerationCategories_clicked(QModelIndex index); //Start-tab view
     void updateComboBoxStartTabUnits(QString unit);  //Start-tab view
     void openResultView();
     void on_buttonTopRefresh_clicked(); //Top-tab view: button
     void on_autoStartButton_clicked();  //Start-tab view: button
+    void registrate();
+    void sendResultXml();
+    void requestTopList(QString category, QString limit);
+    void requestCategories();
+    void ackOfResult();
+    void ackOfRegistration();
+    void ackOfCategories();
+    void ackOfToplist();
+    void errorFromServer(QNetworkReply::NetworkError);
+    void after_timeout();
+    void updateUserName();
 };
 
 #endif // CARMAINWINDOW_H