From d9247eb031416724294602a102d4775d3d5efde5 Mon Sep 17 00:00:00 2001 From: Zhi You Tan Date: Wed, 13 Sep 2017 11:21:33 +1200 Subject: [PATCH] Added player position, boat speed, boat heading to race view. #story[1245] --- .../controllers/RaceViewController.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java index fd94deca..0c1f3cc3 100644 --- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java +++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java @@ -519,9 +519,12 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel } } + /** + * Updates player position with ordinal number up to 23rd position. + */ private void updatePosition() { if (player.getPosition() == null) { - positionLabel.setText("Position:\n0"); + positionLabel.setText("Position:\n-"); } else { switch (player.getPosition()) { case 1: @@ -548,12 +551,18 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel } } + /** + * Updates boat speed value displayed on race view. + */ private void updateBoatSpeed() { - boatSpeedLabel.setText("Boat Speed:\n" + String.valueOf(player.getVelocityProperty().toString())); + boatSpeedLabel.setText("Boat Speed:\n" + String.valueOf(player.getCurrentVelocity())); } + /** + * Updates boat heading value displayed on race view. + */ private void updateBoatHeading() { - boatHeadingLabel.setText("Boat Heading:\n" + String.valueOf(player.getHeading())); + boatHeadingLabel.setText(String.format("Boat Heading:\n%.1f°", player.getHeading())); } /**