johannes/Rennbahn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
Johannes Paehr
2018-12-11 19:55:39 +01:00
parent 9cfb50983a
commit 9d0dee379f
2 changed files with 68 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
windowrace.cpp
View File

@@ -38,7 +38,7 @@ WindowRace::WindowRace(DataBase * db, QWidget * parent)
statement = "select minsec1, minsec2, minsec3, mindestRundenDauer from " statement = "select minsec1, minsec2, minsec3, mindestRundenDauer from "
"renndauer order by id " "renndauer order by id "
"DESC limit 1"; "DESC limit 1";
cout << statement << endl; // cout << statement << endl;
res = db->getData(statement, 4); res = db->getData(statement, 4);
this->minSecTime.append(res[0][0].toInt()); this->minSecTime.append(res[0][0].toInt());
this->minSecTime.append(res[0][1].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::minSec2 = this->minSecTime.at(1);
QVectorHelper::minSec3 = this->minSecTime.at(2); QVectorHelper::minSec3 = this->minSecTime.at(2);
QVectorHelper::minTrackTime = this->minSecTime.at(3); QVectorHelper::minTrackTime = this->minSecTime.at(3);
cout << "Track time minimum:" << QVectorHelper::minTrackTime << endl; // cout << "Track time minimum:" << QVectorHelper::minTrackTime << endl;
firstTimeDea = true; firstTimeDea = true;
firstTimeShell = true; firstTimeShell = true;

104
windowrennliste.cpp
View File

@@ -31,10 +31,11 @@ WindowRennliste::WindowRennliste(DataBase * db, QWidget * parent)
rennid = this->db->getData(statement, 1); rennid = this->db->getData(statement, 1);
statement = "select fahrershellid, autoshellid, fahrerdeaid, autodeaid " statement = "select fahrershellid, autoshellid, fahrerdeaid, autodeaid "
"from aktrennen where id_rennen like " + "from aktrennen where id_rennen like " +
rennid[0][0].toStdString(); rennid.at(0).at(0).toStdString();
this->tableData = db->getData(statement, 4); this->tableData = db->getData(statement, 4);
this->ui->tWRennliste->setRowCount(this->tableData.size()); this->ui->tWRennliste->setRowCount(
static_cast<int>(this->tableData.size()));
this->ui->tWRennliste->setColumnCount(6); this->ui->tWRennliste->setColumnCount(6);
QStringList header; QStringList header;
header << "Fahrer" header << "Fahrer"
@@ -54,34 +55,42 @@ WindowRennliste::WindowRennliste(DataBase * db, QWidget * parent)
for (unsigned int i = 0; i < tableData.size(); i++) { for (unsigned int i = 0; i < tableData.size(); i++) {
statement = "select name from fahrer where id like " + statement = "select name from fahrer where id like " +
tableData[i][0].toStdString(); tableData.at(i).at(0).toStdString();
fahrer = this->db->getData(statement, 1); fahrer = this->db->getData(statement, 1);
this->ui->tWRennliste->setItem(i, 0, this->ui->tWRennliste->setItem(
new QTableWidgetItem(fahrer[0][0])); static_cast<int>(i), 0, new QTableWidgetItem(fahrer.at(0).at(0)));
this->ui->tWRennliste->item(i, 0)->setFlags(Qt::ItemIsEnabled); this->ui->tWRennliste->item(static_cast<int>(i), 0)
->setFlags(Qt::ItemIsEnabled);
statement = "select name from AutoKonfiguration where id_auto like " + 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); autos = this->db->getData(statement, 1);
this->ui->tWRennliste->setItem(i, 1, new QTableWidgetItem(autos[0][0])); this->ui->tWRennliste->setItem(static_cast<int>(i), 1,
this->ui->tWRennliste->item(i, 1)->setFlags(Qt::ItemIsEnabled); new QTableWidgetItem(autos.at(0).at(0)));
this->ui->tWRennliste->item(static_cast<int>(i), 1)
->setFlags(Qt::ItemIsEnabled);
this->ui->tWRennliste->setItem(i, 2, new QTableWidgetItem()); this->ui->tWRennliste->setItem(static_cast<int>(i), 2,
new QTableWidgetItem());
statement = "select name from fahrer where id like " + statement = "select name from fahrer where id like " +
tableData[i][2].toStdString(); tableData.at(i).at(2).toStdString();
fahrer = this->db->getData(statement, 1); fahrer = this->db->getData(statement, 1);
this->ui->tWRennliste->setItem(i, 3, this->ui->tWRennliste->setItem(
new QTableWidgetItem(fahrer[0][0])); static_cast<int>(i), 3, new QTableWidgetItem(fahrer.at(0).at(0)));
this->ui->tWRennliste->item(i, 3)->setFlags(Qt::ItemIsEnabled); this->ui->tWRennliste->item(static_cast<int>(i), 3)
->setFlags(Qt::ItemIsEnabled);
statement = "select name from AutoKonfiguration where id_auto like " + 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); autos = this->db->getData(statement, 1);
this->ui->tWRennliste->setItem(i, 4, new QTableWidgetItem(autos[0][0])); this->ui->tWRennliste->setItem(static_cast<int>(i), 4,
this->ui->tWRennliste->item(i, 4)->setFlags(Qt::ItemIsEnabled); new QTableWidgetItem(autos.at(0).at(0)));
this->ui->tWRennliste->item(static_cast<int>(i), 4)
->setFlags(Qt::ItemIsEnabled);
this->ui->tWRennliste->setItem(i, 5, new QTableWidgetItem()); this->ui->tWRennliste->setItem(static_cast<int>(i), 5,
new QTableWidgetItem());
} }
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
this->ui->tWRennliste->item(0, i)->setBackground(Qt::green); this->ui->tWRennliste->item(0, i)->setBackground(Qt::green);
@@ -93,26 +102,30 @@ void WindowRennliste::setWindowRace(WindowRace * instance) {
vector<QString> WindowRennliste::getDriverAndCarSettings() { vector<QString> WindowRennliste::getDriverAndCarSettings() {
vector<QString> vec; vector<QString> vec;
vec.push_back( vec.push_back(
this->ui->tWRennliste->item(this->selectedRow + 1, 0)->text()); this->ui->tWRennliste->item(static_cast<int>(this->selectedRow) + 1, 0)
->text());
vec.push_back( vec.push_back(
this->ui->tWRennliste->item(this->selectedRow + 1, 1)->text()); this->ui->tWRennliste->item(static_cast<int>(this->selectedRow) + 1, 1)
->text());
vec.push_back( vec.push_back(
this->ui->tWRennliste->item(this->selectedRow + 1, 3)->text()); this->ui->tWRennliste->item(static_cast<int>(this->selectedRow) + 1, 3)
->text());
vec.push_back( vec.push_back(
this->ui->tWRennliste->item(this->selectedRow + 1, 4)->text()); this->ui->tWRennliste->item(static_cast<int>(this->selectedRow) + 1, 4)
->text());
return vec; return vec;
} }
vector<QString> WindowRennliste::getDriverAndCarId() { vector<QString> WindowRennliste::getDriverAndCarId() {
// shellFahrer shellAuto deaFahrer deaAuto // shellFahrer shellAuto deaFahrer deaAuto
return this->tableData[this->selectedRow]; return this->tableData.at(this->selectedRow);
} }
void WindowRennliste::setBesttime(int shell, int dea) { void WindowRennliste::setBesttime(int shell, int dea) {
this->ui->tWRennliste->item(this->selectedRow, 2) this->ui->tWRennliste->item(static_cast<int>(this->selectedRow), 2)
->setText(QString::number(shell / 1000.0)); ->setText(QString::number(shell / 1000.0));
this->ui->tWRennliste->item(this->selectedRow, 5) this->ui->tWRennliste->item(static_cast<int>(this->selectedRow), 5)
->setText(QString::number(dea / 1000.0)); ->setText(QString::number(dea / 1000.0));
// std::cout << this->selectedRow << std::endl; // std::cout << static_cast<int>(this->selectedRow) << std::endl;
} }
void WindowRennliste::listClick(const QModelIndex & index) { void WindowRennliste::listClick(const QModelIndex & index) {
@@ -150,19 +163,27 @@ void WindowRennliste::schliessen() {
void WindowRennliste::setSelection(int row) { void WindowRennliste::setSelection(int row) {
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
this->ui->tWRennliste->item(this->selectedRow, i) this->ui->tWRennliste->item(static_cast<int>(this->selectedRow), i)
->setBackground(Qt::yellow); ->setBackground(Qt::yellow);
} }
this->selectedRow = row; this->selectedRow = static_cast<unsigned int>(row);
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
this->ui->tWRennliste->item(row, i)->setBackground(Qt::green); this->ui->tWRennliste->item(row, i)->setBackground(Qt::green);
} }
this->sendIds(); this->sendIds();
vector<QString> vec; vector<QString> vec;
vec.push_back(this->ui->tWRennliste->item(this->selectedRow, 0)->text()); vec.push_back(
vec.push_back(this->ui->tWRennliste->item(this->selectedRow, 1)->text()); this->ui->tWRennliste->item(static_cast<int>(this->selectedRow), 0)
vec.push_back(this->ui->tWRennliste->item(this->selectedRow, 3)->text()); ->text());
vec.push_back(this->ui->tWRennliste->item(this->selectedRow, 4)->text()); vec.push_back(
this->ui->tWRennliste->item(static_cast<int>(this->selectedRow), 1)
->text());
vec.push_back(
this->ui->tWRennliste->item(static_cast<int>(this->selectedRow), 3)
->text());
vec.push_back(
this->ui->tWRennliste->item(static_cast<int>(this->selectedRow), 4)
->text());
this->instanceWindowRace->setDriverAndCar(vec); this->instanceWindowRace->setDriverAndCar(vec);
} }
void WindowRennliste::sendIds() { void WindowRennliste::sendIds() {
@@ -172,9 +193,12 @@ void WindowRennliste::sendIds() {
void WindowRennliste::changeSelection() { void WindowRennliste::changeSelection() {
if (this->selectedRow + 1 < this->tableData.size()) { if (this->selectedRow + 1 < this->tableData.size()) {
for (unsigned int i = 0; i < 6; i++) { for (unsigned int i = 0; i < 6; i++) {
this->ui->tWRennliste->item(this->selectedRow, i) this->ui->tWRennliste
->item(static_cast<int>(this->selectedRow), static_cast<int>(i))
->setBackground(Qt::gray); ->setBackground(Qt::gray);
this->ui->tWRennliste->item(this->selectedRow + 1, i) this->ui->tWRennliste
->item(static_cast<int>(this->selectedRow) + 1,
static_cast<int>(i))
->setBackground(Qt::green); ->setBackground(Qt::green);
} }
this->selectedRow += 1; this->selectedRow += 1;
@@ -182,13 +206,17 @@ void WindowRennliste::changeSelection() {
vector<QString> vec; vector<QString> vec;
vec.push_back( vec.push_back(
this->ui->tWRennliste->item(this->selectedRow, 0)->text()); this->ui->tWRennliste->item(static_cast<int>(this->selectedRow), 0)
->text());
vec.push_back( vec.push_back(
this->ui->tWRennliste->item(this->selectedRow, 1)->text()); this->ui->tWRennliste->item(static_cast<int>(this->selectedRow), 1)
->text());
vec.push_back( vec.push_back(
this->ui->tWRennliste->item(this->selectedRow, 3)->text()); this->ui->tWRennliste->item(static_cast<int>(this->selectedRow), 3)
->text());
vec.push_back( vec.push_back(
this->ui->tWRennliste->item(this->selectedRow, 4)->text()); this->ui->tWRennliste->item(static_cast<int>(this->selectedRow), 4)
->text());
this->instanceWindowRace->setDriverAndCar(vec); this->instanceWindowRace->setDriverAndCar(vec);
} }
} }