eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 13:20:57 +00:00
Code Activity

Merge remote-tracking branch 'origin/newhome' into newhome

Browse Source
This commit is contained in:
fmittag committed 2014-08-07 14:23:27 +02:00
2 parents 0ceb23ddcd 965070ad2e
commit 61c8bc5621
3 files changed
+17 -5
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/client/CompetitorSelectionModel.java
+7
View File
@@ -112,6 +112,13 @@ public class CompetitorSelectionModel implements CompetitorSelectionProvider {
return Collections.unmodifiableCollection(selectedCompetitors);
}
@Override
public Iterable<CompetitorDTO> getSelectedFilteredCompetitors() {
Set<CompetitorDTO> result = new HashSet<>(selectedCompetitors);
result.retainAll(getFilteredCompetitors());
return result;
}
@Override
public Iterable<CompetitorDTO> getAllCompetitors() {
return Collections.unmodifiableCollection(allCompetitors);
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/CompetitorSelectionProvider.java
+5
View File
@@ -14,6 +14,11 @@ public interface CompetitorSelectionProvider {
*/
Iterable<CompetitorDTO> getSelectedCompetitors();
/**
* The intersection of {@link #getSelectedCompetitors()} and {@link #getFilteredCompetitors()}
*/
Iterable<CompetitorDTO> getSelectedFilteredCompetitors();
/**
* @return a non-<code>null</code> sequence of all competitors which may be empty.
*/
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
+5 -5
View File
@@ -580,7 +580,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
long timeForPositionTransitionMillis = calculateTimeForPositionTransition(newTime, oldTime);
fixesAndTails.updateFixes(boatData, hasTailOverlapForCompetitor, RaceMap.this, timeForPositionTransitionMillis);
showBoatsOnMap(newTime, timeForPositionTransitionMillis, getCompetitorsToShow());
showCompetitorInfoOnMap(newTime, timeForPositionTransitionMillis, competitorSelection.getSelectedCompetitors());
showCompetitorInfoOnMap(newTime, timeForPositionTransitionMillis, competitorSelection.getSelectedFilteredCompetitors());
if (douglasMarkers != null) {
removeAllMarkDouglasPeuckerpoints();
}
@@ -1647,7 +1647,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
i.remove(); // only this way a ConcurrentModificationException while looping can be avoided
}
}
showCompetitorInfoOnMap(timer.getTime(), -1, competitorSelection.getSelectedCompetitors());
showCompetitorInfoOnMap(timer.getTime(), -1, competitorSelection.getSelectedFilteredCompetitors());
} else {
// adding a single competitor; may need to re-load data, so refresh:
timeChanged(timer.getTime(), null);
@@ -1658,7 +1658,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
if (boatCanvas != null) {
boatCanvas.setSelected(displayHighlighted(competitor));
boatCanvas.draw();
showCompetitorInfoOnMap(timer.getTime(), -1, competitorSelection.getSelectedCompetitors());
showCompetitorInfoOnMap(timer.getTime(), -1, competitorSelection.getSelectedFilteredCompetitors());
} else {
// seems like an internal error not to find the lowlighted marker; but maybe the
// competitor was added late to the race;
@@ -1700,7 +1700,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
removedBoatOverlay.removeFromMap();
}
fixesAndTails.removeTail(competitor);
showCompetitorInfoOnMap(timer.getTime(), -1, competitorSelection.getSelectedCompetitors());
showCompetitorInfoOnMap(timer.getTime(), -1, competitorSelection.getSelectedFilteredCompetitors());
}
} else {
// "lowlight" currently selected competitor
@@ -1709,7 +1709,7 @@ public class RaceMap extends AbsolutePanel implements TimeListener, CompetitorSe
boatCanvas.setSelected(displayHighlighted(competitor));
boatCanvas.draw();
}
showCompetitorInfoOnMap(timer.getTime(), -1, competitorSelection.getSelectedCompetitors());
showCompetitorInfoOnMap(timer.getTime(), -1, competitorSelection.getSelectedFilteredCompetitors());
}
}
//Trigger auto-zoom if needed