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

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

@@ -2,11 +2,13 @@ package seng302.Controllers;
 
 
 import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.beans.property.StringProperty;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.canvas.GraphicsContext;
+import javafx.scene.control.Label;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.PropertyValueFactory;
@@ -34,6 +36,9 @@ public class RaceController extends Controller{
 
     ResizableRaceCanvas raceMap;
 
+    @FXML
+    Label timer;
+
     @FXML
     TableView boatInfoTable;
     @FXML
@@ -124,5 +129,12 @@ public class RaceController extends Controller{
 
     }
 
+    public void setTimer(String time){
+        timer.setText(time);
+    }
+
+
+
+
 
 }

src/main/java/seng302/Model/Race.java

@@ -1,6 +1,8 @@
 package seng302.Model;
 
 
+import javafx.application.Platform;
+import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableArray;
 import javafx.collections.ObservableList;
@@ -19,6 +21,7 @@ public abstract class Race implements Runnable {
     protected ArrayList<Leg> legs;
     protected RaceController controller;
     protected int boatsFinished = 0;
+    protected long totalTimeElapsed;
 
 
     private int SLEEP_TIME = 100; //time in milliseconds to pause in a paced loop
@@ -70,6 +73,26 @@ public abstract class Race implements Runnable {
     }
 
 
+    private String calcTimer() {
+        long minutes;
+        long currentTimeInSeconds;
+        long remainingSeconds;
+        long hours;
+
+        currentTimeInSeconds = totalTimeElapsed / 1000;
+        minutes = currentTimeInSeconds / 60;
+        remainingSeconds = currentTimeInSeconds % 60;
+        hours = minutes/60;
+        return String.format("%02d:%02d:%02d", hours, minutes, remainingSeconds);
+    }
+
+    private void updateTime(String time){
+
+        Platform.runLater(() -> {controller.setTimer(time);});
+    }
+
+
+
     /**
      * Starts the Race Simulation, playing the race start to finish with the timescale.
      * This prints the boats participating, the order that the events occur in time order, and the respective information of the events.
@@ -77,23 +100,15 @@ public abstract class Race implements Runnable {
     private void simulateRace() {
 
         long timeRaceStarted = System.currentTimeMillis();
-        long totalTimeElapsed;
 
         long timeLoopStarted;
         long timeLoopEnded;
-        long minutes;
-        long currentTimeInSeconds;
-        long remainingSeconds;
 
 
         while (boatsFinished < startingBoats.size()) {
             timeLoopStarted = System.currentTimeMillis();
             totalTimeElapsed = System.currentTimeMillis() - timeRaceStarted;
-            long currentTime = System.currentTimeMillis() - timeRaceStarted;
+
-            currentTimeInSeconds = currentTime / 1000;
-            minutes = currentTimeInSeconds / 60;
-            remainingSeconds = currentTimeInSeconds % 60;
-            System.out.println(minutes + ":" + remainingSeconds);
 
             for (BoatInRace boat : startingBoats) {
                 if (boat != null && !boat.isFinished()) {
@@ -103,6 +118,7 @@ public abstract class Race implements Runnable {
             }
 
             controller.updateMap(startingBoats);
+            updateTime(calcTimer());
             try {
                 timeLoopEnded = System.currentTimeMillis();
                 Thread.sleep(SLEEP_TIME - (timeLoopEnded - timeLoopStarted));

src/main/resources/scenes/racepane.fxml

@@ -7,13 +7,15 @@
 
 <AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="seng302.Controllers.RaceController">
    <children>
-      <SplitPane dividerPositions="0.75" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
+      <SplitPane dividerPositions="0.75" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <items>
             <AnchorPane fx:id="canvasBase">
-            </AnchorPane>
+               <children>
+                  <Label fx:id="timer" layoutX="45.0" layoutY="146.0" text="0:0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0" />
+               </children></AnchorPane>
           <AnchorPane layoutX="450.0" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0" GridPane.columnIndex="1">
                <children>
-                  <TableView fx:id="boatInfoTable" prefHeight="400.0" prefWidth="146.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.bottomAnchor="0.0">
+                  <TableView fx:id="boatInfoTable" prefHeight="400.0" prefWidth="146.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                     <columns>
                         <TableColumn fx:id="boatPlacingColumn" prefWidth="50.0" text="Place" />
                       <TableColumn fx:id="boatTeamColumn" prefWidth="50.0" text="Team" />