fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed StartController countdown

Browse Source 
- Removed obsolete timer related code
- Consistently use RaceClock throughout StartController

#story[782]
This commit is contained in:
cbt24
2017-05-04 14:16:14 +12:00
parent 17afd9f775
commit 89ba0f278d
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
visualiser/src/main/java/seng302/Controllers/StartController.java
+13 -13
View File
@@ -96,26 +96,26 @@ public class StartController extends Controller implements Observer {
/** /**
* Countdown timer until race starts. Use PRERACE_TIME to set countdown duration. * Countdown timer until race starts. Use PRERACE_TIME to set countdown duration.
* @param scaleFactor factor to scale by
*/ */
protected void countdownTimer() { protected void countdownTimer() {
new AnimationTimer() { new AnimationTimer() {
@Override @Override
public void handle(long arg0) { public void handle(long arg0) {
ZonedDateTime currentTime = raceClock.getTime(); ZonedDateTime currentTime = raceClock.getTime();
if (visualiserInput.getRaceStatus().getRaceStatus()==2) { if (visualiserInput.getRaceStatus().getRaceStatus() == 2) {
raceStat = visualiserInput.getRaceStatus().getRaceStatus(); raceStat = visualiserInput.getRaceStatus().getRaceStatus();
raceStatusLabel.setText("Race Status: " + visualiserInput.getRaceStatus().getRaceStatus()); raceStatusLabel.setText("Race Status: " + visualiserInput.getRaceStatus().getRaceStatus());
if (raceStat==2 || raceStat == 3) { if (raceStat == 2 || raceStat == 3) {
updateTime("Race is starting..."); updateTime("Race is starting...");
stop(); stop();
parent.beginRace(visualiserInput); parent.beginRace(visualiserInput);
startWrapper.setVisible(false); startWrapper.setVisible(false);
start.setVisible(false); start.setVisible(false);
} else { } else {
long seconds = startingTime.toLocalDateTime().until(currentTime.toLocalDateTime(), ChronoUnit.SECONDS); long seconds = startingTime.toLocalDateTime().until(currentTime.toLocalDateTime(), ChronoUnit.SECONDS);
updateTime(String.format("Race starts in: %d:%02d:%02d", seconds/3600, (seconds%3600)/60, (seconds%60))); updateTime(String.format("Race starts in: %d:%02d:%02d", seconds / 3600, (seconds % 3600) / 60, (seconds % 60)));
}
} }
} }
}.start(); }.start();