From 73b0d95e24ca822358bd345100d7409e5d074b6c Mon Sep 17 00:00:00 2001 From: Lisa Date: Fri, 1 Dec 2023 17:54:33 +0100 Subject: [PATCH] bug5918: correcting comments and tooltip --- .../sap/sailing/domain/tracking/TrackedLegOfCompetitor.java | 5 +++-- .../com/sap/sailing/gwt/ui/client/DetailTypeFormatter.java | 3 ++- .../java/com/sap/sailing/gwt/ui/client/StringMessages.java | 3 ++- .../com/sap/sailing/gwt/ui/client/StringMessages.properties | 3 ++- .../sap/sailing/gwt/ui/client/StringMessages_de.properties | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java index 27e88b7f931..546efa43ba4 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/TrackedLegOfCompetitor.java @@ -344,9 +344,10 @@ public interface TrackedLegOfCompetitor extends Serializable { TimePoint getTimePointNotAfterFinishingOfLeg(TimePoint timePoint); /** - * If the difference between COG and next waypoint direction is smaller than the one between COG and wind direction + * For upwind: If the difference between COG and next waypoint direction is smaller than the one between COG and wind direction * {@link TackType#LONGTACK long tack} is returned; if it is greater or equal {@link TackType#SHORTTACK short tack}. - * For other cases {@code null} is returned. + * For downwind: Similar to upwind but instead of "wind direction", one use the opposite direction. So where the wind is blowing to. + * For reaching: Similar to upwind but instead of comparing to "COG and wind direction", one use 10°. To see more differences. * * @return {@code null} if {@link TimePoint} does not fit with current leg, or waypoint is {@code null}, or wind is * {@code null}, or competitor position is {@code null}. diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/DetailTypeFormatter.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/DetailTypeFormatter.java index b7674e26f26..c65bd4e4b23 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/DetailTypeFormatter.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/DetailTypeFormatter.java @@ -507,6 +507,8 @@ public class DetailTypeFormatter { return stringMessages.degreesUnit(); case EXPEDITION_RACE_MAST_BUTT: return stringMessages.millimetersUnit(); + case LEG_TACKTYPE_LONGTACK_SHORTTACK: + return stringMessages.tackTypeUnit(); // Cases for detail types without unit, so that an empty string is returned. case RACE_RANK: case REGATTA_RANK: @@ -596,7 +598,6 @@ public class DetailTypeFormatter { case EXPEDITION_LEG_JIB_CAR_PORT: case EXPEDITION_LEG_JIB_CAR_STBD: case EXPEDITION_LEG_MAST_BUTT: - case LEG_TACKTYPE_LONGTACK_SHORTTACK: return ""; } // Throwing an exception to get notified if an implementation of diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index 52a96683727..31ed970e6cf 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -2441,6 +2441,7 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String scoringSchemeLowPointWithEliminatingMedalSeriesPromotingOneToFinalAndTwoToSemifinalDescription(); String incrementalScoreCorrectionInPoints(); String errorObtainingCourseAreasForLeaderboard(String leaderboardName, String message); - String tackType(); + String tackTypeUnit(); String tackTypeTooltip(); + String tackType(); } \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index 6bc900617bf..f1d9a25ab23 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -2479,4 +2479,5 @@ scoringSchemeLowPointWithEliminatingMedalSeriesPromotingOneToFinalAndTwoToSemifi incrementalScoreCorrectionInPoints=Incremental score correction (points) errorObtainingCourseAreasForLeaderboard=Error obtaining course areas for leaderboard {0}: {1} tackType=Long / short tack -tackTypeTooltip=Showing long tack as 1.0, short tack as -1.0 and unknown as 0.0 \ No newline at end of file +tackTypeTooltip=For upwind: If the difference between COG and next waypoint direction is smaller than the one between COG and wind direction it is long tack (1.0); if it is smaller short tack (-1.0). For downwind: Similar to upwind but instead of "wind direction", one use the opposite direction. So where the wind is blowing to. For reaching: Similar to upwind but instead of comparing to "COG and wind direction", one use 10°. +tackTypeUnit=L=1.0, S=-1.0, Unknown=0.0 \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index 8bc79f5ffa1..95579b625fe 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -2475,4 +2475,5 @@ scoringSchemeLowPointWithEliminatingMedalSeriesPromotingOneToFinalAndTwoToSemifi incrementalScoreCorrectionInPoints=Inkrementelle Punktestrafe errorObtainingCourseAreasForLeaderboard=Fehler beim Abfragen der Bahnkreise zur Veranstaltung der Rangliste {0}: {1} tackType=Streck-/Holebug -tackTypeTooltip=Zeigt Streckbug als Wert 1.0, Holebug als -1.0 und unbekannte Fälle als 0.0 an. \ No newline at end of file +tackTypeTooltip=Für Amwind: Wenn der Unterschied zwischen KüG und Peilung zur nächsten Bahnmarke kleiner ist als KüG und Windrichtung, handelt es sich um Streckbug (1.0); wenn es kleiner ist Holebug (-1.0). Für Vorwind: Ähnlich wie zur Kreuz aber statt "Windrichtung" nutzt man die gegenteiligen Richtung. Also die, wo der Wind hin weht. Für Halbwind: Ähnlich wie zur Kreuz, aber statt "KüG und Windrichtung" nutzt man 10°. +tackTypeUnit=S=1.0, H=-1.0, Unbekannt=0.0 \ No newline at end of file