From eea394372fe93cc10a7f55acd573da1d6892169e Mon Sep 17 00:00:00 2001
From: zwu18 <zwu18@uclive.ac.nz>
Date: Tue, 19 Sep 2017 18:23:45 +1200
Subject: [PATCH 01/10] Race is now showing a speedometer in the bottom right
 corner. Next step is to update with speed of boat and improve appearance. 
 #story[1311]

---
 racevisionGame/pom.xml                        |  6 ++++
 .../Controllers/RaceViewController.java       | 14 ++++++++++
 .../visualiser/scenes/newRaceView.fxml        | 13 +++++++--
 .../resources/visualiser/scenes/raceView.fxml | 28 +++++++++----------
 .../resources/visualiser/scenes/title.fxml    |  7 ++++-
 5 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/racevisionGame/pom.xml b/racevisionGame/pom.xml
index 98ccaf82..444d727a 100644
--- a/racevisionGame/pom.xml
+++ b/racevisionGame/pom.xml
@@ -29,6 +29,12 @@
             <version>2.9.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>eu.hansolo</groupId>
+            <artifactId>Medusa</artifactId>
+            <version>7.9</version>
+        </dependency>
+
         <!-- Maven Dependencies block START-->
         <dependency>
             <groupId>net.bytebuddy</groupId>
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index c2153c1f..c252a646 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -1,6 +1,8 @@
 package visualiser.Controllers;
 
 import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
+import eu.hansolo.medusa.Gauge;
+import eu.hansolo.medusa.GaugeBuilder;
 import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
