michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 06:18:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed dead code from canvas controller and canvas map

Browse Source 
Tags: #story[928]
This commit is contained in:
Michael Rausch
2017-05-24 15:04:12 +12:00
parent c42942430f
commit 71637d7286
2 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/controllers/CanvasController.java
+7 -18
View File
@@ -1,10 +1,5 @@
package seng302.controllers; package seng302.controllers;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.PriorityBlockingQueue;
import javafx.animation.AnimationTimer; import javafx.animation.AnimationTimer;
import javafx.beans.property.SimpleDoubleProperty; import javafx.beans.property.SimpleDoubleProperty;
import javafx.fxml.FXML; import javafx.fxml.FXML;
@@ -21,11 +16,7 @@ import seng302.models.Colors;
import seng302.models.Yacht; import seng302.models.Yacht;
import seng302.models.map.Boundary; import seng302.models.map.Boundary;
import seng302.models.map.CanvasMap; import seng302.models.map.CanvasMap;
import seng302.models.mark.GateMark; import seng302.models.mark.*;
import seng302.models.mark.Mark;
import seng302.models.mark.MarkGroup;
import seng302.models.mark.MarkType;
import seng302.models.mark.SingleMark;
import seng302.models.stream.StreamParser; import seng302.models.stream.StreamParser;
import seng302.models.stream.XMLParser; import seng302.models.stream.XMLParser;
import seng302.models.stream.XMLParser.RaceXMLObject.Limit; import seng302.models.stream.XMLParser.RaceXMLObject.Limit;
@@ -34,6 +25,12 @@ import seng302.models.stream.packets.BoatPositionPacket;
import seng302.server.simulator.GeoUtility; import seng302.server.simulator.GeoUtility;
import seng302.server.simulator.mark.Position; import seng302.server.simulator.mark.Position;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.PriorityBlockingQueue;
/** /**
* Created by ptg19 on 15/03/17. * Created by ptg19 on 15/03/17.
* Modified by Haoming Yin (hyi25) on 20/3/2017. * Modified by Haoming Yin (hyi25) on 20/3/2017.
@@ -113,10 +110,6 @@ public class CanvasController {
public void initializeCanvas (){ public void initializeCanvas (){
gc = canvas.getGraphicsContext2D(); gc = canvas.getGraphicsContext2D();
// gc.save();
// gc.setFill(Color.SKYBLUE);
// gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
// gc.restore();
gc.setGlobalAlpha(0.5); gc.setGlobalAlpha(0.5);
fitMarksToCanvas(); fitMarksToCanvas();
drawGoogleMap(); drawGoogleMap();
@@ -243,13 +236,9 @@ public class CanvasController {
private void checkForCourseChanges() { private void checkForCourseChanges() {
if (StreamParser.isNewRaceXmlReceived()){ if (StreamParser.isNewRaceXmlReceived()){
// gc.setFill(Color.SKYBLUE);
// gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
// gc.restore();
gc.clearRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT); gc.clearRect(0, 0, CANVAS_WIDTH, CANVAS_HEIGHT);
drawGoogleMap(); drawGoogleMap();
addRaceBorder(); addRaceBorder();
// canvas.toBack();
} }
} }
src/main/java/seng302/models/map/CanvasMap.java
-1
View File
@@ -30,7 +30,6 @@ public class CanvasMap {
public Image getMapImage() { public Image getMapImage() {
try { try {
System.out.println(getRequest());
URL url = new URL(getRequest()); URL url = new URL(getRequest());
HttpsURLConnection connection = (HttpsURLConnection) url.openConnection(); HttpsURLConnection connection = (HttpsURLConnection) url.openConnection();