ScStw/shared-libraries
ScStw
/
shared-libraries
2
0
Fork 0
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dorian Zedler 2020-10-04 17:27:44 +02:00
parent 67c1dd6a25 80aae3b22a
commit 0cd1cc0484
Signed by: dorian
GPG Key ID: D3B255CB8BC7CD37
4 changed files with 62 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ScStwLibraries/headers/scstwrace.h
View File

@ -131,17 +131,19 @@ public slots:
protected slots:
private slots:
void handleTimerStateChange();
void handleTimerWantsToBeDisabledChange(ScStwTimer* timer, bool wantsToBeDisabled);
void handleFalseStart();
bool playSoundsAndStartTimers();
ScStwSoundPlayer::PlayResult doDelayAndSoundOfCurrentStartState(double *timeOfSoundPlaybackStart = nullptr);
void technicalIncident();
void handleTimerStateChange(ScStwTimer::TimerState newState);
/**
* \brief Function to declare the winner and looser timers after a timer has been stopped
*/
void handleTimerStop();
void handleFalseStart();
void handleTimerWantsToBeDisabledChange(ScStwTimer* timer, bool wantsToBeDisabled);
bool playSoundsAndStartTimers();
ScStwSoundPlayer::PlayResult doDelayAndSoundOfCurrentStartState(double *timeOfSoundPlaybackStart = nullptr);
void technicalIncident();
virtual void refreshCompetitionMode();

40
ScStwLibraries/headers/scstwtimer.h
View File

