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 9b7ee18..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 {
@@ -61,6 +62,7 @@ public:
 
     void setComboBoxStartTabUnits(QStringList units);       //Start-tab view
     void setListViewStartTabAccelerationCategories(QStringList numbers); //Start-tab view
+    void setLabelInfoToUser(QString infoText);
 
 protected:
     void changeEvent(QEvent *e);
@@ -77,7 +79,6 @@ private:
     //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();
@@ -90,6 +91,7 @@ private:
 
     QTimer *timer;
     Accelerometer *accelerometer;
+    MovingAverage* movingAverageZ;
     double time;
     double speed;
     Measures *measures;
@@ -110,7 +112,7 @@ private:
     double currentAcceleration;
     double currentTime;
     double previousTime;
-    double firstAcceleration;
+    //double firstAcceleration;
 
     QTimer *accelerometerTimer;
     QTime stopWatch;
@@ -122,6 +124,13 @@ 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;
 
@@ -130,8 +139,9 @@ signals:
     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