From 42ffd1b1f894fb676fcc0164a70234b8689e629f Mon Sep 17 00:00:00 2001 From: Haoming Yin Date: Thu, 23 Mar 2017 01:10:07 +1300 Subject: [PATCH] Add rotated wind direction arrow to race view. #story[422] --- .../seng302/controllers/CanvasController.java | 10 ++++++++++ src/main/resources/RaceView.fxml | 15 ++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java index 033598ec..2e00b8f1 100644 --- a/src/main/java/seng302/controllers/CanvasController.java +++ b/src/main/java/seng302/controllers/CanvasController.java @@ -13,6 +13,7 @@ import javafx.scene.canvas.GraphicsContext; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.Pane; import javafx.scene.paint.Color; +import javafx.scene.text.Text; import javafx.util.Duration; import seng302.models.Boat; import seng302.models.Event; @@ -22,6 +23,8 @@ import seng302.models.mark.GateMark; import seng302.models.mark.Mark; import seng302.models.mark.MarkType; import seng302.models.mark.SingleMark; +import seng302.models.parsers.ConfigParser; +import seng302.models.parsers.CourseParser; import java.io.IOException; import java.util.ArrayList; @@ -47,6 +50,8 @@ public class CanvasController { @FXML private AnchorPane contentAnchorPane; + @FXML + private Text windArrowText, windDirectionText; private void loadRaceResultView() { FXMLLoader loader = new FXMLLoader(getClass().getResource("/FinishView.fxml")); @@ -104,6 +109,11 @@ public class CanvasController { } maxTimeline.setOnFinished(event -> loadRaceResultView()); + + //set wind direction!!!!!!! can't find another place to put my code --haoming + double windDirection = new ConfigParser("doc/examples/config.xml").getWindDirection(); + windDirectionText.setText(String.format("%.1f°", windDirection)); + windArrowText.setRotate(windDirection); } /** diff --git a/src/main/resources/RaceView.fxml b/src/main/resources/RaceView.fxml index e658a8bf..4a726873 100644 --- a/src/main/resources/RaceView.fxml +++ b/src/main/resources/RaceView.fxml @@ -1,5 +1,7 @@ + + @@ -18,7 +20,7 @@ - + @@ -33,6 +35,17 @@