Merge branch 'add-fps-counter'

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<>();
@@ -78,15 +79,19 @@ public class CanvasController {
         // overriding the handle so that it can clean canvas and redraw boats and course marks
         AnimationTimer timer = new AnimationTimer() {
             private long lastUpdate = 0;
+            private long lastFpsUpdate = 0;
+            private int lastFpsCount = 0;
+            private int fpsCount = 0;
 
             @Override
             public void handle(long now) {
-                if (now - lastUpdate >= 33000000){
+                if (true){ //if statement for limiting refresh rate if needed
                     gc.clearRect(0, 0, canvas.getWidth(),canvas.getHeight());
                     gc.setFill(Color.SKYBLUE);
                     gc.fillRect(0,0,canvas.getWidth(),canvas.getHeight());
                     drawCourse();
                     drawBoats();
+                    drawFps(lastFpsCount);
 
                     // If race has started, draw the boats and play the timeline
                     if (race.getRaceTime() > 1){
@@ -98,6 +103,12 @@ public class CanvasController {
                         pauseTimelines();
                     }
                     lastUpdate = now;
+                    fpsCount ++;
+                    if (now - lastFpsUpdate >= 1000000000){
+                        lastFpsCount = fpsCount;
+                        fpsCount = 0;
+                        lastFpsUpdate = now;
+                    }
                 }
             }
         };
@@ -139,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();
@@ -256,6 +273,15 @@ public class CanvasController {
         }
     }
 
+    private void drawFps(int fps){
+        if (displayFps){
+            gc.setFill(Color.BLACK);
+            gc.setFont(new Font(14));
+            gc.setLineWidth(3);
+            gc.fillText(fps + " FPS", 5, 20);
+        }
+    }
+
     /**
      * Draws all the boats.
      */

src/main/java/seng302/models/Race.java

@@ -152,7 +152,6 @@ public class Race {
      * @param boat The boat that has finished the race
      */
     public void setBoatFinished(Boat boat){
-        System.out.println(boat.getTeamName() + " finished");
         this.finishingOrder.add(boat);
     }
 

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">