X-Git-Url: http://git.maemo.org/git/?p=speedfreak;a=blobdiff_plain;f=Client%2Fcarmainwindow.cpp;fp=Client%2Fcarmainwindow.cpp;h=d340d19f3f44cd9876e8da0855d91c8b8eb7ccb3;hp=c698f4c717b51fd172e6ab93cf0f9a5033628b2b;hb=39d7f4c4a512b62dac0f777385af70f18f8bcedd;hpb=67d43ca29d2e4165caf0f6f8b637d71ab98281a0

diff --git a/Client/carmainwindow.cpp b/Client/carmainwindow.cpp
index c698f4c..d340d19 100644
--- a/Client/carmainwindow.cpp
+++ b/Client/carmainwindow.cpp
@@ -1,11 +1,4 @@
 #include "carmainwindow.h"
-#include "ui_carmainwindow.h"
-#include "stringlistmodel.h"
-#include "loginwindow.h"
-#include <QStandardItemModel>
-#include <QStringList>
-#include <QString>
-#include <QNetworkRequest>
 
 /**
   *Constructor of this class.
@@ -16,9 +9,11 @@ CarMainWindow::CarMainWindow(QWidget *parent):QMainWindow(parent), ui(new Ui::Ca
     ui->setupUi(this);
     result = new ResultDialog();
     measure = new MeasureDialog();
+    xmlreader = new XmlReader();
 
     initUnitCompoBox();
     initSpeedListView();
+<<<<<<< HEAD:Client/carmainwindow.cpp
     initCategoryCompoBox();
 
     myLogin = new LoginWindow(this);
@@ -26,6 +21,8 @@ CarMainWindow::CarMainWindow(QWidget *parent):QMainWindow(parent), ui(new Ui::Ca
     manager = new QNetworkAccessManager(this);
     connect(manager,SIGNAL(finished(QNetworkReply*)),this,SLOT(networkResponse(QNetworkReply*)));
 
+=======
+>>>>>>> feature/XMLreader:Client/carmainwindow.cpp
 }
 
 /**
@@ -36,6 +33,7 @@ CarMainWindow::~CarMainWindow()
     delete ui;
     delete result;
     delete measure;
+    delete xmlreader;
 }
 
 /**
@@ -55,8 +53,7 @@ void CarMainWindow::changeEvent(QEvent *e)
 }
 
 /**
-  *This slot function is called when ever list view is update.
-  *@param QModelIndex index.
+  *This slot function is called when ever list view is update. Start-tab view.
   */
 void CarMainWindow::on_listView_clicked(QModelIndex index)
 {
@@ -70,7 +67,7 @@ void CarMainWindow::on_listView_clicked(QModelIndex index)
 }
 
 /**
-  *This slot function is called when ever auto start button clicked.
+  *This slot function is called when ever auto start button clicked. Start-tab view.
   */
 void CarMainWindow::on_autoStartButton_clicked()
 {
@@ -85,7 +82,7 @@ void CarMainWindow::on_autoStartButton_clicked()
 }
 
 /**
-  *This slot function is called when ever list view is update.
+  *This slot function is called when ever list view is update. Start-tab view.
   *@param QString unit.
   */
 void CarMainWindow::updateUnitCompoBox(QString unit)
@@ -94,16 +91,16 @@ void CarMainWindow::updateUnitCompoBox(QString unit)
 }
 
 /**
-  *This function is used to init unit combobox.
+  *This function is used to init unit combobox. Start-tab view.
   */
 void CarMainWindow::initUnitCompoBox()
 {
-    units << "km/h" << "km" << "h" << "m" << "min" << "mil" << "in" << "ft" << "yrd";
+    units << "km/h" << "km" << "h" << "m" << "min" << "Mile" << "Mph" << "in" << "ft" << "yrd";
     ui->unitComboBox->addItems(units);
 }
 
 /**
-  *This function is used to set items to unit combobox.
+  *This function is used to set items to unit combobox. Start-tab view.
   *@param QStringlist numbers
   */
 void CarMainWindow::setUnitCompoBox(QStringList units)
