diff --git a/src/main/java/seng302/Controllers/MainController.java b/src/main/java/seng302/Controllers/MainController.java index 0d09391f..ea65001a 100644 --- a/src/main/java/seng302/Controllers/MainController.java +++ b/src/main/java/seng302/Controllers/MainController.java @@ -2,6 +2,7 @@ package seng302.Controllers; import javafx.fxml.FXML; import javafx.scene.control.SplitPane; +import javafx.scene.layout.AnchorPane; import javafx.scene.layout.GridPane; import seng302.RaceXMLReader; @@ -15,7 +16,6 @@ public class MainController extends Controller { @FXML StartController startController; @FXML RaceController raceController; - public void beginRace(int scaleFactor) { raceController.startRace(scaleFactor); } @@ -33,5 +33,9 @@ public class MainController extends Controller { public void initialize(URL location, ResourceBundle resources) { startController.setParent(this); raceController.setParent(this); + AnchorPane.setTopAnchor(startController.startWrapper(), 0.0); + AnchorPane.setBottomAnchor(startController.startWrapper(), 0.0); + AnchorPane.setLeftAnchor(startController.startWrapper(), 0.0); + AnchorPane.setRightAnchor(startController.startWrapper(), 0.0); } } diff --git a/src/main/java/seng302/Controllers/RaceController.java b/src/main/java/seng302/Controllers/RaceController.java index 58c63304..7f9b6421 100644 --- a/src/main/java/seng302/Controllers/RaceController.java +++ b/src/main/java/seng302/Controllers/RaceController.java @@ -162,7 +162,7 @@ public class RaceController extends Controller { //Initialize save annotation array, fps listener, and annotation listeners //timezone RaceClock raceClock = new RaceClock(raceXMLReader.getMark()); - timeZone.textProperty().bind(raceClock.timeProperty()); + timeZone.setText(raceClock.getTimeZone()); initializeFPS(); initializeAnnotations(); diff --git a/src/main/java/seng302/Controllers/StartController.java b/src/main/java/seng302/Controllers/StartController.java index 40a91de7..6fd543f2 100644 --- a/src/main/java/seng302/Controllers/StartController.java +++ b/src/main/java/seng302/Controllers/StartController.java @@ -3,12 +3,16 @@ package seng302.Controllers; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.fxml.FXML; +import javafx.scene.control.Label; 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 org.xml.sax.SAXException; import seng302.Model.BoatInRace; +import seng302.Model.Race; +import seng302.Model.RaceClock; import seng302.RaceXMLReader; import javax.xml.parsers.ParserConfigurationException; @@ -22,10 +26,14 @@ import java.util.ResourceBundle; public class StartController extends Controller { @FXML private GridPane start; + @FXML private AnchorPane startWrapper; @FXML private TableView boatNameTable; @FXML private TableColumn boatNameColumn; @FXML private TableColumn boatCodeColumn; + @FXML private Label timeZoneTime; + + private RaceClock raceClock; /** * Begins the race with a scale factor of 15 @@ -58,7 +66,10 @@ public class StartController extends Controller { public void initialize(URL location, ResourceBundle resources){ initialiseTables(); + } + public AnchorPane startWrapper(){ + return startWrapper; } private void initialiseTables() { @@ -80,6 +91,10 @@ public class StartController extends Controller { boatNameTable.setItems(observableBoats); boatNameColumn.setCellValueFactory(cellData -> cellData.getValue().getName()); boatCodeColumn.setCellValueFactory(new PropertyValueFactory<>("abbrev")); + //timezone + raceClock = new RaceClock(raceXMLReader.getMark()); + timeZoneTime.textProperty().bind(raceClock.timeProperty()); + } diff --git a/src/main/java/seng302/Model/RaceClock.java b/src/main/java/seng302/Model/RaceClock.java index bf850b30..6ea62bd3 100644 --- a/src/main/java/seng302/Model/RaceClock.java +++ b/src/main/java/seng302/Model/RaceClock.java @@ -17,6 +17,7 @@ import java.time.format.DateTimeFormatter; public class RaceClock { private StringProperty time; private DateTimeFormatter dateTimeFormatter; + private String timeZone; private ZoneId zoneId; public RaceClock(GPSCoordinate gpsCoordinate){ @@ -28,6 +29,8 @@ public class RaceClock { dateTimeFormatter = DateTimeFormatter.ofPattern("dd-MM HH:mm:ss z"); // System.out.println(dateTimeFormatter.format(zonedDateTime)); time = new SimpleStringProperty(dateTimeFormatter.format(zonedDateTime)); + DateTimeFormatter timeZoneFormatter = DateTimeFormatter.ofPattern("z"); + timeZone = timeZoneFormatter.format(zonedDateTime); } public void updateTime(){ @@ -43,4 +46,8 @@ public class RaceClock { public StringProperty timeProperty() { return time; } + + public String getTimeZone() { + return timeZone; + } } diff --git a/src/main/resources/scenes/race.fxml b/src/main/resources/scenes/race.fxml index 1a795e84..00e815a9 100644 --- a/src/main/resources/scenes/race.fxml +++ b/src/main/resources/scenes/race.fxml @@ -7,7 +7,6 @@ - @@ -49,7 +48,7 @@ - @@ -74,4 +81,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/scenes/start.fxml b/src/main/resources/scenes/start.fxml index ff359949..677fc861 100644 --- a/src/main/resources/scenes/start.fxml +++ b/src/main/resources/scenes/start.fxml @@ -1,5 +1,10 @@ + + + + + @@ -11,40 +16,47 @@ - - - - - - - - - - - - - - - - - - - - - - - - +