diff --git a/src/main/java/seng302/App.java b/src/main/java/seng302/App.java index 64cf7291..c796998a 100644 --- a/src/main/java/seng302/App.java +++ b/src/main/java/seng302/App.java @@ -29,9 +29,6 @@ public class App extends Application { StreamReceiver.noMoreBytes(); System.exit(0); }); - - - } public static void main(String[] args) { @@ -68,10 +65,7 @@ public class App extends Application { } //Change the StreamReceiver in this else block to change the default data source. else{ -// sr = new StreamReceiver("localhost", 4949, "RaceStream"); -// sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941, "RaceStream"); -// sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4942, "RaceStream"); - sr = new StreamReceiver("livedata.americascup.com", 4941, "RaceStream"); + sr = new StreamReceiver("localhost", 4949, "RaceStream"); } sr.start(); diff --git a/src/main/java/seng302/controllers/CanvasController.java b/src/main/java/seng302/controllers/CanvasController.java index db836edb..0dc8de48 100644 --- a/src/main/java/seng302/controllers/CanvasController.java +++ b/src/main/java/seng302/controllers/CanvasController.java @@ -1,22 +1,38 @@ package seng302.controllers; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.concurrent.PriorityBlockingQueue; import javafx.animation.AnimationTimer; import javafx.beans.property.SimpleDoubleProperty; import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; import javafx.geometry.Point2D; import javafx.scene.Group; import javafx.scene.canvas.Canvas; import javafx.scene.canvas.GraphicsContext; import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.GridPane; +import javafx.scene.layout.Pane; import javafx.scene.paint.Color; -import javafx.scene.text.Font; -import seng302.models.BoatGroup; +import javafx.scene.shape.Polygon; +import javafx.scene.text.Text; +import seng302.fxObjects.BoatAnnotations; +import seng302.fxObjects.BoatGroup; +import seng302.fxObjects.Wake; import seng302.models.Colors; import seng302.models.Yacht; +import seng302.models.mark.GateMark; +import seng302.models.mark.Mark; +import seng302.fxObjects.MarkGroup; +import seng302.models.mark.MarkType; +import seng302.models.mark.SingleMark; import seng302.models.map.Boundary; import seng302.models.map.CanvasMap; -import seng302.models.mark.*; import seng302.models.stream.StreamParser; import seng302.models.stream.XMLParser; import seng302.models.stream.XMLParser.RaceXMLObject.Limit; @@ -45,7 +61,7 @@ public class CanvasController { private Group group; private GraphicsContext gc; private ImageView mapImage; - + private final int BUFFER_SIZE = 50; private final int PANEL_WIDTH = 1260; // it should be 1280 but, minors 40 to cancel the bias. private final int PANEL_HEIGHT = 960; @@ -66,6 +82,8 @@ public class CanvasController { private List markGroups = new ArrayList<>(); private List boatGroups = new ArrayList<>(); + private Text FPSdisplay = new Text(); + private Polygon raceBorder = new Polygon(); //FRAME RATE private Double frameRate = 60.0; @@ -80,7 +98,7 @@ public class CanvasController { VERTICAL } - public void setup(RaceViewController raceViewController){ + public void setup(RaceViewController raceViewController) { this.raceViewController = raceViewController; } @@ -102,49 +120,79 @@ public class CanvasController { canvas.heightProperty().bind(new SimpleDoubleProperty(CANVAS_HEIGHT)); } - public void initializeCanvas (){ + public void initializeCanvas() { gc = canvas.getGraphicsContext2D(); gc.setGlobalAlpha(0.5); fitMarksToCanvas(); drawGoogleMap(); - // TODO: 1/05/17 wmu16 - Change this call to now draw the marks as from the xml - initializeBoats(); + FPSdisplay.setLayoutX(5); + FPSdisplay.setLayoutY(20); + FPSdisplay.setStrokeWidth(2); + group.getChildren().add(FPSdisplay); + group.getChildren().add(raceBorder); initializeMarks(); - timer = new AnimationTimer() { + initializeBoats(); - private int UPDATE_FPM_PERIOD = 50; // update FPM label every 50 frames - private int updateFPMCounter = 100; + timer = new AnimationTimer() { + private long lastTime = 0; + private int FPSCount = 30; @Override public void handle(long now) { - - //fps stuff - long oldFrameTime = frameTimes[frameTimeIndex] ; - frameTimes[frameTimeIndex] = now ; - frameTimeIndex = (frameTimeIndex + 1) % frameTimes.length ; - if (frameTimeIndex == 0) { - arrayFilled = true ; - } - long elapsedNanos; - if (arrayFilled) { - elapsedNanos = now - oldFrameTime ; - long elapsedNanosPerFrame = elapsedNanos / frameTimes.length ; - frameRate = 1_000_000_000.0 / elapsedNanosPerFrame ; - if (updateFPMCounter++ > UPDATE_FPM_PERIOD) { - updateFPMCounter = 0; - drawFps(frameRate.intValue()); + if (lastTime == 0) { + lastTime = now; + } else { + if (now - lastTime >= (1e8 / 60)) { //Fix for framerate going above 60 when minimized + long oldFrameTime = frameTimes[frameTimeIndex]; + frameTimes[frameTimeIndex] = now; + frameTimeIndex = (frameTimeIndex + 1) % frameTimes.length; + if (frameTimeIndex == 0) { + arrayFilled = true; + } + long elapsedNanos; + if (arrayFilled) { + elapsedNanos = now - oldFrameTime; + long elapsedNanosPerFrame = elapsedNanos / frameTimes.length; + frameRate = 1_000_000_000.0 / elapsedNanosPerFrame; + if (FPSCount-- == 0) { + FPSCount = 30; + drawFps(frameRate.intValue()); + } + raceViewController.updateSparkLine(); + } + updateGroups(); + if (StreamParser.isRaceFinished()) { + this.stop(); + } + lastTime = now; + } } - raceViewController.updateSparkLine(); - } - updateGroups(); if (StreamParser.isRaceFinished()) { this.stop(); + switchToFinishScreen(); } } }; } + private void switchToFinishScreen() { + try { + // canvas view -> anchor pane -> grid pane -> main view + GridPane gridPane = (GridPane) canvasPane.getParent().getParent(); + AnchorPane contentPane = (AnchorPane) gridPane.getParent(); + contentPane.getChildren().removeAll(); + contentPane.getChildren().clear(); + contentPane.getStylesheets().add(getClass().getResource("/css/master.css").toString()); + contentPane.getChildren().addAll( + (Pane) FXMLLoader.load(getClass().getResource("/views/FinishScreenView.fxml"))); + } catch (javafx.fxml.LoadException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + /** * First find the top right and bottom left points' geo locations, then retrieve * map from google to display on image view. - Haoming 22/5/2017 @@ -153,19 +201,29 @@ public class CanvasController { findMetersPerPixel(); Point2D topLeftPoint = findScaledXY(maxLatPoint.getLatitude(), minLonPoint.getLongitude()); // distance from top left extreme to panel origin (top left corner) - double distanceFromTopLeftToOrigin = Math.sqrt(Math.pow(topLeftPoint.getX() * metersPerPixelX, 2) + Math.pow(topLeftPoint.getY() * metersPerPixelY, 2)); + double distanceFromTopLeftToOrigin = Math.sqrt( + Math.pow(topLeftPoint.getX() * metersPerPixelX, 2) + Math + .pow(topLeftPoint.getY() * metersPerPixelY, 2)); // angle from top left extreme to panel origin - double bearingFromTopLeftToOrigin = Math.toDegrees(Math.atan2(-topLeftPoint.getX(), topLeftPoint.getY())); + double bearingFromTopLeftToOrigin = Math + .toDegrees(Math.atan2(-topLeftPoint.getX(), topLeftPoint.getY())); // the top left extreme Position topLeftPos = new Position(maxLatPoint.getLatitude(), minLonPoint.getLongitude()); - Position originPos = GeoUtility.getGeoCoordinate(topLeftPos, bearingFromTopLeftToOrigin, distanceFromTopLeftToOrigin); + Position originPos = GeoUtility + .getGeoCoordinate(topLeftPos, bearingFromTopLeftToOrigin, distanceFromTopLeftToOrigin); // distance from origin corner to bottom right corner of the panel - double distanceFromOriginToBottomRight = Math.sqrt(Math.pow(PANEL_HEIGHT* metersPerPixelY, 2) + Math.pow(PANEL_WIDTH * metersPerPixelX, 2)); - double bearingFromOriginToBottomRight = Math.toDegrees(Math.atan2(PANEL_WIDTH, -PANEL_HEIGHT)); - Position bottomRightPos = GeoUtility.getGeoCoordinate(originPos, bearingFromOriginToBottomRight, distanceFromOriginToBottomRight); + double distanceFromOriginToBottomRight = Math.sqrt( + Math.pow(PANEL_HEIGHT * metersPerPixelY, 2) + Math + .pow(PANEL_WIDTH * metersPerPixelX, 2)); + double bearingFromOriginToBottomRight = Math + .toDegrees(Math.atan2(PANEL_WIDTH, -PANEL_HEIGHT)); + Position bottomRightPos = GeoUtility + .getGeoCoordinate(originPos, bearingFromOriginToBottomRight, + distanceFromOriginToBottomRight); - Boundary boundary = new Boundary(originPos.getLat(), bottomRightPos.getLng(), bottomRightPos.getLat(), originPos.getLng()); + Boundary boundary = new Boundary(originPos.getLat(), bottomRightPos.getLng(), + bottomRightPos.getLat(), originPos.getLng()); CanvasMap canvasMap = new CanvasMap(boundary); mapImage.setImage(canvasMap.getMapImage()); } @@ -173,44 +231,27 @@ public class CanvasController { /** * Adds border marks to the canvas, taken from the XML file * - * NOTE: This is quite confusing as objects are grabbed from the XMLParser such as Mark and CompoundMark which are - * named the same as those in the model package but are, however not the same, so they do not have things such as - * a type and must be derived from the number of marks in a compound mark etc.. + * NOTE: This is quite confusing as objects are grabbed from the XMLParser such as Mark and + * CompoundMark which are named the same as those in the model package but are, however not the + * same, so they do not have things such as a type and must be derived from the number of marks + * in a compound mark etc.. */ private void addRaceBorder() { XMLParser.RaceXMLObject raceXMLObject = StreamParser.getXmlObject().getRaceXML(); ArrayList courseLimits = raceXMLObject.getCourseLimit(); - gc.setStroke(Color.DARKBLUE); - gc.setLineWidth(3); - double[] xBoundaryPoints = new double[courseLimits.size()]; - double[] yBoundaryPoints = new double[courseLimits.size()]; - for (int i = 0; i < courseLimits.size() - 1; i++) { - Limit thisPoint1 = courseLimits.get(i); - SingleMark thisMark1 = new SingleMark("", thisPoint1.getLat(), thisPoint1.getLng(), thisPoint1.getSeqID(), thisPoint1.getSeqID()); - Limit thisPoint2 = courseLimits.get(i+1); - SingleMark thisMark2 = new SingleMark("", thisPoint2.getLat(), thisPoint2.getLng(), thisPoint2.getSeqID(), thisPoint2.getSeqID()); - Point2D borderPoint1 = findScaledXY(thisMark1); - Point2D borderPoint2 = findScaledXY(thisMark2); - gc.strokeLine(borderPoint1.getX(), borderPoint1.getY(), - borderPoint2.getX(), borderPoint2.getY()); - xBoundaryPoints[i] = borderPoint1.getX(); - yBoundaryPoints[i] = borderPoint1.getY(); + raceBorder.setStroke(new Color(0.0f, 0.0f, 0.74509807f, 1)); + raceBorder.setStrokeWidth(3); + raceBorder.setFill(new Color(0,0,0,0)); + List boundaryPoints = new ArrayList<>(); + for (Limit limit : courseLimits) { + Point2D location = findScaledXY(limit.getLat(), limit.getLng()); + boundaryPoints.add(location.getX()); + boundaryPoints.add(location.getY()); } - Limit thisPoint1 = courseLimits.get(courseLimits.size()-1); - SingleMark thisMark1 = new SingleMark("", thisPoint1.getLat(), thisPoint1.getLng(), thisPoint1.getSeqID(), thisPoint1.getSeqID()); - Limit thisPoint2 = courseLimits.get(0); - SingleMark thisMark2 = new SingleMark("", thisPoint2.getLat(), thisPoint2.getLng(), thisPoint2.getSeqID(), thisPoint2.getSeqID()); - Point2D borderPoint1 = findScaledXY(thisMark1); - Point2D borderPoint2 = findScaledXY(thisMark2); - gc.strokeLine(borderPoint1.getX(), borderPoint1.getY(), - borderPoint2.getX(), borderPoint2.getY()); - xBoundaryPoints[courseLimits.size()-1] = borderPoint1.getX(); - yBoundaryPoints[courseLimits.size()-1] = borderPoint1.getY(); -// gc.setFill(Color.LIGHTBLUE); -// gc.fillPolygon(xBoundaryPoints,yBoundaryPoints,yBoundaryPoints.length); + raceBorder.getPoints().setAll(boundaryPoints); } - private void updateGroups(){ + private void updateGroups() { for (BoatGroup boatGroup : boatGroups) { // some raceObjects will have multiple ID's (for instance gate marks) //checking if the current "ID" has any updates associated with it @@ -233,8 +274,6 @@ public class CanvasController { private void checkForCourseChanges() { if (StreamParser.isNewRaceXmlReceived()){ - gc.clearRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT); - drawGoogleMap(); addRaceBorder(); } } @@ -242,12 +281,14 @@ public class CanvasController { private void updateBoatGroup(BoatGroup boatGroup) { PriorityBlockingQueue movementQueue = StreamParser.boatLocations.get(boatGroup.getRaceId()); // giving the movementQueue a 5 packet buffer to account for slightly out of order packets - if (movementQueue.size() > 0){ + if (movementQueue.size() > 0) { try { BoatPositionPacket positionPacket = movementQueue.take(); Point2D p2d = findScaledXY(positionPacket.getLat(), positionPacket.getLon()); double heading = 360.0 / 0xffff * positionPacket.getHeading(); - boatGroup.setDestination(p2d.getX(), p2d.getY(), heading, positionPacket.getGroundSpeed(), positionPacket.getTimeValid(), frameRate, boatGroup.getRaceId()); + boatGroup.setDestination( + p2d.getX(), p2d.getY(), heading, positionPacket.getGroundSpeed(), + positionPacket.getTimeValid(), frameRate); } catch (InterruptedException e){ e.printStackTrace(); } @@ -262,7 +303,7 @@ public class CanvasController { BoatPositionPacket positionPacket = movementQueue.take(); Point2D p2d = findScaledXY(positionPacket.getLat(), positionPacket.getLon()); markGroup.moveMarkTo(p2d.getX(), p2d.getY(), raceId); - } catch (InterruptedException e){ + } catch (InterruptedException e) { e.printStackTrace(); } } @@ -273,9 +314,12 @@ public class CanvasController { */ private void initializeBoats() { Map boats = StreamParser.getBoats(); - Group boatAnnotations = new Group(); + Group wakes = new Group(); + Group trails = new Group(); + Group annotations = new Group(); - ArrayList participants = StreamParser.getXmlObject().getRaceXML().getParticipants(); + ArrayList participants = StreamParser.getXmlObject().getRaceXML() + .getParticipants(); ArrayList participantIDs = new ArrayList<>(); for (Participant p : participants) { participantIDs.add(p.getsourceID()); @@ -286,10 +330,14 @@ public class CanvasController { boat.setColour(Colors.getColor()); BoatGroup boatGroup = new BoatGroup(boat, boat.getColour()); boatGroups.add(boatGroup); - boatAnnotations.getChildren().add(boatGroup.getLowPriorityAnnotations()); + trails.getChildren().add(boatGroup.getTrail()); + wakes.getChildren().add(boatGroup.getWake()); + annotations.getChildren().add(boatGroup.getAnnotations()); } } - group.getChildren().add(boatAnnotations); + group.getChildren().addAll(trails); + group.getChildren().addAll(wakes); + group.getChildren().addAll(annotations); group.getChildren().addAll(boatGroups); } @@ -304,7 +352,8 @@ public class CanvasController { } else { GateMark gMark = (GateMark) mark; - MarkGroup markGroup = new MarkGroup(gMark, findScaledXY(gMark.getSingleMark1()), findScaledXY(gMark.getSingleMark2())); //should be 2 objects in the list. + MarkGroup markGroup = new MarkGroup(gMark, findScaledXY(gMark.getSingleMark1()), + findScaledXY(gMark.getSingleMark2())); //should be 2 objects in the list. markGroups.add(markGroup); } } @@ -336,6 +385,7 @@ public class CanvasController { public double prefWidth(double height) { return getWidth(); } + @Override public double prefHeight(double width) { return getHeight(); @@ -345,19 +395,16 @@ public class CanvasController { private void drawFps(int fps){ if (raceViewController.isDisplayFps()){ - gc.clearRect(5, 5, 60, 30); - gc.setFont(new Font(16)); - gc.setLineWidth(4); - gc.setGlobalAlpha(0.75); - gc.fillText(fps + " FPS", 5, 20); - gc.setGlobalAlpha(0.5); + FPSdisplay.setVisible(true); + FPSdisplay.setText(String.format("%d FPS", fps)); } else { - gc.clearRect(5,5,60,30); + FPSdisplay.setVisible(false); } } /** - * Calculates x and y location for every marker that fits it to the canvas the race will be drawn on. + * Calculates x and y location for every marker that fits it to the canvas the race will be + * drawn on. */ private void fitMarksToCanvas() { //Check is called once to avoid unnecessarily change the course limits once the race is running @@ -371,8 +418,9 @@ public class CanvasController { /** - * Sets the class variables minLatPoint, maxLatPoint, minLonPoint, maxLonPoint to the marker with the leftmost - * marker, rightmost marker, southern most marker and northern most marker respectively. + * Sets the class variables minLatPoint, maxLatPoint, minLonPoint, maxLonPoint to the marker + * with the leftmost marker, rightmost marker, southern most marker and northern most marker + * respectively. */ private void findMinMaxPoint() { List sortedPoints = new ArrayList<>(); @@ -397,12 +445,13 @@ public class CanvasController { } /** - * Calculates the location of a reference point, this is always the point with minimum latitude, in relation to the - * canvas. + * Calculates the location of a reference point, this is always the point with minimum latitude, + * in relation to the canvas. * - * @param minLonToMaxLon The horizontal distance between the point of minimum longitude to maximum longitude. + * @param minLonToMaxLon The horizontal distance between the point of minimum longitude to + * maximum longitude. */ - private void calculateReferencePointLocation (double minLonToMaxLon) { + private void calculateReferencePointLocation(double minLonToMaxLon) { Mark referencePoint = minLatPoint; double referenceAngle; @@ -431,20 +480,23 @@ public class CanvasController { /** - * Finds the scale factor necessary to fit all race markers within the onscreen map and assigns it to distanceScaleFactor - * Returns the max horizontal distance of the map. + * Finds the scale factor necessary to fit all race markers within the onscreen map and assigns + * it to distanceScaleFactor Returns the max horizontal distance of the map. */ - private double scaleRaceExtremities () { + private double scaleRaceExtremities() { double vertAngle = Math.abs(Mark.calculateHeadingRad(minLatPoint, maxLatPoint)); - double vertDistance = Math.cos(vertAngle) * Mark.calculateDistance(minLatPoint, maxLatPoint); + double vertDistance = + Math.cos(vertAngle) * Mark.calculateDistance(minLatPoint, maxLatPoint); double horiAngle = Mark.calculateHeadingRad(minLonPoint, maxLonPoint); - if (horiAngle <= (Math.PI / 2)) + if (horiAngle <= (Math.PI / 2)) { horiAngle = (Math.PI / 2) - horiAngle; - else + } else { horiAngle = horiAngle - (Math.PI / 2); - double horiDistance = Math.cos(horiAngle) * Mark.calculateDistance(minLonPoint, maxLonPoint); + } + double horiDistance = + Math.cos(horiAngle) * Mark.calculateDistance(minLonPoint, maxLonPoint); double vertScale = (CANVAS_HEIGHT - (BUFFER_SIZE + BUFFER_SIZE)) / vertDistance; @@ -458,8 +510,8 @@ public class CanvasController { return horiDistance; } - private Point2D findScaledXY (Mark unscaled) { - return findScaledXY (unscaled.getLatitude(), unscaled.getLongitude()); + private Point2D findScaledXY(Mark unscaled) { + return findScaledXY(unscaled.getLatitude(), unscaled.getLongitude()); } public Point2D findScaledXY (double unscaledLat, double unscaledLon) { @@ -468,23 +520,35 @@ public class CanvasController { int xAxisLocation = (int) referencePointX; int yAxisLocation = (int) referencePointY; - angleFromReference = Mark.calculateHeadingRad(minLatPoint.getLatitude(), minLatPoint.getLongitude(), unscaledLat, unscaledLon); - distanceFromReference = Mark.calculateDistance(minLatPoint.getLatitude(), minLatPoint.getLongitude(), unscaledLat, unscaledLon); + angleFromReference = Mark + .calculateHeadingRad(minLatPoint.getLatitude(), minLatPoint.getLongitude(), unscaledLat, + unscaledLon); + distanceFromReference = Mark + .calculateDistance(minLatPoint.getLatitude(), minLatPoint.getLongitude(), unscaledLat, + unscaledLon); if (angleFromReference >= 0 && angleFromReference <= Math.PI / 2) { - xAxisLocation += (int) Math.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); - yAxisLocation -= (int) Math.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); + xAxisLocation += (int) Math + .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); + yAxisLocation -= (int) Math + .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); } else if (angleFromReference >= 0) { angleFromReference = angleFromReference - Math.PI / 2; - xAxisLocation += (int) Math.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); - yAxisLocation += (int) Math.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); + xAxisLocation += (int) Math + .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); + yAxisLocation += (int) Math + .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); } else if (angleFromReference < 0 && angleFromReference >= -Math.PI / 2) { angleFromReference = Math.abs(angleFromReference); - xAxisLocation -= (int) Math.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); - yAxisLocation -= (int) Math.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); + xAxisLocation -= (int) Math + .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); + yAxisLocation -= (int) Math + .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); } else { angleFromReference = Math.abs(angleFromReference) - Math.PI / 2; - xAxisLocation -= (int) Math.round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); - yAxisLocation += (int) Math.round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); + xAxisLocation -= (int) Math + .round(distanceScaleFactor * Math.cos(angleFromReference) * distanceFromReference); + yAxisLocation += (int) Math + .round(distanceScaleFactor * Math.sin(angleFromReference) * distanceFromReference); } if(horizontalInversion) { xAxisLocation = CANVAS_WIDTH - BUFFER_SIZE - (xAxisLocation - BUFFER_SIZE); @@ -495,7 +559,7 @@ public class CanvasController { /** * Find the number of meters per pixel. */ - private void findMetersPerPixel () { + private void findMetersPerPixel() { Point2D p1, p2; Mark m1, m2; double theta, distance, dx, dy, dHorizontal, dVertical; diff --git a/src/main/java/seng302/controllers/FinishScreenViewController.java b/src/main/java/seng302/controllers/FinishScreenViewController.java new file mode 100644 index 00000000..a2d79f36 --- /dev/null +++ b/src/main/java/seng302/controllers/FinishScreenViewController.java @@ -0,0 +1,97 @@ +package seng302.controllers; + +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.ResourceBundle; +import javafx.collections.FXCollections; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; +import javafx.fxml.Initializable; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; +import javafx.scene.control.cell.PropertyValueFactory; +import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.GridPane; +import javafx.scene.layout.Pane; +import seng302.models.Yacht; +import seng302.models.stream.StreamParser; +import seng302.models.stream.XMLParser.RaceXMLObject.Participant; + +public class FinishScreenViewController implements Initializable { + + @FXML + private GridPane finishScreenGridPane; + @FXML + private TableView finishOrderTable; + @FXML + private TableColumn posCol; + @FXML + private TableColumn boatNameCol; + @FXML + private TableColumn shortNameCol; + @FXML + private TableColumn countryCol; + + @Override + public void initialize(URL location, ResourceBundle resources) { + finishScreenGridPane.getStylesheets() + .add(getClass().getResource("/css/master.css").toString()); + finishOrderTable.getStylesheets().add(getClass().getResource("/css/master.css").toString()); + + // set up data for table + ObservableList data = FXCollections.observableArrayList(); + finishOrderTable.setItems(data); + + // setting table col data + posCol.setCellValueFactory( + new PropertyValueFactory<>("position") + ); + boatNameCol.setCellValueFactory( + new PropertyValueFactory<>("boatName") + ); + shortNameCol.setCellValueFactory( + new PropertyValueFactory<>("shortName") + ); + countryCol.setCellValueFactory( + new PropertyValueFactory<>("country") + ); + + // check if the boat is racing + ArrayList participants = StreamParser.getXmlObject().getRaceXML() + .getParticipants(); + ArrayList participantIDs = new ArrayList<>(); + for (Participant p : participants) { + participantIDs.add(p.getsourceID()); + } + + // add data to table + for (Yacht boat : StreamParser.getBoatsPos().values()) { + if (participantIDs.contains(boat.getSourceID())) { + data.add(boat); + } + } + finishOrderTable.refresh(); + } + + private void setContentPane(String jfxUrl) { + try { + // get the main controller anchor pane (FinishView -> MainView) + AnchorPane contentPane = (AnchorPane) finishScreenGridPane.getParent(); + contentPane.getChildren().removeAll(); + contentPane.getChildren().clear(); + contentPane.getStylesheets().add(getClass().getResource("/css/master.css").toString()); + contentPane.getChildren() + .addAll((Pane) FXMLLoader.load(getClass().getResource(jfxUrl))); + } catch (javafx.fxml.LoadException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public void switchToStartScreenView() { + setContentPane("/views/StartScreenView.fxml"); + } +} diff --git a/src/main/java/seng302/controllers/RaceViewController.java b/src/main/java/seng302/controllers/RaceViewController.java index 3360fa05..741d856c 100644 --- a/src/main/java/seng302/controllers/RaceViewController.java +++ b/src/main/java/seng302/controllers/RaceViewController.java @@ -7,7 +7,6 @@ import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.geometry.Point2D; -import javafx.geometry.Side; import javafx.scene.Scene; import javafx.scene.chart.LineChart; import javafx.scene.chart.NumberAxis; @@ -33,10 +32,11 @@ import seng302.controllers.annotations.Annotation; import seng302.controllers.annotations.ImportantAnnotationController; import seng302.controllers.annotations.ImportantAnnotationDelegate; import seng302.controllers.annotations.ImportantAnnotationsState; +import seng302.fxObjects.BoatGroup; +import seng302.fxObjects.MarkGroup; import seng302.models.*; import seng302.models.mark.GateMark; import seng302.models.mark.Mark; -import seng302.models.mark.MarkGroup; import seng302.models.mark.SingleMark; import seng302.models.stream.StreamParser; import seng302.models.stream.XMLParser; @@ -571,76 +571,31 @@ public class RaceViewController extends Thread implements ImportantAnnotationDel return displayFps; } - /** - * Display the important annotations for a specific BoatGroup - * @param bg The boat group to set the annotations for - */ - private void setBoatGroupImportantAnnotations(BoatGroup bg) { - if (importantAnnotations.getAnnotationState(Annotation.NAME)) { - bg.setTeamNameObjectVisible(true); - } else { - bg.setTeamNameObjectVisible(false); - } - - if (importantAnnotations.getAnnotationState(Annotation.SPEED)) { - bg.setVelocityObjectVisible(true); - } else { - bg.setVelocityObjectVisible(false); - } - - if (importantAnnotations.getAnnotationState(Annotation.TRACK)) { - bg.setLineGroupVisible(true); - } else { - bg.setLineGroupVisible(false); - } - - if (importantAnnotations.getAnnotationState(Annotation.WAKE)) { - bg.setWakeVisible(true); - } else { - bg.setWakeVisible(false); - } - //TODO fix boat annotations with new boatgroup - if (importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK)) { - bg.setEstTimeToNextMarkObjectVisible(true); - } else { - bg.setEstTimeToNextMarkObjectVisible(false); - } - - if (importantAnnotations.getAnnotationState(Annotation.LEGTIME)) { - bg.setLegTimeObjectVisible(true); - } else { - bg.setLegTimeObjectVisible(false); - } - } - private void setAnnotations(Integer annotationLevel) { switch (annotationLevel) { // No Annotations case 0: for (BoatGroup bg : includedCanvasController.getBoatGroups()) { - bg.setTeamNameObjectVisible(false); - bg.setVelocityObjectVisible(false); - bg.setEstTimeToNextMarkObjectVisible(false); - bg.setLegTimeObjectVisible(false); - bg.setLineGroupVisible(false); - bg.setWakeVisible(false); + bg.setVisibility(false, false, false, false, false, false); } break; // Important Annotations case 1: for (BoatGroup bg : includedCanvasController.getBoatGroups()) { - setBoatGroupImportantAnnotations(bg); + bg.setVisibility( + importantAnnotations.getAnnotationState(Annotation.NAME), + importantAnnotations.getAnnotationState(Annotation.SPEED), + importantAnnotations.getAnnotationState(Annotation.ESTTIMETONEXTMARK), + importantAnnotations.getAnnotationState(Annotation.LEGTIME), + importantAnnotations.getAnnotationState(Annotation.TRACK), + importantAnnotations.getAnnotationState(Annotation.WAKE) + ); } break; // All Annotations case 2: for (BoatGroup bg : includedCanvasController.getBoatGroups()) { - bg.setTeamNameObjectVisible(true); - bg.setVelocityObjectVisible(true); - bg.setEstTimeToNextMarkObjectVisible(true); - bg.setLegTimeObjectVisible(true); - bg.setLineGroupVisible(true); - bg.setWakeVisible(true); + bg.setVisibility(true, true, true, true, true, true); } break; } diff --git a/src/main/java/seng302/controllers/StartScreenController.java b/src/main/java/seng302/controllers/StartScreenController.java index b2238826..931874d5 100644 --- a/src/main/java/seng302/controllers/StartScreenController.java +++ b/src/main/java/seng302/controllers/StartScreenController.java @@ -77,6 +77,9 @@ public class StartScreenController implements Initializable { * second. */ public void startStream() { + // reset boolean for switch to race view + switchedToRaceView = false; + if (StreamParser.isStreamStatus()) { streamButton.setVisible(false); realTime.setVisible(true); diff --git a/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java index 8dfa8df7..b91f5ca1 100644 --- a/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java +++ b/src/main/java/seng302/controllers/annotations/ImportantAnnotationController.java @@ -6,12 +6,8 @@ import javafx.scene.control.Button; import javafx.scene.control.CheckBox; import javafx.scene.layout.AnchorPane; import javafx.stage.Stage; -import seng302.controllers.RaceViewController; -import seng302.controllers.annotations.Annotation; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; +import java.net.URL;; import java.util.ResourceBundle; public class ImportantAnnotationController implements Initializable { diff --git a/src/main/java/seng302/fxObjects/BoatAnnotations.java b/src/main/java/seng302/fxObjects/BoatAnnotations.java new file mode 100644 index 00000000..fbba2257 --- /dev/null +++ b/src/main/java/seng302/fxObjects/BoatAnnotations.java @@ -0,0 +1,133 @@ +package seng302.fxObjects; + +import javafx.scene.CacheHint; +import javafx.scene.Group; +import javafx.scene.paint.Color; +import javafx.scene.shape.Rectangle; +import javafx.scene.text.Text; +import seng302.models.Yacht; +import seng302.models.stream.StreamParser; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; + +/** + * Collection of annotations for boats. + */ +public class BoatAnnotations extends Group{ + + //Text offset constants + private static final double X_OFFSET_TEXT = 18d; + private static final double Y_OFFSET_TEXT_INIT = -29d; + private static final double Y_OFFSET_PER_TEXT = 12d; + //Background constants + private static final double TEXT_BUFFER = 3; + private static final double BACKGROUND_X = X_OFFSET_TEXT - TEXT_BUFFER; + private static final double BACKGROUND_Y = Y_OFFSET_TEXT_INIT - TEXT_BUFFER; + private static final double BACKGROUND_H_PER_TEXT = 9.5d; + private static final double BACKGROUND_W = 125d; + private static final double BACKGROUND_ARC_SIZE = 10; + + private Rectangle background = new Rectangle(); + private Text teamNameObject; + private Text velocityObject; + private Text estTimeToNextMarkObject; + private Text legTimeObject; + + private Yacht boat; + + BoatAnnotations (Yacht boat, Color theme) { + super.setCache(true); + this.boat = boat; + background.setX(BACKGROUND_X); + background.setY(BACKGROUND_Y); + background.setWidth(BACKGROUND_W); + background.setHeight(Math.abs(BACKGROUND_X) + TEXT_BUFFER + BACKGROUND_H_PER_TEXT * 4); + background.setArcHeight(BACKGROUND_ARC_SIZE); + background.setArcWidth(BACKGROUND_ARC_SIZE); + background.setFill(new Color(1, 1, 1, 0.75)); + background.setStroke(theme); + background.setStrokeWidth(2); + background.setCache(true); + background.setCacheHint(CacheHint.SPEED); + + teamNameObject = getTextObject(boat.getShortName(), theme); + teamNameObject.relocate(X_OFFSET_TEXT, Y_OFFSET_TEXT_INIT + Y_OFFSET_PER_TEXT); + + velocityObject = getTextObject("0 m/s", theme); + velocityObject.relocate(X_OFFSET_TEXT, Y_OFFSET_TEXT_INIT + Y_OFFSET_PER_TEXT * 2); + + estTimeToNextMarkObject = getTextObject("Next mark: ", theme); + estTimeToNextMarkObject.relocate(X_OFFSET_TEXT, Y_OFFSET_TEXT_INIT + Y_OFFSET_PER_TEXT * 3); + + legTimeObject = getTextObject("Last mark: -", theme); + legTimeObject.relocate(X_OFFSET_TEXT, Y_OFFSET_TEXT_INIT + Y_OFFSET_PER_TEXT * 4); + + super.getChildren().addAll(background, teamNameObject, velocityObject, estTimeToNextMarkObject, legTimeObject); + } + + /** + * Return a text object with caching and a color applied + * + * @param defaultText The default text to display + * @param fill The text fill color + * @return The text object + */ + private Text getTextObject(String defaultText, Color fill) { + Text text = new Text(defaultText); + text.setFill(fill); + text.setStrokeWidth(2); + text.setCacheHint(CacheHint.SPEED); + text.setCache(true); + return text; + } + + void update () { + velocityObject.setText(String.format(String.format("%.2f m/s", boat.getVelocity()))); + + if (boat.getTimeTillNext() != null) { + DateFormat format = new SimpleDateFormat("mm:ss"); + String timeToNextMark = format + .format(boat.getTimeTillNext() - StreamParser.getCurrentTimeLong()); + estTimeToNextMarkObject.setText("Next mark: " + timeToNextMark); + } else { + estTimeToNextMarkObject.setText("Next mark: -"); + } + + if (boat.getMarkRoundTime() != null) { + DateFormat format = new SimpleDateFormat("mm:ss"); + String elapsedTime = format + .format(StreamParser.getCurrentTimeLong() - boat.getMarkRoundTime()); + legTimeObject.setText("Last mark: " + elapsedTime); + }else { + legTimeObject.setText("Last mark: - "); + } + } + + void setVisibile (boolean nameVisibility, boolean speedVisibility, + boolean estTimeVisibility, boolean lastMarkVisibility) { + int totalVisible = 0; + totalVisible = updateVisibility(nameVisibility, teamNameObject, totalVisible); + totalVisible = updateVisibility(speedVisibility, velocityObject, totalVisible); + totalVisible = updateVisibility(estTimeVisibility, estTimeToNextMarkObject, totalVisible); + totalVisible = updateVisibility(lastMarkVisibility, legTimeObject, totalVisible); + if (totalVisible != 0) { + background.setVisible(true); + background.setHeight(Math.abs(BACKGROUND_X) + TEXT_BUFFER + BACKGROUND_H_PER_TEXT * totalVisible); + } else { + background.setVisible(false); + } + } + + private int updateVisibility (boolean visibility, Text text, int totalVisible) { + if (visibility){ + totalVisible ++; + text.setVisible(true); + text.setLayoutX(X_OFFSET_TEXT); + text.setLayoutY(Y_OFFSET_TEXT_INIT + Y_OFFSET_PER_TEXT * totalVisible); + } else { + text.setVisible(false); + } + return totalVisible; + } +} diff --git a/src/main/java/seng302/models/BoatGroup.java b/src/main/java/seng302/fxObjects/BoatGroup.java similarity index 58% rename from src/main/java/seng302/models/BoatGroup.java rename to src/main/java/seng302/fxObjects/BoatGroup.java index 0bb8a81b..d5ab53b2 100644 --- a/src/main/java/seng302/models/BoatGroup.java +++ b/src/main/java/seng302/fxObjects/BoatGroup.java @@ -1,4 +1,4 @@ -package seng302.models; +package seng302.fxObjects; import java.util.ArrayList; import javafx.event.EventHandler; @@ -10,6 +10,7 @@ import javafx.scene.shape.Line; import javafx.scene.shape.Polygon; import javafx.scene.text.Text; import javafx.scene.transform.Rotate; +import seng302.models.Yacht; import seng302.GeometryUtils; import seng302.controllers.CanvasController; import seng302.models.mark.GateMark; @@ -31,14 +32,6 @@ import java.text.SimpleDateFormat; public class BoatGroup extends Group { //Constants for drawing - private static final double TEAMNAME_X_OFFSET = 10d; - private static final double TEAMNAME_Y_OFFSET = -29d; - private static final double VELOCITY_X_OFFSET = 10d; - private static final double VELOCITY_Y_OFFSET = -17d; - private static final double ESTTIMETONEXTMARK_X_OFFSET = 10d; - private static final double ESTTIMETONEXTMARK_Y_OFFSET = -5d; - private static final double LEGTIME_X_OFFSET = 10d; - private static final double LEGTIME_Y_OFFSET = 7d; private static final double BOAT_HEIGHT = 15d; private static final double BOAT_WIDTH = 10d; //Variables for boat logic. @@ -52,19 +45,15 @@ public class BoatGroup extends Group { private Yacht boat; private Group lineGroup = new Group(); private Polygon boatPoly; - private Text teamNameObject; - private Text velocityObject; - private Text estTimeToNextMarkObject; - private Text legTimeObject; private Wake wake; private Line leftLayLine; private Line rightLayline; private Double distanceTravelled = 0.0; private Point2D lastPoint; private boolean destinationSet; - private Color textColor = Color.RED; + private BoatAnnotations boatAnnotations; - private Boolean isSelected = true; //All boats are initalised as selected + private Boolean isSelected = true; //All boats are initialised as selected /** * Creates a BoatGroup with the default triangular boat polygon. @@ -74,9 +63,9 @@ public class BoatGroup extends Group { * @param color The colour of the boat polygon and the trailing line. */ public BoatGroup(Yacht boat, Color color) { + destinationSet = false; this.boat = boat; initChildren(color); - this.textColor = color; } /** @@ -90,27 +79,11 @@ public class BoatGroup extends Group { * polygon. */ public BoatGroup(Yacht boat, Color color, double... points) { + destinationSet = false; this.boat = boat; initChildren(color, points); } - /** - * Return a text object with caching and a color applied - * - * @param defaultText The default text to display - * @param fill The text fill color - * @return The text object - */ - private Text getTextObject(String defaultText, Color fill) { - Text text = new Text(defaultText); - - text.setFill(fill); - text.setCacheHint(CacheHint.SPEED); - text.setCache(true); - - return text; - } - /** * Creates the javafx objects that will be the in the group by default. * @@ -119,52 +92,26 @@ public class BoatGroup extends Group { * polygon. */ private void initChildren(Color color, double... points) { - textColor = color; - destinationSet = false; - boatPoly = new Polygon(points); boatPoly.setFill(color); - boatPoly.setOnMouseEntered(event -> boatPoly.setFill(Color.FLORALWHITE)); - boatPoly.setOnMouseExited(event -> boatPoly.setFill(color)); + boatPoly.setOnMouseEntered(event -> { + boatPoly.setFill(Color.FLORALWHITE); + boatPoly.setStroke(Color.RED); + }); + boatPoly.setOnMouseExited(event -> { + boatPoly.setFill(color); + boatPoly.setStroke(Color.BLACK); + }); boatPoly.setOnMouseClicked(event -> setIsSelected(!isSelected)); boatPoly.setCache(true); boatPoly.setCacheHint(CacheHint.SPEED); - - teamNameObject = getTextObject(boat.getShortName(), textColor); - velocityObject = getTextObject(boat.getVelocity().toString(), textColor); - - teamNameObject.setX(TEAMNAME_X_OFFSET); - teamNameObject.setY(TEAMNAME_Y_OFFSET); - teamNameObject.relocate(teamNameObject.getX(), teamNameObject.getY()); - - velocityObject.setX(VELOCITY_X_OFFSET); - velocityObject.setY(VELOCITY_Y_OFFSET); - velocityObject.relocate(velocityObject.getX(), velocityObject.getY()); - - updateLastMarkRoundingTime(); - updateTimeTillNextMark(); - - if (estTimeToNextMarkObject != null) { - estTimeToNextMarkObject.setX(ESTTIMETONEXTMARK_X_OFFSET); - estTimeToNextMarkObject.setY(ESTTIMETONEXTMARK_Y_OFFSET); - estTimeToNextMarkObject - .relocate(estTimeToNextMarkObject.getX(), estTimeToNextMarkObject.getY()); - } - - if (legTimeObject != null) { - legTimeObject.setX(LEGTIME_X_OFFSET); - legTimeObject.setY(LEGTIME_Y_OFFSET); - legTimeObject.relocate(legTimeObject.getX(), legTimeObject.getY()); - - } + boatAnnotations = new BoatAnnotations(boat, color); leftLayLine = new Line(); rightLayline = new Line(); wake = new Wake(0, -BOAT_HEIGHT); - super.getChildren() - .addAll(teamNameObject, velocityObject, boatPoly, estTimeToNextMarkObject, - legTimeObject, leftLayLine, rightLayline); + super.getChildren().addAll(boatPoly, boatAnnotations); } /** @@ -189,14 +136,8 @@ public class BoatGroup extends Group { private void moveGroupBy(double dx, double dy) { boatPoly.setLayoutX(boatPoly.getLayoutX() + dx); boatPoly.setLayoutY(boatPoly.getLayoutY() + dy); - teamNameObject.setLayoutX(teamNameObject.getLayoutX() + dx); - teamNameObject.setLayoutY(teamNameObject.getLayoutY() + dy); - velocityObject.setLayoutX(velocityObject.getLayoutX() + dx); - velocityObject.setLayoutY(velocityObject.getLayoutY() + dy); - estTimeToNextMarkObject.setLayoutX(estTimeToNextMarkObject.getLayoutX() + dx); - estTimeToNextMarkObject.setLayoutY(estTimeToNextMarkObject.getLayoutY() + dy); - legTimeObject.setLayoutX(legTimeObject.getLayoutX() + dx); - legTimeObject.setLayoutY(legTimeObject.getLayoutY() + dy); + boatAnnotations.setLayoutX(boatAnnotations.getLayoutX() + dx); + boatAnnotations.setLayoutY(boatAnnotations.getLayoutY() + dy); wake.setLayoutX(wake.getLayoutX() + dx); wake.setLayoutY(wake.getLayoutY() + dy); } @@ -212,14 +153,8 @@ public class BoatGroup extends Group { rotateTo(rotation); boatPoly.setLayoutX(x); boatPoly.setLayoutY(y); - teamNameObject.setLayoutX(x); - teamNameObject.setLayoutY(y); - velocityObject.setLayoutX(x); - velocityObject.setLayoutY(y); - estTimeToNextMarkObject.setLayoutX(x); - estTimeToNextMarkObject.setLayoutY(y); - legTimeObject.setLayoutX(x); - legTimeObject.setLayoutY(y); + boatAnnotations.setLayoutX(x); + boatAnnotations.setLayoutY(y); wake.setLayoutX(x); wake.setLayoutY(y); wake.rotate(rotation); @@ -229,42 +164,6 @@ public class BoatGroup extends Group { boatPoly.getTransforms().setAll(new Rotate(rotation)); } - /** - * Updates the time until next mark label, will create a label if one doesn't exist - */ - private void updateTimeTillNextMark() { - if (estTimeToNextMarkObject == null) { - estTimeToNextMarkObject = getTextObject("Next mark: -", textColor); - } - if (boat.getEstimateTimeAtNextMark() != null) { - DateFormat format = new SimpleDateFormat("mm:ss"); - String timeToNextMark = format - .format(boat.getEstimateTimeAtNextMark() - StreamParser.getCurrentTimeLong()); - estTimeToNextMarkObject.setText("Next mark: " + timeToNextMark); - } else { - estTimeToNextMarkObject.setText("Next mark: -"); - } - } - - /** - * Updates the time since last mark rounding, will create a label if one doesn't exist - */ - private void updateLastMarkRoundingTime() { - if (legTimeObject == null) { - legTimeObject = getTextObject("Last mark: -", textColor); - } - - if (boat.getMarkRoundingTime() != null) { - DateFormat format = new SimpleDateFormat("mm:ss"); - String elapsedTime = format - .format(StreamParser.getCurrentTimeLong() - boat.getMarkRoundingTime()); - legTimeObject.setText("Last mark: " + elapsedTime); - } else { - legTimeObject.setText("Last mark: -"); - - } - } - public void move() { double dx = xIncrement * framesToMove; double dy = yIncrement * framesToMove; @@ -298,33 +197,7 @@ public class BoatGroup extends Group { lastPoint = new Point2D(boatPoly.getLayoutX(), boatPoly.getLayoutY()); } } - - wake.updatePosition(1000 / 60); - } - - /** - * Calculates the rotational velocity required to reach the rotationalGoal from the - * currentRotation. - */ - protected Double calculateRotationalVelocity(Double rotationalGoal) { - Double rotationalVelocity = 0.0; - - if (Math.abs(rotationalGoal - lastRotation) > 180) { - if (rotationalGoal - lastRotation >= 0.0) { - rotationalVelocity = ((rotationalGoal - lastRotation) - 360) / 200; - } else { - rotationalVelocity = (360 + (rotationalGoal - lastRotation)) / 200; - } - } else { - rotationalVelocity = (rotationalGoal - lastRotation) / 200; - } - - //Sometimes the rotation is too large to be realistic. In that case just do it instantly. - if (Math.abs(rotationalVelocity) > 1) { - rotationalVelocity = 0.0; - } - - return rotationalVelocity; + wake.updatePosition(); } /** @@ -336,7 +209,7 @@ public class BoatGroup extends Group { * @param timeValid the time the position values are valid for */ public void setDestination(double newXValue, double newYValue, double rotation, - double groundSpeed, long timeValid, double frameRate, long id) { + double groundSpeed, long timeValid, double frameRate) { if (lastTimeValid == 0) { lastTimeValid = timeValid - 200; moveTo(newXValue, newYValue, rotation); @@ -350,24 +223,13 @@ public class BoatGroup extends Group { destinationSet = true; - Double rotationalVelocity = calculateRotationalVelocity(rotation); - - updateTimeTillNextMark(); - updateLastMarkRoundingTime(); - - if (Math.abs(rotationalVelocity) > 0.075) { - rotationalVelocity = 0.0; - wake.rotate(rotation); - } - rotateTo(rotation); - wake.setRotationalVelocity(rotationalVelocity, groundSpeed); - - velocityObject.setText(String.format("%.2f m/s", groundSpeed)); + wake.setRotation(rotation, groundSpeed); + boat.setVelocity(groundSpeed); lastTimeValid = timeValid; isStopped = false; - lastRotation = rotation; + boatAnnotations.update(); } @@ -411,30 +273,16 @@ public class BoatGroup extends Group { public void setIsSelected(Boolean isSelected) { this.isSelected = isSelected; - setTeamNameObjectVisible(isSelected); - setVelocityObjectVisible(isSelected); setLineGroupVisible(isSelected); setWakeVisible(isSelected); - setEstTimeToNextMarkObjectVisible(isSelected); - setLegTimeObjectVisible(isSelected); + boatAnnotations.setVisible(isSelected); setLayLinesVisible(isSelected); } - - public void setTeamNameObjectVisible(Boolean visible) { - teamNameObject.setVisible(visible); - } - - public void setVelocityObjectVisible(Boolean visible) { - velocityObject.setVisible(visible); - } - - public void setEstTimeToNextMarkObjectVisible(Boolean visible) { - estTimeToNextMarkObject.setVisible(visible); - } - - public void setLegTimeObjectVisible(Boolean visible) { - legTimeObject.setVisible(visible); + public void setVisibility (boolean teamName, boolean velocity, boolean estTime, boolean legTime, boolean trail, boolean wake) { + boatAnnotations.setVisibile(teamName, velocity, estTime, legTime); + this.wake.setVisible(wake); + this.lineGroup.setVisible(trail); } public void setLineGroupVisible(Boolean visible) { @@ -475,19 +323,17 @@ public class BoatGroup extends Group { return boat.getSourceID(); } - /** - * Due to javaFX limitations annotations associated with a boat that you want to appear below - * all boats in the Z-axis need to be pulled out of the BoatGroup and added to the parent group - * of the BoatGroups. This function returns these annotations as a group. - * - * @return A group containing low priority annotations. - */ - public Group getLowPriorityAnnotations() { - Group group = new Group(); - group.getChildren().addAll(wake, lineGroup); - return group; + public Group getWake () { + return wake; } + public Group getTrail() { + return lineGroup; + } + + public Group getAnnotations() { + return boatAnnotations; + } public Double getBoatLayoutX() { return boatPoly.getLayoutX(); @@ -506,4 +352,5 @@ public class BoatGroup extends Group { public String toString() { return boat.toString(); } + } \ No newline at end of file diff --git a/src/main/java/seng302/models/mark/MarkGroup.java b/src/main/java/seng302/fxObjects/MarkGroup.java similarity index 77% rename from src/main/java/seng302/models/mark/MarkGroup.java rename to src/main/java/seng302/fxObjects/MarkGroup.java index db55656d..2215aef7 100644 --- a/src/main/java/seng302/models/mark/MarkGroup.java +++ b/src/main/java/seng302/fxObjects/MarkGroup.java @@ -1,4 +1,4 @@ -package seng302.models.mark; +package seng302.fxObjects; import java.util.ArrayList; import java.util.List; @@ -8,6 +8,10 @@ import javafx.scene.Node; import javafx.scene.paint.Color; import javafx.scene.shape.Circle; import javafx.scene.shape.Line; +import seng302.models.mark.GateMark; +import seng302.models.mark.Mark; +import seng302.models.mark.MarkType; +import seng302.models.mark.SingleMark; import seng302.GeometryUtils; /** @@ -109,34 +113,35 @@ public class MarkGroup extends Group { } super.getChildren().add(line); - //Laylines -// if (mark.) - -// addLayLine(points1, 12.0, 90.0); -// addLayLine(points2, 12.0, 90.0); } public void moveMarkTo (double x, double y, long raceId) { if (mainMark.getMarkType() == MarkType.SINGLE_MARK) { Circle markCircle = (Circle) super.getChildren().get(0); - - markCircle.setCenterX(x); - markCircle.setCenterY(y); + //One of the test streams produced frequent, jittery movements. Added this as a fix. + if (Math.abs(markCircle.getCenterX() - x) > 5 || Math.abs(markCircle.getCenterY() - y) > 5) { + markCircle.setCenterX(x); + markCircle.setCenterY(y); + } } else { Circle markCircle1 = (Circle) super.getChildren().get(0); Circle markCircle2 = (Circle) super.getChildren().get(1); Line connectingLine = (Line) super.getChildren().get(2); if (marks.get(0).getId() == raceId) { - markCircle1.setCenterX(x); - markCircle1.setCenterY(y); - connectingLine.setStartX(markCircle1.getCenterX()); - connectingLine.setStartY(markCircle1.getCenterY()); + if (Math.abs(markCircle1.getCenterX() - x) > 5 || Math.abs(markCircle1.getCenterY() - y) > 5) { + markCircle1.setCenterX(x); + markCircle1.setCenterY(y); + connectingLine.setStartX(markCircle1.getCenterX()); + connectingLine.setStartY(markCircle1.getCenterY()); + } } else if (marks.get(1).getId() == raceId) { - markCircle2.setCenterX(x); - markCircle2.setCenterY(y); - connectingLine.setEndX(markCircle2.getCenterX()); - connectingLine.setEndY(markCircle2.getCenterY()); + if (Math.abs(markCircle2.getCenterX() - x) > 5 || Math.abs(markCircle2.getCenterY() - y) > 5) { + markCircle2.setCenterX(x); + markCircle2.setCenterY(y); + connectingLine.setEndX(markCircle2.getCenterX()); + connectingLine.setEndY(markCircle2.getCenterY()); + } } } } diff --git a/src/main/java/seng302/models/Wake.java b/src/main/java/seng302/fxObjects/Wake.java similarity index 59% rename from src/main/java/seng302/models/Wake.java rename to src/main/java/seng302/fxObjects/Wake.java index 886dfba8..8f8cc8aa 100644 --- a/src/main/java/seng302/models/Wake.java +++ b/src/main/java/seng302/fxObjects/Wake.java @@ -1,4 +1,4 @@ -package seng302.models; +package seng302.fxObjects; import javafx.scene.CacheHint; import javafx.scene.Group; @@ -7,24 +7,24 @@ import javafx.scene.shape.Arc; import javafx.scene.shape.ArcType; import javafx.scene.shape.StrokeLineCap; import javafx.scene.transform.Rotate; +import javafx.scene.transform.Scale; /** * A group containing objects used to represent wakes onscreen. Contains functionality for their animation. */ -class Wake extends Group { +public class Wake extends Group { //The number of wakes private int numWakes = 8; //The total possible difference between the first wake and the last. Increasing/Decreasing this will make wakes fan out more/less. private final double MAX_DIFF = 75; //Increasing/decreasing this will alter the speed that wakes converge when the heading stop changing. Anything over about 1500 may cause oscillation. - private final int UNIFICATION_SPEED = 750; + private final int UNIFICATION_SPEED = 45; private Arc[] arcs = new Arc[numWakes]; private double[] rotationalVelocities = new double[numWakes]; private double[] rotations = new double[numWakes]; - private double baseRad; /** * Create a wake at the given location. @@ -40,62 +40,60 @@ class Wake extends Group { //Default triangle is -110 deg out of phase with a default wake and has angle of 40 deg. arc = new Arc(0, 0, 0, 0, -110, 40); arc.setCache(true); - arc.setCacheHint(CacheHint.SPEED); + arc.setCacheHint(CacheHint.ROTATE); arc.setType(ArcType.OPEN); arc.setStroke(new Color(0.18, 0.7, 1.0, 1.0 + (-0.99 / numWakes * i))); arc.setStrokeWidth(3.0); arc.setStrokeLineCap(StrokeLineCap.ROUND); arc.setFill(new Color(0.0, 0.0, 0.0, 0.0)); - baseRad = (20 / numWakes); arcs[i] = arc; + arc.getTransforms().setAll( + new Rotate(1) + ); } super.getChildren().addAll(arcs); } - /** - * Sets the rotationalVelocity of each arc. - * - * @param rotationalVelocity The rotationalVelocity the wake should move at. - * @param velocity The real world velocity of the boat in m/s. - */ - void setRotationalVelocity(double rotationalVelocity, double velocity) { - rotationalVelocities[0] = rotationalVelocity; - for (int i = 1; i < numWakes; i++) { - double wakeSeparationRad = Math.toRadians(rotations[i - 1] - rotations[i]); - double shortestDistance = Math.atan2( - Math.sin(wakeSeparationRad), - Math.cos(wakeSeparationRad) - ); - double distDeg = Math.toDegrees(shortestDistance); + void setRotation (double rotation, double velocity) { + if (Math.abs(rotations[0] - rotation) > 20) { + rotate(rotation); + } else { + rotations[0] = rotation; + ((Rotate) arcs[0].getTransforms().get(0)).setAngle(rotation); + for (int i = 1; i < numWakes; i++) { + double wakeSeparationRad = Math.toRadians(rotations[i - 1] - rotations[i]); + double shortestDistance = Math.atan2( + Math.sin(wakeSeparationRad), + Math.cos(wakeSeparationRad) + ); + double distDeg = Math.toDegrees(shortestDistance); + if (rotationalVelocities[i - 1] < 0.01 && rotationalVelocities[i - 1] > -0.01) { + rotationalVelocities[i] = distDeg / UNIFICATION_SPEED * 2 * Math.log(Math.abs(distDeg) + 1) / Math.log(MAX_DIFF / numWakes); - if (rotationalVelocities[i - 1] < 0.01 && rotationalVelocities[i - 1] > -0.01) { - rotationalVelocities[i] = distDeg / UNIFICATION_SPEED * Math.log(Math.abs(distDeg) + 1) / Math.log(MAX_DIFF / numWakes); - - } else { - if (distDeg < (MAX_DIFF / numWakes)) - rotationalVelocities[i] = rotationalVelocities[i - 1] * Math.log(Math.abs(distDeg) + 1) / Math.log(MAX_DIFF / numWakes); - else - rotationalVelocities[i] = rotationalVelocities[i - 1]; + } else { + if (distDeg < (MAX_DIFF / numWakes)) { + rotationalVelocities[i] = distDeg / UNIFICATION_SPEED * Math.log(Math.abs(distDeg) + 1) / Math.log(MAX_DIFF / numWakes); + } else + rotationalVelocities[i] = rotationalVelocities[i - 1]; + } } } - double rad = baseRad + velocity; + double rad = (14 / numWakes) + velocity; for (Arc arc : arcs) { arc.setRadiusX(rad); arc.setRadiusY(rad); - rad += (20 / numWakes) + (velocity / 2); + rad += (14 / numWakes) + (velocity / 2.5); } } /** * Arcs rotate based on the distance they would have travelled over the supplied time interval. - * - * @param timeInterval the time interval, in microseconds, that the wake should move. */ - void updatePosition(long timeInterval) { + void updatePosition() { for (int i = 0; i < numWakes; i++) { - rotations[i] = rotations[i] + rotationalVelocities[i] * timeInterval; - arcs[i].getTransforms().setAll(new Rotate(rotations[i])); + rotations[i] = rotations[i] + rotationalVelocities[i]; + ((Rotate) arcs[i].getTransforms().get(0)).setAngle(rotations[i]); } } diff --git a/src/main/java/seng302/models/Yacht.java b/src/main/java/seng302/models/Yacht.java index 0cfa17f9..c11c7407 100644 --- a/src/main/java/seng302/models/Yacht.java +++ b/src/main/java/seng302/models/Yacht.java @@ -6,8 +6,6 @@ import seng302.controllers.RaceViewController; import java.text.DateFormat; import java.text.SimpleDateFormat; -import seng302.models.stream.StreamParser; -import seng302.models.stream.XMLParser.RaceXMLObject.Corner; /** * Yacht class for the racing boat. @@ -19,7 +17,6 @@ public class Yacht { // Used in boat group private Color colour; - private double velocity; private String boatType; private Integer sourceID; @@ -32,11 +29,13 @@ public class Yacht { private Integer legNumber; private Integer penaltiesAwarded; private Integer penaltiesServed; - private Long estimateTimeAtNextMark; private Long estimateTimeAtFinish; private String position; + private double velocity; + private Long timeTillNext; + private Long markRoundTime; + // Mark rounding - private Long markRoundingTime; private Mark lastMarkRounded; private Mark nextMark; @@ -134,14 +133,8 @@ public class Yacht { this.penaltiesServed = penaltiesServed; } - public Long getEstimateTimeAtNextMark() { -// DateFormat format = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss"); -// return format.format(estimateTimeAtNextMark); - return estimateTimeAtNextMark; - } - public void setEstimateTimeAtNextMark(Long estimateTimeAtNextMark) { - this.estimateTimeAtNextMark = estimateTimeAtNextMark; + timeTillNext = estimateTimeAtNextMark; } public String getEstimateTimeAtFinish() { @@ -169,20 +162,25 @@ public class Yacht { this.colour = colour; } - public Double getVelocity() { - return velocity; - } - public void setVelocity(double velocity) { this.velocity = velocity; } - public Long getMarkRoundingTime() { - return markRoundingTime; - } public void setMarkRoundingTime(Long markRoundingTime) { - this.markRoundingTime = markRoundingTime; + this.markRoundTime = markRoundingTime; + } + + public double getVelocity() { + return velocity; + } + + public Long getTimeTillNext() { + return timeTillNext; + } + + public Long getMarkRoundTime() { + return markRoundTime; } public Mark getLastMarkRounded() { @@ -205,4 +203,5 @@ public class Yacht { public Mark getNextMark(){ return nextMark; } + } diff --git a/src/main/java/seng302/models/stream/StreamParser.java b/src/main/java/seng302/models/stream/StreamParser.java index 6cec3185..e7286561 100644 --- a/src/main/java/seng302/models/stream/StreamParser.java +++ b/src/main/java/seng302/models/stream/StreamParser.java @@ -416,9 +416,10 @@ public class StreamParser extends Thread { double groundSpeed = bytesToLong(Arrays.copyOfRange(payload, 38, 40)) / 1000.0; //type 1 is a racing yacht and type 3 is a mark, needed for updating positions of the mark and boat - if (deviceType == 1) { - BoatPositionPacket boatPacket = new BoatPositionPacket(boatId, timeValid, lat, lon, - heading, groundSpeed); + if (deviceType == 1){ + Yacht boat = boats.get((int) boatId); + boat.setVelocity(groundSpeed); + BoatPositionPacket boatPacket = new BoatPositionPacket(boatId, timeValid, lat, lon, heading, groundSpeed); //add a new priority que to the boatLocations HashMap if (!boatLocations.containsKey(boatId)) { diff --git a/src/main/resources/views/FinishScreenView.fxml b/src/main/resources/views/FinishScreenView.fxml new file mode 100644 index 00000000..736c8b74 --- /dev/null +++ b/src/main/resources/views/FinishScreenView.fxml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +