diff --git a/visualiser/src/main/java/seng302/Controllers/RaceController.java b/visualiser/src/main/java/seng302/Controllers/RaceController.java index cb134f6a..2420c9df 100644 --- a/visualiser/src/main/java/seng302/Controllers/RaceController.java +++ b/visualiser/src/main/java/seng302/Controllers/RaceController.java @@ -109,8 +109,9 @@ public class RaceController extends Controller { startBoats.add(boat); } for (int i=0; i series = new XYChart.Series(); - series.getData().add(new XYChart.Data(0, i+1)); + series.getData().add(new XYChart.Data(0, startPos)); sparklineChart.getData().add(series); } @@ -123,8 +124,6 @@ public class RaceController extends Controller { sparklineChart.setCreateSymbols(false); - sparklineChart.setStyle(".default-color0.chart-series-line { -fx-stroke: #e9967a; }"); - // hide axis ticks and labels sparklineChart.getXAxis().setTickLabelsVisible(false); sparklineChart.getYAxis().setTickLabelsVisible(false); @@ -220,6 +219,7 @@ public class RaceController extends Controller { //int [] boatsInRace = {1, 2, 3, 4, 5, 6}; int colourIndex = 0; int placingVal = boatsInRace.size(); + //System.out.println(boatsInRace.get(0).toString()); sparkLineNumber++; for (int i=0; i= 1 && legNumber < legs.size()) { - boat.setCurrentLeg(legs.get(legNumber)); + if (boat.getCurrentLeg() != legs.get(legNumber)){ + boat.setCurrentLeg(legs.get(legNumber)); + controller.updateSparkline(startingBoats); + } } if (boatStatusEnum == BoatStatusEnum.RACING) { @@ -190,6 +193,7 @@ public class StreamedRace implements Runnable { public void handle(long arg0) { if (boatsFinished < startingBoats.size()) { boatsFinished = 0; + //controller.updateSparkline(startingBoats); totalTimeElapsed = System.currentTimeMillis() - timeRaceStarted; for (Boat boat : startingBoats) { @@ -212,9 +216,6 @@ public class StreamedRace implements Runnable { controller.finishRace(startingBoats); stop(); } - controller.updateSparkline(startingBoats); - - controller.updateMap(startingBoats, boatMarkers); fps++; if ((System.currentTimeMillis() - timeCurrent) > 1000) {