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

Merge branch 'master' into issue_18_track_alpha

Browse Source 
# Conflicts:
#	racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
This commit is contained in:
fjc40
2017-08-17 13:00:13 +12:00
parent 62f400b924 96acb6251e
commit 0f58270c10
29 changed files with 536 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/Commands/VisualiserRaceCommands/BoatLocationCommand.java
+2 -3
View File
@@ -8,7 +8,6 @@ import shared.exceptions.MarkNotFoundException;
import shared.model.GPSCoordinate;
import shared.model.Mark;
import visualiser.model.VisualiserBoat;
import visualiser.model.VisualiserRaceEvent;
import visualiser.model.VisualiserRaceState;
import java.util.logging.Level;
@@ -68,7 +67,7 @@ public class BoatLocationCommand implements Command {
boatLocation.getLatitude(),
boatLocation.getLongitude());
boat.setCurrentPosition(gpsCoordinate);
boat.setPosition(gpsCoordinate);
//Bearing.
boat.setBearing(boatLocation.getHeading());
@@ -96,7 +95,7 @@ public class BoatLocationCommand implements Command {
*/
private void attemptAddTrackPoint(VisualiserBoat boat) {
if (boat.getStatus() == BoatStatusEnum.RACING) {
boat.addTrackPoint(boat.getCurrentPosition(), visualiserRace.getRaceClock().getCurrentTime());
boat.addTrackPoint(boat.getPosition(), visualiserRace.getRaceClock().getCurrentTime());
}
}
racevisionGame/src/main/java/visualiser/Controllers/FinishController.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class FinishController extends Controller {
boatNameColumn.setCellValueFactory(cellData -> cellData.getValue().nameProperty());
//Rank/position.
boatRankColumn.setCellValueFactory(cellData -> cellData.getValue().positionProperty());
boatRankColumn.setCellValueFactory(cellData -> cellData.getValue().placingProperty());
//Winner label.
racevisionGame/src/main/java/visualiser/Controllers/RaceController.java
+1 -2
View File
@@ -23,7 +23,6 @@ import visualiser.gameController.ControllerClient;
import visualiser.gameController.Keys.ControlKey;
import visualiser.gameController.Keys.KeyFactory;
import visualiser.model.*;
import visualiser.network.ServerConnection;
import java.net.URL;
import java.util.ResourceBundle;
@@ -293,7 +292,7 @@ public class RaceController extends Controller {
//Current place within race.
boatPlacingColumn.setCellValueFactory(
cellData -> cellData.getValue().positionProperty() );
cellData -> cellData.getValue().placingProperty() );
}
racevisionGame/src/main/java/visualiser/model/ResizableRaceCanvas.java
+4 -4
View File
@@ -272,7 +272,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
boat.getName(),
boat.getCountry(),
boat.getCurrentSpeed(),
this.map.convertGPS(boat.getCurrentPosition()),
this.map.convertGPS(boat.getPosition()),
boat.getTimeToNextMarkFormatted(this.visualiserRace.getVisualiserRaceState().getRaceClock().getCurrentTime()),
boat.getTimeSinceLastMarkFormatted(this.visualiserRace.getVisualiserRaceState().getRaceClock().getCurrentTime()),
Color.BLACK,
@@ -349,7 +349,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
}
//Convert position to graph coordinate.
GraphCoordinate pos = this.map.convertGPS(boat.getCurrentPosition());
GraphCoordinate pos = this.map.convertGPS(boat.getPosition());
//The x coordinates of each vertex of the boat.
double[] x = {
@@ -385,7 +385,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
private void drawClientBoat(VisualiserBoat boat) {
//Convert position to graph coordinate.
GraphCoordinate pos = this.map.convertGPS(boat.getCurrentPosition());
GraphCoordinate pos = this.map.convertGPS(boat.getPosition());
//The x coordinates of each vertex of the boat.
double[] x = {
@@ -421,7 +421,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
private void drawWake(VisualiserBoat boat) {
//Calculate either end of wake line.
GraphCoordinate wakeFrom = this.map.convertGPS(boat.getCurrentPosition());
GraphCoordinate wakeFrom = this.map.convertGPS(boat.getPosition());
GraphCoordinate wakeTo = this.map.convertGPS(boat.getWake());
double lineWidth = 4;
racevisionGame/src/main/java/visualiser/model/VisualiserBoat.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class VisualiserBoat extends Boat {
//Calculate the new coordinate.
GPSCoordinate wakeCoordinate = GPSCoordinate.calculateNewPosition(getCurrentPosition(), wakeDistanceMeters, reverseAzimuth);
GPSCoordinate wakeCoordinate = GPSCoordinate.calculateNewPosition(getPosition(), wakeDistanceMeters, reverseAzimuth);
return wakeCoordinate;
}
racevisionGame/src/main/java/visualiser/model/VisualiserRaceState.java
+2 -3
View File
@@ -1,7 +1,6 @@
package visualiser.model;
import javafx.application.Platform;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.scene.paint.Color;
@@ -249,10 +248,10 @@ public class VisualiserRaceState extends RaceState {
if ((boat.getStatus() == BoatStatusEnum.DNF) || (boat.getStatus() == BoatStatusEnum.PRESTART) || (boat.getCurrentLeg().getLegNumber() < 0)) {
boat.setPosition("-");
boat.setPlacing("-");
} else {
boat.setPosition(Integer.toString(i + 1));
boat.setPlacing(Integer.toString(i + 1));
}
}