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

Merge remote-tracking branch 'origin/gwt' into gwt

Browse Source
This commit is contained in:
fmittag committed 2012-01-18 18:31:05 +01:00
2 parents 44cd6777f7 ee2c3680d3
commit 92ad306e19
3 files changed
+107 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/LongRangeRegattaGeocoderTest.java
+69
View File
@@ -0,0 +1,69 @@
package com.sap.sailing.domain.test;
import static org.junit.Assert.assertNotNull;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.base.Buoy;
import com.sap.sailing.domain.base.Waypoint;
import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
import com.sap.sailing.domain.common.NoWindException;
import com.sap.sailing.domain.common.Position;
import com.sap.sailing.domain.common.RacePlaceOrder;
import com.sap.sailing.domain.common.TimePoint;
import com.sap.sailing.domain.common.impl.DegreePosition;
import com.sap.sailing.domain.tracking.DynamicTrackedRace;
import com.sap.sailing.domain.tracking.impl.GPSFixImpl;
import com.sap.sailing.domain.tractracadapter.ReceiverType;
public class LongRangeRegattaGeocoderTest extends AbstractManeuverDetectionTestCase {
public LongRangeRegattaGeocoderTest() throws MalformedURLException, URISyntaxException {
super();
}
@Before
public void setUp() throws URISyntaxException, IOException, InterruptedException {
super.setUp();
super.setUp("event_20110609_KielerWoch",
/* raceId */"357c700a-9d9a-11e0-85be-406186cbf87c", new ReceiverType[] { ReceiverType.MARKPASSINGS,
ReceiverType.RACESTARTFINISH, ReceiverType.RACECOURSE });
fixApproximateMarkPositionsForGeocoder(getTrackedRace());
dateFormat = new SimpleDateFormat("MM/dd/yyyy-HH:mm:ss");
}
private void fixApproximateMarkPositionsForGeocoder(DynamicTrackedRace race) {
TimePoint epoch = new MillisecondsTimePoint(0l);
TimePoint now = MillisecondsTimePoint.now();
Map<String, Position> buoyPositions = new HashMap<String, Position>();
buoyPositions.put("K Start (left)", new DegreePosition(5.90906782829855, -55.16166687011719));
buoyPositions.put("K Start (right)", new DegreePosition(5.939801840526332, -55.17402648925781));
buoyPositions.put("K Mark1", new DegreePosition(8.233237111274565, -31.640625));
buoyPositions.put("K Mark4 (right)", new DegreePosition(13.63083009512624, -21.8243408203125));
buoyPositions.put("K Mark4 (left)", new DegreePosition(13.870080100685891, -21.9122314453125));
buoyPositions.put("K Finish (left)", new DegreePosition(14.694198629294522, -17.39307403564453));
buoyPositions.put("K Finish (right)", new DegreePosition(14.693866535193942, -17.371788024902344));
for (Waypoint w : race.getRace().getCourse().getWaypoints()) {
for (Buoy buoy : w.getBuoys()) {
race.getOrCreateTrack(buoy).addGPSFix(new GPSFixImpl(buoyPositions.get(buoy.getName()), epoch));
race.getOrCreateTrack(buoy).addGPSFix(new GPSFixImpl(buoyPositions.get(buoy.getName()), now));
}
}
}
@Test
public void testSetupOK() throws ParseException, NoWindException {
assertNotNull(getTrackedRace());
RacePlaceOrder order = getTrackedRace().getPlaceOrder();
assertNotNull(order);
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindChart.java
+37 -48
View File
@@ -1,8 +1,10 @@
package com.sap.sailing.gwt.ui.adminconsole;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -29,6 +31,8 @@ import ca.nanometrics.gflot.client.options.SeriesOptions;
import ca.nanometrics.gflot.client.options.TickFormatter;
import com.google.gwt.i18n.client.DateTimeFormat;
import com.google.gwt.user.client.ui.Label;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
import com.sap.sailing.domain.common.WindSource;
import com.sap.sailing.gwt.ui.client.ColorMap;
@@ -46,7 +50,9 @@ public class WindChart implements Component<WindChartSettings> {
private PlotWithOverviewModel model;
private final Set<WindSource> windSourcesToDisplay;
private final ColorMap<WindSource> colorMap;
private final HashMap<WindSource, SeriesHandler> stripChartSeries;
private final Map<WindSource, SeriesHandler> stripChartSeries;
private final List<SeriesHandler> seriesHandlersInOrder;
private final Label selectedPointLabel;
private final ErrorReporter errorReporter;
private PlotWithOverview plot;
@@ -58,6 +64,8 @@ public class WindChart implements Component<WindChartSettings> {
dateFormat = DateTimeFormat.getFormat("HH:mm:ss");
this.colorMap = new ColorMap<WindSource>();
this.stripChartSeries = new HashMap<WindSource, SeriesHandler>();
this.seriesHandlersInOrder = new ArrayList<SeriesHandler>();
this.selectedPointLabel = new Label();
}
@Override
@@ -67,6 +75,8 @@ public class WindChart implements Component<WindChartSettings> {
@Override
public Widget getEntryWidget() {
VerticalPanel vp = new VerticalPanel();
vp.add(selectedPointLabel);
model = new PlotWithOverviewModel(PlotModelStrategy.defaultStrategy());
PlotOptions plotOptions = new PlotOptions();
plotOptions.setDefaultLineSeriesOptions(new LineSeriesOptions().setLineWidth(1).setShow(true));
@@ -84,11 +94,10 @@ public class WindChart implements Component<WindChartSettings> {
plotOptions.setGridOptions(new GridOptions().setHoverable(true).setMouseActiveRadius(5).setAutoHighlight(true));
plotOptions.setSelectionOptions(new SelectionOptions().setDragging(true).setMode("x")); // select along x-axis only
for (WindSource windSource : windSourcesToDisplay) {
SeriesHandler series = model.addSeries(""+windSource.name(), colorMap.getColorByID(windSource));
SeriesHandler series = addSeries(windSource);
series.setOptions(SeriesType.LINES, getLinesOptions(/* visible */ windSourcesToDisplay.contains(windSource)));
series.setOptions(SeriesType.POINTS, getPointsOptions(/* visible */ false));
series.setVisible(false);
stripChartSeries.put(windSource, series);
}
this.plot = new PlotWithOverview(model, plotOptions) {
@Override
@@ -102,45 +111,13 @@ public class WindChart implements Component<WindChartSettings> {
// add hover listener
plot.addHoverListener(new PlotHoverListener() {
public void onPlotHover(Plot plot, PlotPosition position, PlotItem item) {
/* TODO show some reasonable hover tooltip in wind strip chart
CompetitorDAO competitor = competitorID.get(seriesID.indexOf(item.getSeries()));
if (item != null && competitor != null) {
if (item.getSeries().getLabel().toLowerCase().contains("mark")){
selectedPointLabel.setText(competitor.name + " passed " + markPassingBuoyName.get(competitor.id + (long) item.getDataPoint().getX()) +" at " + dateFormat.format(new Date((long) item.getDataPoint().getX())));
}
else {
String unit = "";
switch (dataToShow){
case CURRENT_SPEED_OVER_GROUND_IN_KNOTS:
unit = stringConstants.currentSpeedOverGroundInKnotsUnit();
break;
case DISTANCE_TRAVELED:
unit = stringConstants.distanceInMetersUnit();
break;
case GAP_TO_LEADER_IN_SECONDS:
unit = stringConstants.gapToLeaderInSecondsUnit();
break;
case VELOCITY_MADE_GOOD_IN_KNOTS:
unit = stringConstants.velocityMadeGoodInKnotsUnit();
break;
case WINDWARD_DISTANCE_TO_OVERALL_LEADER:
unit = stringConstants.windwardDistanceToGoInMetersUnit();
}
String decimalPlaces = "";
for (int i = 0; i < dataToShow.getPrecision(); i++){
if (i == 0){
decimalPlaces += ".";
}
decimalPlaces += "0";
}
NumberFormat numberFormat = NumberFormat.getFormat("0" +decimalPlaces);
selectedPointLabel.setText(competitor.name + " at " + dateFormat.format(new Date((long) item.getDataPoint().getX()))
+ ": " + numberFormat.format(item.getDataPoint().getY()) + unit);
}
if (item != null) {
SeriesHandler seriesHandler = seriesHandlersInOrder.get(item.getSeriesIndex());
WindSource windSource = getWindSource(seriesHandler);
selectedPointLabel.setText(windSource.name());
} else {
selectedPointLabel.setText(stringConstants.noSelection());
selectedPointLabel.setText("");
}
*/
}
}, true);
plot.addSelectionListener(new SelectionListener() {
@@ -165,10 +142,25 @@ public class WindChart implements Component<WindChartSettings> {
plot.setLinearSelection(x1, x2);
}
});
// plot.setHeight(height);
// plot.setWidth(width);
plot.setOverviewHeight(60);
return plot;
vp.add(plot);
return vp;
}
private WindSource getWindSource(SeriesHandler seriesHandler) {
for (Map.Entry<WindSource, SeriesHandler> e : stripChartSeries.entrySet()) {
if (e.getValue() == seriesHandler) {
return e.getKey();
}
}
return null;
}
private SeriesHandler addSeries(WindSource windSource) {
SeriesHandler series = model.addSeries(windSource.name(), colorMap.getColorByID(windSource));
seriesHandlersInOrder.add(series);
stripChartSeries.put(windSource, series);
return series;
}
public void updateStripChartSeries(WindInfoForRaceDAO result) {
@@ -184,11 +176,9 @@ public class WindChart implements Component<WindChartSettings> {
}
} else {
if (seriesHandler == null) {
seriesHandler = model.addSeries("" + windSource.name(),
colorMap.getColorByID(windSource));
seriesHandler = addSeries(windSource);
seriesHandler.setOptions(SeriesType.LINES, getLinesOptions(/* visible */ windSourcesToDisplay.contains(windSource)));
seriesHandler.setOptions(SeriesType.POINTS, getPointsOptions(/* visible */ false));
stripChartSeries.put(windSource, seriesHandler);
} else {
seriesHandler.clear();
}
@@ -237,8 +227,7 @@ public class WindChart implements Component<WindChartSettings> {
windSourcesToDisplay.clear();
windSourcesToDisplay.addAll(newSettings.getWindSourcesToDisplay());
for (Map.Entry<WindSource, SeriesHandler> e : stripChartSeries.entrySet()) {
e.getValue().setOptions(SeriesType.LINES, getLinesOptions(windSourcesToDisplay.contains(e.getKey())));
e.getValue().setOptions(SeriesType.POINTS, getPointsOptions(windSourcesToDisplay.contains(e.getKey())));
e.getValue().setVisible(windSourcesToDisplay.contains(e.getKey()));
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractChartPanel.java
+1
View File
@@ -409,6 +409,7 @@ public abstract class AbstractChartPanel<SettingsType extends ChartSettings> ext
// add hover listener
plot.addHoverListener(new PlotHoverListener() {
public void onPlotHover(Plot plot, PlotPosition position, PlotItem item) {
// FIXME can the indexOf ever find anything? seriesID is a List<SeriesHandler>; item.getSeries() returns a Series object
CompetitorDAO competitor = competitorID.get(seriesID.indexOf(item.getSeries()));
if (item != null && competitor != null) {
if (item.getSeries().getLabel().toLowerCase().contains("mark")) {