mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-28 14:57:12 +00:00
removed no longer needed classes and DetailType literals; removed separate color-dot quality column
This commit is contained in:
1 parent
0647ce5b81
commit
52847178ec
5 files changed
+20
-90
No files matched your search
+1
-2
@@ -32,8 +32,7 @@ public enum DetailType implements Serializable {
|
||||
MAXIMUM_SPEED_OVER_GROUND_IN_KNOTS(1, DESCENDING),
|
||||
TOTAL_DISTANCE_TRAVELED(0, ASCENDING), TOTAL_AVERAGE_SPEED_OVER_GROUND(2, DESCENDING),
|
||||
TOTAL_TIME_SAILED_IN_SECONDS(1, ASCENDING), RACE_CURRENT_SPEED_OVER_GROUND_IN_KNOTS(2, DESCENDING),
|
||||
RACE_TIME_SINCE_LAST_POSITION_FIX_IN_SECONDS(0 , ASCENDING),
|
||||
RACE_TRACKING_QUALITY(0 , ASCENDING);
|
||||
RACE_TIME_SINCE_LAST_POSITION_FIX_IN_SECONDS(0 , ASCENDING);
|
||||
|
||||
private int precision;
|
||||
|
||||
|
||||
-6
@@ -99,8 +99,6 @@ public class DetailTypeFormatter {
|
||||
return stringMessages.averageJibeLossInMeters();
|
||||
case RACE_TIME_SINCE_LAST_POSITION_FIX_IN_SECONDS:
|
||||
return stringMessages.timeSinceLastPositionFix();
|
||||
case RACE_TRACKING_QUALITY:
|
||||
return "TQ";
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -168,8 +166,6 @@ public class DetailTypeFormatter {
|
||||
case NUMBER_OF_MANEUVERS:
|
||||
case DISPLAY_LEGS:
|
||||
case SIDE_TO_WHICH_MARK_AT_LEG_START_WAS_ROUNDED:
|
||||
case RACE_TRACKING_QUALITY:
|
||||
return "";
|
||||
|
||||
default:
|
||||
// Throwing an exception to get notified if an implementation of
|
||||
@@ -274,8 +270,6 @@ public class DetailTypeFormatter {
|
||||
return stringMessages.windwardDistanceToGoInMetersTooltip();
|
||||
case RACE_TIME_SINCE_LAST_POSITION_FIX_IN_SECONDS:
|
||||
return stringMessages.timeSinceLastPositionFixTooltip();
|
||||
case RACE_TRACKING_QUALITY:
|
||||
return stringMessages.trackingQuality();
|
||||
}
|
||||
|
||||
return "";
|
||||
|
||||
+1
-16
@@ -800,8 +800,7 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
|
||||
DetailType.SPEED_OVER_GROUND_WHEN_PASSING_START,
|
||||
DetailType.DISTANCE_TO_STARBOARD_END_OF_STARTLINE_WHEN_PASSING_START_IN_METERS,
|
||||
DetailType.START_TACK,
|
||||
DetailType.RACE_TIME_SINCE_LAST_POSITION_FIX_IN_SECONDS,
|
||||
DetailType.RACE_TRACKING_QUALITY };
|
||||
DetailType.RACE_TIME_SINCE_LAST_POSITION_FIX_IN_SECONDS };
|
||||
}
|
||||
|
||||
public static DetailType[] getAvailableOverallDetailColumnTypes() {
|
||||
@@ -867,8 +866,6 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
|
||||
result.put(DetailType.RACE_TIME_SINCE_LAST_POSITION_FIX_IN_SECONDS,
|
||||
new TimeSinceLastGpsFixColumn(DetailType.RACE_TIME_SINCE_LAST_POSITION_FIX_IN_SECONDS,
|
||||
new RaceTimeSinceLastPositionFixInSeconds(), LEG_COLUMN_HEADER_STYLE, LEG_COLUMN_STYLE));
|
||||
result.put(DetailType.RACE_TRACKING_QUALITY, new TrackingQualityColumn(stringMessages.trackingQuality(), new RaceTrackingQuality(), LEG_COLUMN_HEADER_STYLE, LEG_COLUMN_STYLE));
|
||||
|
||||
result.put(DetailType.RACE_DISTANCE_TRAVELED,
|
||||
new FormattedDoubleDetailTypeColumn(DetailType.RACE_DISTANCE_TRAVELED, new RaceDistanceTraveledInMeters(),
|
||||
LEG_COLUMN_HEADER_STYLE, LEG_COLUMN_STYLE));
|
||||
@@ -957,18 +954,6 @@ public class LeaderboardPanel extends FormPanel implements TimeListener, PlaySta
|
||||
return result;
|
||||
}
|
||||
|
||||
private class RaceTrackingQuality implements LegDetailField<Double> {
|
||||
@Override
|
||||
public Double get(LeaderboardRowDTO row) {
|
||||
Double result = null;
|
||||
LeaderboardEntryDTO fieldsForRace = row.fieldsByRaceColumnName.get(getRaceColumnName());
|
||||
if (fieldsForRace != null) {
|
||||
result = fieldsForRace.timeSinceLastPositionFixInSeconds;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
private class RaceTimeSinceLastPositionFixInSeconds implements LegDetailField<Double> {
|
||||
@Override
|
||||
public Double get(LeaderboardRowDTO row) {
|
||||
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
package com.sap.sailing.gwt.ui.leaderboard;
|
||||
|
||||
import com.sap.sailing.domain.common.DetailType;
|
||||
|
||||
public class TimeSinceLastGpsFixColumn extends FormattedDoubleDetailTypeColumn {
|
||||
|
||||
public TimeSinceLastGpsFixColumn(DetailType detailType,
|
||||
com.sap.sailing.gwt.ui.leaderboard.DetailTypeColumn.LegDetailField<Double> field, String headerStyle,
|
||||
String columnStyle) {
|
||||
super(detailType, field, headerStyle, columnStyle);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected MinMaxRenderer createMinMaxRenderer() {
|
||||
return new TrackingQualityMinMaxRenderer(this, getComparator());
|
||||
}
|
||||
|
||||
}
|
||||
-66
@@ -1,66 +0,0 @@
|
||||
package com.sap.sailing.gwt.ui.leaderboard;
|
||||
|
||||
import com.google.gwt.cell.client.AbstractSafeHtmlCell;
|
||||
import com.google.gwt.safehtml.shared.SafeHtml;
|
||||
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
|
||||
import com.google.gwt.safehtml.shared.SafeHtmlUtils;
|
||||
import com.google.gwt.text.shared.SafeHtmlRenderer;
|
||||
import com.sap.sailing.domain.common.DetailType;
|
||||
import com.sap.sailing.domain.common.dto.LeaderboardRowDTO;
|
||||
|
||||
public class TrackingQualityColumn extends DetailTypeColumn<Double, Double> {
|
||||
public TrackingQualityColumn(String title, LegDetailField<Double> field, String headerStyle, String columnStyle) {
|
||||
super(DetailType.RACE_TRACKING_QUALITY, field, new TrackingQualityCell(), headerStyle, columnStyle);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Double getValue(LeaderboardRowDTO row) {
|
||||
return getField().get(row);
|
||||
}
|
||||
|
||||
private static class TrackingQualityCell extends AbstractSafeHtmlCell<Double> {
|
||||
private static final String STYLE_TRACKING_QUALITY_CIRCLE = "trackingQuality-circle";
|
||||
private static final String STYLE_TRACKING_QUALITY_CIRCLE_RED = "circleRed";
|
||||
private static final String STYLE_TRACKING_QUALITY_CIRCLE_YELLOW = "circleYellow";
|
||||
private static final String STYLE_TRACKING_QUALITY_CIRCLE_GREEN = "circleGreen";
|
||||
|
||||
public TrackingQualityCell() {
|
||||
super(new SafeHtmlRenderer<Double>() {
|
||||
@Override
|
||||
public SafeHtml render(Double timeSinceLastPositionFixInSeconds) {
|
||||
SafeHtmlBuilder builder = new SafeHtmlBuilder();
|
||||
render(timeSinceLastPositionFixInSeconds, builder);
|
||||
return builder.toSafeHtml();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void render(Double timeSinceLastPositionFixInSeconds, SafeHtmlBuilder builder) {
|
||||
if (timeSinceLastPositionFixInSeconds != null) {
|
||||
builder.append(SafeHtmlUtils.fromTrustedString("<div class=\"" + STYLE_TRACKING_QUALITY_CIRCLE + " "));
|
||||
|
||||
// builder.append(SafeHtmlUtils.fromTrustedString(diffInSeconds + "s"));
|
||||
|
||||
if(timeSinceLastPositionFixInSeconds < 5.0) {
|
||||
builder.append(SafeHtmlUtils.fromTrustedString(STYLE_TRACKING_QUALITY_CIRCLE_GREEN));
|
||||
} else if(timeSinceLastPositionFixInSeconds < 10) {
|
||||
builder.append(SafeHtmlUtils.fromTrustedString(STYLE_TRACKING_QUALITY_CIRCLE_YELLOW));
|
||||
} else {
|
||||
builder.append(SafeHtmlUtils.fromTrustedString(STYLE_TRACKING_QUALITY_CIRCLE_RED));
|
||||
}
|
||||
|
||||
builder.append(SafeHtmlUtils.fromTrustedString("\"></div>"));
|
||||
} else {
|
||||
builder.append(SafeHtmlUtils.fromTrustedString(STYLE_TRACKING_QUALITY_CIRCLE_GREEN));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void render(com.google.gwt.cell.client.Cell.Context context, SafeHtml data, SafeHtmlBuilder sb) {
|
||||
if (data != null) {
|
||||
sb.append(data);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user