From 7790322e048f0de7353ddcc4886bf96c4204d685 Mon Sep 17 00:00:00 2001 From: Fan-Wu Yang Date: Thu, 6 Apr 2017 16:55:43 +1200 Subject: [PATCH] Implemented the Time showing on Grid - Added Label to scene - Added Timezone formatting #story[28] #pair[fwy13,hba56] --- .../java/seng302/Controllers/RaceController.java | 16 ++++++++++++++-- src/main/resources/scenes/racepane.fxml | 10 +++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/main/java/seng302/Controllers/RaceController.java b/src/main/java/seng302/Controllers/RaceController.java index a109e2f5..0c618df0 100644 --- a/src/main/java/seng302/Controllers/RaceController.java +++ b/src/main/java/seng302/Controllers/RaceController.java @@ -18,8 +18,14 @@ import seng302.RaceXMLReader; import javax.xml.parsers.ParserConfigurationException; import java.io.IOException; import java.net.URL; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Calendar; import java.util.ResourceBundle; +import java.util.TimeZone; /** * Created by fwy13 on 15/03/2017. @@ -42,6 +48,8 @@ public class RaceController extends Controller { Label timer; @FXML Label FPS; + @FXML + Label timeZone; @FXML TableView boatInfoTable; @@ -170,8 +178,12 @@ public class RaceController extends Controller { //timezone TimeZoneLookup timeZoneLookup = new TimeZoneLookup(); TimeZoneResult timeZoneResult = timeZoneLookup.getTimeZone(raceXMLReader.getMark().getLatitude(), raceXMLReader.getMark().getLongitude()); - System.out.println(timeZoneResult.getResult()); - + ZoneId zoneId = ZoneId.of(timeZoneResult.getResult()); + LocalDateTime localDateTime = LocalDateTime.now(zoneId); + ZonedDateTime zonedDateTime =localDateTime.atZone(zoneId); + DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("dd-MM HH:mm:ss z"); + // System.out.println(dateTimeFormatter.format(zonedDateTime)); + timeZone.setText(dateTimeFormatter.format(zonedDateTime)); initializeFPS(); initializeAnnotations(); diff --git a/src/main/resources/scenes/racepane.fxml b/src/main/resources/scenes/racepane.fxml index f7e5c19f..67cca59c 100644 --- a/src/main/resources/scenes/racepane.fxml +++ b/src/main/resources/scenes/racepane.fxml @@ -83,7 +83,7 @@ -