From 87f3265640b65b81c2e6972601efeb47e1afad02 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Thu, 14 Sep 2017 13:06:39 +1200
Subject: [PATCH 1/4] pushed branch #story[1195]

---
 .../visualiser/scenes/newRaceView.fxml        | 124 ++++++++++++++++++
 1 file changed, 124 insertions(+)
 create mode 100644 racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml

diff --git a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
new file mode 100644
index 00000000..debda5da
--- /dev/null
+++ b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Accordion?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TitledPane?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.Pane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.text.Font?>
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="364.0" prefWidth="522.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController">
+   <children>
+        <GridPane fx:id="canvasBase" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+            <columnConstraints>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+            </columnConstraints>
+            <rowConstraints>
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+            </rowConstraints>
+        </GridPane>
+          <Pane prefHeight="200.0" prefWidth="400.0" visible="false">
+              <children>
+                  <Accordion>
+                      <panes>
+                          <TitledPane animated="false" prefHeight="395.0" prefWidth="222.0" text="Annotation Control">
+                              <content>
+                                  <AnchorPane fx:id="annotationPane" minHeight="0.0" minWidth="0.0">
+                                      <children>
+                                          <CheckBox fx:id="showName" layoutY="39.0" mnemonicParsing="false" selected="true" text="Show Boat Name" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                          <CheckBox fx:id="showAbbrev" layoutY="61.0" mnemonicParsing="false" selected="true" text="Show Boat Abbreviation" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="25.0" />
+                                          <CheckBox fx:id="showSpeed" layoutY="90.0" mnemonicParsing="false" selected="true" text="Show Boat Speed" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="50.0" />
+                                          <CheckBox fx:id="showBoatPath" mnemonicParsing="false" selected="true" text="Show Boat Paths" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="75.0" />
+                                          <CheckBox fx:id="showTime" mnemonicParsing="false" selected="true" text="Show Boat Leg Time" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="100.0" />
+                                          <CheckBox fx:id="showEstTime" mnemonicParsing="false" selected="true" text="Show Est. Time to Next Mark" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="125.0" />
+                                          <CheckBox fx:id="showGuideline" mnemonicParsing="false" text="Show Guideline" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="150.0" />
+                                          <Separator layoutX="19.6" layoutY="175.6" prefHeight="0.0" prefWidth="200.0" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="175.0" />
+                                          <Label text="Annotations" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="175.0" />
+                                          <RadioButton fx:id="hideAnnoRBtn" mnemonicParsing="false" text="Hidden" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="200.0">
+                                              <toggleGroup>
+                                                  <ToggleGroup fx:id="annoToggleGroup" />
+                                              </toggleGroup>
+                              </RadioButton>
+                                          <RadioButton fx:id="showAnnoRBtn" mnemonicParsing="false" text="Visible" toggleGroup="$annoToggleGroup" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="225.0" />
+                                          <RadioButton fx:id="partialAnnoRBtn" mnemonicParsing="false" text="Partial" toggleGroup="$annoToggleGroup" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="250.0" />
+                                          <RadioButton fx:id="importantAnnoRBtn" mnemonicParsing="false" text="Important" toggleGroup="$annoToggleGroup" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="275.0" />
+                                          <Button fx:id="saveAnno" layoutX="11.0" layoutY="126.0" mnemonicParsing="false" text="Save Important Annotations" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="300.0" />
+                                      </children>
+                                  </AnchorPane>
+                              </content>
+                          </TitledPane>
+                          <TitledPane animated="false" text="FPS Control">
+                              <content>
+                                  <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                      <children>
+                                          <CheckBox fx:id="showFPS" layoutX="-14.0" layoutY="13.0" mnemonicParsing="false" selected="true" text="Show FPS" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                      </children>
+                                  </AnchorPane>
+                              </content>
+                          </TitledPane>
+                      </panes>
+                  </Accordion>
+              </children>
+          </Pane>
+          <Label fx:id="timer" maxHeight="20.0" text="0:0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="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">
+              <font>
+                  <Font name="System Bold" size="15.0" />
+              </font>
+          </Label>
+          <Label fx:id="timeZone" text="Label" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
+              <font>
+                  <Font name="System Bold" size="15.0" />
+              </font>
+         <padding>
+            <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" />
+       <AnchorPane layoutX="450.0" maxWidth="475.0" minHeight="0.0" minWidth="472.0" prefHeight="224.0" prefWidth="472.0" AnchorPane.bottomAnchor="70.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="30.0" AnchorPane.topAnchor="70.0" GridPane.columnIndex="1">
+           <children>
+               <TableView fx:id="boatInfoTable" layoutX="-2.0" minWidth="475.0" prefHeight="265.0" prefWidth="475.0" AnchorPane.bottomAnchor="164.0" AnchorPane.topAnchor="0.0">
+                   <columns>
+                       <TableColumn fx:id="boatPlacingColumn" prefWidth="50.0" text="Place" />
+                       <TableColumn fx:id="boatTeamColumn" prefWidth="200.0" text="Team" />
+                       <TableColumn fx:id="boatMarkColumn" prefWidth="150.0" text="Mark" />
+                       <TableColumn fx:id="boatSpeedColumn" prefWidth="75.0" text="Speed" />
+                   </columns>
+               </TableView>
+               <AnchorPane layoutY="265.0" prefHeight="167.0" prefWidth="178.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
+                   <children>
+                       <LineChart fx:id="sparklineChart" layoutX="-211.0" layoutY="-186.0" mouseTransparent="true" prefHeight="167.0" prefWidth="178.0" titleSide="LEFT" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                           <xAxis>
+                               <NumberAxis side="BOTTOM" fx:id="xAxis" />
+                           </xAxis>
+                           <yAxis>
+                               <NumberAxis fx:id="yAxis" side="LEFT" />
+                           </yAxis>
+                       </LineChart>
+                   </children>
+               </AnchorPane>
+           </children>
+       </AnchorPane>
+   </children>
+</AnchorPane>

