michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge on to master

Browse Source 
Final Push
This commit is contained in:
William Muir
2017-05-04 14:39:29 +12:00
parent f2c4929656
commit 24667991f1
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/controllers/CanvasController.java
+4 -5
View File
@@ -17,6 +17,7 @@ import javafx.stage.Stage;
import seng302.models.*; import seng302.models.*;
import seng302.models.mark.*; import seng302.models.mark.*;
import seng302.models.parsers.StreamParser; import seng302.models.parsers.StreamParser;
import seng302.models.parsers.StreamReceiver;
import seng302.models.parsers.packets.BoatPositionPacket; import seng302.models.parsers.packets.BoatPositionPacket;
import seng302.models.parsers.XMLParser; import seng302.models.parsers.XMLParser;
import seng302.models.parsers.XMLParser.RaceXMLObject.CompoundMark; import seng302.models.parsers.XMLParser.RaceXMLObject.CompoundMark;
@@ -129,13 +130,11 @@ public class CanvasController {
// TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay. // TODO: 1/05/17 cir27 - Make the RaceObjects update on the actual delay.
elapsedNanos = 1000 / 60; elapsedNanos = 1000 / 60;
updateRaceObjects(); updateRaceObjects();
if (StreamParser.isRaceFinished()) {
this.stop();
}
} }
}; };
for (Mark m : raceViewController.getRace().getCourse()) {
//System.out.println(m.getName());
}
//timer.start();
} }
src/main/java/seng302/controllers/RaceViewController.java
+1 -1
View File
@@ -309,7 +309,7 @@ public class RaceViewController extends Thread{
// } // }
for (Yacht boat : StreamParser.getBoatsPos().values()) { for (Yacht boat : StreamParser.getBoatsPos().values()) {
System.out.println(boat.getBoatStatus()); // System.out.println(boat.getBoatStatus());
if (boat.getBoatStatus() == 3) { // 3 is finish status if (boat.getBoatStatus() == 3) { // 3 is finish status
positionVbox.getChildren().add(new Text(boat.getPosition() + ". " + positionVbox.getChildren().add(new Text(boat.getPosition() + ". " +
boat.getShortName() + " (Finished)")); boat.getShortName() + " (Finished)"));