eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-08 20:12:23 +00:00
Code Activity

Removed maneuver duration from RaceMap pop-up

Browse Source
This commit is contained in:
Vladislav Chumak committed 2018-03-27 20:59:08 +02:00
1 parent 08fcca47e3
commit 798587858f
3 files changed
+3 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java
-3
View File
@@ -2194,9 +2194,6 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
vPanel.add(createInfoWindowLabelAndValue(stringMessages.lowestSpeed(),
NumberFormat.getDecimalFormat().format(maneuver.lowestSpeedInKnots) + " "
+ stringMessages.knotsUnit()));
vPanel.add(createInfoWindowLabelAndValue(stringMessages.durationPlain(),
NumberFormat.getDecimalFormat().format(maneuver.maneuverDurationInSeconds) + " "
+ stringMessages.secondsUnit()));
}
if (maneuver.maneuverLossInMeters != null) {
vPanel.add(createInfoWindowLabelAndValue(stringMessages.maneuverLoss(),
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
+1 -1
View File
@@ -3424,7 +3424,7 @@ public class SailingServiceImpl extends ProxiedRemoteServiceServlet implements S
maneuver.getMaxTurningRateInDegreesPerSecond(), maneuver.getAvgTurningRateInDegreesPerSecond(),
maneuver.getLowestSpeed().getKnots(),
maneuver.isMarkPassing() ? maneuver.getMarkPassing().getTimePoint().asDate() : null,
maneuver.isMarkPassing() ? maneuver.getToSide() : null, maneuver.getDuration().asSeconds());
maneuver.isMarkPassing() ? maneuver.getToSide() : null);
result.add(maneuverDTO);
}
return result;
java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/shared/ManeuverDTO.java
+2 -9
View File
@@ -39,8 +39,6 @@ public class ManeuverDTO implements IsSerializable {
public NauticalSide markPassingSide;
public double maneuverDurationInSeconds;
public ManeuverDTO() {
}
@@ -48,7 +46,7 @@ public class ManeuverDTO implements IsSerializable {
SpeedWithBearingDTO speedWithBearingBefore, SpeedWithBearingDTO speedWithBearingAfter,
double directionChangeInDegrees, Double maneuverLossInMeters, double maxTurningRateInDegreesPerSecond,
double avgTurningRateInDegreesPerSecond, double lowestSpeedInKnots, Date markPassingTimePoint,
NauticalSide markPassingSide, double maneuverDurationInSeconds) {
NauticalSide markPassingSide) {
super();
this.type = type;
this.newTack = newTack;
@@ -63,7 +61,6 @@ public class ManeuverDTO implements IsSerializable {
this.lowestSpeedInKnots = lowestSpeedInKnots;
this.markPassingTimePoint = markPassingTimePoint;
this.markPassingSide = markPassingSide;
this.maneuverDurationInSeconds = maneuverDurationInSeconds;
}
public String toString(StringMessages stringMessages) {
@@ -89,9 +86,6 @@ public class ManeuverDTO implements IsSerializable {
+ stringMessages.degreesPerSecondUnit();
String lowestSpeed = stringMessages.lowestSpeed() + ": "
+ NumberFormat.getDecimalFormat().format(this.lowestSpeedInKnots) + " " + stringMessages.knotsUnit();
String maneuverDuration = stringMessages.durationPlain() + ": "
+ NumberFormat.getDecimalFormat().format(this.maneuverDurationInSeconds) + " "
+ stringMessages.secondsUnit();
String maneuverLoss = this.maneuverLossInMeters == null ? ""
: ("; " + stringMessages.maneuverLoss() + ": "
+ NumberFormat.getDecimalFormat().format(this.maneuverLossInMeters) + " "
@@ -103,8 +97,7 @@ public class ManeuverDTO implements IsSerializable {
: stringMessages.starboardSide(),
DateTimeFormat.getFormat(PredefinedFormat.TIME_FULL).format(this.markPassingTimePoint));
String maneuverTitle = timeAndManeuver + "; " + directionChange + "; " + speedChange + "; " + maxTurningRate
+ "; " + avgTurningRate + "; " + lowestSpeed + "; " + maneuverDuration + "; " + maneuverLoss + "; "
+ markPassing;
+ "; " + avgTurningRate + "; " + lowestSpeed + maneuverLoss + markPassing;
return maneuverTitle;
}
}