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

boats have an annotation beside them that shows time since last mark passed

Browse Source 
#story[878]
This commit is contained in:
hba56
2017-05-20 20:40:08 +12:00
parent 9eb4e3daea
commit a24dda2fd8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
visualiser/src/main/java/seng302/Mock/StreamedRace.java
+1 -1
View File
@@ -55,8 +55,8 @@ public class StreamedRace implements Runnable {
if (boat != null) { if (boat != null) {
Leg startLeg = new Leg(name, 0); Leg startLeg = new Leg(name, 0);
startLeg.setEndMarker(endCompoundMark); startLeg.setEndMarker(endCompoundMark);
System.out.println(controller.getRaceClock().getTime());
boat.setCurrentLeg(startLeg, controller.getRaceClock()); boat.setCurrentLeg(startLeg, controller.getRaceClock());
boat.setTimeSinceLastMark(controller.getRaceClock().getTime());
} }
} }
} }
visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
+4
View File
@@ -165,6 +165,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
* @param abbrev abbreviation of the boat name * @param abbrev abbreviation of the boat name
* @param speed speed of the boat * @param speed speed of the boat
* @param coordinate coordinate the text appears * @param coordinate coordinate the text appears
* @param timeSinceLastMark time since the last mark was passed
*/ */
private void displayText(String name, String abbrev, double speed, GraphCoordinate coordinate, ZonedDateTime timeSinceLastMark) { private void displayText(String name, String abbrev, double speed, GraphCoordinate coordinate, ZonedDateTime timeSinceLastMark) {
String text = ""; String text = "";
@@ -304,6 +305,9 @@ public class ResizableRaceCanvas extends ResizableCanvas {
} }
if (raceAnno) if (raceAnno)
if (Duration.between(boat.getTimeSinceLastMark(), raceClock.getTime()).getSeconds() < 0){
boat.setTimeSinceLastMark(raceClock.getTime());
}
displayText(boat.toString(), boat.getAbbrev(), boat.getVelocity(), this.map.convertGPS(boat.getCurrentPosition()), boat.getTimeSinceLastMark()); displayText(boat.toString(), boat.getAbbrev(), boat.getVelocity(), this.map.convertGPS(boat.getCurrentPosition()), boat.getTimeSinceLastMark());
//TODO this needs to be fixed. //TODO this needs to be fixed.
drawTrack(boat, colours.get(currentColour)); drawTrack(boat, colours.get(currentColour));