From 6de80d191f1b9c35f50316cebd67211769b66435 Mon Sep 17 00:00:00 2001 From: Lennart Hensler Date: Wed, 7 Mar 2012 10:32:57 +0100 Subject: [PATCH] The charts are now sizeable in the height --- .../com/sap/sailing/gwt/ui/adminconsole/WindChart.java | 3 ++- .../com/sap/sailing/gwt/ui/adminconsole/WindPanel.java | 2 +- .../sailing/gwt/ui/leaderboard/AbstractChartPanel.java | 5 ++++- .../com/sap/sailing/gwt/ui/leaderboard/ChartPanel.java | 4 ++-- .../gwt/ui/leaderboard/CompareCompetitorsChartDialog.java | 2 +- .../sap/sailing/gwt/ui/leaderboard/MultiChartPanel.java | 5 +++-- .../com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java | 8 ++++---- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindChart.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindChart.java index d6f0973a6e0..525a26bfbb1 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindChart.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindChart.java @@ -76,7 +76,7 @@ public class WindChart implements Component, RaceSelectionCha * server and displayed in this chart. If no race is selected, the chart is cleared. */ public WindChart(SailingServiceAsync sailingService, RaceSelectionProvider raceSelectionProvider, - Timer timer, WindChartSettings settings, final StringMessages stringMessages, ErrorReporter errorReporter) { + Timer timer, WindChartSettings settings, final StringMessages stringMessages, ErrorReporter errorReporter, int chartHeight) { super(); this.sailingService = sailingService; this.stringMessages = stringMessages; @@ -90,6 +90,7 @@ public class WindChart implements Component, RaceSelectionCha .setZoomType(Chart.ZoomType.X) .setSpacingRight(20) .setWidth100() + .setHeight(chartHeight) .setChartTitle(new ChartTitle().setText(stringMessages.wind())) .setChartSubtitle(new ChartSubtitle().setText(stringMessages.clickAndDragToZoomIn())) .setLegend(new Legend().setEnabled(true)) diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindPanel.java index 08f4a3aa3b8..50adfc75dd5 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/WindPanel.java @@ -180,7 +180,7 @@ public class WindPanel extends FormPanel implements EventDisplayer, WindShower, windSourceSelectionPanel.add(showConfigAnchor); grid.setWidget(1, 0, windSourceSelectionPanel); windChart = new WindChart(sailingService, /* race selection provider */ raceSelectionProvider, - new Timer(PlayModes.Replay), new WindChartSettings(WindSourceType.values()), stringMessages, errorReporter); + new Timer(PlayModes.Replay), new WindChartSettings(WindSourceType.values()), stringMessages, errorReporter, 400); grid.setWidget(2, 0, windChart.getEntryWidget()); grid.getCellFormatter().setVerticalAlignment(1, 1, HasVerticalAlignment.ALIGN_TOP); this.setWidget(grid); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractChartPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractChartPanel.java index 80eb3abf55f..55f7223590b 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractChartPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/AbstractChartPanel.java @@ -70,6 +70,7 @@ implements CompetitorSelectionChangeListener, RaceSelectionChangeListener, TimeL protected final SailingServiceAsync sailingService; protected final ErrorReporter errorReporter; protected Chart chart; + private int chartHeight; protected final AbsolutePanel busyIndicatorPanel; protected final Label noCompetitorsSelectedLabel; protected final Map dataSeriesByCompetitor; @@ -84,7 +85,7 @@ implements CompetitorSelectionChangeListener, RaceSelectionChangeListener, TimeL public AbstractChartPanel(SailingServiceAsync sailingService, CompetitorSelectionProvider competitorSelectionProvider, RaceSelectionProvider raceSelectionProvider, - Timer timer, final StringMessages stringMessages, ErrorReporter errorReporter, DetailType dataToShow) { + Timer timer, final StringMessages stringMessages, ErrorReporter errorReporter, DetailType dataToShow, int chartHeight) { this.stringMessages = stringMessages; dataSeriesByCompetitor = new HashMap(); markPassingSeriesByCompetitor = new HashMap(); @@ -95,6 +96,7 @@ implements CompetitorSelectionChangeListener, RaceSelectionChangeListener, TimeL this.errorReporter = errorReporter; this.dataToShow = dataToShow; chartData = null; + this.chartHeight = chartHeight; this.sailingService = sailingService; this.raceSelectionProvider = raceSelectionProvider; raceSelectionProvider.addRaceSelectionChangeListener(this); @@ -135,6 +137,7 @@ implements CompetitorSelectionChangeListener, RaceSelectionChangeListener, TimeL Chart chart = new Chart().setZoomType(Chart.ZoomType.X) .setSpacingRight(20) .setWidth100() + .setHeight(chartHeight) .setChartSubtitle(new ChartSubtitle().setText(stringMessages.clickAndDragToZoomIn())) .setLegend(new Legend().setEnabled(true)) .setLinePlotOptions(new LinePlotOptions().setLineWidth(LINE_WIDTH).setMarker(new Marker().setEnabled(false).setHoverState( diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ChartPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ChartPanel.java index 4f9a857abc8..3ace260bf1a 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ChartPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/ChartPanel.java @@ -26,8 +26,8 @@ public class ChartPanel extends AbstractChartPanel implements Com public ChartPanel(SailingServiceAsync sailingService, CompetitorSelectionProvider competitorSelectionProvider, RaceSelectionProvider raceSelectionProvider, Timer timer, DetailType dataToShow, StringMessages stringMessages, - ErrorReporter errorReporter) { - super(sailingService, competitorSelectionProvider, raceSelectionProvider, timer, stringMessages, errorReporter, dataToShow); + ErrorReporter errorReporter, int chartHeight) { + super(sailingService, competitorSelectionProvider, raceSelectionProvider, timer, stringMessages, errorReporter, dataToShow, chartHeight); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/CompareCompetitorsChartDialog.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/CompareCompetitorsChartDialog.java index 6b398ac0286..9e2c5131c43 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/CompareCompetitorsChartDialog.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/CompareCompetitorsChartDialog.java @@ -54,7 +54,7 @@ public class CompareCompetitorsChartDialog extends DialogBox { raceSelectionProvider.setAllRaces(races); multiChartPanel = new MultiChartPanel(sailingService, competitorSelectionProvider, raceSelectionProvider, - timer, stringConstants, errorReporter); + timer, stringConstants, errorReporter, 400); multiChartPanel.setSize("100%", "100%"); FlowPanel contentPanel = new FlowPanel(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiChartPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiChartPanel.java index 449b487dc4c..5f7e3fd975c 100755 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiChartPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/leaderboard/MultiChartPanel.java @@ -25,8 +25,9 @@ import com.sap.sailing.gwt.ui.shared.components.SettingsDialogComponent; public class MultiChartPanel extends AbstractChartPanel implements Component { public MultiChartPanel(SailingServiceAsync sailingService, CompetitorSelectionProvider competitorSelectionProvider, RaceSelectionProvider raceSelectionProvider, Timer timer, final StringMessages stringMessages, - ErrorReporter errorReporter) { - super(sailingService, competitorSelectionProvider, raceSelectionProvider, timer, stringMessages, errorReporter, /* show initially: */ DetailType.WINDWARD_DISTANCE_TO_OVERALL_LEADER); + ErrorReporter errorReporter, int chartHeight) { + super(sailingService, competitorSelectionProvider, raceSelectionProvider, timer, stringMessages, errorReporter, + /*show initially*/ DetailType.WINDWARD_DISTANCE_TO_OVERALL_LEADER, chartHeight); } @Override diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java index 2d94abf4a40..f45db0f666d 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/RaceBoardPanel.java @@ -136,14 +136,14 @@ public class RaceBoardPanel extends FormPanel implements EventDisplayer, RaceSel WindChartSettings windChartSettings = new WindChartSettings(WindSourceType.values()); WindChart windChart = new WindChart(sailingService, raceSelectionProvider, timer, windChartSettings, - stringMessages, errorReporter); + stringMessages, errorReporter, 200); SimpleComponentViewer windChartViewer = new SimpleComponentViewer( windChart, "auto", "200px"); windChart.onRaceSelectionChange(raceSelectionProvider.getSelectedRaces()); componentViewers.add(windChartViewer); MultiChartPanel competitorCharts = new MultiChartPanel(sailingService, competitorSelectionModel, raceSelectionProvider, - timer, stringMessages, errorReporter); + timer, stringMessages, errorReporter, 200); SimpleComponentViewer chartViewer = new SimpleComponentViewer( competitorCharts, "auto", "200px"); @@ -186,7 +186,7 @@ public class RaceBoardPanel extends FormPanel implements EventDisplayer, RaceSel WindChartSettings windChartSettings = new WindChartSettings(WindSourceType.values()); WindChart windChart = new WindChart(sailingService, raceSelectionProvider, timer, windChartSettings, - stringMessages, errorReporter); + stringMessages, errorReporter, 400); CollapsableComponentViewer windChartViewer = new CollapsableComponentViewer( windChart, "auto", "400px", stringMessages); windChart.onRaceSelectionChange(raceSelectionProvider.getSelectedRaces()); @@ -199,7 +199,7 @@ public class RaceBoardPanel extends FormPanel implements EventDisplayer, RaceSel // competitorCharts, "auto", "400px", stringMessages); MultiChartPanel competitorCharts = new MultiChartPanel(sailingService, competitorSelectionModel, raceSelectionProvider, - timer, stringMessages, errorReporter); + timer, stringMessages, errorReporter, 400); CollapsableComponentViewer chartViewer = new CollapsableComponentViewer( competitorCharts, "auto", "400px", stringMessages);