From 411138055c1d2fa09b1c60df091a8cb5dde9d841 Mon Sep 17 00:00:00 2001 From: Toni Jussila Date: Fri, 5 Mar 2010 14:31:12 +0200 Subject: [PATCH] Development carmainwindow. More comments, rename few variables and function. --- Client/carmainwindow.cpp | 46 +++++++++++++++++++++++----------------------- Client/carmainwindow.h | 28 ++++++++++++++-------------- Client/carmainwindow.ui | 10 +++++----- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/Client/carmainwindow.cpp b/Client/carmainwindow.cpp index 4fc04f3..9b54df5 100644 --- a/Client/carmainwindow.cpp +++ b/Client/carmainwindow.cpp @@ -11,8 +11,8 @@ CarMainWindow::CarMainWindow(QWidget *parent):QMainWindow(parent), ui(new Ui::Ca measure = new MeasureDialog(); xmlreader = new XmlReader(); - initUnitCompoBox(); - initSpeedListView(); + initComboBoxStartTabUnits(); + initListViewStartTabAccelerationCategories(); myLogin = new LoginWindow(this); myRegistration = new Registration(this); @@ -50,15 +50,15 @@ void CarMainWindow::changeEvent(QEvent *e) /** *This slot function is called when ever list view is update. Start-tab view. */ -void CarMainWindow::on_listView_clicked(QModelIndex index) +void CarMainWindow::on_listViewStartTabAccelerationCategories_clicked(QModelIndex index) { QString str = index.data().toString(); QStringList list = str.split("-"); QStringList list2 = list[1].split(" "); - ui->minLineEdit->setText(list[0]); - ui->maxLineEdit->setText(list2[0]); - updateUnitCompoBox(list2[1]); + ui->lineEditStartTabMin->setText(list[0]); + ui->lineEditStartTabMax->setText(list2[0]); + updateComboBoxStartTabUnits(list2[1]); } /** @@ -80,47 +80,47 @@ void CarMainWindow::on_autoStartButton_clicked() *This slot function is called when ever list view is update. Start-tab view. *@param QString unit. */ -void CarMainWindow::updateUnitCompoBox(QString unit) +void CarMainWindow::updateComboBoxStartTabUnits(QString unit) { - ui->unitComboBox->setCurrentIndex(ui->unitComboBox->findText(unit, Qt::MatchExactly)); + ui->comboBoxStartTabUnits->setCurrentIndex(ui->comboBoxStartTabUnits->findText(unit, Qt::MatchExactly)); } /** *This function is used to init unit combobox. Start-tab view. */ -void CarMainWindow::initUnitCompoBox() +void CarMainWindow::initComboBoxStartTabUnits() { units << "km/h" << "km" << "h" << "m" << "min" << "Mile" << "Mph" << "in" << "ft" << "yrd"; - ui->unitComboBox->addItems(units); + ui->comboBoxStartTabUnits->addItems(units); } /** *This function is used to set items to unit combobox. Start-tab view. - *@param QStringlist numbers + *@param QStringlist units */ -void CarMainWindow::setUnitCompoBox(QStringList units) +void CarMainWindow::setComboBoxStartTabUnits(QStringList units) { - ui->unitComboBox->addItems(units); + ui->comboBoxStartTabUnits->addItems(units); } /** - *This function is used to init speed listview. Start-tab view. + *This function is used to init listViewStartTabAccelerationCategories. Start-tab view. */ -void CarMainWindow::initSpeedListView() +void CarMainWindow::initListViewStartTabAccelerationCategories() { - 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"; - QAbstractItemModel *model = new StringListModel(numbers); - ui->listView->setModel(model); + accelerationCategoriesStartTab << "0-40 km/h" << "0-100 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"; + QAbstractItemModel *model = new StringListModel(accelerationCategoriesStartTab); + ui->listViewStartTabAccelerationCategories->setModel(model); } /** - *This function is used to set items to speed listview. Start-tab view. - *@param QStringlist numbers + *This function is used to set items to listViewStartTabAccelerationCategories. Start-tab view. + *@param QStringlist accelerationCategoriesStartTab */ -void CarMainWindow::setSpeedListView(QStringList numbers) +void CarMainWindow::setListViewStartTabAccelerationCategories(QStringList accelerationCategoriesStartTab) { - QAbstractItemModel *model = new StringListModel(numbers); - ui->listView->setModel(model); + QAbstractItemModel *model = new StringListModel(accelerationCategoriesStartTab); + ui->listViewStartTabAccelerationCategories->setModel(model); } /** diff --git a/Client/carmainwindow.h b/Client/carmainwindow.h index c6c0963..6a1472c 100644 --- a/Client/carmainwindow.h +++ b/Client/carmainwindow.h @@ -27,9 +27,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: @@ -43,14 +43,14 @@ private: 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 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 private slots: void on_registratePushButton_clicked(); @@ -58,12 +58,12 @@ private slots: 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 }; #endif // CARMAINWINDOW_H diff --git a/Client/carmainwindow.ui b/Client/carmainwindow.ui index a7c48c1..43adb32 100644 --- a/Client/carmainwindow.ui +++ b/Client/carmainwindow.ui @@ -11,7 +11,7 @@ - CarMainWindow + Speed freak @@ -72,7 +72,7 @@ - + 0 @@ -100,7 +100,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -120,7 +120,7 @@ - + -- 1.7.9.5