From 54d329c5cfe6a030751f2a6334681ab3e2c7ab50 Mon Sep 17 00:00:00 2001 From: Peter Date: Wed, 22 Mar 2017 14:44:40 +1300 Subject: [PATCH] changed raceView javafx structure and added an example of how the handle function works with keyframes #story[426] --- .../seng302/controllers/CanvasController.java | 13 +++++ src/main/resources/RaceView.fxml | 51 +++++++++---------- src/main/resources/RaceViewOld.fxml | 39 ++++++++++++++ 3 files changed, 75 insertions(+), 28 deletions(-) create mode 100644 src/main/resources/RaceViewOld.fxml diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java index f25c7726..e3663035 100644 --- a/src/main/java/seng302/controllers/CanvasController.java +++ b/src/main/java/seng302/controllers/CanvasController.java @@ -6,9 +6,12 @@ import javafx.animation.KeyValue; import javafx.animation.Timeline; import javafx.beans.property.DoubleProperty; import javafx.beans.property.SimpleDoubleProperty; +import javafx.event.ActionEvent; +import javafx.event.EventHandler; import javafx.fxml.FXML; import javafx.scene.canvas.Canvas; import javafx.scene.canvas.GraphicsContext; +import javafx.scene.control.TextArea; import javafx.scene.paint.Color; import javafx.util.Duration; import seng302.models.Boat; @@ -33,6 +36,8 @@ import static java.lang.Math.abs; public class CanvasController { @FXML private Canvas canvas; + @FXML + TextArea boatOrder; private Race race; private GraphicsContext gc; @@ -83,10 +88,18 @@ public class CanvasController { List keyFrames = new ArrayList<>(); List events = boat_events.get(boat); + + EventHandler onFinished = new EventHandler() { + public void handle(ActionEvent event) { + boat.getTeamName(); + } + }; + // iterates all events and convert each event to keyFrame, then add them into a list for (Event event : events) { keyFrames.add( new KeyFrame(Duration.seconds(event.getTime() / 60 / 60 / 5), + onFinished, new KeyValue(x, event.getThisMark().getLatitude()), new KeyValue(y, event.getThisMark().getLongitude()) ) diff --git a/src/main/resources/RaceView.fxml b/src/main/resources/RaceView.fxml index d14c7c88..1ac0d054 100644 --- a/src/main/resources/RaceView.fxml +++ b/src/main/resources/RaceView.fxml @@ -7,33 +7,28 @@ - - - - - - - - - - + - - - - - - - -