From 0fde0cd9b59716d25c21ffbecae688b417261a50 Mon Sep 17 00:00:00 2001
From: Erika Savell <esa46@uclive.ac.nz>
Date: Fri, 24 Mar 2017 13:03:03 +1300
Subject: [PATCH] Created new start screen and implemented switching from start
 to race map

#implement #story[16]
---
 .../seng302/Controllers/RaceController.java   | 20 ++++++++++++++++---
 src/main/resources/scenes/racepane.fxml       | 20 +++++++++++++++++--
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/main/java/seng302/Controllers/RaceController.java b/src/main/java/seng302/Controllers/RaceController.java
index 317d69da..a4981583 100644
--- a/src/main/java/seng302/Controllers/RaceController.java
+++ b/src/main/java/seng302/Controllers/RaceController.java
@@ -12,6 +12,7 @@ import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.GridPane;
 import javafx.scene.paint.Color;
 import javafx.util.Callback;
 import org.geotools.referencing.GeodeticCalculator;
@@ -33,6 +34,9 @@ public class RaceController extends Controller{
     @FXML
     AnchorPane canvasBase;
 
+    @FXML
+    GridPane startScreen;
+
     ResizableRaceCanvas raceMap;
 
     @FXML
@@ -80,8 +84,9 @@ public class RaceController extends Controller{
         });
     }
 
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
+
+    @FXML
+    public void startRace() {
 
         BoatInRace[] boats = generateAC35Competitors();
 
@@ -92,13 +97,22 @@ public class RaceController extends Controller{
         raceMap.drawRaceMap();
 
         canvasBase.getChildren().add(raceMap);
+        startScreen.setVisible(false);
 
         ArrayList<Leg> legs = generateBermudaCourseLegs();
         ConstantVelocityRace race = new ConstantVelocityRace(boats, legs, this);
-
+        raceMap.setVisible(true);
         (new Thread(race)).start();
     }
 
+    @Override
+    public void initialize(URL location, ResourceBundle resources) {
+
+
+    }
+
+
+
     /**
      * Function for the Bermuda Race.
      * @return legs in the Bermuda Race.
diff --git a/src/main/resources/scenes/racepane.fxml b/src/main/resources/scenes/racepane.fxml
index 4abc1d7b..b233563d 100644
--- a/src/main/resources/scenes/racepane.fxml
+++ b/src/main/resources/scenes/racepane.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import javafx.scene.text.*?>
 <?import javafx.scene.canvas.*?>
 <?import javafx.scene.control.*?>
 <?import java.lang.*?>
@@ -9,13 +10,28 @@
    <children>
       <SplitPane dividerPositions="0.65" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <items>
-            <AnchorPane fx:id="canvasBase">
+            <AnchorPane fx:id="canvasBase" prefHeight="581.0" prefWidth="537.0">
                <children>
                   <Label fx:id="timer" layoutX="45.0" layoutY="146.0" text="0:0" AnchorPane.bottomAnchor="0.0" AnchorPane.rightAnchor="0.0" />
+                  <GridPane fx:id="startScreen" prefHeight="600.0" prefWidth="780.0">
+                    <columnConstraints>
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                      <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                    </columnConstraints>
+                    <rowConstraints>
+                      <RowConstraints maxHeight="241.0" minHeight="10.0" prefHeight="215.0" vgrow="SOMETIMES" />
+                      <RowConstraints maxHeight="213.0" minHeight="10.0" prefHeight="213.0" vgrow="SOMETIMES" />
+                      <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                    </rowConstraints>
+                     <children>
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Select Your Race Duration" />
+                        <Button mnemonicParsing="false" onAction="#startRace" text="1 min" GridPane.rowIndex="1" />
+                     </children>
+                  </GridPane>
                </children></AnchorPane>
           <AnchorPane layoutX="450.0" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="200.0" GridPane.columnIndex="1">
                <children>
-                  <TableView fx:id="boatInfoTable" prefHeight="400.0" prefWidth="300.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                  <TableView fx:id="boatInfoTable" layoutX="-2.0" prefHeight="600.0" prefWidth="264.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="-2.0" AnchorPane.rightAnchor="-62.0" AnchorPane.topAnchor="0.0">
                     <columns>
                         <TableColumn fx:id="boatPlacingColumn" prefWidth="50.0" text="Place" />
                       <TableColumn fx:id="boatTeamColumn" prefWidth="100.0" text="Team" />