@@ -93,6 +95,7 @@ public class RaceViewController extends Controller {
     private @FXML Label tutorialText;
     private @FXML AnchorPane infoWrapper;
     private @FXML AnchorPane lineChartWrapper;
+    private @FXML StackPane speedPane;
 
     /**
      * Displays a specified race.
@@ -200,6 +203,16 @@ public class RaceViewController extends Controller {
         });
     }
 
+    /**
+     * Create speedometer
+     */
+    private void initialiseSpeedometer() {
+        Gauge gauge = GaugeBuilder.create().title("Speedometer").subTitle("Speed").unit("Knots").build();
+        gauge.valueProperty().setValue(100);
+        speedPane.getChildren().add(gauge);
+
+    }
+
     /**
      * Initialises the various UI components to listen to the {@link #visualiserRace}.
      */
@@ -222,6 +235,7 @@ public class RaceViewController extends Controller {
         initialiseInfoTable();
         initialiseView3D(this.visualiserRace);
         initialiseRaceClock();
+        initialiseSpeedometer();
         raceTimer();    // start the timer
         new Sparkline(this.raceState, this.sparklineChart);
         timeZone.setText(this.raceState.getRaceClock().getTimeZone());
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
index 76195416..6387d79b 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.chart.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.chart.LineChart?>
 <?import javafx.scene.chart.NumberAxis?>
@@ -22,7 +28,7 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.text.Font?>
 
-<SplitPane fx:id="racePane" prefHeight="431.0" prefWidth="610.0" visible="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController">
+<SplitPane fx:id="racePane" prefHeight="431.0" prefWidth="610.0" visible="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController">
     <items>
         <StackPane fx:id="newPane" prefHeight="150.0" prefWidth="200.0">
             <children>
@@ -79,7 +85,7 @@
                                 </Accordion>
                             </children>
                         </Pane>
-                        <Label fx:id="timer" maxHeight="20.0" text="0:0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
+                        <Label fx:id="timer" alignment="CENTER" maxHeight="20.0" text="0:0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                             <font>
                                 <Font name="System Bold" size="15.0" />
                             </font>
@@ -89,7 +95,7 @@
                                 <Font name="System Bold" size="15.0" />
                             </font>
                         </Label>
-                        <Label fx:id="timeZone" text="Label" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
+                        <Label fx:id="timeZone" text="Label" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
                             <font>
                                 <Font name="System Bold" size="15.0" />
                             </font>
@@ -103,6 +109,7 @@
                             </children>
                         </StackPane>
                         <Label fx:id="tutorialText" alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" style="-fx-border-color: orange; -fx-border-radius: 5px; -fx-background-color: #ffffcc; -fx-text-fill: #3399ff; -fx-border-width: 3; -fx-border-insets: -3;" text="This is the tutorial text" visible="false" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="150.0" AnchorPane.topAnchor="100.0" />
+                  <StackPane fx:id="speedPane" prefHeight="150.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0" />
                     </children>
                 </AnchorPane>
               <AnchorPane fx:id="infoWrapper" focusTraversable="true" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0" visible="false">
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml b/racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
index c4180e76..8b8148a8 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/raceView.fxml
@@ -28,11 +28,7 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.text.Font?>
 
-<SplitPane fx:id="racePane" dividerPositions="1.0" prefHeight="431.0"
-           prefWidth="610.0" visible="true" AnchorPane.bottomAnchor="0.0"
-           AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0"
-           AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8.0.65"
-           xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController">
+<SplitPane fx:id="racePane" dividerPositions="1.0" prefHeight="431.0" prefWidth="610.0" visible="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController">
     <items>
       <StackPane fx:id="newPane" prefHeight="150.0" prefWidth="200.0">
          <children>
@@ -89,17 +85,27 @@
                               </Accordion>
                           </children>
                       </Pane>
-                      <Label fx:id="timer" maxHeight="20.0" text="0:0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
+                      <StackPane fx:id="arrowPane" alignment="TOP_RIGHT" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                          <children>
+                              <fx:include fx:id="arrow" source="arrow.fxml" />
+                          </children>
+                      </StackPane>
+                  <Label fx:id="tutorialText" alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" style="-fx-border-color: orange; -fx-border-radius: 5px; -fx-background-color: #ffffcc; -fx-text-fill: #3399ff; -fx-border-width: 3; -fx-border-insets: -3;" text="This is the tutorial text" visible="false" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="150.0" AnchorPane.topAnchor="100.0" />
+                  <StackPane fx:id="speedPane" prefHeight="150.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
+                     <children>
+                        <Label text="HELLO!" />
+                     </children></StackPane>
+                      <Label fx:id="timer" alignment="CENTER" maxHeight="20.0" text="0:0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                           <font>
                               <Font name="System Bold" size="15.0" />
                           </font>
                       </Label>
-                      <Label fx:id="FPS" text="FPS: 0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0">
+                      <Label fx:id="FPS" text="FPS: 000" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
                           <font>
                               <Font name="System Bold" size="15.0" />
                           </font>
                       </Label>
-                      <Label fx:id="timeZone" text="Label" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
+                      <Label fx:id="timeZone" layoutX="8.0" layoutY="-6.0" text="Label" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0">
                           <font>
                               <Font name="System Bold" size="15.0" />
                           </font>
@@ -107,12 +113,6 @@
                         <Insets bottom="20.0" />
                      </padding>
                       </Label>
-                      <StackPane fx:id="arrowPane" alignment="TOP_RIGHT" mouseTransparent="true" prefHeight="150.0" prefWidth="150.0" snapToPixel="false" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                          <children>
-                              <fx:include fx:id="arrow" source="arrow.fxml" />
-                          </children>
-                      </StackPane>
-                  <Label fx:id="tutorialText" alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" style="-fx-border-color: orange; -fx-border-radius: 5px; -fx-background-color: #ffffcc; -fx-text-fill: #3399ff; -fx-border-width: 3; -fx-border-insets: -3;" text="This is the tutorial text" visible="false" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="150.0" AnchorPane.topAnchor="100.0" />
                </children>
             </AnchorPane>
          </children>
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/title.fxml b/racevisionGame/src/main/resources/visualiser/scenes/title.fxml
index 8334fd5c..49881e38 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/title.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/title.fxml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.RadioButton?>
@@ -13,7 +18,7 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane fx:id="titleWrapper" maxHeight="600.0" maxWidth="800.0" minHeight="600.0" minWidth="800.0" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.TitleController">
+<AnchorPane fx:id="titleWrapper" maxHeight="600.0" maxWidth="800.0" minHeight="600.0" minWidth="800.0" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.TitleController">
    <children>
       <GridPane layoutY="39.0" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500.0" prefWidth="800.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <columnConstraints>

From 201b9f00515838bf0cfdc42bb3386d0c5a2ddb54 Mon Sep 17 00:00:00 2001
From: zwu18 <zwu18@uclive.ac.nz>
Date: Tue, 19 Sep 2017 21:10:48 +1200
Subject: [PATCH 02/10] Linked users boat speed up with speedometer UI. 
 #story[1311]

---
 .../Controllers/RaceViewController.java       | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index c252a646..d11e8c54 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -1,8 +1,7 @@
 package visualiser.Controllers;
 
 import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
-import eu.hansolo.medusa.Gauge;
-import eu.hansolo.medusa.GaugeBuilder;
+import eu.hansolo.medusa.*;
 import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
@@ -67,6 +66,8 @@ public class RaceViewController extends Controller {
     private String keyToPress;
     private View3D view3D;
     private ObservableList<Subject3D> viewSubjects;
+    private Gauge gauge;
+    private FGauge fGauge;
 
     /**
      * Arrow pointing to next mark in third person
@@ -207,9 +208,24 @@ public class RaceViewController extends Controller {
      * Create speedometer
      */
     private void initialiseSpeedometer() {
-        Gauge gauge = GaugeBuilder.create().title("Speedometer").subTitle("Speed").unit("Knots").build();
-        gauge.valueProperty().setValue(100);
-        speedPane.getChildren().add(gauge);
+        gauge = GaugeBuilder.create().title("Speedometer").subTitle("Speed").unit("Knots").skinType(Gauge.SkinType.FLAT).build();
+        gauge.setValueColor(Color.WHITE);
+        gauge.setTitleColor(Color.WHITE);
+        gauge.setSubTitleColor(Color.WHITE);
+        gauge.setBarColor(Color.WHITE);
+        gauge.setUnitColor(Color.WHITE);
+        gauge.setMaxValue(40);
+        fGauge = FGaugeBuilder.create()
+                .gauge(gauge)
+                .gaugeDesign(GaugeDesign.METAL)
+                .gaugeBackground(GaugeDesign.GaugeBackground.CARBON)
+                .foregroundVisible(true)
+                .build();
+        gauge.valueProperty().setValue(0);
+        gauge.setAnimated(true);
+        //fGauge.getGauge().valueProperty().setValue(0);
+        //fGauge.getGauge().maxValueProperty().setValue(50);
+        speedPane.getChildren().add(fGauge);
 
     }
 
@@ -623,6 +639,12 @@ public class RaceViewController extends Controller {
                     }
                 } else {
                     boatInfoTable.sort();
+
+                    try {
+                        gauge.setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
+                    } catch (BoatNotFoundException e) {
+                        e.printStackTrace();
+                    }
                 }
 
                 //Return to main screen if we lose connection.
@@ -639,6 +661,7 @@ public class RaceViewController extends Controller {
         }.start();
     }
 
+
     /**
      * toggles if the info table is shown
      */

From be9feff6fd1b8542bb779985fc246a50289545de Mon Sep 17 00:00:00 2001
From: zwu18 <zwu18@uclive.ac.nz>
Date: Tue, 19 Sep 2017 21:39:40 +1200
Subject: [PATCH 03/10] Layout changes to speedometer UI.  #story[1311]

---
 .../visualiser/Controllers/RaceViewController.java    | 11 ++++++++++-
 .../main/resources/visualiser/scenes/newRaceView.fxml |  7 +++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index d11e8c54..9931a412 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -2,6 +2,7 @@ package visualiser.Controllers;
 
 import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
 import eu.hansolo.medusa.*;
+import eu.hansolo.medusa.events.UpdateEvent;
 import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
@@ -97,6 +98,7 @@ public class RaceViewController extends Controller {
     private @FXML AnchorPane infoWrapper;
     private @FXML AnchorPane lineChartWrapper;
     private @FXML StackPane speedPane;
+    private @FXML AnchorPane raceAnchorPane;
 
     /**
      * Displays a specified race.
@@ -106,6 +108,7 @@ public class RaceViewController extends Controller {
      * @param isHost           is user a host
      */
     public void startRace(VisualiserRaceEvent visualiserRace, ControllerClient controllerClient, Boolean isHost) {
+
         this.visualiserRace = visualiserRace;
         this.raceState = visualiserRace.getVisualiserRaceState();
         this.controllerClient = controllerClient;
@@ -208,7 +211,7 @@ public class RaceViewController extends Controller {
      * Create speedometer
      */
     private void initialiseSpeedometer() {
-        gauge = GaugeBuilder.create().title("Speedometer").subTitle("Speed").unit("Knots").skinType(Gauge.SkinType.FLAT).build();
+        gauge = GaugeBuilder.create().prefSize(200, 200).title("Speedometer").subTitle("Speed").unit("Knots").skinType(Gauge.SkinType.FLAT).build();
         gauge.setValueColor(Color.WHITE);
         gauge.setTitleColor(Color.WHITE);
         gauge.setSubTitleColor(Color.WHITE);
@@ -216,6 +219,7 @@ public class RaceViewController extends Controller {
         gauge.setUnitColor(Color.WHITE);
         gauge.setMaxValue(40);
         fGauge = FGaugeBuilder.create()
+                .prefSize(200, 200)
                 .gauge(gauge)
                 .gaugeDesign(GaugeDesign.METAL)
                 .gaugeBackground(GaugeDesign.GaugeBackground.CARBON)
@@ -642,6 +646,11 @@ public class RaceViewController extends Controller {
 
                     try {
                         gauge.setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
+                        for (VisualiserBoat boat : boatInfoTable.getItems()){
+                            if(raceState.getPlayerBoatID()==boat.getSourceID()){
+                                gauge.setTitle("Position: " + boatInfoTable.getItems().indexOf(boat)+1);
+                            }
+                        }
                     } catch (BoatNotFoundException e) {
                         e.printStackTrace();
                     }
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
index 6387d79b..6f031156 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
@@ -32,7 +32,7 @@
     <items>
         <StackPane fx:id="newPane" prefHeight="150.0" prefWidth="200.0">
             <children>
-                <AnchorPane focusTraversable="true">
+                <AnchorPane fx:id="raceAnchorPane" focusTraversable="true">
                     <children>
                         <GridPane fx:id="canvasBase" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                             <columnConstraints>
@@ -109,7 +109,10 @@
                             </children>
                         </StackPane>
                         <Label fx:id="tutorialText" alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" style="-fx-border-color: orange; -fx-border-radius: 5px; -fx-background-color: #ffffcc; -fx-text-fill: #3399ff; -fx-border-width: 3; -fx-border-insets: -3;" text="This is the tutorial text" visible="false" AnchorPane.leftAnchor="150.0" AnchorPane.rightAnchor="150.0" AnchorPane.topAnchor="100.0" />
-                  <StackPane fx:id="speedPane" prefHeight="150.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0" />
+                  <StackPane fx:id="speedPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="20.0">
+                     <padding>
+                        <Insets right="20.0" />
+                     </padding></StackPane>
                     </children>
                 </AnchorPane>
               <AnchorPane fx:id="infoWrapper" focusTraversable="true" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0" visible="false">

From 4132b6733b06eb942eecccbfc62e85efcc1bbb03 Mon Sep 17 00:00:00 2001
From: zwu18 <zwu18@uclive.ac.nz>
Date: Tue, 19 Sep 2017 21:55:38 +1200
Subject: [PATCH 04/10] Fixed small display error with current position.
 #story[1311]

---
 .../main/java/visualiser/Controllers/RaceViewController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index 9931a412..6040c946 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -648,7 +648,7 @@ public class RaceViewController extends Controller {
                         gauge.setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
                         for (VisualiserBoat boat : boatInfoTable.getItems()){
                             if(raceState.getPlayerBoatID()==boat.getSourceID()){
-                                gauge.setTitle("Position: " + boatInfoTable.getItems().indexOf(boat)+1);
+                                gauge.setTitle("Position: " + (boatInfoTable.getItems().indexOf(boat)+1));
                             }
                         }
                     } catch (BoatNotFoundException e) {

From e2ea6a5f0350164041cec30d842820c0b111bdd4 Mon Sep 17 00:00:00 2001
From: zwu18 <zwu18@uclive.ac.nz>
Date: Fri, 22 Sep 2017 02:40:54 +1200
Subject: [PATCH 05/10] Fixed issue with speedometer and sails interaction.
 #story[1311]

---
 .../Controllers/RaceViewController.java       | 250 ++++++++++++++++--
 1 file changed, 228 insertions(+), 22 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index 6040c946..67233cd6 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -1,6 +1,7 @@
 package visualiser.Controllers;
 
 import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
+import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
 import eu.hansolo.medusa.*;
 import eu.hansolo.medusa.events.UpdateEvent;
 import javafx.animation.AnimationTimer;
@@ -22,6 +23,7 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Material;
 import javafx.scene.paint.PhongMaterial;
+import javafx.scene.paint.Stop;
 import javafx.scene.shape.MeshView;
 import javafx.scene.shape.Shape3D;
 import javafx.scene.transform.Translate;
@@ -211,25 +213,199 @@ public class RaceViewController extends Controller {
      * Create speedometer
      */
     private void initialiseSpeedometer() {
-        gauge = GaugeBuilder.create().prefSize(200, 200).title("Speedometer").subTitle("Speed").unit("Knots").skinType(Gauge.SkinType.FLAT).build();
-        gauge.setValueColor(Color.WHITE);
-        gauge.setTitleColor(Color.WHITE);
-        gauge.setSubTitleColor(Color.WHITE);
-        gauge.setBarColor(Color.WHITE);
-        gauge.setUnitColor(Color.WHITE);
-        gauge.setMaxValue(40);
-        fGauge = FGaugeBuilder.create()
+//        gauge = GaugeBuilder.create().prefSize(200, 200).title("Speedometer").subTitle("Speed").unit("Knots").skinType(Gauge.SkinType.FLAT).build();
+//        gauge.setValueColor(Color.WHITE);
+//        gauge.setTitleColor(Color.WHITE);
+//        gauge.setSubTitleColor(Color.WHITE);
+//        gauge.setBarColor(Color.WHITE);
+//        gauge.setUnitColor(Color.WHITE);
+//        gauge.setMaxValue(40);
+//        fGauge = FGaugeBuilder.create()
+//                .prefSize(200, 200)
+//                .gauge(gauge)
+//                .gaugeDesign(GaugeDesign.METAL)
+//                .gaugeBackground(GaugeDesign.GaugeBackground.CARBON)
+//                .foregroundVisible(true)
+//                .build();
+//        gauge.valueProperty().setValue(0);
+//        gauge.setAnimated(true);
+//        //fGauge.getGauge().valueProperty().setValue(0);
+//        //fGauge.getGauge().maxValueProperty().setValue(50);
+//        speedPane.getChildren().add(fGauge);
+        /**
+         *  Definition of Sections that can be used for
+         *  - Sections
+         *  - Areas
+         *  - TickMarkSections
+         *  - TickLabelSections
+         *
+         *  Sections will be checked against current value if gauge.getCheckSectionsForValue == true
+         */
+        Section section1 = SectionBuilder.create()
+                .start(50)
+                .stop(75)
+                .color(Color.rgb(255, 200, 0, 0.7))
+                .onSectionEntered(sectionEvent -> System.out.println("Entered Section 1"))
+                .onSectionLeft(sectionEvent -> System.out.println("Left Section 1"))
+                .build();
+
+        Section section2 = SectionBuilder.create()
+                .start(75)
+                .stop(100)
+                .color(Color.rgb(255, 0, 0, 0.7))
+                .onSectionEntered(sectionEvent -> System.out.println("Entered Section 2"))
+                .onSectionLeft(sectionEvent -> System.out.println("Left Section 2"))
+                .build();
+
+        /**
+         *  Definition of Markers
+         *  You can attach a listener for the following event types
+         *  - MARKER_PRESSED
+         *  - MARKER_RELEASED
+         *  - MARKER_EXCEEDED
+         *  - MARKER_UNDERRUN
+         *  via the MarkerBuilder
+         *  To receive MARKER_EXCEEDED and MARKER_UNDERRUN events you have to check the
+         *  current value against each marker by calling the markers checkForValue() method
+         */
+        Marker marker1 = MarkerBuilder.create()
+                .value(25)
+                .text("Marker 1")
+                .color(Color.HOTPINK)
+                .markerType(Marker.MarkerType.DOT)
+                .onMarkerPressed(markerEvent -> System.out.println("Marker 1 pressed"))
+                .onMarkerReleased(markerEvent -> System.out.println("Marker 1 released"))
+                .build();
+
+        Marker marker2 = MarkerBuilder.create()
+                .value(75)
+                .text("Marker 2")
+                .color(Color.CYAN)
+                .markerType(Marker.MarkerType.STANDARD)
+                .onMarkerPressed(markerEvent -> System.out.println("Marker 2 pressed"))
+                .onMarkerReleased(markerEvent -> System.out.println("Marker 2 released"))
+                .build();
+
+        /**
+         *  Create the Medusa Gauge with most of it's options
+         *  Simply play with the boolean variables first to see what mean.
+         */
+        gauge = GaugeBuilder.create()
+                .prefSize(200,200)                                                                  // Set the preferred size of the control
+                // Related to Foreground Elements
+                .foregroundBaseColor(Color.WHITE)                                                   // Defines a color for title, subtitle, unit, value, tick label, tick mark, major tick mark, medium tick mark and minor tick mark
+                // Related to Title Text
+                .title("Title")                                                                     // Set the text for the title
+                // Related to Sub Title Text
+                .subTitle("SubTitle")                                                               // Set the text for the subtitle
+                // Related to Unit Text
+                .unit("Unit")                                                                       // Set the text for the unit
+                // Related to Value Text
+                .decimals(2)                                                                        // Set the number of decimals for the value/lcd text
+                // Related to LCD
+                .lcdVisible(true)                                                                   // Display a LCD instead of the plain value text
+                .lcdDesign(LcdDesign.STANDARD)                                                      // Set the design for the LCD
+                .lcdFont(LcdFont.DIGITAL_BOLD)                                                      // Set the font for the LCD (STANDARD, LCD, SLIM, DIGITAL_BOLD, ELEKTRA)
+                // Related to scale
+                .scaleDirection(Gauge.ScaleDirection.CLOCKWISE)                                           // Define the direction of the Scale (CLOCKWISE, COUNTER_CLOCKWISE)
+                .minValue(0)                                                                        // Set the start value of the scale
+                .maxValue(100)                                                                      // Set the end value of the scale
+                .startAngle(320)                                                                    // Set the start angle of your scale (bottom -> 0, direction -> CCW)
+                .angleRange(280)                                                                    // Set the angle range of your scale starting from the start angle
+                // Related to Tick Labels
+                .tickLabelDecimals(0)                                                               // Set the number of decimals for the tick labels
+                .tickLabelLocation(TickLabelLocation.INSIDE)                                        // Define wether the tick labels should be inside or outside the scale (INSIDE, OUTSIDE)
+                .tickLabelOrientation(TickLabelOrientation.ORTHOGONAL)                              // Define the orientation of the tick labels (ORTHOGONAL,  HORIZONTAL, TANGENT)
+                .onlyFirstAndLastTickLabelVisible(false)                                            // Define if only the first and last tick label should be visible
+                .tickLabelSectionsVisible(false)                                                    // Define if sections for tick labels should be visible
+                .tickLabelSections(section1, section2)                                              // Define sections to color tick labels
+                .tickLabelColor(Color.BLACK)                                                        // Define the color for tick labels (overriden by tick label sections)
+                // Related to Tick Marks
+                .tickMarkSectionsVisible(false)                                                     // Define if sections for tick marks should be visible
+                .tickMarkSections(section1, section2)                                               // Define sections to color tick marks
+                // Related to Major Tick Marks
+                .majorTickMarksVisible(true)                                                        // Define if major tick marks should be visible
+                .majorTickMarkType(TickMarkType.TRAPEZOID)                                           // Define the tick mark type for major tick marks (LINE, DOT, TRAPEZOID, TICK_LABEL)
+                // Related to Medium Tick Marks
+                .mediumTickMarksVisible(false)                                                      // Define if medium tick marks should be visible
+                .mediumTickMarkType(TickMarkType.LINE)                                              // Define the tick mark type for medium tick marks (LINE, DOT, TRAPEZOID)
+                // Related to Minor Tick Marks
+                .minorTickMarksVisible(true)                                                        // Define if minor tick marks should be visible
+                .minorTickMarkType(TickMarkType.LINE)                                               // Define the tick mark type for minor tick marks (LINE, DOT, TRAPEZOID)
+                // Related to LED
+                .ledVisible(false)                                                                  // Defines if the LED should be visible
+                .ledType(Gauge.LedType.STANDARD)                                                          // Defines the type of the LED (STANDARD, FLAT)
+                .ledColor(Color.rgb(255, 200, 0))                                                   // Defines the color of the LED
+                .ledBlinking(false)                                                                 // Defines if the LED should blink
+                // Related to Needle
+                .needleShape(Gauge.NeedleShape.ANGLED)                                                    // Defines the shape of the needle (ANGLED, ROUND, FLAT)
+                .needleSize(Gauge.NeedleSize.STANDARD)                                                    // Defines the size of the needle (THIN, STANDARD, THICK)
+                .needleColor(Color.CRIMSON)                                                         // Defines the color of the needle
+                // Related to Needle behavior
+                .startFromZero(false)                                                               // Defines if the needle should start from the 0 value
+                .returnToZero(false)                                                                // Defines if the needle should always return to the 0 value (only makes sense when animated==true)
+                // Related to Knob
+                .knobType(Gauge.KnobType.METAL)                                                           // Defines the type for the center knob (STANDARD, PLAIN, METAL, FLAT)
+                .knobColor(Color.LIGHTGRAY)                                                         // Defines the color that should be used for the center knob
+                .interactive(false)                                                                 // Defines if it should be possible to press the center knob
+                .onButtonPressed(buttonEvent -> System.out.println("Knob pressed"))                 // Defines a handler that will be triggered when the center knob was pressed
+                .onButtonReleased(buttonEvent -> System.out.println("Knob released"))               // Defines a handler that will be triggered when the center knob was released
+                // Related to Threshold
+                .thresholdVisible(true)                                                            // Defines if the threshold indicator should be visible
+                .threshold(50)                                                                      // Defines the value for the threshold
+                .thresholdColor(Color.RED)                                                          // Defines the color for the threshold
+                .checkThreshold(true)                                                              // Defines if each value should be checked against the threshold
+                .onThresholdExceeded(thresholdEvent -> System.out.println("Threshold exceeded"))    // Defines a handler that will be triggered if checkThreshold==true and the threshold is exceeded
+                .onThresholdUnderrun(thresholdEvent -> System.out.println("Threshold underrun"))    // Defines a handler that will be triggered if checkThreshold==true and the threshold is underrun
+                // Related to Gradient Bar
+                .gradientBarEnabled(true)                                                         // Defines if a gradient filled bar should be visible to visualize a range
+                .gradientBarStops(new Stop(0.0, Color.BLUE),// Defines a conical color gradient that will be use to color the gradient bar
+                        new Stop(0.25, Color.CYAN),
+                        new Stop(0.5, Color.LIME),
+                        new Stop(0.75, Color.YELLOW),
+                        new Stop(1.0, Color.RED))
+                // Related to Markers
+                .markersVisible(true)                                                               // Defines if markers will be visible
+                .markers(marker1, marker2)                                                          // Defines markers that will be drawn
+                // Related to Value
+                .animated(true)                                                                     // Defines if the needle will be animated
+                .animationDuration(500)                                                             // Defines the speed of the needle in milliseconds (10 - 10000 ms)
+                .build();
+
+        /**
+         *  Create a gauge with a frame and background that utilizes a Medusa gauge
+         *  You can choose between the following GaugeDesigns
+         *  - METAL
+         *  - TILTED_GRAY
+         *  - STEEL
+         *  - BRASS
+         *  - GOLD
+         *  - BLACK_METAL
+         *  - SHINY_METAL
+         *  - ENZO
+         *  - FLAT (when used one could set the frame color by calling GaugeDesign.FLAT.frameColor = Color.ORANGE;)
+         *  - TRANSPARENT
+         *
+         *  and the following GaugeBackgrounds
+         *  - DARK_GRAY
+         *  - BEIGE
+         *  - ANTHRACITE
+         *  - LIGHT_GRAY
+         *  - WHITE
+         *  - BLACK
+         *  - CARBON
+         *  - TRANSPARENT
+         */
+        fGauge = FGaugeBuilder
+                .create()
                 .prefSize(200, 200)
                 .gauge(gauge)
                 .gaugeDesign(GaugeDesign.METAL)
                 .gaugeBackground(GaugeDesign.GaugeBackground.CARBON)
                 .foregroundVisible(true)
                 .build();
-        gauge.valueProperty().setValue(0);
-        gauge.setAnimated(true);
-        //fGauge.getGauge().valueProperty().setValue(0);
-        //fGauge.getGauge().maxValueProperty().setValue(50);
         speedPane.getChildren().add(fGauge);
+        //(event -> gauge.setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed()));
 
     }
 
@@ -257,6 +433,7 @@ public class RaceViewController extends Controller {
         initialiseRaceClock();
         initialiseSpeedometer();
         raceTimer();    // start the timer
+        speedometerLoop();
         new Sparkline(this.raceState, this.sparklineChart);
         timeZone.setText(this.raceState.getRaceClock().getTimeZone());
         arrowController.setWindProperty(this.raceState.windProperty());
@@ -643,28 +820,57 @@ public class RaceViewController extends Controller {
                     }
                 } else {
                     boatInfoTable.sort();
+//                    try {
+//                        System.out.println(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
+//                        gauge.setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
+//                        for (VisualiserBoat boat : boatInfoTable.getItems()){
+//                            if(raceState.getPlayerBoatID()==boat.getSourceID()){
+//                                gauge.setTitle("Position: " + (boatInfoTable.getItems().indexOf(boat)+1));
+//                            }
+//                        }
+//                    } catch (BoatNotFoundException e) {
+//                        e.printStackTrace();
+//                    }
+                }
+
+                //Return to main screen if we lose connection.
+                if (!visualiserRace.getServerConnection().isAlive()) {
+                    try {
+                        loadTitleScreen();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    //TODO we should display an error to the user
+                    //TODO also need to "reset" any state (race, connections, etc...).
+                }
+            }
+        }.start();
+    }
 
+    private void speedometerLoop(){
+        new AnimationTimer(){
+            @Override
+            public void handle(long arg0){
+                if (raceState.getRaceStatusEnum() == RaceStatusEnum.FINISHED) {
+                    stop(); // stop the timer
+
+                } else {
                     try {
+                        System.out.println(gauge.getValue());
                         gauge.setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
+                        fGauge.getGauge().setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
+                        Thread.sleep(50);
                         for (VisualiserBoat boat : boatInfoTable.getItems()){
                             if(raceState.getPlayerBoatID()==boat.getSourceID()){
                                 gauge.setTitle("Position: " + (boatInfoTable.getItems().indexOf(boat)+1));
+                                fGauge.getGauge().setTitle("Position: " + (boatInfoTable.getItems().indexOf(boat)+1));
                             }
                         }
                     } catch (BoatNotFoundException e) {
                         e.printStackTrace();
-                    }
-                }
-
-                //Return to main screen if we lose connection.
-                if (!visualiserRace.getServerConnection().isAlive()) {
-                    try {
-                        loadTitleScreen();
-                    } catch (Exception e) {
+                    } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
-                    //TODO we should display an error to the user
-                    //TODO also need to "reset" any state (race, connections, etc...).
                 }
             }
         }.start();

From 0b02727bf1522602303788f408e3c80f9462f9f2 Mon Sep 17 00:00:00 2001
From: zwu18 <zwu18@uclive.ac.nz>
Date: Fri, 22 Sep 2017 20:33:56 +1200
Subject: [PATCH 06/10] Set limits and more appearance changes for speedometer.
 #story[1311]

---
 .../Controllers/RaceViewController.java       | 109 +-----------------
 1 file changed, 5 insertions(+), 104 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index 67233cd6..2cbda6d4 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -213,82 +213,10 @@ public class RaceViewController extends Controller {
      * Create speedometer
      */
     private void initialiseSpeedometer() {
-//        gauge = GaugeBuilder.create().prefSize(200, 200).title("Speedometer").subTitle("Speed").unit("Knots").skinType(Gauge.SkinType.FLAT).build();
-//        gauge.setValueColor(Color.WHITE);
-//        gauge.setTitleColor(Color.WHITE);
-//        gauge.setSubTitleColor(Color.WHITE);
-//        gauge.setBarColor(Color.WHITE);
-//        gauge.setUnitColor(Color.WHITE);
-//        gauge.setMaxValue(40);
-//        fGauge = FGaugeBuilder.create()
-//                .prefSize(200, 200)
-//                .gauge(gauge)
-//                .gaugeDesign(GaugeDesign.METAL)
-//                .gaugeBackground(GaugeDesign.GaugeBackground.CARBON)
-//                .foregroundVisible(true)
-//                .build();
-//        gauge.valueProperty().setValue(0);
-//        gauge.setAnimated(true);
-//        //fGauge.getGauge().valueProperty().setValue(0);
-//        //fGauge.getGauge().maxValueProperty().setValue(50);
-//        speedPane.getChildren().add(fGauge);
-        /**
-         *  Definition of Sections that can be used for
-         *  - Sections
-         *  - Areas
-         *  - TickMarkSections
-         *  - TickLabelSections
-         *
-         *  Sections will be checked against current value if gauge.getCheckSectionsForValue == true
-         */
-        Section section1 = SectionBuilder.create()
-                .start(50)
-                .stop(75)
-                .color(Color.rgb(255, 200, 0, 0.7))
-                .onSectionEntered(sectionEvent -> System.out.println("Entered Section 1"))
-                .onSectionLeft(sectionEvent -> System.out.println("Left Section 1"))
-                .build();
 
-        Section section2 = SectionBuilder.create()
-                .start(75)
-                .stop(100)
-                .color(Color.rgb(255, 0, 0, 0.7))
-                .onSectionEntered(sectionEvent -> System.out.println("Entered Section 2"))
-                .onSectionLeft(sectionEvent -> System.out.println("Left Section 2"))
-                .build();
-
-        /**
-         *  Definition of Markers
-         *  You can attach a listener for the following event types
-         *  - MARKER_PRESSED
-         *  - MARKER_RELEASED
-         *  - MARKER_EXCEEDED
-         *  - MARKER_UNDERRUN
-         *  via the MarkerBuilder
-         *  To receive MARKER_EXCEEDED and MARKER_UNDERRUN events you have to check the
-         *  current value against each marker by calling the markers checkForValue() method
-         */
-        Marker marker1 = MarkerBuilder.create()
-                .value(25)
-                .text("Marker 1")
-                .color(Color.HOTPINK)
-                .markerType(Marker.MarkerType.DOT)
-                .onMarkerPressed(markerEvent -> System.out.println("Marker 1 pressed"))
-                .onMarkerReleased(markerEvent -> System.out.println("Marker 1 released"))
-                .build();
-
-        Marker marker2 = MarkerBuilder.create()
-                .value(75)
-                .text("Marker 2")
-                .color(Color.CYAN)
-                .markerType(Marker.MarkerType.STANDARD)
-                .onMarkerPressed(markerEvent -> System.out.println("Marker 2 pressed"))
-                .onMarkerReleased(markerEvent -> System.out.println("Marker 2 released"))
-                .build();
 
         /**
          *  Create the Medusa Gauge with most of it's options
-         *  Simply play with the boolean variables first to see what mean.
          */
         gauge = GaugeBuilder.create()
                 .prefSize(200,200)                                                                  // Set the preferred size of the control
@@ -297,9 +225,9 @@ public class RaceViewController extends Controller {
                 // Related to Title Text
                 .title("Title")                                                                     // Set the text for the title
                 // Related to Sub Title Text
-                .subTitle("SubTitle")                                                               // Set the text for the subtitle
+                .subTitle("Speed")                                                               // Set the text for the subtitle
                 // Related to Unit Text
-                .unit("Unit")                                                                       // Set the text for the unit
+                .unit("Knots")                                                                       // Set the text for the unit
                 // Related to Value Text
                 .decimals(2)                                                                        // Set the number of decimals for the value/lcd text
                 // Related to LCD
@@ -309,7 +237,7 @@ public class RaceViewController extends Controller {
                 // Related to scale
                 .scaleDirection(Gauge.ScaleDirection.CLOCKWISE)                                           // Define the direction of the Scale (CLOCKWISE, COUNTER_CLOCKWISE)
                 .minValue(0)                                                                        // Set the start value of the scale
-                .maxValue(100)                                                                      // Set the end value of the scale
+                .maxValue(50)                                                                      // Set the end value of the scale
                 .startAngle(320)                                                                    // Set the start angle of your scale (bottom -> 0, direction -> CCW)
                 .angleRange(280)                                                                    // Set the angle range of your scale starting from the start angle
                 // Related to Tick Labels
@@ -318,12 +246,9 @@ public class RaceViewController extends Controller {
                 .tickLabelOrientation(TickLabelOrientation.ORTHOGONAL)                              // Define the orientation of the tick labels (ORTHOGONAL,  HORIZONTAL, TANGENT)
                 .onlyFirstAndLastTickLabelVisible(false)                                            // Define if only the first and last tick label should be visible
                 .tickLabelSectionsVisible(false)                                                    // Define if sections for tick labels should be visible
-                .tickLabelSections(section1, section2)                                              // Define sections to color tick labels
                 .tickLabelColor(Color.BLACK)                                                        // Define the color for tick labels (overriden by tick label sections)
                 // Related to Tick Marks
                 .tickMarkSectionsVisible(false)                                                     // Define if sections for tick marks should be visible
-                .tickMarkSections(section1, section2)                                               // Define sections to color tick marks
-                // Related to Major Tick Marks
                 .majorTickMarksVisible(true)                                                        // Define if major tick marks should be visible
                 .majorTickMarkType(TickMarkType.TRAPEZOID)                                           // Define the tick mark type for major tick marks (LINE, DOT, TRAPEZOID, TICK_LABEL)
                 // Related to Medium Tick Marks
@@ -366,7 +291,7 @@ public class RaceViewController extends Controller {
                         new Stop(1.0, Color.RED))
                 // Related to Markers
                 .markersVisible(true)                                                               // Defines if markers will be visible
-                .markers(marker1, marker2)                                                          // Defines markers that will be drawn
+                //.markers(marker1, marker2)                                                          // Defines markers that will be drawn
                 // Related to Value
                 .animated(true)                                                                     // Defines if the needle will be animated
                 .animationDuration(500)                                                             // Defines the speed of the needle in milliseconds (10 - 10000 ms)
@@ -374,27 +299,6 @@ public class RaceViewController extends Controller {
 
         /**
          *  Create a gauge with a frame and background that utilizes a Medusa gauge
-         *  You can choose between the following GaugeDesigns
-         *  - METAL
-         *  - TILTED_GRAY
-         *  - STEEL
-         *  - BRASS
-         *  - GOLD
-         *  - BLACK_METAL
-         *  - SHINY_METAL
-         *  - ENZO
-         *  - FLAT (when used one could set the frame color by calling GaugeDesign.FLAT.frameColor = Color.ORANGE;)
-         *  - TRANSPARENT
-         *
-         *  and the following GaugeBackgrounds
-         *  - DARK_GRAY
-         *  - BEIGE
-         *  - ANTHRACITE
-         *  - LIGHT_GRAY
-         *  - WHITE
-         *  - BLACK
-         *  - CARBON
-         *  - TRANSPARENT
          */
         fGauge = FGaugeBuilder
                 .create()
@@ -856,10 +760,9 @@ public class RaceViewController extends Controller {
 
                 } else {
                     try {
-                        System.out.println(gauge.getValue());
                         gauge.setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
                         fGauge.getGauge().setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
-                        Thread.sleep(50);
+                        //Thread.sleep(50);
                         for (VisualiserBoat boat : boatInfoTable.getItems()){
                             if(raceState.getPlayerBoatID()==boat.getSourceID()){
                                 gauge.setTitle("Position: " + (boatInfoTable.getItems().indexOf(boat)+1));
@@ -868,8 +771,6 @@ public class RaceViewController extends Controller {
                         }
                     } catch (BoatNotFoundException e) {
                         e.printStackTrace();
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
                     }
                 }
             }

From 64ae01113aff49e37a63af4f596cf72694ca0462 Mon Sep 17 00:00:00 2001
From: zwu18 <zwu18@uclive.ac.nz>
Date: Fri, 22 Sep 2017 22:15:28 +1200
Subject: [PATCH 07/10] Added delay for position update. This fixes fps issue.
 #story[1311]

---
 .../visualiser/Controllers/RaceViewController.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index 2cbda6d4..af4d6189 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -71,6 +71,8 @@ public class RaceViewController extends Controller {
     private ObservableList<Subject3D> viewSubjects;
     private Gauge gauge;
     private FGauge fGauge;
+    private long positionDelay = 1000;
+    private long positionTime = 0;
 
     /**
      * Arrow pointing to next mark in third person
@@ -762,12 +764,14 @@ public class RaceViewController extends Controller {
                     try {
                         gauge.setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
                         fGauge.getGauge().setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
-                        //Thread.sleep(50);
-                        for (VisualiserBoat boat : boatInfoTable.getItems()){
-                            if(raceState.getPlayerBoatID()==boat.getSourceID()){
-                                gauge.setTitle("Position: " + (boatInfoTable.getItems().indexOf(boat)+1));
-                                fGauge.getGauge().setTitle("Position: " + (boatInfoTable.getItems().indexOf(boat)+1));
+                        if(System.currentTimeMillis() > positionTime+positionDelay) {
+                            for (VisualiserBoat boat : boatInfoTable.getItems()) {
+                                if (raceState.getPlayerBoatID() == boat.getSourceID()) {
+                                    gauge.setTitle("Position: " + (boatInfoTable.getItems().indexOf(boat) + 1));
+                                    fGauge.getGauge().setTitle("Position: " + (boatInfoTable.getItems().indexOf(boat) + 1));
+                                }
                             }
+                            positionTime = System.currentTimeMillis();
                         }
                     } catch (BoatNotFoundException e) {
                         e.printStackTrace();

From 67779eb9ad65f34e7bc453ee48d9056c50bedb7c Mon Sep 17 00:00:00 2001
From: zwu18 <zwu18@uclive.ac.nz>
Date: Sat, 23 Sep 2017 00:38:33 +1200
Subject: [PATCH 08/10] Same changes to dev. #story[1311]

---
 .../Controllers/RaceViewController.java       | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index af4d6189..a7c57aac 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -46,10 +46,7 @@ import visualiser.utils.GPSConverter;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -295,8 +292,8 @@ public class RaceViewController extends Controller {
                 .markersVisible(true)                                                               // Defines if markers will be visible
                 //.markers(marker1, marker2)                                                          // Defines markers that will be drawn
                 // Related to Value
-                .animated(true)                                                                     // Defines if the needle will be animated
-                .animationDuration(500)                                                             // Defines the speed of the needle in milliseconds (10 - 10000 ms)
+                //.animated(true)                                                                     // Defines if the needle will be animated
+                //.animationDuration(500)                                                             // Defines the speed of the needle in milliseconds (10 - 10000 ms)
                 .build();
 
         /**
@@ -764,14 +761,13 @@ public class RaceViewController extends Controller {
                     try {
                         gauge.setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
                         fGauge.getGauge().setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
-                        if(System.currentTimeMillis() > positionTime+positionDelay) {
-                            for (VisualiserBoat boat : boatInfoTable.getItems()) {
-                                if (raceState.getPlayerBoatID() == boat.getSourceID()) {
-                                    gauge.setTitle("Position: " + (boatInfoTable.getItems().indexOf(boat) + 1));
-                                    fGauge.getGauge().setTitle("Position: " + (boatInfoTable.getItems().indexOf(boat) + 1));
-                                }
+                        //Thread.sleep(50);
+                        List<VisualiserBoat> boatList = boatInfoTable.getItems();
+                        for (VisualiserBoat boat : boatList){
+                            if(raceState.getPlayerBoatID()==boat.getSourceID()){
+                                gauge.titleProperty().setValue("Position: " + (boatInfoTable.getItems().indexOf(boat)+1));
+                                fGauge.getGauge().titleProperty().setValue("Position: " + (boatInfoTable.getItems().indexOf(boat)+1));
                             }
-                            positionTime = System.currentTimeMillis();
                         }
                     } catch (BoatNotFoundException e) {
                         e.printStackTrace();

From 11d6d3a880f8fbf2f8d26927c601730c2e45f9a0 Mon Sep 17 00:00:00 2001
From: zwu18 <zwu18@uclive.ac.nz>
Date: Tue, 26 Sep 2017 16:20:48 +1300
Subject: [PATCH 09/10] Documentation added. Master merged. #story[1311]

---
 .../Controllers/RaceViewController.java       | 143 ++++++++----------
 1 file changed, 60 insertions(+), 83 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index 84e9c3bb..9720d563 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -216,93 +216,66 @@ public class RaceViewController extends Controller {
      * Create speedometer
      */
     private void initialiseSpeedometer() {
-
-
-        /**
-         *  Create the Medusa Gauge with most of it's options
-         */
+        //Create the Medusa Gauge
         gauge = GaugeBuilder.create()
-                .prefSize(200,200)                                                                  // Set the preferred size of the control
-                // Related to Foreground Elements
-                .foregroundBaseColor(Color.WHITE)                                                   // Defines a color for title, subtitle, unit, value, tick label, tick mark, major tick mark, medium tick mark and minor tick mark
-                // Related to Title Text
-                .title("Title")                                                                     // Set the text for the title
-                // Related to Sub Title Text
-                .subTitle("Speed")                                                               // Set the text for the subtitle
-                // Related to Unit Text
-                .unit("Knots")                                                                       // Set the text for the unit
-                // Related to Value Text
-                .decimals(2)                                                                        // Set the number of decimals for the value/lcd text
-                // Related to LCD
-                .lcdVisible(true)                                                                   // Display a LCD instead of the plain value text
-                .lcdDesign(LcdDesign.STANDARD)                                                      // Set the design for the LCD
-                .lcdFont(LcdFont.DIGITAL_BOLD)                                                      // Set the font for the LCD (STANDARD, LCD, SLIM, DIGITAL_BOLD, ELEKTRA)
-                // Related to scale
-                .scaleDirection(Gauge.ScaleDirection.CLOCKWISE)                                           // Define the direction of the Scale (CLOCKWISE, COUNTER_CLOCKWISE)
-                .minValue(0)                                                                        // Set the start value of the scale
-                .maxValue(50)                                                                      // Set the end value of the scale
-                .startAngle(320)                                                                    // Set the start angle of your scale (bottom -> 0, direction -> CCW)
-                .angleRange(280)                                                                    // Set the angle range of your scale starting from the start angle
-                // Related to Tick Labels
-                .tickLabelDecimals(0)                                                               // Set the number of decimals for the tick labels
-                .tickLabelLocation(TickLabelLocation.INSIDE)                                        // Define wether the tick labels should be inside or outside the scale (INSIDE, OUTSIDE)
-                .tickLabelOrientation(TickLabelOrientation.ORTHOGONAL)                              // Define the orientation of the tick labels (ORTHOGONAL,  HORIZONTAL, TANGENT)
-                .onlyFirstAndLastTickLabelVisible(false)                                            // Define if only the first and last tick label should be visible
-                .tickLabelSectionsVisible(false)                                                    // Define if sections for tick labels should be visible
-                .tickLabelColor(Color.BLACK)                                                        // Define the color for tick labels (overriden by tick label sections)
-                // Related to Tick Marks
-                .tickMarkSectionsVisible(false)                                                     // Define if sections for tick marks should be visible
-                .majorTickMarksVisible(true)                                                        // Define if major tick marks should be visible
-                .majorTickMarkType(TickMarkType.TRAPEZOID)                                           // Define the tick mark type for major tick marks (LINE, DOT, TRAPEZOID, TICK_LABEL)
-                // Related to Medium Tick Marks
-                .mediumTickMarksVisible(false)                                                      // Define if medium tick marks should be visible
-                .mediumTickMarkType(TickMarkType.LINE)                                              // Define the tick mark type for medium tick marks (LINE, DOT, TRAPEZOID)
-                // Related to Minor Tick Marks
-                .minorTickMarksVisible(true)                                                        // Define if minor tick marks should be visible
-                .minorTickMarkType(TickMarkType.LINE)                                               // Define the tick mark type for minor tick marks (LINE, DOT, TRAPEZOID)
-                // Related to LED
-                .ledVisible(false)                                                                  // Defines if the LED should be visible
-                .ledType(Gauge.LedType.STANDARD)                                                          // Defines the type of the LED (STANDARD, FLAT)
-                .ledColor(Color.rgb(255, 200, 0))                                                   // Defines the color of the LED
-                .ledBlinking(false)                                                                 // Defines if the LED should blink
-                // Related to Needle
-                .needleShape(Gauge.NeedleShape.ANGLED)                                                    // Defines the shape of the needle (ANGLED, ROUND, FLAT)
-                .needleSize(Gauge.NeedleSize.STANDARD)                                                    // Defines the size of the needle (THIN, STANDARD, THICK)
-                .needleColor(Color.CRIMSON)                                                         // Defines the color of the needle
-                // Related to Needle behavior
-                .startFromZero(false)                                                               // Defines if the needle should start from the 0 value
-                .returnToZero(false)                                                                // Defines if the needle should always return to the 0 value (only makes sense when animated==true)
-                // Related to Knob
-                .knobType(Gauge.KnobType.METAL)                                                           // Defines the type for the center knob (STANDARD, PLAIN, METAL, FLAT)
-                .knobColor(Color.LIGHTGRAY)                                                         // Defines the color that should be used for the center knob
-                .interactive(false)                                                                 // Defines if it should be possible to press the center knob
-                .onButtonPressed(buttonEvent -> System.out.println("Knob pressed"))                 // Defines a handler that will be triggered when the center knob was pressed
-                .onButtonReleased(buttonEvent -> System.out.println("Knob released"))               // Defines a handler that will be triggered when the center knob was released
-                // Related to Threshold
-                .thresholdVisible(true)                                                            // Defines if the threshold indicator should be visible
-                .threshold(50)                                                                      // Defines the value for the threshold
-                .thresholdColor(Color.RED)                                                          // Defines the color for the threshold
-                .checkThreshold(true)                                                              // Defines if each value should be checked against the threshold
-                .onThresholdExceeded(thresholdEvent -> System.out.println("Threshold exceeded"))    // Defines a handler that will be triggered if checkThreshold==true and the threshold is exceeded
-                .onThresholdUnderrun(thresholdEvent -> System.out.println("Threshold underrun"))    // Defines a handler that will be triggered if checkThreshold==true and the threshold is underrun
-                // Related to Gradient Bar
-                .gradientBarEnabled(true)                                                         // Defines if a gradient filled bar should be visible to visualize a range
-                .gradientBarStops(new Stop(0.0, Color.BLUE),// Defines a conical color gradient that will be use to color the gradient bar
+                .prefSize(200,200)
+                .foregroundBaseColor(Color.WHITE)
+                .title("Title")
+                .subTitle("Speed")
+                .unit("Knots")
+                .decimals(2)
+                .lcdVisible(true)
+                .lcdDesign(LcdDesign.STANDARD)
+                .lcdFont(LcdFont.DIGITAL_BOLD)
+                .scaleDirection(Gauge.ScaleDirection.CLOCKWISE)
+                .minValue(0)
+                .maxValue(50)
+                .startAngle(320)
+                .angleRange(280)
+                .tickLabelDecimals(0)
+                .tickLabelLocation(TickLabelLocation.INSIDE)
+                .tickLabelOrientation(TickLabelOrientation.ORTHOGONAL)
+                .onlyFirstAndLastTickLabelVisible(false)
+                .tickLabelSectionsVisible(false)
+                .tickLabelColor(Color.BLACK)
+                .tickMarkSectionsVisible(false)
+                .majorTickMarksVisible(true)
+                .majorTickMarkType(TickMarkType.TRAPEZOID)
+                .mediumTickMarksVisible(false)
+                .mediumTickMarkType(TickMarkType.LINE)
+                .minorTickMarksVisible(true)
+                .minorTickMarkType(TickMarkType.LINE)
+                .ledVisible(false)
+                .ledType(Gauge.LedType.STANDARD)
+                .ledColor(Color.rgb(255, 200, 0))
+                .ledBlinking(false)
+                .needleShape(Gauge.NeedleShape.ANGLED)
+                .needleSize(Gauge.NeedleSize.STANDARD)
+                .needleColor(Color.CRIMSON)
+                .startFromZero(false)
+                .returnToZero(false)
+                .knobType(Gauge.KnobType.METAL)
+                .knobColor(Color.LIGHTGRAY)
+                .interactive(false)
+                .onButtonPressed(buttonEvent -> System.out.println("Knob pressed"))
+                .onButtonReleased(buttonEvent -> System.out.println("Knob released"))
+                .thresholdVisible(true)
+                .threshold(50)
+                .thresholdColor(Color.RED)
+                .checkThreshold(true)
+                .onThresholdExceeded(thresholdEvent -> System.out.println("Threshold exceeded"))
+                .onThresholdUnderrun(thresholdEvent -> System.out.println("Threshold underrun"))
+                .gradientBarEnabled(true)
+                .gradientBarStops(new Stop(0.0, Color.BLUE),
                         new Stop(0.25, Color.CYAN),
                         new Stop(0.5, Color.LIME),
                         new Stop(0.75, Color.YELLOW),
                         new Stop(1.0, Color.RED))
-                // Related to Markers
-                .markersVisible(true)                                                               // Defines if markers will be visible
-                //.markers(marker1, marker2)                                                          // Defines markers that will be drawn
-                // Related to Value
-                //.animated(true)                                                                     // Defines if the needle will be animated
-                //.animationDuration(500)                                                             // Defines the speed of the needle in milliseconds (10 - 10000 ms)
+                .markersVisible(true)
                 .build();
 
-        /**
-         *  Create a gauge with a frame and background that utilizes a Medusa gauge
-         */
+
+        //Create a gauge with a frame and background that utilizes a Medusa gauge
         fGauge = FGaugeBuilder
                 .create()
                 .prefSize(200, 200)
@@ -312,7 +285,6 @@ public class RaceViewController extends Controller {
                 .foregroundVisible(true)
                 .build();
         speedPane.getChildren().add(fGauge);
-        //(event -> gauge.setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed()));
 
     }
 
@@ -841,21 +813,26 @@ public class RaceViewController extends Controller {
         }.start();
     }
 
+    /**
+     * Animation timer loop for the speedometer
+     */
     private void speedometerLoop(){
         new AnimationTimer(){
             @Override
             public void handle(long arg0){
                 if (raceState.getRaceStatusEnum() == RaceStatusEnum.FINISHED) {
                     stop(); // stop the timer
-
                 } else {
                     try {
+                        //Set the current speed value of the boat
                         gauge.setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
                         fGauge.getGauge().setValue(raceState.getBoat(raceState.getPlayerBoatID()).getCurrentSpeed());
-                        //Thread.sleep(50);
+
+                        //Create list with sorted boat placements
                         List<VisualiserBoat> boatList = boatInfoTable.getItems();
                         for (VisualiserBoat boat : boatList){
                             if(raceState.getPlayerBoatID()==boat.getSourceID()){
+                                //Set boat current placement value as title of speedometer
                                 gauge.titleProperty().setValue("Position: " + (boatInfoTable.getItems().indexOf(boat)+1));
                                 fGauge.getGauge().titleProperty().setValue("Position: " + (boatInfoTable.getItems().indexOf(boat)+1));
                             }

From ba82328c425844387113733e9e166be66c57c6b0 Mon Sep 17 00:00:00 2001
From: zwu18 <zwu18@uclive.ac.nz>
Date: Tue, 26 Sep 2017 17:09:00 +1300
Subject: [PATCH 10/10] Removed souts for speedometer. #story[1311]

---
 .../main/java/visualiser/Controllers/RaceViewController.java  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index 9720d563..d1ef843e 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -257,14 +257,10 @@ public class RaceViewController extends Controller {
                 .knobType(Gauge.KnobType.METAL)
                 .knobColor(Color.LIGHTGRAY)
                 .interactive(false)
-                .onButtonPressed(buttonEvent -> System.out.println("Knob pressed"))
-                .onButtonReleased(buttonEvent -> System.out.println("Knob released"))
                 .thresholdVisible(true)
                 .threshold(50)
                 .thresholdColor(Color.RED)
                 .checkThreshold(true)
-                .onThresholdExceeded(thresholdEvent -> System.out.println("Threshold exceeded"))
-                .onThresholdUnderrun(thresholdEvent -> System.out.println("Threshold underrun"))
                 .gradientBarEnabled(true)
                 .gradientBarStops(new Stop(0.0, Color.BLUE),
                         new Stop(0.25, Color.CYAN),