From 9076606030c575190fd3a8c279453faec40ee9b2 Mon Sep 17 00:00:00 2001 From: David Wu Date: Tue, 23 May 2017 17:49:00 +1200 Subject: [PATCH] Fixed show all annotation not toggling annotations. -Problem found with if statement to fix annotation toggling. -Sparkline graph x-axis also increased slightly. #story[878] --- mock/src/test/java/seng302/Model/PolarsTest.java | 2 ++ .../main/java/seng302/Controllers/RaceController.java | 4 ++-- .../src/main/java/seng302/Model/ResizableRaceCanvas.java | 9 +++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/mock/src/test/java/seng302/Model/PolarsTest.java b/mock/src/test/java/seng302/Model/PolarsTest.java index fbdcae2d..f7835662 100644 --- a/mock/src/test/java/seng302/Model/PolarsTest.java +++ b/mock/src/test/java/seng302/Model/PolarsTest.java @@ -33,6 +33,8 @@ public class PolarsTest { } + + /** * Tests if we can calculate VMG for a variety of values. */ diff --git a/visualiser/src/main/java/seng302/Controllers/RaceController.java b/visualiser/src/main/java/seng302/Controllers/RaceController.java index 513a661b..43d12f64 100644 --- a/visualiser/src/main/java/seng302/Controllers/RaceController.java +++ b/visualiser/src/main/java/seng302/Controllers/RaceController.java @@ -140,8 +140,8 @@ public class RaceController extends Controller { xAxis.setTickMarkVisible(false); xAxis.setTickLabelsVisible(false); xAxis.setMinorTickVisible(false); - xAxis.setUpperBound(startBoats.size()*legNum); - xAxis.setTickUnit(startBoats.size()*legNum); + xAxis.setUpperBound((startBoats.size()+1)*legNum); + xAxis.setTickUnit((startBoats.size()+1)*legNum); // set y axis details diff --git a/visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java b/visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java index 2078333a..f3ba5262 100644 --- a/visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java +++ b/visualiser/src/main/java/seng302/Model/ResizableRaceCanvas.java @@ -324,13 +324,14 @@ public class ResizableRaceCanvas extends ResizableCanvas { displayBoat(boat, 0, boatColours.get(sourceID)); } - if (raceAnno) - if (Duration.between(boat.getTimeSinceLastMark(), raceClock.getTime()).getSeconds() < 0){ + if (raceAnno) { + if (Duration.between(boat.getTimeSinceLastMark(), raceClock.getTime()).getSeconds() < 0) { boat.setTimeSinceLastMark(raceClock.getTime()); } displayText(boat.toString(), boat.getAbbrev(), boat.getVelocity(), this.map.convertGPS(boat.getCurrentPosition()), boat.getTimeSinceLastMark()); - //TODO this needs to be fixed. - drawTrack(boat, boatColours.get(sourceID)); + //TODO this needs to be fixed. + drawTrack(boat, boatColours.get(sourceID)); + } } } }