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]
This commit is contained in:
@@ -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,13 +324,14 @@ 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());
|
||||||
//TODO this needs to be fixed.
|
//TODO this needs to be fixed.
|
||||||
drawTrack(boat, boatColours.get(sourceID));
|
drawTrack(boat, boatColours.get(sourceID));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user