eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-21 19:50:01 +00:00
Code Activity

Merge branch 'master' into bug3918

Browse Source
This commit is contained in:
Axel Uhl committed 2016-11-07 17:57:21 +01:00
2 parents 3535f4fb40 e9813370db
commit 500740e047
4 files changed
+29 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/Spectator.css
+9 -4
View File
@@ -23,6 +23,9 @@
top: -1000px;
}
html {
font-size: 15px;
}
body {
background: url(images/spectatorview-bg.png) no-repeat left top #ebebeb;
@@ -48,7 +51,7 @@ table td,select,button {
.contentOuterPanel {
background: #dddcdc;
margin: 0 12px 0 12px;
margin: 0 12px 120px;
padding: 12px;
}
@@ -159,6 +162,7 @@ input.magnifier {
.mainPanel {
width: 100%;
margin-left: 13px;
margin-bottom: 120px;
}
.leaderboardGroupPanel-GroupName {
@@ -187,7 +191,8 @@ input.magnifier {
margin: 5px 5px 5px 0;
text-decoration: none;
font-family: 'Open Sans', Arial, Verdana, sans-serif;
font-weight: 600
font-weight: 600;
box-sizing: content-box;
}
.leaderboardGroupPanel-BoatClass {
@@ -206,8 +211,8 @@ input.magnifier {
padding: 5px;
display: block;
float: left;
width: 8px;
height: 8px;
width: 18px;
height: 18px;
border-radius: 4px;
-moz-border-radius: 4px;
-webkit-border-radius: 4px;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/AbstractCompetitorRaceChart.java
+2
View File
@@ -384,6 +384,8 @@ public abstract class AbstractCompetitorRaceChart<SettingsType extends ChartSett
if (!chartSeries.contains(competitorDataSeries)) {
chart.addSeries(competitorDataSeries);
chart.addSeries(markPassingSeries);
//this is to prevent a bug, that will prohibit the initial rendering
chart.setSizeToMatchContainer();
}
}
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/charts/WindChart.java
+3 -2
View File
@@ -103,6 +103,7 @@ public class WindChart extends AbstractRaceChart<WindChartSettings> implements R
colorMap = new ColorMapImpl<WindSource>();
chart = new Chart()
.setPersistent(true)
.setReflow(false)
.setZoomType(BaseChart.ZoomType.X)
.setMarginLeft(65)
.setMarginRight(65)
@@ -115,7 +116,7 @@ public class WindChart extends AbstractRaceChart<WindChartSettings> implements R
.setPlotBackgroundColor("#f8f8f8")
.setPlotBorderWidth(0)
.setCredits(new Credits().setEnabled(false))
.setChartTitle(new ChartTitle().setText(stringMessages.wind()))
.setChartTitle(new ChartTitle().setText(stringMessages.wind()).setOption("floating",true))
.setChartSubtitle(new ChartSubtitle().setText(stringMessages.clickAndDragToZoomIn()))
.setLinePlotOptions(new LinePlotOptions().setLineWidth(LINE_WIDTH).setMarker(
new Marker().setEnabled(false).setHoverState(
@@ -182,7 +183,7 @@ public class WindChart extends AbstractRaceChart<WindChartSettings> implements R
chart.getYAxis(1).setOpposite(true).setAxisTitleText(stringMessages.speed()+" ("+stringMessages.knotsUnit()+")").setMin(0)
.setMaxPadding(0.05).setStartOnTick(false).setGridLineWidth(0).setMinorGridLineWidth(0);
if (compactChart) {
chart.setSpacingBottom(10).setSpacingLeft(10).setSpacingRight(10).setSpacingTop(2)
chart.setSpacingBottom(10).setSpacingLeft(10).setSpacingRight(10).setSpacingTop(20)
.setOption("legend/margin", 2)
.setOption("title/margin", 5)
.setChartSubtitle(null)
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/spectator/SpectatorEntryPoint.java
+15 -8
View File
@@ -1,5 +1,6 @@
package com.sap.sailing.gwt.ui.spectator;
import com.google.gwt.dom.client.Style.Position;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.user.client.Window;
@@ -8,9 +9,9 @@ import com.google.gwt.user.client.ui.Anchor;
import com.google.gwt.user.client.ui.FlowPanel;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.SimplePanel;
import com.sap.sailing.gwt.common.authentication.FixedSailingAuthentication;
import com.sap.sailing.gwt.common.authentication.SAPSailingHeaderWithAuthentication;
import com.sap.sailing.gwt.ui.client.AbstractSailingEntryPoint;
import com.sap.sailing.gwt.ui.client.GlobalNavigationPanel;
import com.sap.sailing.gwt.ui.client.LogoAndTitlePanel;
import com.sap.sailing.gwt.ui.client.RegattaRefresher;
import com.sap.sailing.gwt.ui.client.shared.panels.SimpleWelcomeWidget;
import com.sap.sailing.gwt.ui.client.shared.racemap.RaceMapSettings;
@@ -66,12 +67,8 @@ public class SpectatorEntryPoint extends AbstractSailingEntryPoint implements Re
&& Window.Location.getParameter("embedded").equalsIgnoreCase("true");
if (!embedded) {
String title = groupName != null ? groupName : getStringMessages().overview();
LogoAndTitlePanel logoAndTitlePanel = new LogoAndTitlePanel(title, getStringMessages(), this, getUserService());
logoAndTitlePanel.addStyleName("LogoAndTitlePanel");
FlowPanel globalNavigationPanel = new GlobalNavigationPanel(getStringMessages(), true, null, null, /* event */ null, null);
logoAndTitlePanel.add(globalNavigationPanel);
rootPanel.add(logoAndTitlePanel);
SAPSailingHeaderWithAuthentication header = getHeader(title);
rootPanel.add(header);
} else {
RootPanel.getBodyElement().getStyle().setPadding(0, Unit.PX);
RootPanel.getBodyElement().getStyle().setPaddingTop(20, Unit.PX);
@@ -108,6 +105,16 @@ public class SpectatorEntryPoint extends AbstractSailingEntryPoint implements Re
fillRegattas();
}
private SAPSailingHeaderWithAuthentication getHeader(String title){
SAPSailingHeaderWithAuthentication header = new SAPSailingHeaderWithAuthentication(title);
new FixedSailingAuthentication(getUserService(), header.getAuthenticationMenuView());
header.getElement().getStyle().setPosition(Position.FIXED);
header.getElement().getStyle().setTop(0, Unit.PX);
header.getElement().getStyle().setWidth(100, Unit.PCT);
header.getElement().getStyle().setZIndex(100);
return header;
}
@Override
public void fillRegattas() {