From 6fc55bb82c0308884ce4d983776fce213b15e280 Mon Sep 17 00:00:00 2001
From: Peter <ptg19@uclive.ac.nz>
Date: Mon, 27 Mar 2017 16:45:02 +1300
Subject: [PATCH] Added toggle for fps #story[463]

---
 .../seng302/controllers/CanvasController.java | 19 ++++++++++++++-----
 src/main/resources/RaceView.fxml              |  5 +++--
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java
index 87421576..84709f81 100644
--- a/src/main/java/seng302/controllers/CanvasController.java
+++ b/src/main/java/seng302/controllers/CanvasController.java
@@ -45,7 +45,7 @@ public class CanvasController {
     @FXML
     private BoatPositionController teamPositionsController;
     @FXML
-    private CheckBox toggleAnnotation;
+    private CheckBox toggleAnnotation, toggleFps;
 
     private Race race;
     private GraphicsContext gc;
@@ -61,6 +61,7 @@ public class CanvasController {
     private final int SCALE = 16000;
 
     private boolean annotationCheck = true;
+    private boolean displayFps = true;
 
     ///test
     private HashSet<Integer> headingTest = new HashSet<>();
@@ -149,6 +150,12 @@ public class CanvasController {
                 annotationCheck = !annotationCheck;
             }
         });
+        toggleFps.selectedProperty().addListener(new ChangeListener<Boolean>() {
+            @Override
+            public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+                displayFps = !displayFps;
+            }
+        });
 
         //set wind direction!!!!!!! can't find another place to put my code --haoming
         double windDirection = new ConfigParser("/config.xml").getWindDirection();
@@ -267,10 +274,12 @@ public class CanvasController {
     }
 
     private void drawFps(int fps){
-        gc.setFill(Color.BLACK);
-        gc.setFont(new Font(14));
-        gc.setLineWidth(3);
-        gc.fillText(fps + " FPS", 5, 20);
+        if (displayFps){
+            gc.setFill(Color.BLACK);
+            gc.setFont(new Font(14));
+            gc.setLineWidth(3);
+            gc.fillText(fps + " FPS", 5, 20);
+        }
     }
 
     /**
diff --git a/src/main/resources/RaceView.fxml b/src/main/resources/RaceView.fxml
index 9c8b7add..c36a95d5 100644
--- a/src/main/resources/RaceView.fxml
+++ b/src/main/resources/RaceView.fxml
@@ -25,7 +25,7 @@
             <AnchorPane prefHeight="200.0" prefWidth="200.0" GridPane.rowSpan="3">
                <children>
                   <Label layoutX="11.0" layoutY="259.0" text="Team Position" />
-                  <Label layoutX="13.0" layoutY="432.0" text="Annotation toggle" />
+                  <Label layoutX="13.0" layoutY="432.0" text="Settings" />
                   <Label layoutX="11.0" layoutY="14.0" text="Timer" />
                   <Label layoutX="11.0" layoutY="88.0" text="Wind direction" />
                   <Circle fx:id="windBackgroundCircle" blendMode="DARKEN" fill="#76baf8" layoutX="110.0" layoutY="166.0" radius="35.0" stroke="#686868" strokeType="INSIDE" strokeWidth="3.0" />
@@ -45,7 +45,8 @@
                         <fx:include fx:id="teamPositions" source="TeamPositions.fxml" />
                      </children>
                   </AnchorPane>
-                  <CheckBox fx:id="toggleAnnotation" layoutX="27.0" layoutY="462.0" mnemonicParsing="false" text="Toggle annotation" />
+                  <CheckBox fx:id="toggleAnnotation" layoutX="27.0" layoutY="462.0" mnemonicParsing="false" selected="true" text="Show annotations" />
+                  <CheckBox fx:id="toggleFps" layoutX="27.0" layoutY="488.0" mnemonicParsing="false" prefHeight="18.0" prefWidth="143.0" selected="true" text="Show FPS" />
                </children>
             </AnchorPane>
             <AnchorPane fx:id="contentAnchorPane" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="960.0" prefWidth="1280.0" GridPane.columnIndex="1" GridPane.rowSpan="3">