Quick change to stop adding course markers as they are dynamic and add them in the previous way

This commit is contained in:
William Muir
2017-05-02 21:31:38 +12:00
parent 4432ba26e5
commit b3a89279d6
2 changed files with 4 additions and 20 deletions
+2 -2
View File
@@ -34,9 +34,9 @@ public class App extends Application
sr = new StreamReceiver("localhost", 8085, "TestThread1"); sr = new StreamReceiver("localhost", 8085, "TestThread1");
} }
else{ else{
// sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"TestThread1"); sr = new StreamReceiver("csse-s302staff.canterbury.ac.nz", 4941,"TestThread1");
// sr = new StreamReceiver("livedata.americascup.com", 4941, "TestThread1"); // sr = new StreamReceiver("livedata.americascup.com", 4941, "TestThread1");
sr = new StreamReceiver("localhost", 8085, "TestThread1"); // sr = new StreamReceiver("localhost", 8085, "TestThread1");
} }
sr.start(); sr.start();
@@ -100,24 +100,7 @@ public class CanvasController {
gc.setFill(Color.SKYBLUE); gc.setFill(Color.SKYBLUE);
gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT); gc.fillRect(0,0, CANVAS_WIDTH, CANVAS_HEIGHT);
gc.restore(); gc.restore();
// fitMarksToCanvas(); fitMarksToCanvas();
//Wait until wer have received the XML
while(StreamParser.getXmlObject().getRaceXML() == null) {
try {
Thread.sleep(1);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
findMinMaxPoint();
double minLonToMaxLon = scaleRaceExtremities();
calculateReferencePointLocation(minLonToMaxLon);
addRaceBorder();
addCourseMarks();
findMetersToPixels();
// TODO: 1/05/17 wmu16 - Change this call to now draw the marks as from the xml // TODO: 1/05/17 wmu16 - Change this call to now draw the marks as from the xml
@@ -357,6 +340,7 @@ public class CanvasController {
double minLonToMaxLon = scaleRaceExtremities(); double minLonToMaxLon = scaleRaceExtremities();
calculateReferencePointLocation(minLonToMaxLon); calculateReferencePointLocation(minLonToMaxLon);
givePointsXY(); givePointsXY();
addRaceBorder();
findMetersToPixels(); findMetersToPixels();
} }