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

fix: minsec-times invalid if first lap is not valid

Browse Source
This commit is contained in:
Johannes Paehr
2019-12-26 20:37:43 +01:00
parent 64c5e426b3
commit f3692fb825
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
qvectorhelper.cpp
View File

@@ -21,14 +21,14 @@ int QVectorHelper::getCurTime(const QVector<int> x) {
int QVectorHelper::getMinSec1(const QVector<QVector<int>> x) { int QVectorHelper::getMinSec1(const QVector<QVector<int>> x) {
int min = 9999; int min = 9999;
if (x.size() > 0) { if (x.size() > 0) {
if (x.at(0).size() >= 4) { for (auto vec : x) {
if (x.at(0).at(0) >= minSec1) { if (vec.size() >= 4) {
min = x.at(0).at(0); if (vec.at(0) >= minSec1) {
min = vec.at(0);
break;
}
} }
} }
else {
return 9999;
}
} }
else { else {
return 9999; return 9999;
@@ -48,14 +48,14 @@ int QVectorHelper::getMinSec1(const QVector<QVector<int>> x) {
int QVectorHelper::getMinSec2(const QVector<QVector<int>> x) { int QVectorHelper::getMinSec2(const QVector<QVector<int>> x) {
int min = 9999; int min = 9999;
if (x.size() > 0) { if (x.size() > 0) {
if (x.at(0).size() >= 3) { for (auto vec : x) {
if (x.at(0).at(1) >= minSec2) { if (vec.size() >= 3) {
min = x.at(0).at(1); if (vec.at(1) >= minSec2) {
min = vec.at(1);
break;
}
} }
} }
else {
return 9999;
}
} }
else { else {
return 9999; return 9999;
@@ -75,16 +75,17 @@ int QVectorHelper::getMinSec2(const QVector<QVector<int>> x) {
int QVectorHelper::getMinSec3(const QVector<QVector<int>> x) { int QVectorHelper::getMinSec3(const QVector<QVector<int>> x) {
int min = 9999; int min = 9999;
if (x.size() > 0) { if (x.size() > 0) {
if (x.at(0).size() >= 3) { for (auto vec : x) {
if (x.at(0).at(2) >= minSec3) { if (vec.size() >= 3) {
min = x.at(0).at(2); if (vec.at(2) >= minSec3) {
min = vec.at(2);
break;
}
} }
} }
else {
return 9999;
}
} }
else { else {
// no times set
return 9999; return 9999;
} }
@@ -104,12 +105,13 @@ int QVectorHelper::getMin(const QVector<QVector<int>> x) {
int min = 9999; int min = 9999;
if (x.size() > 0) { // at least one lap is available if (x.size() > 0) { // at least one lap is available
for(auto vec : x){ for (auto vec : x) {
if (vec.size() >= 3) { // check if 3 sectors are available if (vec.size() >= 3) { // check if 3 sectors are available
if (getCurTime(x.at(0)) >= minTrackTime && if (getCurTime(x.at(0)) >= minTrackTime &&
vec.at(0) > QVectorHelper::minSec1 && vec.at(0) > QVectorHelper::minSec1 &&
vec.at(1) > QVectorHelper::minSec2 && vec.at(1) > QVectorHelper::minSec2 &&
vec.at(2) > QVectorHelper::minSec3) { // check if lap is valid vec.at(2) >
QVectorHelper::minSec3) { // check if lap is valid
min = getCurTime(vec); min = getCurTime(vec);
break; break;
} }