fix: clear fields added with last commits; fix: changed wrong time reference for top lap
This commit is contained in:
10
training.cpp
10
training.cpp
@@ -75,6 +75,11 @@ void Training::ResetShell() {
|
|||||||
this->ui->lBestZeitShell->setText("∞");
|
this->ui->lBestZeitShell->setText("∞");
|
||||||
this->ui->lCurRoundTimeShell->setText("∞");
|
this->ui->lCurRoundTimeShell->setText("∞");
|
||||||
this->firstTimeShell = true;
|
this->firstTimeShell = true;
|
||||||
|
|
||||||
|
this->ui->lBridgeShellTop->setText("∞");
|
||||||
|
this->ui->lStraightShellTop->setText("∞");
|
||||||
|
this->ui->lCurvesShellTop->setText("∞");
|
||||||
|
this->ui->lDeltaTopTimeShell->setText("∞");
|
||||||
}
|
}
|
||||||
void Training::ResetDea() {
|
void Training::ResetDea() {
|
||||||
this->VecDea.clear();
|
this->VecDea.clear();
|
||||||
@@ -87,6 +92,11 @@ void Training::ResetDea() {
|
|||||||
|
|
||||||
this->ui->lCurRoundDea->setText("∞");
|
this->ui->lCurRoundDea->setText("∞");
|
||||||
this->firstTimeDea = true;
|
this->firstTimeDea = true;
|
||||||
|
|
||||||
|
this->ui->lBridgeDeaTop->setText("∞");
|
||||||
|
this->ui->lStraightDeaTop->setText("∞");
|
||||||
|
this->ui->lCurvesDeaTop->setText("∞");
|
||||||
|
this->ui->lDeltaTopTimeDea->setText("∞");
|
||||||
}
|
}
|
||||||
void Training::Reset() {
|
void Training::Reset() {
|
||||||
this->ResetDea();
|
this->ResetDea();
|
||||||
|
|||||||
@@ -192,6 +192,16 @@ void WindowRace::prepareNextRace() {
|
|||||||
this->ui->lCurRoundTimeShell->setText("∞");
|
this->ui->lCurRoundTimeShell->setText("∞");
|
||||||
this->ui->lCurRoundDea->setText("∞");
|
this->ui->lCurRoundDea->setText("∞");
|
||||||
|
|
||||||
|
this->ui->lBridgeShell->setText("∞");
|
||||||
|
this->ui->lStraightShell->setText("∞");
|
||||||
|
this->ui->lCurvesShell->setText("∞");
|
||||||
|
this->ui->lDeltaShellTop->setText("∞");
|
||||||
|
|
||||||
|
this->ui->lBridgeDea->setText("∞");
|
||||||
|
this->ui->lStraightDea->setText("∞");
|
||||||
|
this->ui->lCurvesDea->setText("∞");
|
||||||
|
this->ui->lDeltaDeaTop->setText("∞");
|
||||||
|
|
||||||
this->VecShell.clear();
|
this->VecShell.clear();
|
||||||
this->VecDea.clear();
|
this->VecDea.clear();
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,9 @@ WindowsSettings::WindowsSettings(DataBase * db, QWidget * parent)
|
|||||||
QObject::connect(this->ui->pbSaveAndExitDauer, SIGNAL(clicked()), this,
|
QObject::connect(this->ui->pbSaveAndExitDauer, SIGNAL(clicked()), this,
|
||||||
SLOT(SaveDauerAndExitSlot()));
|
SLOT(SaveDauerAndExitSlot()));
|
||||||
|
|
||||||
|
QObject::connect(this->ui->lEMinRundenzeit, SIGNAL(textChanged(QString)),
|
||||||
|
this, SLOT(repaintMinCurLapTime()));
|
||||||
|
|
||||||
// update minimal lap time on changeing minimal sector time
|
// update minimal lap time on changeing minimal sector time
|
||||||
// QObject::connect(this->ui->lEMinTimeSec1,
|
// QObject::connect(this->ui->lEMinTimeSec1,
|
||||||
// SIGNAL(textChanged(QString)),
|
// SIGNAL(textChanged(QString)),
|
||||||
@@ -93,6 +96,12 @@ void WindowsSettings::repaintMinLapTime() {
|
|||||||
this->ui->lEMinRundenzeit->setText(QString::number(minlapTime));
|
this->ui->lEMinRundenzeit->setText(QString::number(minlapTime));
|
||||||
this->ui->lEMinRundenzeitAktRennen->setText(QString::number(minlapTime));
|
this->ui->lEMinRundenzeitAktRennen->setText(QString::number(minlapTime));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void WindowsSettings::repaintMinCurLapTime() {
|
||||||
|
|
||||||
|
this->ui->lEMinRundenzeitAktRennen->setText(
|
||||||
|
this->ui->lEMinRundenzeit->text());
|
||||||
|
}
|
||||||
void WindowsSettings::AbbrechenSlot() {
|
void WindowsSettings::AbbrechenSlot() {
|
||||||
this->close();
|
this->close();
|
||||||
delete this;
|
delete this;
|
||||||
|
|||||||
@@ -1,35 +1,34 @@
|
|||||||
#ifndef WINDOWSSETTINGS_H
|
#ifndef WINDOWSSETTINGS_H
|
||||||
#define WINDOWSSETTINGS_H
|
#define WINDOWSSETTINGS_H
|
||||||
|
|
||||||
|
#include "database.h"
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include "database.h"
|
|
||||||
|
|
||||||
using std::string;
|
using std::string;
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
class WindowsSettings;
|
class WindowsSettings;
|
||||||
}
|
}
|
||||||
|
|
||||||
class WindowsSettings : public QMainWindow
|
class WindowsSettings : public QMainWindow {
|
||||||
{
|
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit WindowsSettings(DataBase *db, QWidget *parent = 0);
|
explicit WindowsSettings(DataBase * db, QWidget * parent = 0);
|
||||||
~WindowsSettings();
|
~WindowsSettings();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
Ui::WindowsSettings *ui;
|
Ui::WindowsSettings * ui;
|
||||||
string currentDateTime();
|
string currentDateTime();
|
||||||
DataBase *db;
|
DataBase * db;
|
||||||
int rennId;
|
int rennId;
|
||||||
public slots:
|
public slots:
|
||||||
void SaveDauerSlot();
|
void SaveDauerSlot();
|
||||||
void AbbrechenSlot();
|
void AbbrechenSlot();
|
||||||
void StreckeSpeichernSlot();
|
void StreckeSpeichernSlot();
|
||||||
void SaveDauerAndExitSlot();
|
void SaveDauerAndExitSlot();
|
||||||
void repaintMinLapTime();
|
void repaintMinLapTime();
|
||||||
|
void repaintMinCurLapTime();
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // WINDOWSSETTINGS_H
|
#endif // WINDOWSSETTINGS_H
|
||||||
|
|||||||
Reference in New Issue
Block a user