From ac558746a0b8ef54731e1a173bfa7a4485365fef Mon Sep 17 00:00:00 2001 From: Erika Savell Date: Sat, 25 Mar 2017 18:18:01 +1300 Subject: [PATCH] Cleaning up gui -In future, users could load xml file before selecting scaling, and then get estimates of time different scaling would take #implement #sotry[16] --- .../seng302/Controllers/RaceController.java | 10 ++- src/main/resources/scenes/racepane.fxml | 81 +++++++++++++------ 2 files changed, 63 insertions(+), 28 deletions(-) diff --git a/src/main/java/seng302/Controllers/RaceController.java b/src/main/java/seng302/Controllers/RaceController.java index fddea21e..311412bd 100644 --- a/src/main/java/seng302/Controllers/RaceController.java +++ b/src/main/java/seng302/Controllers/RaceController.java @@ -8,6 +8,7 @@ import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.scene.canvas.GraphicsContext; import javafx.scene.control.Label; +import javafx.scene.control.SplitPane; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; import javafx.scene.control.cell.PropertyValueFactory; @@ -43,6 +44,9 @@ public class RaceController extends Controller{ @FXML Label timer; + @FXML + SplitPane ongoingRacePane; + @FXML TableView boatInfoTable; @FXML @@ -109,20 +113,22 @@ public class RaceController extends Controller{ raceMap.heightProperty().bind(canvasBase.heightProperty()); raceMap.setBoats(boats); raceMap.drawRaceMap(); + raceMap.setVisible(true); canvasBase.getChildren().add(raceMap); startScreen.setVisible(false); + ongoingRacePane.setVisible(true); ArrayList legs = generateBermudaCourseLegs(); ConstantVelocityRace race = new ConstantVelocityRace(boats, legs, this, scaleFactor); - raceMap.setVisible(true); + + (new Thread(race)).start(); } @Override public void initialize(URL location, ResourceBundle resources) { - } diff --git a/src/main/resources/scenes/racepane.fxml b/src/main/resources/scenes/racepane.fxml index 2e627ee5..c9e743a7 100644 --- a/src/main/resources/scenes/racepane.fxml +++ b/src/main/resources/scenes/racepane.fxml @@ -1,5 +1,7 @@ + + @@ -8,36 +10,63 @@ - + + + + + + + + + + + + + + + + + + + + + +