added ui tweaks + fix for accepting wrong laptimes
This commit is contained in:
56
windowrace.h
56
windowrace.h
@@ -1,17 +1,17 @@
|
||||
#ifndef WINDOWRACE_H
|
||||
#define WINDOWRACE_H
|
||||
|
||||
#include <QMainWindow>
|
||||
#include "hardwaresetup.h"
|
||||
#include "counter.h"
|
||||
#include <vector>
|
||||
#include "countdown.h"
|
||||
#include <string>
|
||||
#include "ampel.h"
|
||||
#include "countdown.h"
|
||||
#include "counter.h"
|
||||
#include "database.h"
|
||||
#include "windowrennliste.h"
|
||||
#include <QMessageBox>
|
||||
#include "hardwaresetup.h"
|
||||
#include "timemodel.h"
|
||||
#include "windowrennliste.h"
|
||||
#include <QMainWindow>
|
||||
#include <QMessageBox>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
using std::string;
|
||||
|
||||
@@ -19,52 +19,58 @@ namespace Ui {
|
||||
class WindowRace;
|
||||
}
|
||||
|
||||
class WindowRace : public QMainWindow
|
||||
{
|
||||
class WindowRace : public QMainWindow {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit WindowRace(DataBase *db, QWidget *parent = 0);
|
||||
public:
|
||||
explicit WindowRace(DataBase * db, QWidget * parent = 0);
|
||||
~WindowRace();
|
||||
void setWindowRennliste(WindowRennliste *ptrInstance);
|
||||
void setWindowRennliste(WindowRennliste * ptrInstance);
|
||||
void setDriverAndCar(vector<QString> vec);
|
||||
void setDriverAndCarId(vector<QString> vec);
|
||||
|
||||
private:
|
||||
private:
|
||||
int shellDriverId;
|
||||
int deaDriverId;
|
||||
int deaCarId;
|
||||
int shellCarId;
|
||||
|
||||
void closeEvent(QCloseEvent *event);
|
||||
void closeEvent(QCloseEvent * event);
|
||||
bool started;
|
||||
Countdown *countdown;
|
||||
HardwareSetup *Hardware;
|
||||
Ui::WindowRace *ui;
|
||||
Countdown * countdown;
|
||||
HardwareSetup * Hardware;
|
||||
Ui::WindowRace * ui;
|
||||
Counter counterShell;
|
||||
Counter counterDea;
|
||||
bool firstTimeShell;
|
||||
bool firstTimeDea;
|
||||
QVector<QVector<int>> VecShell;
|
||||
QVector<QVector<int>> VecDea;
|
||||
TimeModel *timeModelShell;
|
||||
TimeModel *timeModelDea;
|
||||
TimeModel * timeModelShell;
|
||||
TimeModel * timeModelDea;
|
||||
long getMinimum(std::vector<long> a);
|
||||
QString timeWrapper(long zahl);
|
||||
long countdownValue; //in sec
|
||||
Ampel *startAmpelThread;
|
||||
long countdownValue; // in sec
|
||||
Ampel * startAmpelThread;
|
||||
int ampelCounter;
|
||||
bool paused;
|
||||
DataBase *db;
|
||||
DataBase * db;
|
||||
bool finished;
|
||||
WindowRennliste *wRennliste;
|
||||
WindowRennliste * wRennliste;
|
||||
bool wRennlisteSeted;
|
||||
int fahrzeit;
|
||||
int renn_id;
|
||||
int minimumTime;
|
||||
QVector<int> minSecTime;
|
||||
|
||||
public slots:
|
||||
// sector top times
|
||||
int theoreticalMinShell;
|
||||
int deltaShell;
|
||||
|
||||
int theoreticalMinDea;
|
||||
int deltaDea;
|
||||
|
||||
public slots:
|
||||
void stopClicked();
|
||||
void prepareNextRace();
|
||||
void breakCounter();
|
||||
|
||||
Reference in New Issue
Block a user