eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-04 03:13:49 +00:00
Code Activity

Merge branch 'master' into metaleaderboard-on-same-page

Browse Source
This commit is contained in:
Axel Uhl committed 2012-12-05 15:05:31 +01:00
2 parents 96b10a62d8 149bc67bf9
commit 0b274f7584
3 files changed
+23 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/AbstractChartPanel.java
+2 -11
View File
@@ -124,7 +124,7 @@ public abstract class AbstractChartPanel<SettingsType extends ChartSettings> ext
.setMarginRight(65)
.setBorderColor(new Color("#CACACA"))
.setBackgroundColor(new Color("#EBEBEB"))
.setBorderWidth(1)
.setBorderWidth(0)
.setBorderRadius(0)
.setPlotBorderWidth(0)
.setCredits(new Credits().setEnabled(false))
@@ -317,16 +317,7 @@ public abstract class AbstractChartPanel<SettingsType extends ChartSettings> ext
System.arraycopy(raceDataPointsToAdd, 0, newRaceDataPoints, 0, currentPointIndex);
}
if(timeRangeWithZoomProvider.isZoomed()) {
Pair<Date, Date> timeZoom = timeRangeWithZoomProvider.getTimeZoom();
resetMinMaxAndExtremesInterval(false);
competitorDataSeries.setPoints(newRaceDataPoints, false);
changeMinMaxAndExtremesInterval(timeZoom.getA(), timeZoom.getB(), false);
} else {
competitorDataSeries.setPoints(newRaceDataPoints, false);
}
setSeriesPoints(competitorDataSeries, newRaceDataPoints);
// Adding the series if chart doesn't contain it
if (!chartSeries.contains(competitorDataSeries)) {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/RaceChart.java
+18 -1
View File
@@ -3,6 +3,8 @@ package com.sap.sailing.gwt.ui.shared.charts;
import java.util.Date;
import org.moxieapps.gwt.highcharts.client.Chart;
import org.moxieapps.gwt.highcharts.client.Point;
import org.moxieapps.gwt.highcharts.client.Series;
import org.moxieapps.gwt.highcharts.client.XAxis;
import org.moxieapps.gwt.highcharts.client.events.ChartClickEvent;
import org.moxieapps.gwt.highcharts.client.events.ChartSelectionEvent;
@@ -10,6 +12,7 @@ import org.moxieapps.gwt.highcharts.client.events.ChartSelectionEvent;
import com.google.gwt.i18n.client.DateTimeFormat;
import com.google.gwt.user.client.ui.SimplePanel;
import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.gwt.ui.actions.AsyncActionsExecutor;
import com.sap.sailing.gwt.ui.client.ErrorReporter;
import com.sap.sailing.gwt.ui.client.RaceSelectionChangeListener;
@@ -125,6 +128,19 @@ public abstract class RaceChart extends SimplePanel implements RaceSelectionChan
}
}
protected void setSeriesPoints(Series series, Point[] points) {
if(timeRangeWithZoomProvider.isZoomed()) {
Pair<Date, Date> timeZoom = timeRangeWithZoomProvider.getTimeZoom();
resetMinMaxAndExtremesInterval(false);
series.setPoints(points, false);
changeMinMaxAndExtremesInterval(timeZoom.getA(), timeZoom.getB(), false);
} else {
series.setPoints(points, false);
}
}
protected void resetMinMaxAndExtremesInterval(boolean redraw) {
changeMinMaxAndExtremesInterval(timeRangeWithZoomProvider.getFromTime(), timeRangeWithZoomProvider.getToTime(), redraw);
}
@@ -136,8 +152,9 @@ public abstract class RaceChart extends SimplePanel implements RaceSelectionChan
}
public void onTimeRangeChanged(Date fromTime, Date toTime) {
if(isZoomed && timer.getPlayMode() != PlayModes.Live)
if(!(isZoomed && timer.getPlayMode() == PlayModes.Live)) {
changeMinMaxAndExtremesInterval(timeRangeWithZoomProvider.getFromTime(), timeRangeWithZoomProvider.getToTime(), true);
}
}
public void onTimeZoomReset() {
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/charts/WindChart.java
+3 -3
View File
@@ -104,7 +104,7 @@ public class WindChart extends RaceChart implements Component<WindChartSettings>
.setWidth100()
.setHeight100()
.setBorderColor(new Color("#CACACA"))
.setBorderWidth(1)
.setBorderWidth(0)
.setBorderRadius(0)
.setBackgroundColor(new Color("#EBEBEB"))
.setPlotBorderWidth(0)
@@ -382,10 +382,10 @@ public class WindChart extends RaceChart implements Component<WindChartSettings>
newSpeedPoints = speedPoints;
}
directionSeries.setPoints(newDirectionPoints);
setSeriesPoints(directionSeries, newDirectionPoints);
windSourceDirectionPoints.put(windSource, newDirectionPoints);
if (windSource.getType().useSpeed()) {
speedSeries.setPoints(newSpeedPoints);
setSeriesPoints(speedSeries, newSpeedPoints);
windSourceSpeedPoints.put(windSource, newSpeedPoints);
}
}