mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-16 01:01:02 +00:00
removed 4 labels under every windchart and added one + changed size of map overlays in startanalysiscard
This commit is contained in:
1 parent
ed25a36225
commit
50be3fd698
8 files changed
+41
-36
No files matched your search
+1
@@ -22,6 +22,7 @@
|
|||||||
<g:HTMLPanel ui:field="rightwindbotcontainer"
|
<g:HTMLPanel ui:field="rightwindbotcontainer"
|
||||||
styleName="{style.collumn} {style.right}">
|
styleName="{style.collumn} {style.right}">
|
||||||
</g:HTMLPanel>
|
</g:HTMLPanel>
|
||||||
|
<g:HTMLPanel styleName="{style.windcharthint}">Tab on chart to change interval.</g:HTMLPanel>
|
||||||
</mgwtpanel:Panel>
|
</mgwtpanel:Panel>
|
||||||
<mgwtpanel:Panel styleName="{style.page}">
|
<mgwtpanel:Panel styleName="{style.page}">
|
||||||
<g:HTMLPanel styleName="{style.collumn} {style.startanalysiscollumn}">
|
<g:HTMLPanel styleName="{style.collumn} {style.startanalysiscollumn}">
|
||||||
|
|||||||
+14
-1
@@ -48,7 +48,7 @@
|
|||||||
.collumn {
|
.collumn {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 5pt;
|
top: 5pt;
|
||||||
bottom: 0pt;
|
bottom: 15pt;
|
||||||
margin: 5pt;
|
margin: 5pt;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,6 +181,19 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.windcharthint{
|
||||||
|
position: absolute;
|
||||||
|
bottom: 0pt;
|
||||||
|
height: 15pt;
|
||||||
|
line-height: 15pt;
|
||||||
|
margin-top: 0pt;
|
||||||
|
vertical-align: middle;
|
||||||
|
font-size: 12pt;
|
||||||
|
font-family: "Arial";
|
||||||
|
width: 100%;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
.scrollLayoutPanel {
|
.scrollLayoutPanel {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
+19
-19
@@ -92,8 +92,8 @@
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 10pt;
|
top: 10pt;
|
||||||
left: 10pt;
|
left: 10pt;
|
||||||
width: 50pt;
|
width: 40pt;
|
||||||
height: 100pt;
|
height: 80pt;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,15 +101,15 @@
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0pt;
|
top: 0pt;
|
||||||
right: 0pt;
|
right: 0pt;
|
||||||
width: 50pt;
|
width: 40pt;
|
||||||
height: 50pt;
|
height: 40pt;
|
||||||
border-radius: 25pt;
|
border-radius: 20pt;
|
||||||
background-color: white;
|
background-color: white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.startanalysis_card_wind_arrow {
|
.startanalysis_card_wind_arrow {
|
||||||
width: 30pt;
|
width: 20pt;
|
||||||
height: 30pt;
|
height: 20pt;
|
||||||
margin-top: 10pt;
|
margin-top: 10pt;
|
||||||
margin-left: 10pt;
|
margin-left: 10pt;
|
||||||
}
|
}
|
||||||
@@ -124,44 +124,44 @@
|
|||||||
.startanalysis_card_data {
|
.startanalysis_card_data {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 0pt;
|
right: 0pt;
|
||||||
width: 50pt;
|
width: 40pt;
|
||||||
height: 30pt;
|
height: 20pt;
|
||||||
background-color: white;
|
background-color: white;
|
||||||
line-height: 30pt;
|
line-height: 20pt;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
font-size: 13pt;
|
font-size: 11pt;
|
||||||
font-family: "Arial";
|
font-family: "Arial";
|
||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
.startanalysis_card_wind_data_direction {
|
.startanalysis_card_wind_data_direction {
|
||||||
top: 60pt;
|
top: 50pt;
|
||||||
}
|
}
|
||||||
|
|
||||||
.startanalysis_card_wind_data_speed {
|
.startanalysis_card_wind_data_speed {
|
||||||
top: 100pt;
|
top: 80pt;
|
||||||
}
|
}
|
||||||
|
|
||||||
.startanalysis_card_line_data {
|
.startanalysis_card_line_data {
|
||||||
top: 0pt;
|
top: 0pt;
|
||||||
left: 60pt;
|
left: 50pt;
|
||||||
width: 120pt;
|
width: 105pt;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
padding-left: 7pt;
|
padding-left: 7pt;
|
||||||
}
|
}
|
||||||
|
|
||||||
.startanalysis_card_line_data_wind {
|
.startanalysis_card_line_data_wind {
|
||||||
top: 0pt;
|
top: 0pt;
|
||||||
left: 180pt;
|
left: 160pt;
|
||||||
width: 90pt;
|
width: 85pt;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
padding-left: 7pt;
|
padding-left: 7pt;
|
||||||
}
|
}
|
||||||
|
|
||||||
.startanalysis_card_line_data_geo {
|
.startanalysis_card_line_data_geo {
|
||||||
top: 0pt;
|
top: 0pt;
|
||||||
left: 275pt;
|
left: 245pt;
|
||||||
width: 120pt;
|
width: 105pt;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+3
-3
@@ -109,9 +109,9 @@ public class StartlineAnalysisCard extends Composite implements HasWidgets, Star
|
|||||||
this.startanalysis_card_wind_data_speed
|
this.startanalysis_card_wind_data_speed
|
||||||
.setInnerHTML(NumberFormat.getFormat("#0.0").format(startAnalysisDTO.startAnalysisWindLineInfoDTO.windSpeedInKnots) + " kts");
|
.setInnerHTML(NumberFormat.getFormat("#0.0").format(startAnalysisDTO.startAnalysisWindLineInfoDTO.windSpeedInKnots) + " kts");
|
||||||
this.startanalysis_card_line_data
|
this.startanalysis_card_line_data
|
||||||
.setInnerHTML("Startline Advantage");
|
.setInnerHTML("Startline Advantage:");
|
||||||
this.startanalysis_card_line_data_wind.setInnerHTML("Wind: "+NumberFormat.getFormat("#0.0").format(startAnalysisDTO.startAnalysisWindLineInfoDTO.startLineAdvantageAtPinEnd) + " m");
|
this.startanalysis_card_line_data_wind.setInnerHTML("<b>Wind:</b> "+NumberFormat.getFormat("#0.0").format(startAnalysisDTO.startAnalysisWindLineInfoDTO.startLineAdvantageAtPinEnd) + " m");
|
||||||
this.startanalysis_card_line_data_geo.setInnerHTML("Geometry: "+NumberFormat.getFormat("#0.0").format(startAnalysisDTO.startAnalysisWindLineInfoDTO.startLineAdvantageByGeometry) + " m");
|
this.startanalysis_card_line_data_geo.setInnerHTML("<b>Geometry:</b> "+NumberFormat.getFormat("#0.0").format(startAnalysisDTO.startAnalysisWindLineInfoDTO.startLineAdvantageByGeometry) + " m");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -13,9 +13,10 @@ text-shadow: 0 1px 1px rgba(255,255,255,.7);
|
|||||||
}
|
}
|
||||||
|
|
||||||
.cellTableCell {
|
.cellTableCell {
|
||||||
padding: 10px;
|
padding: 5px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
font-size: 10pt;
|
font-size: 10pt;
|
||||||
|
height: 20px;
|
||||||
color: black;
|
color: black;
|
||||||
background-color: white;
|
background-color: white;
|
||||||
border:none;
|
border:none;
|
||||||
|
|||||||
+1
-9
@@ -26,7 +26,6 @@ import org.moxieapps.gwt.highcharts.client.plotOptions.BarPlotOptions;
|
|||||||
import org.moxieapps.gwt.highcharts.client.plotOptions.Marker;
|
import org.moxieapps.gwt.highcharts.client.plotOptions.Marker;
|
||||||
|
|
||||||
import com.google.gwt.core.client.GWT;
|
import com.google.gwt.core.client.GWT;
|
||||||
import com.google.gwt.dom.client.SpanElement;
|
|
||||||
import com.google.gwt.event.dom.client.ClickEvent;
|
import com.google.gwt.event.dom.client.ClickEvent;
|
||||||
import com.google.gwt.resources.client.CssResource;
|
import com.google.gwt.resources.client.CssResource;
|
||||||
import com.google.gwt.uibinder.client.UiBinder;
|
import com.google.gwt.uibinder.client.UiBinder;
|
||||||
@@ -35,7 +34,6 @@ import com.google.gwt.uibinder.client.UiField;
|
|||||||
import com.google.gwt.uibinder.client.UiHandler;
|
import com.google.gwt.uibinder.client.UiHandler;
|
||||||
import com.google.gwt.user.client.ui.Composite;
|
import com.google.gwt.user.client.ui.Composite;
|
||||||
import com.google.gwt.user.client.ui.FocusPanel;
|
import com.google.gwt.user.client.ui.FocusPanel;
|
||||||
import com.google.gwt.user.client.ui.HTMLPanel;
|
|
||||||
import com.google.gwt.user.client.ui.HasWidgets;
|
import com.google.gwt.user.client.ui.HasWidgets;
|
||||||
import com.google.gwt.user.client.ui.Widget;
|
import com.google.gwt.user.client.ui.Widget;
|
||||||
import com.sap.sailing.dashboards.gwt.client.RibDashboardEntryPoint;
|
import com.sap.sailing.dashboards.gwt.client.RibDashboardEntryPoint;
|
||||||
@@ -89,12 +87,6 @@ public class VerticalWindChart extends Composite implements HasWidgets {
|
|||||||
@UiField(provided = true)
|
@UiField(provided = true)
|
||||||
Chart verticalWindChart;
|
Chart verticalWindChart;
|
||||||
|
|
||||||
@UiField
|
|
||||||
HTMLPanel verticalWindChartClickHint;
|
|
||||||
|
|
||||||
@UiField
|
|
||||||
SpanElement clickHintMinutesSpan;
|
|
||||||
|
|
||||||
public VerticalWindChart() {
|
public VerticalWindChart() {
|
||||||
initWidget(uiBinder.createAndBindUi(this));
|
initWidget(uiBinder.createAndBindUi(this));
|
||||||
}
|
}
|
||||||
@@ -295,7 +287,7 @@ public class VerticalWindChart extends Composite implements HasWidgets {
|
|||||||
chartIntervallinMinutes = SMALL_DISPLAY_INTERVALL_IN_MINUTES;
|
chartIntervallinMinutes = SMALL_DISPLAY_INTERVALL_IN_MINUTES;
|
||||||
}
|
}
|
||||||
adaptVerticalWindChartExtemes();
|
adaptVerticalWindChartExtemes();
|
||||||
notifyVerticalWindChartClickListeners(SMALL_DISPLAY_INTERVALL_IN_MINUTES);
|
notifyVerticalWindChartClickListeners(chartIntervallinMinutes);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
-2
@@ -9,8 +9,6 @@
|
|||||||
<g:FlowPanel styleName="{style.flowPanelContainer}">
|
<g:FlowPanel styleName="{style.flowPanelContainer}">
|
||||||
<highcharts:Chart ui:field="verticalWindChart"
|
<highcharts:Chart ui:field="verticalWindChart"
|
||||||
styleName="{style.verticalWindChart}"></highcharts:Chart>
|
styleName="{style.verticalWindChart}"></highcharts:Chart>
|
||||||
<g:HTMLPanel ui:field="verticalWindChartClickHint"
|
|
||||||
styleName="{style.verticalWindChartClickHint}">Tab chart for change to <span ui:field="clickHintMinutesSpan" class="{style.clickHintMinutesSpan}">15</span> minutes intervall</g:HTMLPanel>
|
|
||||||
<g:FocusPanel ui:field="verticalWindChartClickArea" styleName="{style.verticalWindChartClickArea}"></g:FocusPanel>
|
<g:FocusPanel ui:field="verticalWindChartClickArea" styleName="{style.verticalWindChartClickArea}"></g:FocusPanel>
|
||||||
</g:FlowPanel>
|
</g:FlowPanel>
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -15,7 +15,7 @@
|
|||||||
.verticalWindChart {
|
.verticalWindChart {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0px;
|
top: 0px;
|
||||||
bottom: 35px;
|
bottom: 5px;
|
||||||
left: 0px;
|
left: 0px;
|
||||||
right: 0px;
|
right: 0px;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user