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]
main
David Wu 9 years ago
parent 2ac932b4f3
commit 9076606030

@ -33,6 +33,8 @@ public class PolarsTest {
} }
/** /**
* Tests if we can calculate VMG for a variety of values. * Tests if we can calculate VMG for a variety of values.
*/ */

@ -140,8 +140,8 @@ public class RaceController extends Controller {
xAxis.setTickMarkVisible(false); xAxis.setTickMarkVisible(false);
xAxis.setTickLabelsVisible(false); xAxis.setTickLabelsVisible(false);
xAxis.setMinorTickVisible(false); xAxis.setMinorTickVisible(false);
xAxis.setUpperBound(startBoats.size()*legNum); xAxis.setUpperBound((startBoats.size()+1)*legNum);
xAxis.setTickUnit(startBoats.size()*legNum); xAxis.setTickUnit((startBoats.size()+1)*legNum);
// set y axis details // set y axis details

@ -324,8 +324,8 @@ public class ResizableRaceCanvas extends ResizableCanvas {
displayBoat(boat, 0, boatColours.get(sourceID)); displayBoat(boat, 0, boatColours.get(sourceID));
} }
if (raceAnno) if (raceAnno) {
if (Duration.between(boat.getTimeSinceLastMark(), raceClock.getTime()).getSeconds() < 0){ if (Duration.between(boat.getTimeSinceLastMark(), raceClock.getTime()).getSeconds() < 0) {
boat.setTimeSinceLastMark(raceClock.getTime()); boat.setTimeSinceLastMark(raceClock.getTime());
} }
displayText(boat.toString(), boat.getAbbrev(), boat.getVelocity(), this.map.convertGPS(boat.getCurrentPosition()), boat.getTimeSinceLastMark()); displayText(boat.toString(), boat.getAbbrev(), boat.getVelocity(), this.map.convertGPS(boat.getCurrentPosition()), boat.getTimeSinceLastMark());
@ -334,6 +334,7 @@ public class ResizableRaceCanvas extends ResizableCanvas {
} }
} }
} }
}
/** /**
* Draws all track points for a given boat. Colour is set by boat, opacity by track point. * Draws all track points for a given boat. Colour is set by boat, opacity by track point.

Loading…
Cancel
Save