finished implementing wildcard and failing state

ScStwLibraries/headers/scstwrace.h

@@ -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();
 

ScStwLibraries/headers/scstwtimer.h

@@ -348,7 +348,7 @@ signals:
     /*!
      * \brief Emitted when the state of the timer changed
      */
-    void stateChanged();
+    void stateChanged(TimerState state);
 
     /*!
      * \brief Emitted when the reaction time changed

ScStwLibraries/sources/scstwrace.cpp

@@ -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
@@ -438,7 +446,7 @@ void ScStwRace::handleTimerStop() {
 
     // 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,28 +454,13 @@ 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);
     }
 }
-}
 
 void ScStwRace::handleFalseStart() {
     if(this->state != STARTING && this->state != RUNNING && this->state != STOPPED)
@@ -476,7 +469,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 +489,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);

ScStwLibraries/sources/scstwtimer.cpp

@@ -84,8 +84,8 @@ void ScStwTimer::handleClimberStart(double timeOfStart) {
     qDebug() << "+ [INFO][TIMER] reaction time: " << this->reactionTime;
 
     if(this->reactionTime <= 0 && this->reactionTime > -3100){
-        this->stop(FailStop);
-        return;
+        qDebug() << "[INFO][TIMER] False Start detected: "  << "start Time: " << startTime << " reactionTime: " << reactionTime;
+        this->setState(FAILING);
     }
 
     emit this->reactionTimeChanged();
@@ -134,11 +134,6 @@ bool ScStwTimer::stop(StopReason reason, double timeOfStop) {
         }
         break;
     }
-    case FailStop: {
-        qDebug() << "[INFO][TIMER] False Start detected: "  << "start Time: " << startTime << " reactionTime: " << reactionTime;
-        this->setState(FAILED);
-        break;
-    }
     default: {
         return false;
     }
@@ -209,7 +204,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);
     }
 }