From 083eb5a4bc304be5ac494ec0280a8ff04423a2f3 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Thu, 14 Sep 2017 13:45:46 +1200
Subject: [PATCH 2/4] updated race view that does not use a split pane

---
 .../Controllers/InGameLobbyController.java    |   2 +-
 .../Controllers/RaceViewController.java       |  26 +-
 .../visualiser/scenes/newRaceView.fxml        | 232 ++++++++++--------
 3 files changed, 137 insertions(+), 123 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
index 3366b790..e4865925 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/InGameLobbyController.java
@@ -250,7 +250,7 @@ public class InGameLobbyController extends Controller {
                         visualiserRaceEvent.getVisualiserRaceState().getBoats().removeListener(lobbyUpdateListener);
 
                         RaceViewController rvc = (RaceViewController)
-                                loadScene("raceView.fxml");
+                                loadScene("newRaceView.fxml");
                         rvc.startRace(visualiserRaceEvent, controllerClient,
                                 isHost);
                     } catch (IOException e) {
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index 5bd45274..66fdc23e 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -12,6 +12,7 @@ import javafx.scene.chart.LineChart;
 import javafx.scene.control.*;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
+import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.StackPane;
 import javafx.scene.shape.MeshView;
@@ -64,7 +65,7 @@ public class RaceViewController extends Controller {
     // note: it says it's not used but it is! do not remove :)
     private @FXML ArrowController arrowController;
     private @FXML GridPane canvasBase;
-    private @FXML SplitPane racePane;
+    private @FXML AnchorPane newRacePane;
     private @FXML StackPane arrowPane;
     private @FXML Label timer;
     private @FXML Label FPS;
@@ -77,6 +78,7 @@ public class RaceViewController extends Controller {
     private @FXML TableColumn<VisualiserBoat, Number> boatSpeedColumn;
     private @FXML LineChart<Number, Number> sparklineChart;
     private @FXML Label tutorialText;
+    private @FXML AnchorPane infoWrapper;
 
     /**
      * Displays a specified race.
@@ -125,7 +127,7 @@ public class RaceViewController extends Controller {
      * Sets up the listener and actions that occur when a key is pressed.
      */
     private void initKeypressHandler() {
-        racePane.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+        newRacePane.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             String codeString = event.getCode().toString();
 
             // tab key
@@ -255,7 +257,7 @@ public class RaceViewController extends Controller {
         });
 
         // Bind zooming to keypress (Z/X default)
-        racePane.addEventFilter(KeyEvent.KEY_PRESSED, e -> {
+        newRacePane.addEventFilter(KeyEvent.KEY_PRESSED, e -> {
             ControlKey key = keyFactory.getKey(e.getCode().toString());
             if (key != null) {
                 switch (key.toString()) {
@@ -442,23 +444,7 @@ public class RaceViewController extends Controller {
      * toggles if the info table is shown
      */
     private void toggleTable() {
-        double tablePercent = 1 - (boatPlacingColumn.getPrefWidth() +
-                boatTeamColumn.getPrefWidth() + boatMarkColumn.getPrefWidth()
-                + boatSpeedColumn.getPrefWidth())/racePane.getWidth();
-
-        if (infoTableShow) {
-            racePane.setDividerPositions(tablePercent);
-            arrowPane.setScaleX(0.5);
-            arrowPane.setScaleY(0.5);
-            arrowPane.setTranslateX(0 + (arrowPane.getScene().getWidth()/4)*tablePercent);
-            arrowPane.setTranslateY(0 - arrowPane.getScene().getHeight()/4);
-        } else {
-            racePane.setDividerPositions(1);
-            arrowPane.setScaleX(1);
-            arrowPane.setScaleY(1);
-            arrowPane.setTranslateX(0);
-            arrowPane.setTranslateY(0);
-        }
+        infoWrapper.setVisible(infoTableShow);
         boatInfoTable.refresh();
         infoTableShow = !infoTableShow;
     }
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
index debda5da..1404636d 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
@@ -1,12 +1,21 @@
 <?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?>
 <?import javafx.scene.control.Accordion?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.RadioButton?>
 <?import javafx.scene.control.Separator?>
+<?import javafx.scene.control.SplitPane?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
 <?import javafx.scene.control.TitledPane?>
@@ -19,106 +28,125 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="364.0" prefWidth="522.0" xmlns="http://javafx.com/javafx/8.0.65" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.RaceViewController">
-   <children>
-        <GridPane fx:id="canvasBase" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-            <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
-            </columnConstraints>
-            <rowConstraints>
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
-            </rowConstraints>
-        </GridPane>
-          <Pane prefHeight="200.0" prefWidth="400.0" visible="false">
-              <children>
-                  <Accordion>
-                      <panes>
-                          <TitledPane animated="false" prefHeight="395.0" prefWidth="222.0" text="Annotation Control">
-                              <content>
-                                  <AnchorPane fx:id="annotationPane" minHeight="0.0" minWidth="0.0">
-                                      <children>
-                                          <CheckBox fx:id="showName" layoutY="39.0" mnemonicParsing="false" selected="true" text="Show Boat Name" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                                          <CheckBox fx:id="showAbbrev" layoutY="61.0" mnemonicParsing="false" selected="true" text="Show Boat Abbreviation" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="25.0" />
-                                          <CheckBox fx:id="showSpeed" layoutY="90.0" mnemonicParsing="false" selected="true" text="Show Boat Speed" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="50.0" />
-                                          <CheckBox fx:id="showBoatPath" mnemonicParsing="false" selected="true" text="Show Boat Paths" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="75.0" />
-                                          <CheckBox fx:id="showTime" mnemonicParsing="false" selected="true" text="Show Boat Leg Time" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="100.0" />
-                                          <CheckBox fx:id="showEstTime" mnemonicParsing="false" selected="true" text="Show Est. Time to Next Mark" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="125.0" />
-                                          <CheckBox fx:id="showGuideline" mnemonicParsing="false" text="Show Guideline" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="150.0" />
-                                          <Separator layoutX="19.6" layoutY="175.6" prefHeight="0.0" prefWidth="200.0" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="175.0" />
-                                          <Label text="Annotations" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="175.0" />
-                                          <RadioButton fx:id="hideAnnoRBtn" mnemonicParsing="false" text="Hidden" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="200.0">
-                                              <toggleGroup>
-                                                  <ToggleGroup fx:id="annoToggleGroup" />
-                                              </toggleGroup>
-                              </RadioButton>
-                                          <RadioButton fx:id="showAnnoRBtn" mnemonicParsing="false" text="Visible" toggleGroup="$annoToggleGroup" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="225.0" />
-                                          <RadioButton fx:id="partialAnnoRBtn" mnemonicParsing="false" text="Partial" toggleGroup="$annoToggleGroup" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="250.0" />
-                                          <RadioButton fx:id="importantAnnoRBtn" mnemonicParsing="false" text="Important" toggleGroup="$annoToggleGroup" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="275.0" />
-                                          <Button fx:id="saveAnno" layoutX="11.0" layoutY="126.0" mnemonicParsing="false" text="Save Important Annotations" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="300.0" />
-                                      </children>
-                                  </AnchorPane>
-                              </content>
-                          </TitledPane>
-                          <TitledPane animated="false" text="FPS Control">
-                              <content>
-                                  <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
-                                      <children>
-                                          <CheckBox fx:id="showFPS" layoutX="-14.0" layoutY="13.0" mnemonicParsing="false" selected="true" text="Show FPS" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                                      </children>
-                                  </AnchorPane>
-                              </content>
-                          </TitledPane>
-                      </panes>
-                  </Accordion>
-              </children>
-          </Pane>
-          <Label fx:id="timer" maxHeight="20.0" text="0:0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="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">
-              <font>
-                  <Font name="System Bold" size="15.0" />
-              </font>
-          </Label>
-          <Label fx:id="timeZone" text="Label" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
-              <font>
-                  <Font name="System Bold" size="15.0" />
-              </font>
-         <padding>
-            <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" />
-       <AnchorPane layoutX="450.0" maxWidth="475.0" minHeight="0.0" minWidth="472.0" prefHeight="224.0" prefWidth="472.0" AnchorPane.bottomAnchor="70.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="30.0" AnchorPane.topAnchor="70.0" GridPane.columnIndex="1">
-           <children>
-               <TableView fx:id="boatInfoTable" layoutX="-2.0" minWidth="475.0" prefHeight="265.0" prefWidth="475.0" AnchorPane.bottomAnchor="164.0" AnchorPane.topAnchor="0.0">
-                   <columns>
-                       <TableColumn fx:id="boatPlacingColumn" prefWidth="50.0" text="Place" />
-                       <TableColumn fx:id="boatTeamColumn" prefWidth="200.0" text="Team" />
-                       <TableColumn fx:id="boatMarkColumn" prefWidth="150.0" text="Mark" />
-                       <TableColumn fx:id="boatSpeedColumn" prefWidth="75.0" text="Speed" />
-                   </columns>
-               </TableView>
-               <AnchorPane layoutY="265.0" prefHeight="167.0" prefWidth="178.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0">
-                   <children>
-                       <LineChart fx:id="sparklineChart" layoutX="-211.0" layoutY="-186.0" mouseTransparent="true" prefHeight="167.0" prefWidth="178.0" titleSide="LEFT" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                           <xAxis>
-                               <NumberAxis side="BOTTOM" fx:id="xAxis" />
-                           </xAxis>
-                           <yAxis>
-                               <NumberAxis fx:id="yAxis" side="LEFT" />
-                           </yAxis>
-                       </LineChart>
-                   </children>
-               </AnchorPane>
-           </children>
-       </AnchorPane>
-   </children>
+<AnchorPane fx:id="newRacePane" 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">
+    <children>
+        <StackPane fx:id="newPane" prefHeight="150.0" prefWidth="200.0">
+            <children>
+                <AnchorPane>
+                    <children>
+                        <GridPane fx:id="canvasBase" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                            <columnConstraints>
+                                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+                            </columnConstraints>
+                            <rowConstraints>
+                                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
+                            </rowConstraints>
+                        </GridPane>
+                        <Pane prefHeight="200.0" prefWidth="400.0" visible="false">
+                            <children>
+                                <Accordion>
+                                    <panes>
+                                        <TitledPane animated="false" prefHeight="395.0" prefWidth="222.0" text="Annotation Control">
+                                            <content>
+                                                <AnchorPane fx:id="annotationPane" minHeight="0.0" minWidth="0.0">
+                                                    <children>
+                                                        <CheckBox fx:id="showName" layoutY="39.0" mnemonicParsing="false" selected="true" text="Show Boat Name" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                                        <CheckBox fx:id="showAbbrev" layoutY="61.0" mnemonicParsing="false" selected="true" text="Show Boat Abbreviation" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="25.0" />
+                                                        <CheckBox fx:id="showSpeed" layoutY="90.0" mnemonicParsing="false" selected="true" text="Show Boat Speed" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="50.0" />
+                                                        <CheckBox fx:id="showBoatPath" mnemonicParsing="false" selected="true" text="Show Boat Paths" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="75.0" />
+                                                        <CheckBox fx:id="showTime" mnemonicParsing="false" selected="true" text="Show Boat Leg Time" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="100.0" />
+                                                        <CheckBox fx:id="showEstTime" mnemonicParsing="false" selected="true" text="Show Est. Time to Next Mark" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="125.0" />
+                                                        <CheckBox fx:id="showGuideline" mnemonicParsing="false" text="Show Guideline" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="150.0" />
+                                                        <Separator layoutX="19.6" layoutY="175.6" prefHeight="0.0" prefWidth="200.0" AnchorPane.leftAnchor="10.0" AnchorPane.topAnchor="175.0" />
+                                                        <Label text="Annotations" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="175.0" />
+                                                        <RadioButton fx:id="hideAnnoRBtn" mnemonicParsing="false" text="Hidden" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="200.0">
+                                                            <toggleGroup>
+                                                                <ToggleGroup fx:id="annoToggleGroup" />
+                                                            </toggleGroup>
+                                                        </RadioButton>
+                                                        <RadioButton fx:id="showAnnoRBtn" mnemonicParsing="false" text="Visible" toggleGroup="$annoToggleGroup" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="225.0" />
+                                                        <RadioButton fx:id="partialAnnoRBtn" mnemonicParsing="false" text="Partial" toggleGroup="$annoToggleGroup" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="250.0" />
+                                                        <RadioButton fx:id="importantAnnoRBtn" mnemonicParsing="false" text="Important" toggleGroup="$annoToggleGroup" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="275.0" />
+                                                        <Button fx:id="saveAnno" layoutX="11.0" layoutY="126.0" mnemonicParsing="false" text="Save Important Annotations" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="300.0" />
+                                                    </children>
+                                                </AnchorPane>
+                                            </content>
+                                        </TitledPane>
+                                        <TitledPane animated="false" text="FPS Control">
+                                            <content>
+                                                <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0">
+                                                    <children>
+                                                        <CheckBox fx:id="showFPS" layoutX="-14.0" layoutY="13.0" mnemonicParsing="false" selected="true" text="Show FPS" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                                    </children>
+                                                </AnchorPane>
+                                            </content>
+                                        </TitledPane>
+                                    </panes>
+                                </Accordion>
+                            </children>
+                        </Pane>
+                        <Label fx:id="timer" maxHeight="20.0" text="0:0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="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">
+                            <font>
+                                <Font name="System Bold" size="15.0" />
+                            </font>
+                        </Label>
+                        <Label fx:id="timeZone" text="Label" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0">
+                            <font>
+                                <Font name="System Bold" size="15.0" />
+                            </font>
+                            <padding>
+                                <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>
+        </StackPane>
+        <AnchorPane fx:id="infoWrapper" layoutX="450.0" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0" visible="false" AnchorPane.bottomAnchor="20.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="20.0" GridPane.columnIndex="1">
+            <children>
+            <GridPane layoutX="50.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+               <columnConstraints>
+                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
+               </columnConstraints>
+               <rowConstraints>
+                  <RowConstraints maxHeight="369.0" minHeight="10.0" prefHeight="228.0" vgrow="SOMETIMES" />
+                  <RowConstraints maxHeight="250.0" minHeight="10.0" prefHeight="163.0" vgrow="SOMETIMES" />
+               </rowConstraints>
+               <children>
+                      <TableView fx:id="boatInfoTable" layoutX="-2.0" maxWidth="475.0" minWidth="475.0" prefWidth="475.0" AnchorPane.bottomAnchor="126.0" AnchorPane.leftAnchor="50.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
+                          <columns>
+                              <TableColumn fx:id="boatPlacingColumn" prefWidth="50.0" text="Place" />
+                              <TableColumn fx:id="boatTeamColumn" prefWidth="200.0" text="Team" />
+                              <TableColumn fx:id="boatMarkColumn" prefWidth="150.0" text="Mark" />
+                              <TableColumn fx:id="boatSpeedColumn" prefWidth="75.0" text="Speed" />
+                          </columns>
+                      </TableView>
+                      <AnchorPane prefHeight="167.0" prefWidth="178.0" GridPane.rowIndex="1">
+                          <children>
+                              <LineChart fx:id="sparklineChart" layoutX="-211.0" layoutY="-186.0" mouseTransparent="true" prefHeight="167.0" prefWidth="178.0" titleSide="LEFT" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                  <xAxis>
+                                      <NumberAxis side="BOTTOM" fx:id="xAxis" />
+                                  </xAxis>
+                                  <yAxis>
+                                      <NumberAxis fx:id="yAxis" side="LEFT" />
+                                  </yAxis>
+                              </LineChart>
+                          </children>
+                      </AnchorPane>
+               </children>
+            </GridPane>
+            </children>
+        </AnchorPane>
+    </children>
 </AnchorPane>

From 88f1a393f2428e55dd012937674ea06b661c9e47 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Thu, 14 Sep 2017 23:40:02 +1200
Subject: [PATCH 3/4] Made the info tab into an  overlay #story[1195]

---
 .../Controllers/HostController.java           |  0
 .../Controllers/RaceViewController.java       | 17 ++--
 .../src/main/resources/css/dayMode.css        | 12 +++
 .../src/main/resources/css/nightMode.css      | 11 +++
 .../visualiser/scenes/newRaceView.fxml        | 88 +++++++++----------
 5 files changed, 72 insertions(+), 56 deletions(-)
 delete mode 100644 racevisionGame/src/main/java/visualiser/Controllers/HostController.java

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
deleted file mode 100644
index e69de29b..00000000
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
index a6f34bca..946ffe2d 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/RaceViewController.java
@@ -3,7 +3,6 @@ package visualiser.Controllers;
 import com.interactivemesh.jfx.importer.stl.StlMeshImporter;
 import javafx.animation.AnimationTimer;
 import javafx.application.Platform;
-import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -13,7 +12,6 @@ import javafx.scene.AmbientLight;
 import javafx.scene.PointLight;
 import javafx.scene.chart.LineChart;
 import javafx.scene.control.*;
-import javafx.scene.effect.Light;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.AnchorPane;
@@ -22,7 +20,8 @@ import javafx.scene.layout.StackPane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Material;
 import javafx.scene.paint.PhongMaterial;
-import javafx.scene.shape.*;
+import javafx.scene.shape.MeshView;
+import javafx.scene.shape.Shape3D;
 import javafx.scene.transform.Translate;
 import javafx.util.Callback;
 import network.Messages.Enums.RaceStatusEnum;
@@ -33,11 +32,8 @@ import visualiser.app.App;
 import visualiser.enums.TutorialState;
 import visualiser.gameController.ControllerClient;
 import visualiser.gameController.Keys.ControlKey;
-import visualiser.layout.*;
-import visualiser.model.*;
 import visualiser.gameController.Keys.KeyFactory;
-import visualiser.layout.Subject3D;
-import visualiser.layout.View3D;
+import visualiser.layout.*;
 import visualiser.model.Sparkline;
 import visualiser.model.VisualiserBoat;
 import visualiser.model.VisualiserRaceEvent;
@@ -82,7 +78,7 @@ public class RaceViewController extends Controller {
     // note: it says it's not used but it is! do not remove :)
     private @FXML ArrowController arrowController;
     private @FXML GridPane canvasBase;
-    private @FXML AnchorPane newRacePane;
+    private @FXML SplitPane racePane;
     private @FXML StackPane arrowPane;
     private @FXML Label timer;
     private @FXML Label FPS;
@@ -96,6 +92,7 @@ public class RaceViewController extends Controller {
     private @FXML LineChart<Number, Number> sparklineChart;
     private @FXML Label tutorialText;
     private @FXML AnchorPane infoWrapper;
+    private @FXML AnchorPane lineChartWrapper;
 
     /**
      * Displays a specified race.
@@ -143,7 +140,7 @@ public class RaceViewController extends Controller {
     private AnimationTimer arrowToNextMark;
 
     private void initKeypressHandler() {
-        newRacePane.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
+        racePane.addEventFilter(KeyEvent.KEY_PRESSED, event -> {
             String codeString = event.getCode().toString();
 
             // tab key
@@ -353,7 +350,7 @@ public class RaceViewController extends Controller {
         });
 
         // Bind zooming to keypress (Z/X default)
-        newRacePane.addEventFilter(KeyEvent.KEY_PRESSED, e -> {
+        racePane.addEventFilter(KeyEvent.KEY_PRESSED, e -> {
             ControlKey key = keyFactory.getKey(e.getCode().toString());
             if(key != null) {
                 switch (key.toString()) {
diff --git a/racevisionGame/src/main/resources/css/dayMode.css b/racevisionGame/src/main/resources/css/dayMode.css
index b62f8391..39903bdb 100644
--- a/racevisionGame/src/main/resources/css/dayMode.css
+++ b/racevisionGame/src/main/resources/css/dayMode.css
@@ -89,3 +89,15 @@
     -fx-focus-color: transparent;
     -fx-background-color: transparent;
 }
+
+#lineChartWrapper{
+    -fx-border-color: #02378c;
+    -fx-background-color: #4783e0;
+    -fx-border-width: 3;
+}
+
+#boatInfoTable{
+    -fx-border-color: #012256;
+    -fx-border-width: 3;
+}
+
diff --git a/racevisionGame/src/main/resources/css/nightMode.css b/racevisionGame/src/main/resources/css/nightMode.css
index deefa51a..514893aa 100644
--- a/racevisionGame/src/main/resources/css/nightMode.css
+++ b/racevisionGame/src/main/resources/css/nightMode.css
@@ -91,3 +91,14 @@
     -fx-focus-color: transparent;
     -fx-background-color: transparent;
 }
+
+#lineChartWrapper{
+    -fx-border-color: #02378c;
+    -fx-background-color: #012256;
+    -fx-border-width: 3;
+}
+
+#boatInfoTable{
+    -fx-border-color: #012256;
+    -fx-border-width: 3;
+}
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
index 1404636d..5c9c2660 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
@@ -1,11 +1,5 @@
 <?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?>
@@ -28,11 +22,11 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="newRacePane" 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">
-    <children>
+<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">
+    <items>
         <StackPane fx:id="newPane" prefHeight="150.0" prefWidth="200.0">
             <children>
-                <AnchorPane>
+                <AnchorPane focusTraversable="true">
                     <children>
                         <GridPane fx:id="canvasBase" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                             <columnConstraints>
@@ -111,42 +105,44 @@
                         <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>
+              <AnchorPane fx:id="infoWrapper" focusTraversable="true" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0">
+                  <children>
+                  <GridPane layoutX="-2.0" AnchorPane.bottomAnchor="40.0" AnchorPane.leftAnchor="40.0" AnchorPane.rightAnchor="40.0" AnchorPane.topAnchor="40.0">
+                     <columnConstraints>
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" maxWidth="475.0" minWidth="475.0" prefWidth="475.0" />
+                        <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                     </columnConstraints>
+                     <rowConstraints>
+                        <RowConstraints maxHeight="330.0" minHeight="10.0" prefHeight="214.0" vgrow="SOMETIMES" />
+                        <RowConstraints maxHeight="150.0" minHeight="10.0" prefHeight="135.0" vgrow="SOMETIMES" />
+                     </rowConstraints>
+                     <children>
+                            <TableView fx:id="boatInfoTable" minWidth="475.0" prefHeight="214.0" prefWidth="475.0" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
+                                <columns>
+                                    <TableColumn fx:id="boatPlacingColumn" prefWidth="50.0" text="Place" />
+                                    <TableColumn fx:id="boatTeamColumn" prefWidth="200.0" text="Team" />
+                                    <TableColumn fx:id="boatMarkColumn" prefWidth="150.0" text="Mark" />
+                                    <TableColumn fx:id="boatSpeedColumn" prefWidth="75.0" text="Speed" />
+                                </columns>
+                            </TableView>
+                            <AnchorPane fx:id="lineChartWrapper" prefHeight="167.0" prefWidth="178.0" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER">
+                                <children>
+                                    <LineChart fx:id="sparklineChart" layoutX="-211.0" layoutY="-186.0" mouseTransparent="true" prefHeight="167.0" prefWidth="178.0" titleSide="LEFT" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                        <xAxis>
+                                            <NumberAxis side="BOTTOM" fx:id="xAxis" />
+                                        </xAxis>
+                                        <yAxis>
+                                            <NumberAxis fx:id="yAxis" side="LEFT" />
+                                        </yAxis>
+                                    </LineChart>
+                                </children>
+                            </AnchorPane>
+                     </children>
+                  </GridPane>
+                  </children>
+              </AnchorPane>
             </children>
         </StackPane>
-        <AnchorPane fx:id="infoWrapper" layoutX="450.0" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0" visible="false" AnchorPane.bottomAnchor="20.0" AnchorPane.leftAnchor="20.0" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="20.0" GridPane.columnIndex="1">
-            <children>
-            <GridPane layoutX="50.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-               <columnConstraints>
-                  <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
-               </columnConstraints>
-               <rowConstraints>
-                  <RowConstraints maxHeight="369.0" minHeight="10.0" prefHeight="228.0" vgrow="SOMETIMES" />
-                  <RowConstraints maxHeight="250.0" minHeight="10.0" prefHeight="163.0" vgrow="SOMETIMES" />
-               </rowConstraints>
-               <children>
-                      <TableView fx:id="boatInfoTable" layoutX="-2.0" maxWidth="475.0" minWidth="475.0" prefWidth="475.0" AnchorPane.bottomAnchor="126.0" AnchorPane.leftAnchor="50.0" AnchorPane.rightAnchor="50.0" AnchorPane.topAnchor="0.0" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
-                          <columns>
-                              <TableColumn fx:id="boatPlacingColumn" prefWidth="50.0" text="Place" />
-                              <TableColumn fx:id="boatTeamColumn" prefWidth="200.0" text="Team" />
-                              <TableColumn fx:id="boatMarkColumn" prefWidth="150.0" text="Mark" />
-                              <TableColumn fx:id="boatSpeedColumn" prefWidth="75.0" text="Speed" />
-                          </columns>
-                      </TableView>
-                      <AnchorPane prefHeight="167.0" prefWidth="178.0" GridPane.rowIndex="1">
-                          <children>
-                              <LineChart fx:id="sparklineChart" layoutX="-211.0" layoutY="-186.0" mouseTransparent="true" prefHeight="167.0" prefWidth="178.0" titleSide="LEFT" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
-                                  <xAxis>
-                                      <NumberAxis side="BOTTOM" fx:id="xAxis" />
-                                  </xAxis>
-                                  <yAxis>
-                                      <NumberAxis fx:id="yAxis" side="LEFT" />
-                                  </yAxis>
-                              </LineChart>
-                          </children>
-                      </AnchorPane>
-               </children>
-            </GridPane>
-            </children>
-        </AnchorPane>
-    </children>
-</AnchorPane>
+    </items>
+</SplitPane>

From e0d886ffb2d12bf09965fd26dd7ecc2bd78eed83 Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Thu, 14 Sep 2017 23:53:13 +1200
Subject: [PATCH 4/4] overlay off by default #story[1195]

---
 .../src/main/resources/visualiser/scenes/newRaceView.fxml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
index 5c9c2660..76195416 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/newRaceView.fxml
@@ -105,7 +105,7 @@
                         <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>
-              <AnchorPane fx:id="infoWrapper" focusTraversable="true" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0">
+              <AnchorPane fx:id="infoWrapper" focusTraversable="true" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0" visible="false">
                   <children>
                   <GridPane layoutX="-2.0" AnchorPane.bottomAnchor="40.0" AnchorPane.leftAnchor="40.0" AnchorPane.rightAnchor="40.0" AnchorPane.topAnchor="40.0">
                      <columnConstraints>