@@ -112,18 +109,21 @@ void CarMainWindow::setUnitCompoBox(QStringList units)
 }
 
 /**
-  *This function is used to init speed listview.
+  *This function is used to init speed listview. Start-tab view.
   */
 void CarMainWindow::initSpeedListView()
 {
+<<<<<<< HEAD:Client/carmainwindow.cpp
     numbers << "0-40 km/h" << "0-1/4 mil" << "0-50 km" << "50-100 mil" << "0-100 m" << "0-50 ft" << "0-50 yrd" << "0-500 in";
+=======
+    numbers << "0-40 km/h" << "0-1/4 Mile" << "0-1/8 Mile" << "0-50 km" << "50-100 Mile" << "0-60 Mph" << "0-100 m" << "0-50 ft" << "0-50 yrd" << "0-500 in";
+>>>>>>> feature/XMLreader:Client/carmainwindow.cpp
     QAbstractItemModel *model = new StringListModel(numbers);
     ui->listView->setModel(model);
 }
 
 /**
-<<<<<<< HEAD:Client/carmainwindow.cpp
-  *This function is used to set items to speed listview.
+  *This function is used to set items to speed listview. Start-tab view.
   *@param QStringlist numbers
   */
 void CarMainWindow::setSpeedListView(QStringList numbers)
@@ -133,36 +133,37 @@ void CarMainWindow::setSpeedListView(QStringList numbers)
 }
 
 /**
-  *This function is used to init category combobox.
-  */
-void CarMainWindow::initCategoryCompoBox()
-{
-    categories << "Top 10 1/4 mile" << "Top 10 0-100 km/h" << "Top 10 car";
-    ui->comboBoxTopCategory->addItems(categories);
-}
-
-/**
-  *This function is used to set items to category combobox.
-  *@param QStringlist categories
+  *This function is used to set items to category combobox. Top-tab view.
+  *@param
   */
-void CarMainWindow::setCategoryCompoBox(QStringList categories)
+void CarMainWindow::setCategoryCompoBox()
 {
-    ui->comboBoxTopCategory->addItems(categories);
+    ui->comboBoxTopCategory->addItems(xmlreader->getTop10List());
 }
 
 /**
-  *This slot function is called when ever categories combobox is update.
+  *This function is used to set items to labelTopList. Top-tab view.
   *@param QString category
   */
-void CarMainWindow::on_comboBoxTopCategory_activated(QString category)
+void CarMainWindow::setListViewTopList(QString category)
 {
-    //TODO: get top list
+    QString topList;
+
+    if (category == "acceleration-0-100")
+    {
+        topList.append(xmlreader->getTop10AccelerationList());
+    }
 
-    QStringList topList;
-    topList << "1. Pertti 7,5s" << "2. Ville 10,2s";
+    else if (category == "Speed")
+    {
+        topList.append(xmlreader->getTop10SpeedList());
+    }
 
-    QAbstractItemModel *model = new StringListModel(topList);
-    ui->listViewTopList->setModel(model);
+    else if (category == "G-force")
+    {
+        topList.append(xmlreader->getTop10GforceList());
+    }
+    ui->labelTopList->setText(topList);
 }
 
 /**
@@ -176,6 +177,7 @@ void CarMainWindow::openResultView()
 }
 
 /**
+<<<<<<< HEAD:Client/carmainwindow.cpp
   *This slot function is called when the server has finished guery.
   */
 void CarMainWindow::networkResponse(QNetworkReply *reply)
@@ -210,4 +212,20 @@ void CarMainWindow::on_loginLogoutButton_clicked()
 void CarMainWindow::on_registratePushButton_clicked()
 {
     myRegistration->show();
+=======
+  *This slot function is called when ever refresh button clicked. Top-tab view.
+  */
+void CarMainWindow::on_buttonTopRefresh_clicked()
+{
+    setCategoryCompoBox();
+}
+
+/**
+  *This slot function is called when ever category combobox current index changed. Top-tab view.
+  *@param QString category
+  */
+void CarMainWindow::on_comboBoxTopCategory_currentIndexChanged(QString category)
+{
+    setListViewTopList(category);
+>>>>>>> feature/XMLreader:Client/carmainwindow.cpp
 }