eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-28 14:57:12 +00:00
Code Activity

Live races ui - add images for wind direction visualisation

Browse Source
This commit is contained in:
Benjamin Barth committed 2015-05-13 16:50:43 +02:00
1 parent 4cab549000
commit ee3fb023f5
2 files changed
+37 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/images/home/windkompass_nord.svg
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 20 20" enable-background="new 0 0 20 20" xml:space="preserve">
<g>
<polygon fill="#E94A1B" points="16.6,16.7 10.3,14.9 4.1,16.7 10.3,2.4 "/>
<polygon fill="#B23518" points="10.3,14.9 16.6,16.7 10.3,2.4 "/>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 596 B

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/home/client/place/event/partials/racelist/RaceList.java
+27 -6
View File
@@ -6,13 +6,13 @@ import java.util.List;
import com.google.gwt.cell.client.AbstractCell;
import com.google.gwt.cell.client.Cell;
import com.google.gwt.cell.client.DateCell;
import com.google.gwt.cell.client.NumberCell;
import com.google.gwt.cell.client.TextCell;
import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.i18n.client.DateTimeFormat;
import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat;
import com.google.gwt.safecss.shared.SafeStyles;
import com.google.gwt.safecss.shared.SafeStylesBuilder;
import com.google.gwt.safecss.shared.SafeStylesUtils;
import com.google.gwt.safehtml.client.SafeHtmlTemplates;
import com.google.gwt.safehtml.shared.SafeHtml;
@@ -21,6 +21,7 @@ import com.google.gwt.user.cellview.client.Header;
import com.google.gwt.user.cellview.client.RowStyles;
import com.google.gwt.user.cellview.client.TextHeader;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HasHorizontalAlignment;
import com.sap.sailing.domain.common.InvertibleComparator;
import com.sap.sailing.domain.common.RegattaAndRaceIdentifier;
import com.sap.sailing.domain.common.SortingOrder;
@@ -32,7 +33,6 @@ import com.sap.sailing.gwt.common.client.i18n.TextMessages;
import com.sap.sailing.gwt.home.client.place.event.EventView;
import com.sap.sailing.gwt.home.client.place.event.partials.raceListLive.RacesListLiveResources;
import com.sap.sailing.gwt.home.client.place.event.partials.raceListLive.RacesListLiveResources.LocalCss;
import com.sap.sailing.gwt.ui.client.NumberFormatterFactory;
import com.sap.sailing.gwt.ui.client.StringMessages;
import com.sap.sailing.gwt.ui.client.shared.controls.SortableColumn;
import com.sap.sailing.gwt.ui.leaderboard.SortedCellTable;
@@ -41,6 +41,7 @@ import com.sap.sailing.gwt.ui.regattaoverview.SailingFlagsBuilder;
import com.sap.sailing.gwt.ui.shared.dispatch.event.LiveRaceDTO;
import com.sap.sailing.gwt.ui.shared.race.FlagStateDTO;
import com.sap.sailing.gwt.ui.shared.race.RaceProgressDTO;
import com.sap.sailing.gwt.ui.shared.race.SimpleWindDTO;
import com.sap.sailing.gwt.ui.shared.util.NullSafeComparableComparator;
import com.sap.sse.common.Util;
import com.sap.sse.gwt.theme.client.component.celltable.CleanCellTableResources;
@@ -68,6 +69,9 @@ public class RaceList extends Composite {
@Template("<div>{3}</div><div class=\"{0}\"><div style=\"{2}\" class=\"{1}\"></div></div>")
SafeHtml raceProgress(String styleNamesBar, String styleNamesProgress, SafeStyles width, String text);
@Template("<img style=\"{0}\" src=\"images/home/windkompass_nord.svg\"/>")
SafeHtml windDirection(SafeStyles rotation);
}
public RaceList(EventView.Presenter presenter) {
@@ -268,7 +272,8 @@ public class RaceList extends Composite {
}
});
add(new RaceListColumn<Number>(I18N.from(), new NumberCell(NumberFormatterFactory.getDecimalFormat(0))) {
RaceListColumn<SimpleWindDTO> windDirectionColumn = new RaceListColumn<SimpleWindDTO>(I18N.from(),
new WindDirectionCell()) {
@Override
public InvertibleComparator<LiveRaceDTO> getComparator() {
return null;
@@ -285,10 +290,12 @@ public class RaceList extends Composite {
}
@Override
public Number getValue(LiveRaceDTO object) {
return object.getWind() != null ? object.getWind().getTrueWindFromDeg() : null;
public SimpleWindDTO getValue(LiveRaceDTO object) {
return object.getWind();
}
});
};
windDirectionColumn.setHorizontalAlignment(HasHorizontalAlignment.ALIGN_CENTER);
add(windDirectionColumn);
add(new RaceListColumn<String>(I18N.courseArea(), new TextCell()) {
@Override
@@ -443,6 +450,20 @@ public class RaceList extends Composite {
}
}
private static class WindDirectionCell extends AbstractCell<SimpleWindDTO> {
@Override
public void render(Context context, SimpleWindDTO value, SafeHtmlBuilder sb) {
if (value != null) {
SafeStylesBuilder safeStyles = new SafeStylesBuilder();
safeStyles.trustedNameAndValue("transform", "rotate(" + value.getTrueWindFromDeg() + "deg)");
safeStyles.width(2.5, Unit.EM);
safeStyles.height(2.5, Unit.EM);
safeStyles.trustedNameAndValue("margin", "-0.75em auto");
sb.append(TEMPLATE.windDirection(safeStyles.toSafeStyles()));
}
}
}
private static class RaceProgressCell extends AbstractCell<RaceProgressDTO> {
@Override
public void render(Context context, RaceProgressDTO value, SafeHtmlBuilder sb) {