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

# Conflicts:
#	src/main/java/seng302/Controllers/RaceController.java
main
David Wu 9 years ago
commit ec03ec9be9

@ -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;
@ -54,5 +55,12 @@ public class RaceController extends Controller{
displayBoat(markCoord, Color.GOLD);
displayLine(southGate1, southGate2, Color.DARKCYAN);
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);
}
}

Loading…
Cancel
Save