From 13c5c12db3d084beb6c4a73cde625182e55c86f8 Mon Sep 17 00:00:00 2001
From: David Wu <zwu18@uclive.ac.nz>
Date: Mon, 20 Mar 2017 17:27:09 +1300
Subject: [PATCH] Added table column to display speed of each boat -BoatInRace
 now has a column to called boatSpeedColumn that displays boat

#story [17] #pair[fwy13, zwu18]
---
 src/main/java/seng302/Controllers/RaceController.java | 3 +++
 src/main/java/seng302/Model/Boat.java                 | 8 ++++++++
 src/main/resources/scenes/racepane.fxml               | 1 +
 3 files changed, 12 insertions(+)

diff --git a/src/main/java/seng302/Controllers/RaceController.java b/src/main/java/seng302/Controllers/RaceController.java
index 57f96474..317d69da 100644
--- a/src/main/java/seng302/Controllers/RaceController.java
+++ b/src/main/java/seng302/Controllers/RaceController.java
@@ -46,6 +46,8 @@ public class RaceController extends Controller{
     TableColumn<BoatInRace, String> boatTeamColumn;
     @FXML
     TableColumn<BoatInRace, String> boatMarkColumn;
+    @FXML
+    TableColumn<BoatInRace, String> boatSpeedColumn;
 
     /**
      * updates the ResizableRaceCanvas (raceMap) with most recent data
@@ -68,6 +70,7 @@ public class RaceController extends Controller{
         boatInfoTable.setItems(race.getStartingBoats());
 
         boatTeamColumn.setCellValueFactory(cellData -> cellData.getValue().getName());
+        boatSpeedColumn.setCellValueFactory(cellData -> cellData.getValue().getVelocityProp());
         boatMarkColumn.setCellValueFactory(cellData -> cellData.getValue().getCurrentLegName());
         boatPlacingColumn.setCellValueFactory(new Callback<TableColumn.CellDataFeatures<BoatInRace, String>, ObservableValue<String>>() {
             @Override
diff --git a/src/main/java/seng302/Model/Boat.java b/src/main/java/seng302/Model/Boat.java
index 12ed8279..4cd2503b 100644
--- a/src/main/java/seng302/Model/Boat.java
+++ b/src/main/java/seng302/Model/Boat.java
@@ -1,5 +1,7 @@
 package seng302.Model;
 
+import javafx.beans.property.DoubleProperty;
+import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
@@ -11,6 +13,7 @@ import java.util.ArrayList;
 public class Boat {
     private StringProperty name;
     private double velocity;
+    private StringProperty velocityProp;
     private String abbrev;
 
     /**
@@ -20,6 +23,7 @@ public class Boat {
      */
     public Boat(String name, double velocity, String abbrev){
         this.velocity = velocity;
+        this.velocityProp = new SimpleStringProperty(String.valueOf(velocity));
         this.abbrev = abbrev;
         this.name = new SimpleStringProperty(name);
     }
@@ -52,6 +56,10 @@ public class Boat {
         return getName().getValue();
     }
 
+    public StringProperty getVelocityProp() {
+        return velocityProp;
+    }
+
     public String getAbbrev() { return abbrev; }
 
 }
diff --git a/src/main/resources/scenes/racepane.fxml b/src/main/resources/scenes/racepane.fxml
index d699ff46..ed538a38 100644
--- a/src/main/resources/scenes/racepane.fxml
+++ b/src/main/resources/scenes/racepane.fxml
@@ -20,6 +20,7 @@
                         <TableColumn fx:id="boatPlacingColumn" prefWidth="50.0" text="Place" />
                       <TableColumn fx:id="boatTeamColumn" prefWidth="50.0" text="Team" />
                         <TableColumn fx:id="boatMarkColumn" prefWidth="50.0" text="Mark" />
+                        <TableColumn fx:id="boatSpeedColumn" prefWidth="75.0" text="Speed" />
                     </columns>
                   </TableView>
                </children>