From 13706456f77d2ef4de7f98c2faabc2902c9d5cfa Mon Sep 17 00:00:00 2001 From: fmittag Date: Mon, 3 Dec 2012 12:33:18 +0100 Subject: [PATCH] quickfix for bug 1083 --- .../gwt/ui/shared/charts/AbstractChartPanel.java | 13 +++++++++++-- .../sap/sailing/gwt/ui/shared/charts/RaceChart.java | 4 ++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/AbstractChartPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/AbstractChartPanel.java index 7f531d6cd7b..3475848e962 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/AbstractChartPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/AbstractChartPanel.java @@ -316,8 +316,17 @@ public abstract class AbstractChartPanel ext newRaceDataPoints = new Point[currentPointIndex]; System.arraycopy(raceDataPointsToAdd, 0, newRaceDataPoints, 0, currentPointIndex); } - - competitorDataSeries.setPoints(newRaceDataPoints, false); + + if(timeRangeWithZoomProvider.isZoomed()) { + Pair timeZoom = timeRangeWithZoomProvider.getTimeZoom(); + resetMinMaxInterval(); + + competitorDataSeries.setPoints(newRaceDataPoints, false); + + changeMinMaxInterval(timeZoom.getA(), timeZoom.getB()); + } else { + competitorDataSeries.setPoints(newRaceDataPoints, false); + } // Adding the series if chart doesn't contain it if (!chartSeries.contains(competitorDataSeries)) { diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/RaceChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/RaceChart.java index 1cd8cd807e6..73180d8af2b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/RaceChart.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/RaceChart.java @@ -106,7 +106,7 @@ public abstract class RaceChart extends SimplePanel implements RaceSelectionChan return true; } - protected void resetMinMaxInterval(Date minIntervalTimepoint, Date maxIntervalTimepoint) { + protected void resetMinMaxInterval() { XAxis xAxis = chart.getXAxis(); Date minTimepoint = timeRangeWithZoomProvider.getFromTime(); Date maxTimepoint = timeRangeWithZoomProvider.getToTime(); @@ -137,7 +137,7 @@ public abstract class RaceChart extends SimplePanel implements RaceSelectionChan } public void onTimeRangeChanged(Date fromTime, Date toTime) { - resetMinMaxInterval(fromTime, toTime); + resetMinMaxInterval(); } public void onTimeZoomReset() {