diff --git a/src/main/java/seng302/visualiser/controllers/RaceViewController.java b/src/main/java/seng302/visualiser/controllers/RaceViewController.java index 24107453..2efe36ee 100644 --- a/src/main/java/seng302/visualiser/controllers/RaceViewController.java +++ b/src/main/java/seng302/visualiser/controllers/RaceViewController.java @@ -30,6 +30,7 @@ import javafx.scene.control.ComboBox; import javafx.scene.control.Label; import javafx.scene.control.Slider; import javafx.scene.control.TextField; +import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; import javafx.scene.layout.GridPane; import javafx.scene.layout.Pane; @@ -100,6 +101,8 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel private Text fpsDisplay; @FXML private Text windSpeedText; + @FXML + private ImageView windImageView; //Race Data private Map participants; @@ -120,6 +123,7 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel public void initialize() { Sounds.stopMusic(); Sounds.playRaceMusic(); + // Load a default important annotation state //importantAnnotations = new ImportantAnnotationsState(); diff --git a/src/main/resources/css/DJB-Get-Digital.ttf b/src/main/resources/css/DJB-Get-Digital.ttf new file mode 100644 index 00000000..4cd9ec7d Binary files /dev/null and b/src/main/resources/css/DJB-Get-Digital.ttf differ diff --git a/src/main/resources/css/RaceView.css b/src/main/resources/css/RaceView.css index 6763ea7a..f0f89d17 100644 --- a/src/main/resources/css/RaceView.css +++ b/src/main/resources/css/RaceView.css @@ -1,10 +1,17 @@ +@font-face { + src: url("DJB-Get-Digital.ttf"); +} + #timerGrid{ -fx-background-color: rgba(255, 255, 255, 0.6); } +.timer Label { + -fx-font-family: "DJB Get Digital" !important; +} + #timerLabel{ -fx-font-size: 21px; - -fx-font-family: "Baloo"; } #raceInfoArea{ @@ -34,4 +41,8 @@ -jfx-focus-color: -fx-pp-light-theme-color; -jfx-unfocus-color: -fx-pp-dark-text-color; -fx-background-color: transparent; +} + +#windImageView { + -fx-image: url("/images/wind.png"); } \ No newline at end of file diff --git a/src/main/resources/images/wind.png b/src/main/resources/images/wind.png new file mode 100644 index 00000000..c4502a87 Binary files /dev/null and b/src/main/resources/images/wind.png differ diff --git a/src/main/resources/views/RaceView.fxml b/src/main/resources/views/RaceView.fxml index 2b564da1..02188f66 100644 --- a/src/main/resources/views/RaceView.fxml +++ b/src/main/resources/views/RaceView.fxml @@ -40,7 +40,7 @@ vgrow="SOMETIMES"/> - + @@ -122,7 +122,29 @@ - + + + + + + + + + + + + + + +