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

Fix for now - Need to change

Browse Source
This commit is contained in:
hba56
2017-05-04 14:56:54 +12:00
parent 89ba0f278d
commit e409c8752c
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
visualiser/src/main/java/seng302/Controllers/StartController.java
+12 -13
View File
@@ -102,20 +102,19 @@ public class StartController extends Controller implements Observer {
@Override
public void handle(long arg0) {
ZonedDateTime currentTime = raceClock.getTime();
if (visualiserInput.getRaceStatus().getRaceStatus() == 2) {
raceStat = visualiserInput.getRaceStatus().getRaceStatus();
raceStatusLabel.setText("Race Status: " + visualiserInput.getRaceStatus().getRaceStatus());
if (raceStat == 2 || raceStat == 3) {
updateTime("Race is starting...");
stop();
parent.beginRace(visualiserInput);
startWrapper.setVisible(false);
start.setVisible(false);
//race about to start
raceStat = visualiserInput.getRaceStatus().getRaceStatus();
raceStatusLabel.setText("Race Status: " + visualiserInput.getRaceStatus().getRaceStatus());
if (raceStat == 2 || raceStat == 3) {
updateTime("Race is starting...");
stop();
parent.beginRace(visualiserInput);
startWrapper.setVisible(false);
start.setVisible(false);
} else {
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)));
}
} else {
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)));
}
}
}.start();
visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java
+6 -5
View File
@@ -210,9 +210,11 @@ public class ResizableRaceCanvas extends Canvas {
if (this.raceBoundaries == null) {
return;
}
gc.setFill(Color.AQUA);
//gc.setFill(Color.AQUA);
setRaceBoundCoordinates();
gc.fillPolygon(xpoints, ypoints, xpoints.length);
gc.setLineWidth(1);
gc.strokePolygon(xpoints, ypoints, xpoints.length);
}
/**
@@ -248,10 +250,9 @@ public class ResizableRaceCanvas extends Canvas {
this.map.setWidth((int) width);
gc.setLineWidth(2);
drawBoundaries();
drawMarkers();
updateBoats();
drawMarkers();
drawBoundaries();
//display wind direction arrow - specify origin point and angle - angle now set to random angle
displayArrow(new GraphCoordinate((int) getWidth() - 40, 40), 150);