Added new tab "Measure" in main window

[speedfreak] / Client / carmainwindow.h

diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h
index c6c0963..a00516c 100644 (file)
--- a/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@ -1,3 +1,14 @@
+/**
+  * 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
 
@@ -7,15 +18,23 @@
 #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"
 
 namespace Ui {
     class CarMainWindow;
@@ -27,9 +46,9 @@ public:
     CarMainWindow(QWidget *parent = 0);
     ~CarMainWindow();
 
-    void setUnitCompoBox(QStringList units);    //Start-tab
-    void setSpeedListView(QStringList numbers); //Start-tab
-    void setListViewTopList(QString category);  //Top-tab
+    void setComboBoxStartTabUnits(QStringList units);    //Start-tab view
+    void setListViewStartTabAccelerationCategories(QStringList numbers); //Start-tab view
+    void setListViewTopList(QString category);  //Top-tab view
     void setCategoryCompoBox(); //Top-tab
 
 protected:
@@ -37,33 +56,56 @@ protected:
 
 private:
     Ui::CarMainWindow *ui;
-    ResultDialog *result;
-    MeasureDialog *measure;
+    //ResultDialog *result;
+    //MeasureDialog *measure;
     XmlReader *xmlreader;
+    XmlWriter *xmlwriter;
     QNetworkAccessManager* manager;
     LoginWindow *myLogin;
     Registration *myRegistration;
-    void initCategoryCompoBox();
-    void initUnitCompoBox();    //Start-tab
-    void initSpeedListView();   //Start-tab
+    //void initCategoryCompoBox();    //
+    void initComboBoxStartTabUnits();    //Start-tab view
+    void initListViewStartTabAccelerationCategories();   //Start-tab view
+
+    void initializeMeasures();
 
 private:
-    QStringList numbers; //Start-tab
-    QStringList units;  //Start-tab
-    QStringList categories; //Top-tab
+    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();
     void on_loginLogoutButton_clicked();
     void on_comboBoxTopCategory_activated(QString );
     void on_pushButton_clicked();
     void networkResponse(QNetworkReply*);
-    void on_comboBoxTopCategory_currentIndexChanged(QString category); //Top-tab
-    void on_listView_clicked(QModelIndex index); //Start-tab
-    void updateUnitCompoBox(QString unit);  //Start-tab
+    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: button
-    void on_autoStartButton_clicked();  //Start-tab: button
+    void on_buttonTopRefresh_clicked(); //Top-tab view: button
+    void on_autoStartButton_clicked();  //Start-tab view: button
+    void registrate();
+    void sendXml();
+    void ackOfResult();
+    void ackOfRegistration();
+
+    void after_timeout();
 };
 
 #endif // CARMAINWINDOW_H