From 4b2e90f54bf9f2e463f8ad0484b7b8e96ae434de Mon Sep 17 00:00:00 2001
From: hba56 <hba56@uclive.ac.nz>
Date: Sat, 20 May 2017 21:04:03 +1200
Subject: [PATCH] can now toggle the boats time on and off  #story[878]

---
 .../seng302/Controllers/RaceController.java   |  5 ++
 .../seng302/Model/ResizableRaceCanvas.java    |  8 ++
 .../src/main/resources/scenes/race.fxml       | 76 +++++++------------
 3 files changed, 41 insertions(+), 48 deletions(-)

diff --git a/visualiser/src/main/java/seng302/Controllers/RaceController.java b/visualiser/src/main/java/seng302/Controllers/RaceController.java
index c34e1768..a0937a9b 100644
--- a/visualiser/src/main/java/seng302/Controllers/RaceController.java
+++ b/visualiser/src/main/java/seng302/Controllers/RaceController.java
@@ -35,6 +35,7 @@ public class RaceController extends Controller {
     @FXML CheckBox showName;
     @FXML CheckBox showAbbrev;
     @FXML CheckBox showSpeed;
+    @FXML CheckBox showTime;
     @FXML Button saveAnno;
     @FXML Button showSetAnno;
     @FXML TableView<Boat> boatInfoTable;
@@ -200,6 +201,10 @@ public class RaceController extends Controller {
             raceMap.toggleAnnoSpeed();
             raceMap.update();
         });
