From 4c60d227c0d268c6139093ba3a8e5ca992444d62 Mon Sep 17 00:00:00 2001 From: Marcus Kammer Date: Mon, 20 Feb 2012 23:53:11 +0100 Subject: [PATCH 1/2] bigger background image for table in spectator view --- .../images/spectator-table-bg.png | Bin 22808 -> 2856 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/images/spectator-table-bg.png b/java/com.sap.sailing.gwt.ui/images/spectator-table-bg.png index e57994d7aa9fbd17e7c89c3f503f97e3191f4b17..75c7c506ff03d7e1679027c2c9a97fa6d1703d3e 100644 GIT binary patch literal 2856 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 From 9e3ae250900a8a9eaf9591d05d7e375918c44be6 Mon Sep 17 00:00:00 2001 From: fmittag Date: Tue, 21 Feb 2012 00:01:42 +0100 Subject: [PATCH 2/2] changed the min/max calculation for the timeslider to cut long periods of time not belonging to the real race --- .../com/sap/sailing/gwt/ui/client/RaceTimePanel.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java index 8b0165e55ea..2e341c7e1c0 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/RaceTimePanel.java @@ -134,11 +134,14 @@ public class RaceTimePanel extends TimePanel 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 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; }