Merge branch 'story27' of https://eng-git.canterbury.ac.nz/seng302-2017/team-7 into story27

src/main/java/seng302/App.java

@@ -25,10 +25,8 @@ public class App extends Application {
 
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/scenes/main.fxml"));
         Parent root = loader.load();
-        Scene scene = new Scene(root, 1050, 835);
+        Scene scene = new Scene(root, 1200, 800);
         stage.setScene(scene);
-        stage.setMinHeight(800);
-        stage.setMinWidth(1200);
         stage.show();
     }
 

src/main/java/seng302/Controllers/Controller.java

@@ -11,14 +11,14 @@ import java.util.ResourceBundle;
  * Created by fwy13 on 15/03/2017.
  */
 public abstract class Controller implements Initializable {
-    protected Controller parent;
+    protected MainController parent;
 
     /**
      * Sets the parent of the application
      *
      * @param parent controller
      */
-    public void setParent(Controller parent) {
+    public void setParent(MainController parent) {
         this.parent = parent;
     }
 

src/main/java/seng302/Controllers/MainController.java

@@ -15,6 +15,11 @@ public class MainController extends Controller {
     @FXML RaceController raceController;
 
 
+    public void beginRace(int scaleFactor) {
+        raceController.startRace(scaleFactor);
+    }
+
+
 
 
     /**

src/main/java/seng302/Controllers/RaceController.java

@@ -25,11 +25,7 @@ public class RaceController extends Controller {
     GridPane canvasBase;
 
     ResizableRaceCanvas raceMap;
-
+    @FXML SplitPane race;
-    @FXML
-    GridPane startScreen;
-    @FXML
-    SplitPane racepane;
     @FXML
     CheckBox showFPS;
     @FXML
@@ -99,7 +95,7 @@ public class RaceController extends Controller {
      *
      * @param scaleFactor scale value of race
      */
-    private void startRace(int scaleFactor) {
+    public void startRace(int scaleFactor) {
         RaceXMLReader raceXMLReader = null;
         try {
             raceXMLReader = new RaceXMLReader("raceXML/bermuda_AC35.xml");
@@ -120,12 +116,12 @@ public class RaceController extends Controller {
 
 
         ArrayList<Leg> legs = raceXMLReader.getLegs();
-        ConstantVelocityRace race = new ConstantVelocityRace(boats, legs, this, scaleFactor);
+        ConstantVelocityRace newRace = new ConstantVelocityRace(boats, legs, this, scaleFactor);
-        race.initialiseBoats();
+        newRace.initialiseBoats();
 
-        BoatInRace[] startingBoats = new BoatInRace[race.getStartingBoats().size()];
+        BoatInRace[] startingBoats = new BoatInRace[newRace.getStartingBoats().size()];
         int i = 0;
-        for (BoatInRace boat : race.getStartingBoats()) {
+        for (BoatInRace boat : newRace.getStartingBoats()) {
             startingBoats[i] = boat;
             i++;
         }
@@ -140,14 +136,13 @@ public class RaceController extends Controller {
         raceMap.setVisible(true);
 
         canvasBase.getChildren().add(raceMap);
-        startScreen.setVisible(false);
+        race.setVisible(true);
-        racepane.setVisible(true);
 
 
         initializeFPS();
         initializeAnnotations();
 
-        new Thread((race)).start();
+        new Thread((newRace)).start();
     }
 
 

src/main/java/seng302/Controllers/StartController.java

@@ -1,5 +1,8 @@
 package seng302.Controllers;
 
+import javafx.fxml.FXML;
+import javafx.scene.layout.GridPane;
+
 import java.net.URL;
 import java.util.ResourceBundle;
 
@@ -8,6 +11,7 @@ import java.util.ResourceBundle;
  */
 public class StartController extends Controller {
 
+    @FXML private GridPane start;
 
     /**
      * Begins the race with a scale factor of 15
@@ -31,7 +35,8 @@ public class StartController extends Controller {
     }
 
     private void startRace(Integer raceScale){
-
+        start.setVisible(false);
+        parent.beginRace(raceScale);
     }
 
     @Override
@@ -39,5 +44,4 @@ public class StartController extends Controller {
 
     }
 
-
 }