mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-18 02:00:58 +00:00
renamed detail type stuff for competitor chart to make usage clear; removed aggregated foiling values again from chart detail types
Change-Id: I829113a6ca4aa8d1796c0a262a1ae073533446ae
This commit is contained in:
1 parent
970a755406
commit
a9c3a95a58
5 files changed
+8
-10
No files matched your search
+1
-1
@@ -687,7 +687,7 @@ public interface SailingService extends RemoteService, FileStorageManagementGwtS
|
||||
* Used to determine for a Chart the available Detailtypes. This is for example used to only show the RideHeight as
|
||||
* an option for charts if it actually recorded for the race.
|
||||
*/
|
||||
List<DetailType> determineDetailTypes(String leaderboardGroupName, RegattaAndRaceIdentifier identifier);
|
||||
List<DetailType> determineDetailTypesForCompetitorChart(String leaderboardGroupName, RegattaAndRaceIdentifier identifier);
|
||||
|
||||
List<ExpeditionDeviceConfiguration> getExpeditionDeviceConfigurations();
|
||||
|
||||
|
||||
+1
-1
@@ -862,7 +862,7 @@ public interface SailingServiceAsync extends ServerInfoRetriever, FileStorageMan
|
||||
* Used to determine for a Chart the available Detailtypes. This is for example used, to only show the RideHeight as
|
||||
* an option for charts, if it actually recorded for the race.
|
||||
*/
|
||||
void determineDetailTypes(String leaderboardGroupName, RegattaAndRaceIdentifier identifier,
|
||||
void determineDetailTypesForCompetitorChart(String leaderboardGroupName, RegattaAndRaceIdentifier identifier,
|
||||
AsyncCallback<List<DetailType>> callback);
|
||||
|
||||
void getExpeditionDeviceConfigurations(AsyncCallback<List<ExpeditionDeviceConfiguration>> callback);
|
||||
|
||||
+1
-1
@@ -106,7 +106,7 @@ public class RaceBoardEntryPoint extends AbstractSailingEntryPoint {
|
||||
final StoredSettingsLocation storageDefinition = StoredSettingsLocationFactory
|
||||
.createStoredSettingsLocatorForRaceBoard(raceboardContextDefinition,
|
||||
finalMode != null ? finalMode.name() : null);
|
||||
sailingService.determineDetailTypes(raceboardContextDefinition.getLeaderboardGroupName(),
|
||||
sailingService.determineDetailTypesForCompetitorChart(raceboardContextDefinition.getLeaderboardGroupName(),
|
||||
raceboardData.getRace().getRaceIdentifier(), new AsyncCallback<List<DetailType>>() {
|
||||
|
||||
@Override
|
||||
|
||||
+4
-4
@@ -28,16 +28,16 @@ public class RaceBoardPerspectiveLifecycle extends AbstractPerspectiveLifecycle<
|
||||
public static final String ID = "rb";
|
||||
|
||||
//constructor used by Standalone RaceBoard
|
||||
public RaceBoardPerspectiveLifecycle(StringMessages stringMessages, List<DetailType> allowedDetailTypes) {
|
||||
this(null, stringMessages, allowedDetailTypes);
|
||||
public RaceBoardPerspectiveLifecycle(StringMessages stringMessages, List<DetailType> competitorChartAllowedDetailTypes) {
|
||||
this(null, stringMessages, competitorChartAllowedDetailTypes);
|
||||
}
|
||||
|
||||
public RaceBoardPerspectiveLifecycle(AbstractLeaderboardDTO leaderboard, StringMessages stringMessages, List<DetailType> allowedDetailTypes) {
|
||||
public RaceBoardPerspectiveLifecycle(AbstractLeaderboardDTO leaderboard, StringMessages stringMessages, List<DetailType> competitorChartAllowedDetailTypes) {
|
||||
this.stringMessages = stringMessages;
|
||||
raceMapLifecycle = new RaceMapLifecycle(stringMessages);
|
||||
windChartLifecycle = new WindChartLifecycle(stringMessages);
|
||||
leaderboardPanelLifecycle = new SingleRaceLeaderboardPanelLifecycle(stringMessages);
|
||||
multiCompetitorRaceChartLifecycle = new MultiCompetitorRaceChartLifecycle(stringMessages, allowedDetailTypes);
|
||||
multiCompetitorRaceChartLifecycle = new MultiCompetitorRaceChartLifecycle(stringMessages, competitorChartAllowedDetailTypes);
|
||||
mediaPlayerLifecycle = new MediaPlayerLifecycle(stringMessages);
|
||||
raceTimePanelLifecycle = new RaceTimePanelLifecycle(stringMessages);
|
||||
|
||||
|
||||
+1
-3
@@ -6710,7 +6710,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DetailType> determineDetailTypes(String leaderboardGroupName, RegattaAndRaceIdentifier identifier) {
|
||||
public List<DetailType> determineDetailTypesForCompetitorChart(String leaderboardGroupName, RegattaAndRaceIdentifier identifier) {
|
||||
List<DetailType> availableDetailsTypes = DetailType.getDefaultDetailTypesForChart();
|
||||
final DynamicTrackedRace trackedRace = getService().getTrackedRace(identifier);
|
||||
if (trackedRace != null) {
|
||||
@@ -6725,8 +6725,6 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
|
||||
}
|
||||
if (hasBravoTrack) {
|
||||
availableDetailsTypes.add(DetailType.RACE_CURRENT_RIDE_HEIGHT_IN_METERS);
|
||||
availableDetailsTypes.add(DetailType.RACE_CURRENT_DURATION_FOILED_IN_SECONDS);
|
||||
availableDetailsTypes.add(DetailType.RACE_CURRENT_DISTANCE_FOILED_IN_METERS);
|
||||
availableDetailsTypes.add(DetailType.CURRENT_HEEL_IN_DEGREES);
|
||||
availableDetailsTypes.add(DetailType.CURRENT_PITCH_IN_DEGREES);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user