@ -94,17 +94,6 @@ public:
};
Q_ENUM(TimerState);
/*!
* \brief The StopReason enum contains all possible reasons for a stop
*/
enum StopReason {
ManualStop, /*!< Timer was stopped manually */
CancelStop, /*!< Timer was cancelled */
FailStop, /*!< A false start occured */
TopPadStop, /*!< Timer was stopped by a physical trigger (eg. a ScStwExtension) */
TechnicalIncidentStop /*!< The timer was stopped due to a technical incident */
};
/*!
* \brief The ReadyStatus enum contains all possible reasons for a timer not to be ready (>0) and the case that it is ready (0)
*/
@ -283,33 +272,6 @@ protected slots:
*/
void handleClimberStart(double timeOfStart);
/*!
* \brief Function to stop the timer at a given point in time (past or future)
*
* To do this, the timer has to be in ScStwTimer::RUNNING state!
*
* \param reason reason for the timer stop
* \param timeOfStop the point in time (msecs since epoch) when the timer is supposted to be stopped
*
* \return false if the timer was not in the required state and therefore not stopped, true otherwise
*
* \see ScStwTimer::StopReason
*/
virtual bool stop(StopReason reason, double timeOfStop);
/*!
* \brief Function to stop the timer
*
* To do this, the timer has to be in ScStwTimer::RUNNING state!
*
* \param reason reason for the timer stop
*
* \return false if the timer was not in the required state and therefore not stopped, true otherwise
*
* \see ScStwTimer::StopReason
*/
bool stop(StopReason reason);
/*!
* \brief Function to change the state of the timer
*
@ -348,7 +310,7 @@ signals:
/*!
* \brief Emitted when the state of the timer changed
*/
void stateChanged();
void stateChanged(TimerState state);
/*!
* \brief Emitted when the reaction time changed

41
ScStwLibraries/sources/scstwrace.cpp
View File

@ -405,7 +405,15 @@ void ScStwRace::setState(RaceState newState) {
}
}
void ScStwRace::handleTimerStateChange() {
void ScStwRace::handleTimerStateChange(ScStwTimer::TimerState newState) {
if(
newState == ScStwTimer::WON ||
newState == ScStwTimer::LOST ||
newState == ScStwTimer::WILDCARD ||
newState == ScStwTimer::FAILED
)
return;
qDebug() << "[INFO][MAIN] handling timer state change";
// check if the race is over
@ -432,13 +440,15 @@ void ScStwRace::handleTimerStop() {
if(this->state != RUNNING)
return;
qDebug() << "[INFO][RACE] Got a TIMER STOP";
// find out which timer has won
double lowestStoppedTime = -1;
QList<ScStwTimer *> timersWhichHaveWon;
// iterate through all timers and find the lowest time that was stopped
foreach(ScStwTimer * timer, this->timers) {
if(timer->getCurrentTime() > 0 && (timer->getCurrentTime() <= lowestStoppedTime || lowestStoppedTime < 0)) {
if(timer->getCurrentTime() <= lowestStoppedTime || lowestStoppedTime < 0) {
// this is the timer with the lowest stopped time
lowestStoppedTime = timer->getCurrentTime();
}
@ -446,26 +456,11 @@ void ScStwRace::handleTimerStop() {
// append the timer(s) with the lowest stopped time to the winner list
foreach(ScStwTimer * timer, this->timers) {
if(timer->getCurrentTime() > 0
&& (timer->getCurrentTime() <= lowestStoppedTime || lowestStoppedTime < 0)
&& timer->getState() != ScStwTimer::RUNNING
) {
if(timer->getCurrentTime() <= lowestStoppedTime)
// this is the timer with the lowest stopped time
timersWhichHaveWon.append(timer);
}
}
// update the states of all timers
foreach(ScStwTimer * timer, this->timers) {
if(timer->getState() == ScStwTimer::RUNNING)
continue;
if(timersWhichHaveWon.contains(timer)) {
timer->setResult(ScStwTimer::WON);
}
else {
else
timer->setResult(ScStwTimer::LOST);
}
}
}
@ -476,7 +471,7 @@ void ScStwRace::handleFalseStart() {
qDebug() << "[INFO][RACE] Got a FALSE START";
// set lowest to a value that is impossible to reach (start tone is only 3100ms long)
int lowestReactionTime = -4000;
double lowestReactionTime = -4000;
// iterate through all timers and find the lowest reactiontime that was stopped
foreach(ScStwTimer *timer, this->timers) {
@ -496,15 +491,19 @@ void ScStwRace::handleFalseStart() {
// no timer has failed
return;
qDebug() << "LOWEST reaction time is: " << lowestReactionTime;
// find out which timer(s) have lost and which get a wildcard
foreach(ScStwTimer * timer, this->timers) {
qDebug() << "THIS TIMERS reaction time is: " << lowestReactionTime;
if(
timer->getState() >= ScStwTimer::FAILING &&
timer->getState() <= ScStwTimer::FAILED &&
timer->getCurrentTime() <= lowestReactionTime
timer->getReactionTime() == lowestReactionTime
) {
// this is the timer with the lowest stopped time
timer->setResult(ScStwTimer::FAILED);
qDebug() << "FOUND BAD TIMER";
}
else {
timer->setResult(ScStwTimer::WILDCARD);

73
ScStwLibraries/sources/scstwtimer.cpp
View File

@ -83,9 +83,9 @@ void ScStwTimer::handleClimberStart(double timeOfStart) {
this->reactionTime = timeOfStart - this->startTime;
qDebug() << "+ [INFO][TIMER] reaction time: " << this->reactionTime;
if(this->reactionTime <= 0 && this->reactionTime > -3100){
this->stop(FailStop);
return;
if(this->reactionTime <= 0 && this->reactionTime){
qDebug() << "[INFO][TIMER] False Start detected: " << "start Time: " << startTime << " reactionTime: " << reactionTime;
this->setState(FAILING);
}
emit this->reactionTimeChanged();
@ -109,63 +109,56 @@ bool ScStwTimer::stop() {
}
bool ScStwTimer::stop(double timeOfStop) {
return this->stop(ManualStop, timeOfStop);
}
bool ScStwTimer::stop(StopReason reason) {
return this->stop(reason, QDateTime::currentMSecsSinceEpoch());
}
bool ScStwTimer::stop(StopReason reason, double timeOfStop) {
if(this->state != STARTING && this->state != WILDCARD && this->state != RUNNING && this->state != WAITING){
if(this->state != RUNNING)
return false;
}
switch (reason) {
case ManualStop: {
if(this->state == STARTING){
this->setState(CANCELLED);
}
else {
this->stopTime = timeOfStop;
this->stopTime = timeOfStop;
// trigger an external state refresh to set the state to either WON or LOST depending on the other timers values (see ScStwRace::refreshTimerStates())
this->setState(WAITING);
}
break;
}
case FailStop: {
qDebug() << "[INFO][TIMER] False Start detected: " << "start Time: " << startTime << " reactionTime: " << reactionTime;
this->setState(FAILED);
break;
}
default: {
return false;
}
}
// trigger an external state refresh to set the state to either WON or LOST depending on the other timers values (see ScStwRace::refreshTimerStates())
this->setState(WAITING);
qDebug() << "[INFO][TIMER] Stopped: " << "start Time: " << startTime << " stopTime: " << stopTime << " stoppedTime: " << this->getCurrentTime() << " reactionTime: " << reactionTime;
return true;
}
bool ScStwTimer::setResult(TimerState result) {
if(this->state != FAILING && this->state != WAITING && this->state != STARTING)
QList<ScStwTimer::TimerState> allowedStates = {
STARTING,
RUNNING,
WAITING,
WON,
FAILING,
FAILED
};
if(!allowedStates.contains(this->state))
return false;
/* The reasons why it has to accept all these states:
*
* STARTING: To set a timer to WILDCARD when its opponent has done a false start
* RUNNING: To set a timer to WILDCARD when its opponent has done a false start that was received with a delay
* WAITING: To set a timer to either WON or LOST
* WON: To set a timer to LOST when its opponent has won the race but their trigger was delayed
* FAILING: To set a timer to either FAILED or WILDCARD
* FAILED: To set a timer to WILDCARD when its opponent did an earlier false start but their tirgger was delayed
*/
switch (result) {
case WON:
case LOST:
if(this->state == WAITING) {
case WON:
if(this->state == WAITING || this->state == WON) {
this->setState(result);
return true;
}
break;
case WILDCARD:
if(this->state == STARTING) {
case FAILED:
if(this->state == STARTING || this->state == RUNNING || this->state == FAILED) {
this->setState(WILDCARD);
return true;
}
case FAILED:
if(this->state == FAILING) {
this->setState(result);
return true;
@ -209,7 +202,7 @@ void ScStwTimer::setState(TimerState newState){
if(this->state != newState) {
this->state = newState;
qDebug() << "[INFO][TIMER] timer state changed: " << newState;
emit this->stateChanged();
emit this->stateChanged(newState);
}
}