Merge remote-tracking branch 'origin/NewUI_merge' into NewUI_merge

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<Integer, ClientYacht> 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();
 

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");
 }

src/main/resources/views/RaceView.fxml

@@ -40,7 +40,7 @@
               vgrow="SOMETIMES"/>
         </rowConstraints>
          <children>
-            <GridPane id="timerGrid" fx:id="timerGrid" prefWidth="192.0">
+             <GridPane id="timerGrid" fx:id="timerGrid" prefWidth="192.0" styleClass=".timer">
               <columnConstraints>
                   <ColumnConstraints hgrow="SOMETIMES" maxWidth="50.0" minWidth="50.0"
                     prefWidth="50.0"/>
@@ -122,7 +122,29 @@
                        </GridPane.margin>
                    </JFXTextField>
                </children>
-            </GridPane>
+             </GridPane>
+             <GridPane GridPane.halignment="CENTER" GridPane.rowIndex="2"
+               GridPane.valignment="BOTTOM">
+                 <columnConstraints>
+                     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+                 </columnConstraints>
+                 <rowConstraints>
+                     <RowConstraints maxHeight="100.0" minHeight="100.0" prefHeight="100.0"
+                       vgrow="SOMETIMES"/>
+                     <RowConstraints maxHeight="100.0" minHeight="100.0" prefHeight="100.0"
+                       vgrow="SOMETIMES"/>
+                     <RowConstraints maxHeight="30.0" minHeight="30.0" prefHeight="30.0"
+                       vgrow="SOMETIMES"/>
+                 </rowConstraints>
+                 <children>
+                     <ImageView fx:id="windImageView" fitHeight="92.0" fitWidth="109.0"
+                       pickOnBounds="true" preserveRatio="true" GridPane.halignment="CENTER"
+                       GridPane.rowIndex="1" GridPane.valignment="CENTER"/>
+                     <Label fx:id="windLabel" text="112d   11.5knot" GridPane.halignment="CENTER"
+                       GridPane.rowIndex="2" GridPane.valignment="CENTER"/>
+                 </children>
+             </GridPane>
          </children>
       </GridPane>
    </children>