From ddbb77a6107eb1b1b85ab7fed4044f23fca7da6b Mon Sep 17 00:00:00 2001 From: David Wu Date: Thu, 16 Mar 2017 17:44:24 +1300 Subject: [PATCH 1/3] Arrow is now movable around the canvas -Arrow method is changed to take coordinates and an angle -Arrow will now be drawn around the coordinate #story [14] --- .../seng302/Controllers/RaceController.java | 19 ++++++++++++++----- src/main/resources/scenes/racepane.fxml | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/seng302/Controllers/RaceController.java b/src/main/java/seng302/Controllers/RaceController.java index 7f888ccd..8a7c0f59 100644 --- a/src/main/java/seng302/Controllers/RaceController.java +++ b/src/main/java/seng302/Controllers/RaceController.java @@ -1,5 +1,6 @@ package seng302.Controllers; + import javafx.fxml.FXML; import javafx.scene.canvas.Canvas; import javafx.scene.canvas.GraphicsContext; @@ -47,14 +48,15 @@ public class RaceController extends Controller{ gc.fillOval(graphCoordinate.getX(), graphCoordinate.getY(), 10, 10); } - public void displayArrow(GraphCoordinate coordinate, Paint paint){ - rotate(10, 30,30); - gc.fillPolygon(new double[]{0, 6, 12, 8, 8, 4, 4}, - new double[]{15, 0, 15, 15, 40, 40, 15}, + public void displayArrow(GraphCoordinate coordinate, int angle){ + rotate(angle, coordinate.getX(),coordinate.getY()); + gc.fillPolygon(new double[]{coordinate.getX()-12, coordinate.getX()-6, coordinate.getX(), coordinate.getX()-4, coordinate.getX()-4, coordinate.getX()-8, coordinate.getX()-8}, + new double[]{coordinate.getY()-5, coordinate.getY()-20, coordinate.getY()-5, coordinate.getY()-5, coordinate.getY()+20, coordinate.getY()+20, coordinate.getY()-5}, 7); gc.restore(); } + private void rotate(double angle, double px, double py) { Rotate r = new Rotate(angle, px, py); gc.setTransform(r.getMxx(), r.getMyx(), r.getMxy(), r.getMyy(), r.getTx(), r.getTy()); @@ -65,6 +67,7 @@ public class RaceController extends Controller{ raceMap.widthProperty().bind(canvasBase.widthProperty()); raceMap.heightProperty().bind(canvasBase.heightProperty());*/ this.gc = raceMap.getGraphicsContext2D(); + this.map = new RaceMap(32.321989, -64.8553, 32.246, -64.831, (int)raceMap.getWidth(), (int)raceMap.getHeight()); //boat GraphCoordinate boat1coord = this.map.convertGPS(32.296577, -64.854304); @@ -89,7 +92,13 @@ public class RaceController extends Controller{ GraphCoordinate startline2 = this.map.convertGPS(32.293771, -64.855242); displayLine(startline1, startline2, Color.GREEN); + //display wind direction arrow - specify origin point and angle displayPoint(this.map.convertGPS(32.293771, -64.855242), Color.BLACK); - displayArrow(new GraphCoordinate(100, 100), Color.BLUEVIOLET); + displayArrow(new GraphCoordinate(500, 20), 100); + + + } + + } diff --git a/src/main/resources/scenes/racepane.fxml b/src/main/resources/scenes/racepane.fxml index 8eaf63a6..bffa0d7f 100644 --- a/src/main/resources/scenes/racepane.fxml +++ b/src/main/resources/scenes/racepane.fxml @@ -11,7 +11,7 @@ - + From d3937660272f9b5f631e3ca8bc5e1107947661c1 Mon Sep 17 00:00:00 2001 From: cbt24 Date: Thu, 16 Mar 2017 17:44:34 +1300 Subject: [PATCH 2/3] Partially completed story 13 --- .../seng302/Controllers/RaceController.java | 37 +++++++++++++++++-- src/main/java/seng302/Model/Boat.java | 4 ++ src/main/java/seng302/Model/Race.java | 11 +++++- src/main/resources/scenes/racepane.fxml | 3 +- 4 files changed, 48 insertions(+), 7 deletions(-) diff --git a/src/main/java/seng302/Controllers/RaceController.java b/src/main/java/seng302/Controllers/RaceController.java index e0f1a867..83e6b2fb 100644 --- a/src/main/java/seng302/Controllers/RaceController.java +++ b/src/main/java/seng302/Controllers/RaceController.java @@ -1,13 +1,21 @@ package seng302.Controllers; +import javafx.collections.FXCollections; import javafx.fxml.FXML; import javafx.scene.canvas.Canvas; import javafx.scene.canvas.GraphicsContext; +import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; +import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.layout.AnchorPane; import javafx.scene.paint.Color; import javafx.scene.paint.Paint; +import seng302.GPSCoordinate; import seng302.GraphCoordinate; +import seng302.Model.Boat; +import seng302.Model.BoatInRace; +import seng302.Model.ConstantVelocityRace; +import seng302.Model.Leg; import seng302.RaceMap; import java.net.URL; @@ -20,10 +28,19 @@ public class RaceController extends Controller{ @FXML Canvas raceMap; @FXML - TableView boatInfoTable; + TableView boatInfoTable; @FXML AnchorPane canvasBase; - + /* + @FXML + TableColumn boatPlacingColumn; + */ + @FXML + TableColumn boatTeamColumn; + /* + @FXML + TableColumn boatMarkColumn; + */ private GraphicsContext gc; private RaceMap map; @@ -50,8 +67,22 @@ public class RaceController extends Controller{ public void initialize(URL location, ResourceBundle resources) {/* raceMap.widthProperty().bind(canvasBase.widthProperty()); raceMap.heightProperty().bind(canvasBase.heightProperty());*/ - this.gc = raceMap.getGraphicsContext2D(); + + BoatInRace boat = new BoatInRace("NZ", 10000); + BoatInRace[] boats = new BoatInRace[] {boat}; + Leg leg1 = new Leg("first leg", 1, new GPSCoordinate(0, 0), new GPSCoordinate(1, 1), 0); + Leg[] legs = new Leg[] {leg1}; + + ConstantVelocityRace race = new ConstantVelocityRace(boats, legs); + + (new Thread(race)).start(); + //table view + boatTeamColumn.setCellValueFactory(new PropertyValueFactory("Name")); + boatInfoTable.setItems(FXCollections.observableArrayList(race.getFinishingBoats())); + this.map = new RaceMap(32.321989, -64.8553, 32.246, -64.831, (int)raceMap.getWidth(), (int)raceMap.getHeight()); + + this.gc = raceMap.getGraphicsContext2D(); //boat GraphCoordinate boat1coord = this.map.convertGPS(32.296577, -64.854304); displayBoat(boat1coord, Color.AQUAMARINE); diff --git a/src/main/java/seng302/Model/Boat.java b/src/main/java/seng302/Model/Boat.java index 25d67520..3fedb34e 100644 --- a/src/main/java/seng302/Model/Boat.java +++ b/src/main/java/seng302/Model/Boat.java @@ -27,6 +27,10 @@ public class Boat { return name; } + public void setName(String name) { + this.name = name; + } + /** * * @return returns the speed of the boat. diff --git a/src/main/java/seng302/Model/Race.java b/src/main/java/seng302/Model/Race.java index d61b7221..f1dc3093 100644 --- a/src/main/java/seng302/Model/Race.java +++ b/src/main/java/seng302/Model/Race.java @@ -7,7 +7,7 @@ import java.util.*; * Parent class for races * Created by fwy13 on 3/03/17. */ -public abstract class Race { +public abstract class Race implements Runnable { protected BoatInRace[] startingBoats; protected ArrayList finishingBoats = new ArrayList<>(); protected Leg[] legs; @@ -26,9 +26,11 @@ public abstract class Race { } public void run() { + long time = System.currentTimeMillis(); preRace(); simulateRace(); - + System.out.println(System.currentTimeMillis() - time); + System.out.println(finishingBoats.get(0)); } private void preRace() { @@ -90,6 +92,11 @@ public abstract class Race { } + + public ArrayList getFinishingBoats() { + return finishingBoats; + } + /** * This function is a function that generates the Race and populates the events list. * Is automatically called by the initialiser function, so that simulateRace() does not return an empty race. diff --git a/src/main/resources/scenes/racepane.fxml b/src/main/resources/scenes/racepane.fxml index 8eaf63a6..9803ca44 100644 --- a/src/main/resources/scenes/racepane.fxml +++ b/src/main/resources/scenes/racepane.fxml @@ -18,8 +18,7 @@ - - + From 456925c4c6509caf2c59889cd528da13b323e000 Mon Sep 17 00:00:00 2001 From: cbt24 Date: Fri, 17 Mar 2017 11:15:15 +1300 Subject: [PATCH 3/3] Implemented table view for finishing list - Added auto-numbered placing, team name, and last mark columns - Added dummy 'Finish' mark to race - Added callback for race to update controller #story [13] --- .../seng302/Controllers/RaceController.java | 34 ++++++++++++------- .../seng302/Model/ConstantVelocityRace.java | 5 +++ src/main/java/seng302/Model/Leg.java | 8 +++++ src/main/java/seng302/Model/Race.java | 15 ++++++-- src/main/resources/scenes/racepane.fxml | 4 ++- 5 files changed, 50 insertions(+), 16 deletions(-) diff --git a/src/main/java/seng302/Controllers/RaceController.java b/src/main/java/seng302/Controllers/RaceController.java index 83e6b2fb..9c974b68 100644 --- a/src/main/java/seng302/Controllers/RaceController.java +++ b/src/main/java/seng302/Controllers/RaceController.java @@ -1,5 +1,7 @@ package seng302.Controllers; +import javafx.beans.property.ReadOnlyObjectWrapper; +import javafx.beans.value.ObservableValue; import javafx.collections.FXCollections; import javafx.fxml.FXML; import javafx.scene.canvas.Canvas; @@ -10,15 +12,16 @@ import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.layout.AnchorPane; import javafx.scene.paint.Color; import javafx.scene.paint.Paint; +import javafx.util.Callback; import seng302.GPSCoordinate; import seng302.GraphCoordinate; -import seng302.Model.Boat; -import seng302.Model.BoatInRace; -import seng302.Model.ConstantVelocityRace; -import seng302.Model.Leg; +import seng302.Model.*; import seng302.RaceMap; import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Observable; import java.util.ResourceBundle; /** @@ -31,16 +34,13 @@ public class RaceController extends Controller{ TableView boatInfoTable; @FXML AnchorPane canvasBase; - /* @FXML TableColumn boatPlacingColumn; - */ @FXML TableColumn boatTeamColumn; - /* @FXML TableColumn boatMarkColumn; - */ + private GraphicsContext gc; private RaceMap map; @@ -63,6 +63,19 @@ public class RaceController extends Controller{ gc.fillOval(graphCoordinate.getX(), graphCoordinate.getY(), 10, 10); } + public void updateInfoTable(Race race) { + boatInfoTable.setItems(FXCollections.observableArrayList(race.getFinishingBoats())); + + boatTeamColumn.setCellValueFactory(new PropertyValueFactory("Name")); + boatMarkColumn.setCellValueFactory(new PropertyValueFactory("CurrentLeg")); + boatPlacingColumn.setCellValueFactory(new Callback, ObservableValue>() { + @Override + public ObservableValue call(TableColumn.CellDataFeatures table) { + return new ReadOnlyObjectWrapper(boatInfoTable.getItems().indexOf(table.getValue()) + 1); + } + }); + } + @Override public void initialize(URL location, ResourceBundle resources) {/* raceMap.widthProperty().bind(canvasBase.widthProperty()); @@ -73,12 +86,9 @@ public class RaceController extends Controller{ Leg leg1 = new Leg("first leg", 1, new GPSCoordinate(0, 0), new GPSCoordinate(1, 1), 0); Leg[] legs = new Leg[] {leg1}; - ConstantVelocityRace race = new ConstantVelocityRace(boats, legs); + ConstantVelocityRace race = new ConstantVelocityRace(boats, legs, this); (new Thread(race)).start(); - //table view - boatTeamColumn.setCellValueFactory(new PropertyValueFactory("Name")); - boatInfoTable.setItems(FXCollections.observableArrayList(race.getFinishingBoats())); this.map = new RaceMap(32.321989, -64.8553, 32.246, -64.831, (int)raceMap.getWidth(), (int)raceMap.getHeight()); diff --git a/src/main/java/seng302/Model/ConstantVelocityRace.java b/src/main/java/seng302/Model/ConstantVelocityRace.java index a6e34e67..c5526fc2 100644 --- a/src/main/java/seng302/Model/ConstantVelocityRace.java +++ b/src/main/java/seng302/Model/ConstantVelocityRace.java @@ -1,5 +1,6 @@ package seng302.Model; +import seng302.Controllers.RaceController; import seng302.GPSCoordinate; import seng302.GraphCoordinate; @@ -17,6 +18,10 @@ public class ConstantVelocityRace extends Race { * @see Leg */ + public ConstantVelocityRace(BoatInRace[] startingBoats, Leg[] marks, RaceController controller) { + super(startingBoats, marks, controller); + } + public ConstantVelocityRace(BoatInRace[] startingBoats, Leg[] marks) { super(startingBoats, marks); } diff --git a/src/main/java/seng302/Model/Leg.java b/src/main/java/seng302/Model/Leg.java index 699c9f63..67557ab8 100644 --- a/src/main/java/seng302/Model/Leg.java +++ b/src/main/java/seng302/Model/Leg.java @@ -28,6 +28,14 @@ public class Leg { this.legNumber = number; } + public Leg(String name) { + this.name = name; + this.distance = 0; + this.startGPSCoordinate = new GPSCoordinate(0,0); + this.endGPSCoordinate = new GPSCoordinate(0,0); + this.legNumber = 0; + } + /** * * @return the name of the Leg diff --git a/src/main/java/seng302/Model/Race.java b/src/main/java/seng302/Model/Race.java index f1dc3093..8d8342a3 100644 --- a/src/main/java/seng302/Model/Race.java +++ b/src/main/java/seng302/Model/Race.java @@ -1,6 +1,9 @@ package seng302.Model; +import seng302.Controllers.RaceController; +import seng302.GPSCoordinate; + import java.util.*; /** @@ -11,6 +14,7 @@ public abstract class Race implements Runnable { protected BoatInRace[] startingBoats; protected ArrayList finishingBoats = new ArrayList<>(); protected Leg[] legs; + protected RaceController controller; private int SLEEP_TIME = 1000; //time in milliseconds to pause in a paced loop @@ -19,18 +23,22 @@ public abstract class Race implements Runnable { * @param boats Takes in an array of boats that are participating in the race. * @param marks Number of marks in order that the boats pass in order to complete the race. */ - public Race(BoatInRace[] boats, Leg[] marks) { + public Race(BoatInRace[] boats, Leg[] marks, RaceController controller) { this.startingBoats = boats; this.legs = marks; + this.controller = controller; + } + public Race(BoatInRace[] boats, Leg[] marks) { + this.startingBoats = boats; + this.legs = marks; } public void run() { long time = System.currentTimeMillis(); preRace(); simulateRace(); - System.out.println(System.currentTimeMillis() - time); - System.out.println(finishingBoats.get(0)); + if(controller != null) controller.updateInfoTable(this); } private void preRace() { @@ -81,6 +89,7 @@ public abstract class Race implements Runnable { if (boat.getCurrentLeg().getLegNumber() == legs.length - 1) { //boat has finished boat.setTimeFinished(timeElapsed); + boat.setCurrentLeg(new Leg("Finish")); finishingBoats.add(boat); } else { boat.setDistanceTravelledInLeg(boat.getDistanceTravelledInLeg() - boat.getCurrentLeg().getDistance()); diff --git a/src/main/resources/scenes/racepane.fxml b/src/main/resources/scenes/racepane.fxml index 9803ca44..1c2146be 100644 --- a/src/main/resources/scenes/racepane.fxml +++ b/src/main/resources/scenes/racepane.fxml @@ -18,7 +18,9 @@ - + + +