eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-26 15:36:40 +00:00
Code Activity

zoom in live mode of the charts is still broken, but the rest should work fine.

Browse Source
This commit is contained in:
fmittag
2012-12-03 17:21:41 +01:00
parent 024ca01e4a
commit 017cd4d4e5
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/AbstractChartPanel.java
+2 -2
View File
@@ -319,11 +319,11 @@ public abstract class AbstractChartPanel<SettingsType extends ChartSettings> ext
if(timeRangeWithZoomProvider.isZoomed()) {
Pair<Date, Date> timeZoom = timeRangeWithZoomProvider.getTimeZoom();
resetMinMaxInterval();
resetMinMaxAndExtremesInterval(false);
competitorDataSeries.setPoints(newRaceDataPoints, false);
changeMinMaxInterval(timeZoom.getA(), timeZoom.getB());
changeMinMaxAndExtremesInterval(timeZoom.getA(), timeZoom.getB(), false);
} else {
competitorDataSeries.setPoints(newRaceDataPoints, false);
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/RaceChart.java
+11 -11
View File
@@ -106,10 +106,8 @@ public abstract class RaceChart extends SimplePanel implements RaceSelectionChan
return true;
}
protected void resetMinMaxInterval() {
protected void changeMinMaxAndExtremesInterval(Date minTimepoint, Date maxTimepoint, boolean redraw) {
XAxis xAxis = chart.getXAxis();
Date minTimepoint = timeRangeWithZoomProvider.getFromTime();
Date maxTimepoint = timeRangeWithZoomProvider.getToTime();
if (minTimepoint != null) {
xAxis.setMin(minTimepoint.getTime());
@@ -122,25 +120,27 @@ public abstract class RaceChart extends SimplePanel implements RaceSelectionChan
long tickInterval = (maxTimepoint.getTime() - minTimepoint.getTime()) / TICKCOUNT;
xAxis.setTickInterval(tickInterval);
}
chart.redraw();
if(redraw) {
chart.redraw();
}
}
protected void changeMinMaxInterval(Date minIntervalTimepoint, Date maxIntervalTimepoint) {
XAxis xAxis = chart.getXAxis();
xAxis.setExtremes(minIntervalTimepoint.getTime(), maxIntervalTimepoint.getTime(), true, true);
protected void resetMinMaxAndExtremesInterval(boolean redraw) {
changeMinMaxAndExtremesInterval(timeRangeWithZoomProvider.getFromTime(), timeRangeWithZoomProvider.getToTime(), redraw);
}
public void onTimeZoomChanged(Date zoomStartTimepoint, Date zoomEndTimepoint) {
changeMinMaxInterval(zoomStartTimepoint, zoomEndTimepoint);
changeMinMaxAndExtremesInterval(zoomStartTimepoint, zoomEndTimepoint, true);
// Probably there is a function for this in a newer version of highcharts: http://jsfiddle.net/mqz3N/1071/
// chart.showResetZoom();
}
public void onTimeRangeChanged(Date fromTime, Date toTime) {
resetMinMaxInterval();
if(isZoomed && timer.getPlayMode() != PlayModes.Live)
changeMinMaxAndExtremesInterval(timeRangeWithZoomProvider.getFromTime(), timeRangeWithZoomProvider.getToTime(), true);
}
public void onTimeZoomReset() {
changeMinMaxInterval(timeRangeWithZoomProvider.getFromTime(), timeRangeWithZoomProvider.getToTime());
resetMinMaxAndExtremesInterval(true);
}
}