mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-05 11:53:53 +00:00
fixing bug 780; by default, don't show maneuvers upon competitor click on map; new leaderboard column defaults
This commit is contained in:
1 parent
027d33c333
commit
d14448b2c0
7 files changed
+14
-12
No files matched your search
+1
@@ -333,4 +333,5 @@ public interface StringMessages extends Messages {
|
||||
String apply();
|
||||
String successfullyUpdatedScores();
|
||||
String errorUpdatingScoresForLeaderboard(String leaderboardName, String message);
|
||||
String maneuverTypesToShowWhenCompetitorIsClicked();
|
||||
}
|
||||
+2
-1
@@ -329,4 +329,5 @@ importOfficialResults=Import official results...
|
||||
selectAll=Select all
|
||||
apply=Apply
|
||||
successfullyUpdatedScores=Successfully updated scores
|
||||
errorUpdatingScoresForLeaderboard=Error updating scores for leaderboard {0}: {1}
|
||||
errorUpdatingScoresForLeaderboard=Error updating scores for leaderboard {0}: {1}
|
||||
maneuverTypesToShowWhenCompetitorIsClicked=Maneuver types to show when competitor is clicked
|
||||
+3
-2
@@ -159,7 +159,7 @@ secondsUnit=s
|
||||
metersUnit=m
|
||||
failedToLoadRaceData=Renndaten konnten nicht geladen werden.
|
||||
close=Schließen
|
||||
compareCompetitors=Kompetitoren vergleichen
|
||||
compareCompetitors=Segler vergleichen
|
||||
description=Beschreibung
|
||||
sailNumber=Segelnummer
|
||||
country=Land
|
||||
@@ -330,4 +330,5 @@ importOfficialResults=Offizielle Ergebnisse importieren...
|
||||
selectAll=Alle auswählen
|
||||
apply=Übernehmen
|
||||
successfullyUpdatedScores=Ergebnisse erfolgreich aktualisiert
|
||||
errorUpdatingScoresForLeaderboard=Fehler beim Aktualisieren der Ergebnisse für {0}: {1}
|
||||
errorUpdatingScoresForLeaderboard=Fehler beim Aktualisieren der Ergebnisse für {0}: {1}
|
||||
maneuverTypesToShowWhenCompetitorIsClicked=Anzuzeigende Manövertypen für angeklickte Segler
|
||||
+4
-1
@@ -51,10 +51,14 @@ public class LeaderboardSettingsFactory {
|
||||
ArrayList<DetailType> legDetails = new ArrayList<DetailType>();
|
||||
legDetails.add(DetailType.DISTANCE_TRAVELED);
|
||||
legDetails.add(DetailType.AVERAGE_SPEED_OVER_GROUND_IN_KNOTS);
|
||||
legDetails.add(DetailType.ESTIMATED_TIME_TO_NEXT_WAYPOINT_IN_SECONDS);
|
||||
legDetails.add(DetailType.RANK_GAIN);
|
||||
ArrayList<DetailType> raceDetails = new ArrayList<DetailType>();
|
||||
raceDetails.add(DetailType.RACE_DISTANCE_TRAVELED);
|
||||
raceDetails.add(DetailType.RACE_AVERAGE_SPEED_OVER_GROUND_IN_KNOTS);
|
||||
raceDetails.add(DetailType.RACE_DISTANCE_TO_LEADER_IN_METERS);
|
||||
raceDetails.add(DetailType.NUMBER_OF_MANEUVERS);
|
||||
raceDetails.add(DetailType.DISPLAY_LEGS);
|
||||
settings = new LeaderboardSettings(maneuverDetails, legDetails, raceDetails, namesOfRaceColumnsToShow,
|
||||
namesOfRacesToShow,
|
||||
/* set autoExpandFirstRace to true if we look at a single race */ nameOfRaceColumnToShow != null || nameOfRaceToShow != null, /* refresh interval */ null,
|
||||
@@ -77,7 +81,6 @@ public class LeaderboardSettingsFactory {
|
||||
* @param namesOfRacesToShow
|
||||
* alternatively, races to show can also be specified by their race names; if not <code>null</code>,
|
||||
* <code>namesOfRaceColumnsToShow</code> must be <code>null
|
||||
* @param nameOfRaceToSort TODO
|
||||
*/
|
||||
public LeaderboardSettings createNewDefaultSettings(List<String> namesOfRaceColumnsToShow,
|
||||
List<String> namesOfRacesToShow, String nameOfRaceToSort, boolean autoExpandFirstRace) {
|
||||
|
||||
+2
-2
@@ -16,14 +16,14 @@ public class RaceMapHelpLinesSettings {
|
||||
private final Set<HelpLineTypes> visibleHelpLines;
|
||||
|
||||
/**
|
||||
* Creates new RaceMapHelpLinesSettings with the {@link HelpLineTypes} <code>STARTLINE</code>, <code>FINISHLINE</code> and <code>ADVANTAGELINE</code>.<br />
|
||||
* Creates new RaceMapHelpLinesSettings with the {@link HelpLineTypes} <code>STARTLINE</code>,
|
||||
* <code>FINISHLINE</code> and <code>ADVANTAGELINE</code>.<br />
|
||||
*/
|
||||
public RaceMapHelpLinesSettings() {
|
||||
visibleHelpLines = new HashSet<HelpLineTypes>();
|
||||
visibleHelpLines.add(HelpLineTypes.STARTLINE);
|
||||
visibleHelpLines.add(HelpLineTypes.FINISHLINE);
|
||||
visibleHelpLines.add(HelpLineTypes.ADVANTAGELINE);
|
||||
visibleHelpLines.add(HelpLineTypes.COURSEMIDDLELINE);
|
||||
}
|
||||
|
||||
public RaceMapHelpLinesSettings(Collection<HelpLineTypes> visibleHelpLines) {
|
||||
|
||||
+1
-5
@@ -20,12 +20,8 @@ public class RaceMapSettings {
|
||||
private long tailLengthInMilliseconds = 100000l;
|
||||
|
||||
public RaceMapSettings() {
|
||||
// empty default settings; don't show maneuvers by default
|
||||
maneuverTypesToShow = new HashSet<ManeuverType>();
|
||||
maneuverTypesToShow.add(ManeuverType.TACK);
|
||||
maneuverTypesToShow.add(ManeuverType.JIBE);
|
||||
maneuverTypesToShow.add(ManeuverType.PENALTY_CIRCLE);
|
||||
maneuverTypesToShow.add(ManeuverType.MARK_PASSING);
|
||||
|
||||
this.zoomSettings = new RaceMapZoomSettings();
|
||||
this.helpLinesSettings = new RaceMapHelpLinesSettings();
|
||||
}
|
||||
|
||||
+1
-1
@@ -97,7 +97,7 @@ public class RaceMapSettingsDialogComponent implements SettingsDialogComponent<R
|
||||
//Run zoomSettingsChanged to set the checkboxes to their correct state
|
||||
zoomSettingsChanged();
|
||||
|
||||
Label maneuversLabel = dialog.createHeadlineLabel(stringMessages.maneuverTypes());
|
||||
Label maneuversLabel = dialog.createHeadlineLabel(stringMessages.maneuverTypesToShowWhenCompetitorIsClicked());
|
||||
vp.add(maneuversLabel);
|
||||
for (ManeuverType maneuverType : ManeuverType.values()) {
|
||||
CheckBox checkbox = dialog.createCheckbox(ManeuverTypeFormatter.format(maneuverType, stringMessages));
|
||||
|
||||
Reference in new issue
Block a user