From 6c3b7ccee72a37aa2473d73aa03586ff08c8cf10 Mon Sep 17 00:00:00 2001 From: cbt24 Date: Wed, 15 Mar 2017 12:33:55 +1300 Subject: [PATCH 1/2] Implemented start line in RaceController - Added coordinates as given in Story 10 - Displayed start line - Marked line ends with circles #story [10] --- src/main/java/seng302/Controllers/RaceController.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/seng302/Controllers/RaceController.java b/src/main/java/seng302/Controllers/RaceController.java index ec31731b..ddcece29 100644 --- a/src/main/java/seng302/Controllers/RaceController.java +++ b/src/main/java/seng302/Controllers/RaceController.java @@ -6,6 +6,7 @@ import javafx.scene.canvas.GraphicsContext; import javafx.scene.control.TableView; import javafx.scene.paint.Color; import javafx.scene.paint.Paint; +import javafx.scene.shape.Line; import seng302.Coordinate; import seng302.RaceMap; @@ -35,8 +36,12 @@ public class RaceController extends Controller{ this.gc = raceMap.getGraphicsContext2D(); this.map = new RaceMap(32.321989, -64.866142, 32.273089, -64.814987, (int)raceMap.getWidth(), (int)raceMap.getHeight()); - Coordinate boat1coord = this.map.convertGPS(32.296577, -64.854304); - System.out.println(boat1coord.getX() + " " + boat1coord.getY()); - displayBoat(boat1coord, Color.AQUAMARINE); + gc.setStroke(Color.GREEN); + gc.setFill(Color.GREEN); + Coordinate startline1 = this.map.convertGPS(32.296577, -64.854304); + Coordinate startline2 = this.map.convertGPS(32.293771, -64.855242); + gc.strokeLine(startline1.getX(), startline1.getY(), startline2.getX(), startline2.getY()); + gc.fillOval(startline1.getX()-3, startline1.getY()-3, 6, 6); + gc.fillOval(startline2.getX()-3, startline2.getY()-3, 6, 6); } } From b4baba8c1529f93470d4a32270c06688ef6c87c5 Mon Sep 17 00:00:00 2001 From: David Wu Date: Wed, 15 Mar 2017 12:35:14 +1300 Subject: [PATCH 2/2] Implemented display a gate as a line -method created to add a line to canvas -added points for mark, north gate, and south gate #story [12] --- .../seng302/Controllers/RaceController.java | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/seng302/Controllers/RaceController.java b/src/main/java/seng302/Controllers/RaceController.java index ec31731b..a6d13e39 100644 --- a/src/main/java/seng302/Controllers/RaceController.java +++ b/src/main/java/seng302/Controllers/RaceController.java @@ -29,6 +29,14 @@ public class RaceController extends Controller{ gc.fillOval(coordinate.getX(), coordinate.getY(), 15, 15); } + public void displayLine(Coordinate coordinateA, Coordinate coordinateB, Paint paint){ + gc.setStroke(paint); + gc.setFill(paint); + gc.fillOval(coordinateA.getX(), coordinateA.getY(), 6, 6); + gc.fillOval(coordinateB.getX(), coordinateB.getY(), 6, 6); + gc.strokeLine(coordinateA.getX(), coordinateA.getY(), coordinateB.getX(), coordinateB.getY()); + } + @Override public void initialize(URL location, ResourceBundle resources) { @@ -36,7 +44,15 @@ public class RaceController extends Controller{ this.map = new RaceMap(32.321989, -64.866142, 32.273089, -64.814987, (int)raceMap.getWidth(), (int)raceMap.getHeight()); Coordinate boat1coord = this.map.convertGPS(32.296577, -64.854304); - System.out.println(boat1coord.getX() + " " + boat1coord.getY()); + //System.out.println(boat1coord.getX() + " " + boat1coord.getY()); + Coordinate markCoord = this.map.convertGPS(32.293039, -64.843983); + Coordinate southGate1 = this.map.convertGPS(32.284680, -64.850045); + Coordinate southGate2 = this.map.convertGPS(32.280164, -64.847591); + Coordinate northGate1 = this.map.convertGPS(32.309693, -64.835249); + Coordinate northGate2 = this.map.convertGPS(32.308046, -64.831785); displayBoat(boat1coord, Color.AQUAMARINE); + displayBoat(markCoord, Color.GOLD); + displayLine(southGate1, southGate2, Color.DARKCYAN); + displayLine(northGate1, northGate2, Color.DARKVIOLET); } }