added ui tweaks + fix for accepting wrong laptimes

This commit is contained in:
2017-12-26 20:26:30 +01:00
parent 8fea1a1108
commit 2a1a082a30
13 changed files with 443 additions and 149 deletions

View File

@@ -1,6 +1,11 @@
#include "qvectorhelper.h"
#include <qvector.h>
int QVectorHelper::minSec1;
int QVectorHelper::minSec2;
int QVectorHelper::minSec3;
int QVectorHelper::minTrackTime;
QVectorHelper::QVectorHelper() {
}
@@ -13,12 +18,13 @@ int QVectorHelper::getCurTime(const QVector<int> x) {
}
}
int QVectorHelper::getMinSec1(const QVector<QVector<int>> x) {
int min;
int min = 9999;
if (x.size() > 0) {
if (x.at(0).size() >= 3) {
min = getCurTime(x.at(0));
if (x.at(0).at(0) >= minSec1) {
min = x.at(0).at(0);
}
}
else {
return 9999;
@@ -29,9 +35,11 @@ int QVectorHelper::getMinSec1(const QVector<QVector<int>> x) {
}
for (int i = 1; i < x.size(); i++) {
if(x.at(i).size() >= 1){
if (x.at(i).size() >= 1) {
if (x.at(i).at(0) < min) {
min = x.at(i).at(0);
if (x.at(i).at(0) >= minSec1) {
min = x.at(i).at(0);
}
}
}
}
@@ -41,7 +49,9 @@ int QVectorHelper::getMinSec2(const QVector<QVector<int>> x) {
int min;
if (x.size() > 0) {
if (x.at(0).size() >= 3) {
min = getCurTime(x.at(1));
if (x.at(0).at(1) >= minSec2) {
min = x.at(0).at(1);
}
}
else {
return 9999;
@@ -54,7 +64,9 @@ int QVectorHelper::getMinSec2(const QVector<QVector<int>> x) {
for (int i = 1; i < x.size(); i++) {
if (x.at(0).size() >= 2) {
if (x.at(i).at(1) < min) {
min = x.at(i).at(1);
if (x.at(0).at(1) >= minSec2) {
min = x.at(i).at(1);
}
}
}
}
@@ -64,7 +76,9 @@ int QVectorHelper::getMinSec3(const QVector<QVector<int>> x) {
int min;
if (x.size() > 0) {
if (x.at(0).size() >= 3) {
min = getCurTime(x.at(2));
if (x.at(0).at(2) >= minSec3) {
min = x.at(0).at(2);
}
}
else {
return 9999;
@@ -75,9 +89,11 @@ int QVectorHelper::getMinSec3(const QVector<QVector<int>> x) {
}
for (int i = 1; i < x.size(); i++) {
if(x.at(i).size() >= 3){
if (x.at(i).size() >= 3) {
if (x.at(i).at(2) < min) {
min = x.at(i).at(2);
if (x.at(0).at(2) >= minSec3) {
min = x.at(i).at(2);
}
}
}
}
@@ -88,7 +104,9 @@ int QVectorHelper::getMin(const QVector<QVector<int>> x) {
int min;
if (x.size() > 0) {
if (x.at(0).size() >= 3) {
min = getCurTime(x.at(0));
if (getCurTime(x.at(0)) >= minTrackTime) {
min = getCurTime(x.at(0));
}
}
else {
return 9999;
@@ -99,7 +117,9 @@ int QVectorHelper::getMin(const QVector<QVector<int>> x) {
}
for (int i = 1; i < x.size(); i++) {
if (getCurTime(x.at(i)) < min) {
min = getCurTime(x.at(i));
if (getCurTime(x.at(0)) >= minTrackTime) {
min = getCurTime(x.at(i));
}
}
}
return min;