Corrections to reading route from file

[speedfreak] / Client / carmainwindow.h

diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h
index 934a48c..9b7ee18 100644 (file)
--- a/Client/carmainwindow.h
+++ b/Client/carmainwindow.h
@@ -56,12 +56,11 @@ 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
 
 protected:
     void changeEvent(QEvent *e);
@@ -71,16 +70,15 @@ 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);
@@ -88,7 +86,7 @@ private:
 private:
     QStringList accelerationCategoriesStartTab;         //Start-tab view
     QStringList units;                                  //Start-tab view
-    QStringList categories;                             //Top-tab view
+    QString recentCategory;
 
     QTimer *timer;
     Accelerometer *accelerometer;
@@ -98,6 +96,7 @@ private:
 
     QModelIndex choice;
     int choiceInt;
+    QStringList catList;
 
     Calculate *calculate;
 
@@ -131,6 +130,8 @@ signals:
     void userNameChanged();
 
 private slots:
+    void on_stopRecPushButton_clicked();
+    void on_startRecPushButton_clicked();
     void on_pushButtonShowResultDialog_clicked();
     void on_gpsOnCheckBox_stateChanged(int GPSState);   //Route-tab view
     void gpsStatus();                                   //Route-tab view
@@ -140,8 +141,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
@@ -154,6 +153,9 @@ private slots:
     void userLogin();
     void readAccelerometerData();
     void handleCheckPoint(double totalTime, double currentSpeed);
+    void setCategoryCompoBox();                         //Top-tab
+    void showTop10();
+
 };
 
 #endif // CARMAINWINDOW_H