From 143ae6aeee8bdcf454e26603dce0997e57f4ea87 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Wed, 11 Feb 2015 14:12:45 +0100 Subject: [PATCH] use the same setHeight() implementation for both types of competitor leaderboard charts (points / ranks) --- .../SailingGWT sdm.launch | 21 +++++++++---------- .../AbstractCompetitorLeaderboardChart.java | 10 +++++---- .../Security UI sdm.launch | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch index 74c0ed79c05..95f290cbd5c 100755 --- a/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT sdm.launch @@ -4,19 +4,19 @@ - - - - - - - - - + + + + + + + + + @@ -30,7 +30,6 @@ - @@ -69,7 +68,7 @@ - + diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorLeaderboardChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorLeaderboardChart.java index 515f6233390..ad6cd88a09c 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorLeaderboardChart.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorLeaderboardChart.java @@ -297,8 +297,11 @@ public abstract class AbstractCompetitorLeaderboardChart extends A raceColumnNumber++; } } -// chart.getYAxis().setMaxPadding(0.5 / maxCompetitorCount).setMinPadding(0.5 / maxCompetitorCount); - chart.setHeight(Window.getClientHeight()); // maxCompetitorCount * 30 + 100 + "px"); + setHeight(); + } + + private void setHeight() { + chart.setHeight(Window.getClientHeight()); } private void fillTotalPointsSeries( @@ -342,8 +345,7 @@ public abstract class AbstractCompetitorLeaderboardChart extends A raceColumnNumber++; } } - chart.getYAxis().setMaxPadding(0.5/maxCompetitorCount).setMinPadding(0.5/maxCompetitorCount); - chart.setHeight(maxCompetitorCount * 30 + 100 + "px"); + setHeight(); } private boolean hasValidValues(List values) { diff --git a/java/com.sap.sse.security.ui/Security UI sdm.launch b/java/com.sap.sse.security.ui/Security UI sdm.launch index 56e5f53b58d..4655b59b08e 100755 --- a/java/com.sap.sse.security.ui/Security UI sdm.launch +++ b/java/com.sap.sse.security.ui/Security UI sdm.launch @@ -45,5 +45,5 @@ - +