From 9d0dee379f15bc8aa0f92495a67a2fb3701f96ca Mon Sep 17 00:00:00 2001 From: Johannes Paehr Date: Tue, 11 Dec 2018 19:55:39 +0100 Subject: [PATCH] code cleanup --- windowrace.cpp | 4 +- windowrennliste.cpp | 104 ++++++++++++++++++++++++++++---------------- 2 files changed, 68 insertions(+), 40 deletions(-) diff --git a/windowrace.cpp b/windowrace.cpp index 3213185..ccb8eeb 100644 --- a/windowrace.cpp +++ b/windowrace.cpp @@ -38,7 +38,7 @@ WindowRace::WindowRace(DataBase * db, QWidget * parent) statement = "select minsec1, minsec2, minsec3, mindestRundenDauer from " "renndauer order by id " "DESC limit 1"; - cout << statement << endl; + // cout << statement << endl; res = db->getData(statement, 4); this->minSecTime.append(res[0][0].toInt()); this->minSecTime.append(res[0][1].toInt()); @@ -49,7 +49,7 @@ WindowRace::WindowRace(DataBase * db, QWidget * parent) QVectorHelper::minSec2 = this->minSecTime.at(1); QVectorHelper::minSec3 = this->minSecTime.at(2); QVectorHelper::minTrackTime = this->minSecTime.at(3); - cout << "Track time minimum:" << QVectorHelper::minTrackTime << endl; + // cout << "Track time minimum:" << QVectorHelper::minTrackTime << endl; firstTimeDea = true; firstTimeShell = true; diff --git a/windowrennliste.cpp b/windowrennliste.cpp index d4e5519..cbacc81 100644 --- a/windowrennliste.cpp +++ b/windowrennliste.cpp @@ -31,10 +31,11 @@ WindowRennliste::WindowRennliste(DataBase * db, QWidget * parent) rennid = this->db->getData(statement, 1); statement = "select fahrershellid, autoshellid, fahrerdeaid, autodeaid " "from aktrennen where id_rennen like " + - rennid[0][0].toStdString(); + rennid.at(0).at(0).toStdString(); this->tableData = db->getData(statement, 4); - this->ui->tWRennliste->setRowCount(this->tableData.size()); + this->ui->tWRennliste->setRowCount( + static_cast(this->tableData.size())); this->ui->tWRennliste->setColumnCount(6); QStringList header; header << "Fahrer" @@ -54,34 +55,42 @@ WindowRennliste::WindowRennliste(DataBase * db, QWidget * parent) for (unsigned int i = 0; i < tableData.size(); i++) { statement = "select name from fahrer where id like " + - tableData[i][0].toStdString(); + tableData.at(i).at(0).toStdString(); fahrer = this->db->getData(statement, 1); - this->ui->tWRennliste->setItem(i, 0, - new QTableWidgetItem(fahrer[0][0])); - this->ui->tWRennliste->item(i, 0)->setFlags(Qt::ItemIsEnabled); + this->ui->tWRennliste->setItem( + static_cast(i), 0, new QTableWidgetItem(fahrer.at(0).at(0))); + this->ui->tWRennliste->item(static_cast(i), 0) + ->setFlags(Qt::ItemIsEnabled); statement = "select name from AutoKonfiguration where id_auto like " + - tableData[i][1].toStdString() + " order by seit DESC"; + tableData.at(i).at(1).toStdString() + " order by seit DESC"; autos = this->db->getData(statement, 1); - this->ui->tWRennliste->setItem(i, 1, new QTableWidgetItem(autos[0][0])); - this->ui->tWRennliste->item(i, 1)->setFlags(Qt::ItemIsEnabled); + this->ui->tWRennliste->setItem(static_cast(i), 1, + new QTableWidgetItem(autos.at(0).at(0))); + this->ui->tWRennliste->item(static_cast(i), 1) + ->setFlags(Qt::ItemIsEnabled); - this->ui->tWRennliste->setItem(i, 2, new QTableWidgetItem()); + this->ui->tWRennliste->setItem(static_cast(i), 2, + new QTableWidgetItem()); statement = "select name from fahrer where id like " + - tableData[i][2].toStdString(); + tableData.at(i).at(2).toStdString(); fahrer = this->db->getData(statement, 1); - this->ui->tWRennliste->setItem(i, 3, - new QTableWidgetItem(fahrer[0][0])); - this->ui->tWRennliste->item(i, 3)->setFlags(Qt::ItemIsEnabled); + this->ui->tWRennliste->setItem( + static_cast(i), 3, new QTableWidgetItem(fahrer.at(0).at(0))); + this->ui->tWRennliste->item(static_cast(i), 3) + ->setFlags(Qt::ItemIsEnabled); statement = "select name from AutoKonfiguration where id_auto like " + - tableData[i][3].toStdString() + " order by seit DESC"; + tableData.at(i).at(3).toStdString() + " order by seit DESC"; autos = this->db->getData(statement, 1); - this->ui->tWRennliste->setItem(i, 4, new QTableWidgetItem(autos[0][0])); - this->ui->tWRennliste->item(i, 4)->setFlags(Qt::ItemIsEnabled); + this->ui->tWRennliste->setItem(static_cast(i), 4, + new QTableWidgetItem(autos.at(0).at(0))); + this->ui->tWRennliste->item(static_cast(i), 4) + ->setFlags(Qt::ItemIsEnabled); - this->ui->tWRennliste->setItem(i, 5, new QTableWidgetItem()); + this->ui->tWRennliste->setItem(static_cast(i), 5, + new QTableWidgetItem()); } for (int i = 0; i < 6; i++) { this->ui->tWRennliste->item(0, i)->setBackground(Qt::green); @@ -93,26 +102,30 @@ void WindowRennliste::setWindowRace(WindowRace * instance) { vector WindowRennliste::getDriverAndCarSettings() { vector vec; vec.push_back( - this->ui->tWRennliste->item(this->selectedRow + 1, 0)->text()); + this->ui->tWRennliste->item(static_cast(this->selectedRow) + 1, 0) + ->text()); vec.push_back( - this->ui->tWRennliste->item(this->selectedRow + 1, 1)->text()); + this->ui->tWRennliste->item(static_cast(this->selectedRow) + 1, 1) + ->text()); vec.push_back( - this->ui->tWRennliste->item(this->selectedRow + 1, 3)->text()); + this->ui->tWRennliste->item(static_cast(this->selectedRow) + 1, 3) + ->text()); vec.push_back( - this->ui->tWRennliste->item(this->selectedRow + 1, 4)->text()); + this->ui->tWRennliste->item(static_cast(this->selectedRow) + 1, 4) + ->text()); return vec; } vector WindowRennliste::getDriverAndCarId() { // shellFahrer shellAuto deaFahrer deaAuto - return this->tableData[this->selectedRow]; + return this->tableData.at(this->selectedRow); } void WindowRennliste::setBesttime(int shell, int dea) { - this->ui->tWRennliste->item(this->selectedRow, 2) + this->ui->tWRennliste->item(static_cast(this->selectedRow), 2) ->setText(QString::number(shell / 1000.0)); - this->ui->tWRennliste->item(this->selectedRow, 5) + this->ui->tWRennliste->item(static_cast(this->selectedRow), 5) ->setText(QString::number(dea / 1000.0)); - // std::cout << this->selectedRow << std::endl; + // std::cout << static_cast(this->selectedRow) << std::endl; } void WindowRennliste::listClick(const QModelIndex & index) { @@ -150,19 +163,27 @@ void WindowRennliste::schliessen() { void WindowRennliste::setSelection(int row) { for (int i = 0; i < 6; i++) { - this->ui->tWRennliste->item(this->selectedRow, i) + this->ui->tWRennliste->item(static_cast(this->selectedRow), i) ->setBackground(Qt::yellow); } - this->selectedRow = row; + this->selectedRow = static_cast(row); for (int i = 0; i < 6; i++) { this->ui->tWRennliste->item(row, i)->setBackground(Qt::green); } this->sendIds(); vector vec; - vec.push_back(this->ui->tWRennliste->item(this->selectedRow, 0)->text()); - vec.push_back(this->ui->tWRennliste->item(this->selectedRow, 1)->text()); - vec.push_back(this->ui->tWRennliste->item(this->selectedRow, 3)->text()); - vec.push_back(this->ui->tWRennliste->item(this->selectedRow, 4)->text()); + vec.push_back( + this->ui->tWRennliste->item(static_cast(this->selectedRow), 0) + ->text()); + vec.push_back( + this->ui->tWRennliste->item(static_cast(this->selectedRow), 1) + ->text()); + vec.push_back( + this->ui->tWRennliste->item(static_cast(this->selectedRow), 3) + ->text()); + vec.push_back( + this->ui->tWRennliste->item(static_cast(this->selectedRow), 4) + ->text()); this->instanceWindowRace->setDriverAndCar(vec); } void WindowRennliste::sendIds() { @@ -172,9 +193,12 @@ void WindowRennliste::sendIds() { void WindowRennliste::changeSelection() { if (this->selectedRow + 1 < this->tableData.size()) { for (unsigned int i = 0; i < 6; i++) { - this->ui->tWRennliste->item(this->selectedRow, i) + this->ui->tWRennliste + ->item(static_cast(this->selectedRow), static_cast(i)) ->setBackground(Qt::gray); - this->ui->tWRennliste->item(this->selectedRow + 1, i) + this->ui->tWRennliste + ->item(static_cast(this->selectedRow) + 1, + static_cast(i)) ->setBackground(Qt::green); } this->selectedRow += 1; @@ -182,13 +206,17 @@ void WindowRennliste::changeSelection() { vector vec; vec.push_back( - this->ui->tWRennliste->item(this->selectedRow, 0)->text()); + this->ui->tWRennliste->item(static_cast(this->selectedRow), 0) + ->text()); vec.push_back( - this->ui->tWRennliste->item(this->selectedRow, 1)->text()); + this->ui->tWRennliste->item(static_cast(this->selectedRow), 1) + ->text()); vec.push_back( - this->ui->tWRennliste->item(this->selectedRow, 3)->text()); + this->ui->tWRennliste->item(static_cast(this->selectedRow), 3) + ->text()); vec.push_back( - this->ui->tWRennliste->item(this->selectedRow, 4)->text()); + this->ui->tWRennliste->item(static_cast(this->selectedRow), 4) + ->text()); this->instanceWindowRace->setDriverAndCar(vec); } }