mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-03 10:53:49 +00:00
Merge remote-tracking branch 'server/master'
This commit is contained in:
commit
2b363a1089
2 files changed
+7
-4
No files matched your search
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 2.8 KiB |
+7
-4
@@ -134,11 +134,14 @@ public class RaceTimePanel extends TimePanel<RaceTimePanelSettings> implements R
|
||||
private void initMinMax(RaceTimesInfoDTO newRaceTimesInfo) {
|
||||
Date min = null;
|
||||
Date max = null;
|
||||
if (newRaceTimesInfo.startOfTracking != null) {
|
||||
long startAndEndRaceExtensionTime = 5 * 60 * 1000; // 5 minutes
|
||||
|
||||
if (newRaceTimesInfo.startOfRace != null) {
|
||||
min = new Date(newRaceTimesInfo.startOfRace.getTime() - startAndEndRaceExtensionTime);
|
||||
} else if (newRaceTimesInfo.startOfTracking != null) {
|
||||
min = newRaceTimesInfo.startOfTracking;
|
||||
} else if (newRaceTimesInfo.startOfRace != null) {
|
||||
min = new Date(newRaceTimesInfo.startOfRace.getTime() - 5 * 60 * 1000);
|
||||
}
|
||||
|
||||
switch (timer.getPlayMode()) {
|
||||
case Live:
|
||||
if (newRaceTimesInfo.timePointOfNewestEvent != null) {
|
||||
@@ -147,7 +150,7 @@ public class RaceTimePanel extends TimePanel<RaceTimePanelSettings> implements R
|
||||
break;
|
||||
case Replay:
|
||||
if (newRaceTimesInfo.endOfRace != null) {
|
||||
max = newRaceTimesInfo.endOfRace;
|
||||
max = new Date(newRaceTimesInfo.endOfRace.getTime() + startAndEndRaceExtensionTime);
|
||||
} else if (newRaceTimesInfo.timePointOfNewestEvent != null) {
|
||||
max = newRaceTimesInfo.timePointOfNewestEvent;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user