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

Merge remote-tracking branch 'origin/story9' into story9

Browse Source 
# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
This commit is contained in:
David Wu
2017-03-15 12:36:43 +13:00
parent b4baba8c15 6c3b7ccee7
commit ec03ec9be9
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/Controllers/RaceController.java
+8
View File
@@ -6,6 +6,7 @@ import javafx.scene.canvas.GraphicsContext;
import javafx.scene.control.TableView; import javafx.scene.control.TableView;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
import javafx.scene.paint.Paint; import javafx.scene.paint.Paint;
import javafx.scene.shape.Line;
import seng302.Coordinate; import seng302.Coordinate;
import seng302.RaceMap; import seng302.RaceMap;
@@ -54,5 +55,12 @@ public class RaceController extends Controller{
displayBoat(markCoord, Color.GOLD); displayBoat(markCoord, Color.GOLD);
displayLine(southGate1, southGate2, Color.DARKCYAN); displayLine(southGate1, southGate2, Color.DARKCYAN);
displayLine(northGate1, northGate2, Color.DARKVIOLET); displayLine(northGate1, northGate2, Color.DARKVIOLET);
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);
} }
} }