Merge remote-tracking branch 'origin/splitIntoTwoModules' into splitIntoTwoModules

# Conflicts:
#	visualiser/src/main/java/seng302/Controllers/StartController.java

visualiser/src/main/java/seng302/Controllers/RaceController.java

@@ -117,7 +117,7 @@ public class RaceController extends Controller {
      * Initializes and runs the race, based on the user's chosen scale factor
      * Currently uses an example racecourse
      *
-     * @param visualiserInput
+     * @param visualiserInput input from network
      */
     public void startRace(VisualiserInput visualiserInput) {
         StreamedRace newRace = new StreamedRace(visualiserInput, this);

visualiser/src/main/java/seng302/Controllers/StartController.java

@@ -44,12 +44,14 @@ public class StartController extends Controller implements Observer {
     @FXML private Label timer;
 
     private ZonedDateTime startingTime;
+    @FXML private Label raceStatusLabel;
 
     //@FXML Button fifteenMinButton;
 
     private RaceClock raceClock;
 
     private StreamedCourse raceData;
+    private int raceStat;
 
     private VisualiserInput visualiserInput;
 
@@ -94,6 +96,7 @@ public class StartController extends Controller implements Observer {
 
     /**
      * Countdown timer until race starts. Use PRERACE_TIME to set countdown duration.
+     * @param scaleFactor factor to scale by
      */
     protected void countdownTimer() {
         new AnimationTimer() {
@@ -101,6 +104,9 @@ public class StartController extends Controller implements Observer {
             public void handle(long arg0) {
                 ZonedDateTime currentTime = raceClock.getTime();
                 if (visualiserInput.getRaceStatus().getRaceStatus()==2) {
+                raceStat = visualiserInput.getRaceStatus().getRaceStatus();
+                raceStatusLabel.setText("Race Status: " + visualiserInput.getRaceStatus().getRaceStatus());
+                if (raceStat==2 || raceStat == 3) {
                     updateTime("Race is starting...");
                     stop();
                     parent.beginRace(visualiserInput);