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

2017-05-04 13:41:14 +12:00
parent ccd90b91d7 545ef7aa7f
commit 1f8941e37c
4 changed files with 8 additions and 5 deletions
@@ -40,6 +40,7 @@ public class StartController extends Controller implements Observer {
    @FXML private TableColumn<Boat, String> boatCodeColumn;
    @FXML private Label timeZoneTime;
    @FXML private Label timer;
+    @FXML private Label raceStatusLabel;
    @FXML private int PRERACE_TIME = 10;

    //@FXML Button fifteenMinButton;
@@ -48,6 +49,7 @@ public class StartController extends Controller implements Observer {

    private StreamedCourse raceData;
    private long timeLeft = 1;
+    private int raceStat;

    private VisualiserInput visualiserInput;

@@ -108,7 +110,9 @@ public class StartController extends Controller implements Observer {
            @Override
            public void handle(long arg0) {
                timeLeft = startTime - currentTime;
-                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);