Merge branch 'master' of https://vcs.maemo.org/git/speedfreak

[speedfreak] / Client / carmainwindow.h

diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h
index 8e78595..433ee9d 100644 (file)
--- a/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@ -44,6 +44,7 @@
 #include "routedialog.h"
 #include "calculate.h"
 #include "gpsdata.h"
+#include "movingaverage.h"
 #include <maemo5location.h>
 
 namespace Ui {
@@ -56,12 +57,12 @@ public:
     CarMainWindow(QWidget *parent = 0);
     ~CarMainWindow();
     Registration *myRegistration;       //Check if this should be public or private
-
+    LoginWindow *myLogin;
+    GPSData *gpsData;
 
     void setComboBoxStartTabUnits(QStringList units);       //Start-tab view
     void setListViewStartTabAccelerationCategories(QStringList numbers); //Start-tab view
-    void setListViewTopList(QString category, int size);    //Top-tab view
-    void setCategoryCompoBox();                             //Top-tab
+    void setLabelInfoToUser(QString infoText);
 
 protected:
     void changeEvent(QEvent *e);
@@ -71,32 +72,33 @@ private:
     ResultDialog *result;
     //MeasureDialog *measure;
     WelcomeDialog *welcomeDialog;
-    CategoryList *categorylist;
+    CategoryList *myCategorylist;
     HttpClient *myHttpClient;
-    LoginWindow *myLogin;
     RouteDialog *myRoute;
-    GPSData *gpsData;
     Maemo5Location *location;
     //void initCategoryCompoBox();
     void initComboBoxStartTabUnits();                   //Start-tab view
     void initListViewStartTabAccelerationCategories();  //Start-tab view
-    void initializeMeasures();
+    void setListViewTopList(QString category, int size);    //Top-tab view
     void resetAccelerometerMeasurements();
     void calibrateAccelerometer();
+    void setTimeAxisGapAndShowResult(double pTime);
 
 private:
     QStringList accelerationCategoriesStartTab;         //Start-tab view
     QStringList units;                                  //Start-tab view
-    QStringList categories;                             //Top-tab view
+    QString recentCategory;
 
     QTimer *timer;
     Accelerometer *accelerometer;
+    MovingAverage* movingAverageZ;
     double time;
     double speed;
     Measures *measures;
 
     QModelIndex choice;
     int choiceInt;
+    QStringList catList;
 
     Calculate *calculate;
 
@@ -110,7 +112,7 @@ private:
     double currentAcceleration;
     double currentTime;
     double previousTime;
-    double firstAcceleration;
+    //double firstAcceleration;
 
     QTimer *accelerometerTimer;
     QTime stopWatch;
@@ -122,14 +124,24 @@ private:
     QString totalTime;
 
     QDateTime *gpsTime;
+    QTimer *gpsTimer;
+    double gpsSpeedNow;     //Route-tab view
+    double gpsSpeedPrevious;//Route-tab view
+    double gpsAcceleration; //Route-tab view
+    double timeFromGps;     //Route-tab view
+    double gpsSpeed;        //Route-tab view
+    int gpsUpdateTime;      //Route-tab view
+
+    int counterForSaveResults;
 
 signals:
     void speedAchieved();
     void userNameChanged();
 
 private slots:
-    void on_stopRecPushButton_clicked();
-    void on_startRecPushButton_clicked();
+    void on_calibrateButton_clicked();
+    void gpsTimerTimeout();                             //Route-tab view
+    void on_startRecPushButton_clicked();               //Route-tab view
     void on_pushButtonShowResultDialog_clicked();
     void on_gpsOnCheckBox_stateChanged(int GPSState);   //Route-tab view
     void gpsStatus();                                   //Route-tab view
@@ -139,8 +151,6 @@ private slots:
     void on_manualStartButton_clicked();
     void on_setUserPushButton_clicked();
     void on_registratePushButton_clicked();
-    void on_comboBoxTopCategory_activated(QString );
-    //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
@@ -153,6 +163,9 @@ private slots:
     void userLogin();
     void readAccelerometerData();
     void handleCheckPoint(double totalTime, double currentSpeed);
+    void setCategoryCompoBox();                         //Top-tab
+    void showTop10();
+
 };
 
 #endif // CARMAINWINDOW_H