Merge branch 'splitIntoTwoModules' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into splitIntoTwoModules

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

@@ -6,8 +6,10 @@ import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.layout.GridPane;
+import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 import seng302.Mock.StreamedRace;
 import seng302.Model.*;
@@ -129,7 +131,7 @@ public class RaceController extends Controller {
         raceMap.drawRaceMap();
         raceMap.setVisible(true);
 
-        canvasBase.getChildren().add(raceMap);
+        canvasBase.getChildren().add(0, raceMap);
         race.setVisible(true);
 
         //Initialize save annotation array, fps listener, and annotation listeners

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

@@ -22,10 +22,8 @@ import java.net.Socket;
 import java.net.URL;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.List;
-import java.util.Observable;
-import java.util.Observer;
-import java.util.ResourceBundle;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
 
 /**
  * Created by esa46 on 6/04/17.
@@ -35,6 +33,7 @@ public class StartController extends Controller implements Observer {
     @FXML private GridPane start;
     @FXML private AnchorPane startWrapper;
     @FXML private Label raceTitleLabel;
+    @FXML private Label raceStartLabel;
 
     @FXML private TableView<Boat> boatNameTable;
     @FXML private TableColumn<Boat, String> boatNameColumn;
@@ -103,7 +102,6 @@ public class StartController extends Controller implements Observer {
             long currentTime = System.currentTimeMillis();
             long startTime = currentTime + (PRERACE_TIME/scaleFactor);
             DateFormat timerFormat = new SimpleDateFormat("'Race Clock:' -HH:mm:ss");
-
             @Override
             public void handle(long arg0) {
                 timeLeft = startTime - currentTime;
@@ -122,7 +120,7 @@ public class StartController extends Controller implements Observer {
         }.start();
     }
 
-    protected void setRaceClock() {
+    private void setRaceClock() {
         raceClock = new RaceClock(raceData.getZonedDateTime());
         timeZoneTime.textProperty().bind(raceClock.timeStringProperty());
 
@@ -138,6 +136,20 @@ public class StartController extends Controller implements Observer {
         }.start();
     }
 
+    private void setStartingTime() {
+        String dateFormat = "'Starting time:' HH:mm dd/MM/YYYY";
+        Platform.runLater(()-> {
+            long utcTime = visualiserInput.getRaceStatus().getExpectedStartTime();
+            raceStartLabel.setText(DateTimeFormatter.ofPattern(dateFormat).format(raceClock.getLocalTime(utcTime)));
+        });
+    }
+
+    private void setCurrentTime() {
+        Platform.runLater(()->
+            raceClock.setTime(raceClock.getLocalTime(visualiserInput.getRaceStatus().getCurrentTime()))
+        );
+    }
+
     @Override
     public void update(Observable o, Object arg) {
         if(o instanceof StreamedCourse) {
@@ -148,7 +160,12 @@ public class StartController extends Controller implements Observer {
                 Platform.runLater(() -> raceTitleLabel.setText(((StreamedCourse)o).getRegattaName()));
             }
             if (((StreamedCourse) o).hasReadCourse()) {
-                Platform.runLater(() -> setRaceClock());
+                Platform.runLater(() -> {
+                    setRaceClock();
+                    while(visualiserInput.getRaceStatus() == null);
+                    setStartingTime();
+                    setCurrentTime();
+                });
             }
         }
     }