From b9d696ef12d4ceb2778e361270fffb7557dd1ccd Mon Sep 17 00:00:00 2001 From: zwu18 Date: Sun, 21 May 2017 23:06:51 +1200 Subject: [PATCH] Sparkline has a set x-axis now to prevent sparkline constantly re-adjusting axis. #story[876] --- .../main/java/seng302/Controllers/RaceController.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/visualiser/src/main/java/seng302/Controllers/RaceController.java b/visualiser/src/main/java/seng302/Controllers/RaceController.java index 143fbc7a..89d49e32 100644 --- a/visualiser/src/main/java/seng302/Controllers/RaceController.java +++ b/visualiser/src/main/java/seng302/Controllers/RaceController.java @@ -30,6 +30,7 @@ public class RaceController extends Controller { private ResizableRaceMap raceBoundaries; private ArrayList colours; private Map boatColours = new HashMap<>(); + private int legNum; @FXML SplitPane race; @FXML CheckBox showFPS; @FXML CheckBox showBoatPath; @@ -126,6 +127,9 @@ public class RaceController extends Controller { xAxis.setTickMarkVisible(false); xAxis.setTickLabelsVisible(false); xAxis.setMinorTickVisible(false); + xAxis.setUpperBound(startBoats.size()*legNum); + xAxis.setTickUnit(startBoats.size()*legNum); + // set y axis details yAxis.setLowerBound(-(startBoats.size()+1)); @@ -160,7 +164,7 @@ public class RaceController extends Controller { public void startRace(VisualiserInput visualiserInput, RaceClock raceClock) { StreamedRace newRace = new StreamedRace(visualiserInput, this); //newRace.initialiseBoats(); - + legNum = visualiserInput.getCourse().getLegs().size()-1; raceMap = new ResizableRaceCanvas(visualiserInput.getCourse()); raceMap.setMouseTransparent(true); raceMap.widthProperty().bind(canvasBase.widthProperty()); @@ -271,8 +275,8 @@ public class RaceController extends Controller { } } } - xAxis.setUpperBound(sparkLineNumber); - xAxis.setTickUnit(sparkLineNumber); +// xAxis.setUpperBound(sparkLineNumber); +// xAxis.setTickUnit(sparkLineNumber); } private void makeColours() {