+        showTime.selectedProperty().addListener((ov, old_val, new_val) -> {
+            raceMap.toggleAnnoTime();
+            raceMap.update();
+        });
         //listener to save currently selected annotation
         saveAnno.setOnAction(event -> {
             presetAnno.clear();
diff --git a/visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java b/visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
index 02082a78..edccebdd 100644
--- a/visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
+++ b/visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
@@ -266,10 +266,18 @@ public class ResizableRaceCanvas extends ResizableCanvas {
         annoName = !annoName;
     }
 
+    /**
+     * Toggle boat path display in annotation
+     */
     public void toggleBoatPath() {
         annoPath = !annoPath;
     }
 
+    /**
+     * Toggle boat time display in annotation
+     */
+    public void toggleAnnoTime() { annoTimeSinceLastMark = !annoTimeSinceLastMark;}
+
     /**
      * Toggle abbreviation display in annotation
      */
diff --git a/visualiser/src/main/resources/scenes/race.fxml b/visualiser/src/main/resources/scenes/race.fxml
index 7ab63046..148f1133 100644
--- a/visualiser/src/main/resources/scenes/race.fxml
+++ b/visualiser/src/main/resources/scenes/race.fxml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.Font?>
-<SplitPane xmlns:fx="http://javafx.com/fxml/1" fx:id="race" dividerPositions="0.7" visible="false" AnchorPane.bottomAnchor="0.0"
-           AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"
-           xmlns="http://javafx.com/javafx/8" fx:controller="seng302.Controllers.RaceController">
+
+<SplitPane fx:id="race" dividerPositions="0.7" visible="false" 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="seng302.Controllers.RaceController">
     <items>
         <GridPane fx:id="canvasBase">
             <columnConstraints>
-                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0"/>
+                <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" />
             </columnConstraints>
             <rowConstraints>
-                <RowConstraints minHeight="10.0" vgrow="SOMETIMES"/>
+                <RowConstraints minHeight="10.0" vgrow="SOMETIMES" />
             </rowConstraints>
             <children>
                 <Pane prefHeight="200.0" prefWidth="400.0" GridPane.halignment="LEFT" GridPane.valignment="TOP">
@@ -24,28 +26,14 @@
                                     <content>
                                         <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="240.0" prefWidth="200.0">
                                             <children>
-                                                <CheckBox fx:id="showBoatPath" mnemonicParsing="false" selected="true"
-                                                          text="Show Boat Paths" AnchorPane.leftAnchor="0.0"
-                                                          AnchorPane.topAnchor="104.0"/>
-                                                <CheckBox fx:id="showAnnotations" layoutX="-2.0" layoutY="14.0"
-                                                          mnemonicParsing="false" selected="true"
-                                                          text="Show Annotations" AnchorPane.leftAnchor="0.0"
-                                                          AnchorPane.topAnchor="0.0"/>
-                                                <CheckBox fx:id="showName" layoutY="39.0" mnemonicParsing="false"
-                                                          selected="true" text="Show Boat Name"
-                                                          AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="26.0"/>
-                                                <CheckBox fx:id="showAbbrev" layoutY="61.0" mnemonicParsing="false"
-                                                          selected="true" text="Show Boat Abbreviation"
-                                                          AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="52.0"/>
-                                                <CheckBox fx:id="showSpeed" layoutY="90.0" mnemonicParsing="false"
-                                                          selected="true" text="Show Boat Speed"
-                                                          AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="78.0"/>
-                                                <Button fx:id="saveAnno" layoutX="11.0" layoutY="106.0" maxWidth="154.0"
-                                                        mnemonicParsing="false" prefWidth="154.0" text="Save Annotation"
-                                                        AnchorPane.topAnchor="130.0"/>
-                                                <Button fx:id="showSetAnno" layoutX="11.0" layoutY="139.0"
-                                                        mnemonicParsing="false" text="Show Set Annotation"
-                                                        AnchorPane.topAnchor="160.0"/>
+                                                <CheckBox fx:id="showBoatPath" mnemonicParsing="false" selected="true" text="Show Boat Paths" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="104.0" />
+                                                <CheckBox fx:id="showAnnotations" layoutX="-2.0" layoutY="14.0" mnemonicParsing="false" selected="true" text="Show Annotations" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                                <CheckBox fx:id="showName" layoutY="39.0" mnemonicParsing="false" selected="true" text="Show Boat Name" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="26.0" />
+                                                <CheckBox fx:id="showAbbrev" layoutY="61.0" mnemonicParsing="false" selected="true" text="Show Boat Abbreviation" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="52.0" />
+                                                <CheckBox fx:id="showSpeed" layoutY="90.0" mnemonicParsing="false" selected="true" text="Show Boat Speed" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="78.0" />
+                                    <CheckBox fx:id="showTime" mnemonicParsing="false" selected="true" text="Show Boat Time" AnchorPane.leftAnchor="0.0" AnchorPane.topAnchor="130.0" />
+                                                <Button fx:id="saveAnno" layoutX="11.0" layoutY="106.0" maxWidth="154.0" mnemonicParsing="false" prefWidth="154.0" text="Save Annotation" AnchorPane.topAnchor="160.0" />
+                                                <Button fx:id="showSetAnno" layoutX="11.0" layoutY="139.0" mnemonicParsing="false" text="Show Set Annotation" AnchorPane.topAnchor="190.0" />
                                             </children>
                                         </AnchorPane>
                                     </content>
@@ -54,9 +42,7 @@
                                     <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"/>
+                                                <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>
@@ -65,40 +51,34 @@
                         </Accordion>
                     </children>
                 </Pane>
-                <Label fx:id="timer" layoutX="45.0" layoutY="146.0" maxHeight="20.0" text="0:0"
-                       AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0" GridPane.halignment="RIGHT"
-                       GridPane.valignment="BOTTOM">
+                <Label fx:id="timer" layoutX="45.0" layoutY="146.0" maxHeight="20.0" text="0:0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0" GridPane.halignment="RIGHT" GridPane.valignment="BOTTOM">
                     <font>
-                        <Font name="System Bold" size="15.0"/>
+                        <Font name="System Bold" size="15.0" />
                     </font>
                 </Label>
-                <Label fx:id="FPS" text="FPS: 0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
-                       GridPane.halignment="LEFT" GridPane.valignment="BOTTOM">
+                <Label fx:id="FPS" text="FPS: 0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" GridPane.halignment="LEFT" GridPane.valignment="BOTTOM">
                     <font>
-                        <Font name="System Bold" size="15.0"/>
+                        <Font name="System Bold" size="15.0" />
                     </font>
                 </Label>
                 <Label fx:id="timeZone" text="Label" GridPane.halignment="RIGHT" GridPane.valignment="BOTTOM">
                     <GridPane.margin>
-                        <Insets bottom="20.0"/>
+                        <Insets bottom="20.0" />
                     </GridPane.margin>
                     <font>
-                        <Font name="System Bold" size="15.0"/>
+                        <Font name="System Bold" size="15.0" />
                     </font>
                 </Label>
             </children>
         </GridPane>
-        <AnchorPane layoutX="450.0" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0"
-                    GridPane.columnIndex="1">
+        <AnchorPane layoutX="450.0" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0" GridPane.columnIndex="1">
             <children>
-                <TableView fx:id="boatInfoTable" layoutX="-2.0" prefHeight="600.0" prefWidth="264.0"
-                           AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="-2.0" AnchorPane.rightAnchor="-62.0"
-                           AnchorPane.topAnchor="0.0">
+                <TableView fx:id="boatInfoTable" layoutX="-2.0" prefHeight="600.0" prefWidth="264.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="-2.0" AnchorPane.rightAnchor="-62.0" AnchorPane.topAnchor="0.0">
                     <columns>
-                        <TableColumn fx:id="boatPlacingColumn" prefWidth="50.0" text="Place"/>
-                        <TableColumn fx:id="boatTeamColumn" prefWidth="100.0" text="Team"/>
-                        <TableColumn fx:id="boatMarkColumn" prefWidth="130.0" text="Mark"/>
-                        <TableColumn fx:id="boatSpeedColumn" prefWidth="75.0" text="Speed"/>
+                        <TableColumn fx:id="boatPlacingColumn" prefWidth="50.0" text="Place" />
+                        <TableColumn fx:id="boatTeamColumn" prefWidth="100.0" text="Team" />
+                        <TableColumn fx:id="boatMarkColumn" prefWidth="130.0" text="Mark" />
+                        <TableColumn fx:id="boatSpeedColumn" prefWidth="75.0" text="Speed" />
                     </columns>
                 </TableView>
             </children>