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

Merge branch 'design2015' into design2015-races

Browse Source
This commit is contained in:
Steffen Schaefer committed 2015-07-16 11:34:14 +02:00
2 parents 67c0c7841c d20f6eaebc
commit d865123cea
5 files changed
+143 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/dispatch/event/RaceContext.java
+3 -12
View File
@@ -41,7 +41,7 @@ import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.domain.common.racelog.RaceLogRaceStatus;
import com.sap.sailing.domain.leaderboard.Leaderboard;
import com.sap.sailing.domain.leaderboard.RegattaLeaderboard;
import com.sap.sailing.domain.leaderboard.SettableScoreCorrection;
import com.sap.sailing.domain.leaderboard.ScoreCorrection;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.domain.tracking.WindTrack;
import com.sap.sailing.domain.tracking.WindWithConfidence;
@@ -517,8 +517,8 @@ public class RaceContext {
}
}
}
SettableScoreCorrection scoreCorrection = leaderboard.getScoreCorrection();
if(!hasTrackingForRaceColumn() && scoreCorrection != null && scoreCorrection.hasCorrectionFor(raceColumn)) {
ScoreCorrection scoreCorrection = leaderboard.getScoreCorrection();
if(trackedRace == null && scoreCorrection != null && scoreCorrection.hasCorrectionForNonTrackedFleet(raceColumn)) {
return RaceViewState.FINISHED;
}
if(startTime != null) {
@@ -527,15 +527,6 @@ public class RaceContext {
return RaceViewState.PLANNED;
}
private boolean hasTrackingForRaceColumn() {
for(Fleet fleetOfRaceColumn : raceColumn.getFleets()) {
if(raceColumn.getTrackedRace(fleetOfRaceColumn) != null) {
return true;
}
}
return false;
}
private Wind checkForWindFixesFromRaceLog() {
WindFixesFinder windFixesFinder = new WindFixesFinder(raceLog);
List<Wind> windList = windFixesFinder.analyze();