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

Finished implementing drawing of border from XML

Browse Source 
Border is drawn onto canvas, it is static.

#story[469]
This commit is contained in:
William Muir
2017-05-02 21:05:53 +12:00
parent c5c2d4375d
commit fe824a8f71
2 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/App.java
+2 -2
View File
@@ -34,9 +34,9 @@ public class App extends Application
sr = new StreamReceiver("localhost", 8085, "TestThread1"); sr = new StreamReceiver("localhost", 8085, "TestThread1");
} }
else{ else{
sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"TestThread1"); // sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"TestThread1");
// sr = new StreamReceiver("livedata.americascup.com", 4941, "TestThread1"); // sr = new StreamReceiver("livedata.americascup.com", 4941, "TestThread1");
// sr = new StreamReceiver("localhost", 8085, "TestThread1"); sr = new StreamReceiver("localhost", 8085, "TestThread1");
} }
sr.start(); sr.start();
src/main/java/seng302/controllers/CanvasController.java
+39 -37
View File
@@ -4,21 +4,17 @@ import javafx.animation.*;
import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.property.SimpleDoubleProperty;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.geometry.Point2D; import javafx.geometry.Point2D;
import javafx.geometry.Point3D;
import javafx.scene.Group; import javafx.scene.Group;
import javafx.scene.canvas.Canvas; import javafx.scene.canvas.Canvas;
import javafx.scene.canvas.GraphicsContext; import javafx.scene.canvas.GraphicsContext;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.scene.shape.Arc;
import javafx.scene.shape.ArcType;
import javafx.scene.text.Font; import javafx.scene.text.Font;
import seng302.models.Boat; import seng302.models.Boat;
import seng302.models.BoatGroup; import seng302.models.BoatGroup;
import seng302.models.Colors; import seng302.models.Colors;
import seng302.models.RaceObject; import seng302.models.RaceObject;
import seng302.models.mark.*; import seng302.models.mark.*;
import seng302.models.parsers.StreamPacket;
import seng302.models.parsers.StreamParser; import seng302.models.parsers.StreamParser;
import seng302.models.parsers.packets.BoatPositionPacket; import seng302.models.parsers.packets.BoatPositionPacket;
import seng302.models.parsers.XMLParser; import seng302.models.parsers.XMLParser;
@@ -26,7 +22,6 @@ import seng302.models.parsers.XMLParser.RaceXMLObject.CompoundMark;
import seng302.models.parsers.XMLParser.RaceXMLObject.Limit; import seng302.models.parsers.XMLParser.RaceXMLObject.Limit;
import seng302.models.mark.Mark; import seng302.models.mark.Mark;
import java.sql.Time;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.*; import java.util.*;
import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.PriorityBlockingQueue;
@@ -119,7 +114,7 @@ public class CanvasController {
findMinMaxPoint(); findMinMaxPoint();
double minLonToMaxLon = scaleRaceExtremities(); double minLonToMaxLon = scaleRaceExtremities();
calculateReferencePointLocation(minLonToMaxLon); calculateReferencePointLocation(minLonToMaxLon);
addBorderMarks(); addRaceBorder();
addCourseMarks(); addCourseMarks();
findMetersToPixels(); findMetersToPixels();
@@ -167,14 +162,33 @@ public class CanvasController {
* named the same as those in the model package but are, however not the same, so they do not have things such as * 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.. * a type and must be derived from the number of marks in a compound mark etc..
*/ */
private void addBorderMarks() { private void addRaceBorder() {
XMLParser.RaceXMLObject raceXMLObject = StreamParser.getXmlObject().getRaceXML(); XMLParser.RaceXMLObject raceXMLObject = StreamParser.getXmlObject().getRaceXML();
ArrayList<Limit> courselimits = raceXMLObject.getCourseLimit(); ArrayList<Limit> courseLimits = raceXMLObject.getCourseLimit();
for (Limit courselimit : courselimits) { gc.setStroke(Color.DARKRED);
Mark thisMark = new SingleMark("", courselimit.getLat(), courselimit.getLng(), courselimit.getSeqID()); gc.setLineWidth(3);
RaceObject markGroup = new MarkGroup(thisMark, findScaledXY(thisMark));
raceObjects.add(markGroup); for (int i = 0; i < courseLimits.size() - 1; i++) {
Limit thisPoint1 = courseLimits.get(i);
SingleMark thisMark1 = new SingleMark("", thisPoint1.getLat(), thisPoint1.getLng(), thisPoint1.getSeqID());
Limit thisPoint2 = courseLimits.get(i+1);
SingleMark thisMark2 = new SingleMark("", thisPoint2.getLat(), thisPoint2.getLng(), thisPoint2.getSeqID());
Point2D borderPoint1 = findScaledXY(thisMark1);
Point2D borderPoint2 = findScaledXY(thisMark2);
gc.strokeLine(borderPoint1.getX(), borderPoint1.getY(),
borderPoint2.getX(), borderPoint2.getY());
} }
Limit thisPoint1 = courseLimits.get(courseLimits.size()-1);
SingleMark thisMark1 = new SingleMark("", thisPoint1.getLat(), thisPoint1.getLng(), thisPoint1.getSeqID());
Limit thisPoint2 = courseLimits.get(0);
SingleMark thisMark2 = new SingleMark("", thisPoint2.getLat(), thisPoint2.getLng(), thisPoint2.getSeqID());
Point2D borderPoint1 = findScaledXY(thisMark1);
Point2D borderPoint2 = findScaledXY(thisMark2);
gc.strokeLine(borderPoint1.getX(), borderPoint1.getY(),
borderPoint2.getX(), borderPoint2.getY());
} }
@@ -352,34 +366,22 @@ public class CanvasController {
* marker, rightmost marker, southern most marker and northern most marker respectively. * marker, rightmost marker, southern most marker and northern most marker respectively.
*/ */
private void findMinMaxPoint() { private void findMinMaxPoint() {
List<CompoundMark.Mark> sortedPoints = new ArrayList<>(); List<Limit> sortedPoints = new ArrayList<>();
// for (Mark mark : raceViewController.getRace().getCourse()) for (Limit limit : StreamParser.getXmlObject().getRaceXML().getCourseLimit()) {
// for (Mark mark : raceMarks) sortedPoints.add(limit);
// {
// if (mark.getMarkType() == MarkType.SINGLE_MARK)
// sortedPoints.add(mark);
// else {
// sortedPoints.add(((GateMark) mark).getSingleMark1());
// sortedPoints.add(((GateMark) mark).getSingleMark2());
// }
// }
for (CompoundMark compoundMark : StreamParser.getXmlObject().getRaceXML().getCompoundMarks()) {
for (CompoundMark.Mark mark : compoundMark.getMarks()) {
sortedPoints.add(mark);
} }
} sortedPoints.sort(Comparator.comparingDouble(Limit::getLat));
sortedPoints.sort(Comparator.comparingDouble(CompoundMark.Mark::getTargetLat)); Limit minLatMark = sortedPoints.get(0);
CompoundMark.Mark minLatMark = sortedPoints.get(0); Limit maxLatMark = sortedPoints.get(sortedPoints.size()-1);
CompoundMark.Mark maxLatMark = sortedPoints.get(sortedPoints.size()-1); minLatPoint = new SingleMark(minLatMark.toString(), minLatMark.getLat(), minLatMark.getLng(), minLatMark.getSeqID());
minLatPoint = new SingleMark(minLatMark.getMarkName(), minLatMark.getTargetLat(), minLatMark.getTargetLng(), minLatMark.getSourceID()); maxLatPoint = new SingleMark(maxLatMark.toString(), maxLatMark.getLat(), maxLatMark.getLng(), maxLatMark.getSeqID());
maxLatPoint = new SingleMark(maxLatMark.getMarkName(), maxLatMark.getTargetLat(), maxLatMark.getTargetLng(), maxLatMark.getSourceID());
sortedPoints.sort(Comparator.comparingDouble(CompoundMark.Mark::getTargetLng)); sortedPoints.sort(Comparator.comparingDouble(Limit::getLng));
//If the course is on a point on the earth where longitudes wrap around. //If the course is on a point on the earth where longitudes wrap around.
CompoundMark.Mark minLonMark = sortedPoints.get(0); Limit minLonMark = sortedPoints.get(0);
CompoundMark.Mark maxLonMark = sortedPoints.get(sortedPoints.size()-1); Limit maxLonMark = sortedPoints.get(sortedPoints.size()-1);
SingleMark thisMinLon = new SingleMark(minLonMark.getMarkName(), minLonMark.getTargetLat(), minLonMark.getTargetLng(), minLonMark.getSourceID()); SingleMark thisMinLon = new SingleMark(minLonMark.toString(), minLonMark.getLat(), minLonMark.getLng(), minLonMark.getSeqID());
SingleMark thisMaxLon = new SingleMark(maxLonMark.getMarkName(), maxLonMark.getTargetLat(), maxLonMark.getTargetLng(), maxLonMark.getSourceID()); SingleMark thisMaxLon = new SingleMark(maxLonMark.toString(), maxLonMark.getLat(), maxLonMark.getLng(), maxLonMark.getSeqID());
// TODO: 30/03/17 cir27 - Correctly account for longitude wrapping around. // TODO: 30/03/17 cir27 - Correctly account for longitude wrapping around.
if (thisMaxLon.getLongitude() - thisMinLon.getLongitude() > 180) { if (thisMaxLon.getLongitude() - thisMinLon.getLongitude() > 180) {
SingleMark temp = thisMinLon; SingleMark temp = thisMinLon;