diff --git a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/ManeuverSettings.java b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/ManeuverSettings.java new file mode 100644 index 00000000000..dcfb68e9936 --- /dev/null +++ b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/ManeuverSettings.java @@ -0,0 +1,17 @@ +package com.sap.sailing.datamining.shared; + +import com.sap.sse.common.settings.SerializableSettings; + +public abstract class ManeuverSettings extends SerializableSettings { + + private static final long serialVersionUID = -393430331972342L; + + public abstract Double getMinManeuverDuration(); + public abstract Double getMaxManeuverDuration(); + public abstract Double getMinManeuverEnteringSpeedInKnots(); + public abstract Double getMaxManeuverEnteringSpeedInKnots(); + public abstract Double getMinManeuverExitingSpeedInKnots(); + public abstract Double getMaxManeuverExitingSpeedInKnots(); + +} + diff --git a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/ManeuverSettingsImpl.java b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/ManeuverSettingsImpl.java new file mode 100644 index 00000000000..77aa75e0f19 --- /dev/null +++ b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/ManeuverSettingsImpl.java @@ -0,0 +1,114 @@ +package com.sap.sailing.datamining.shared; + +public class ManeuverSettingsImpl extends ManeuverSettings { + + private static final long serialVersionUID = 69258712144L; + + private Double minManeuverDuration; + private Double maxManeuverDuration; + private Double minManeuverEnteringSpeedInKnots; + private Double maxManeuverEnteringSpeedInKnots; + private Double minManeuverExitingSpeedInKnots; + private Double maxManeuverExitingSpeedInKnots; + + public static ManeuverSettingsImpl createDefault() { + return new ManeuverSettingsImpl(1.0, null, 2.0, null, 1.0, null); + } + + public ManeuverSettingsImpl() {} + + public ManeuverSettingsImpl(Double minManeuverDuration, Double maxManeuverDuration, + Double minManeuverEnteringSpeedInKnots, Double maxManeuverEnteringSpeedInKnots, + Double minManeuverExitingSpeedInKnots, Double maxManeuverExitingSpeedInKnots) { + this.minManeuverDuration = minManeuverDuration; + this.maxManeuverDuration = maxManeuverDuration; + this.minManeuverEnteringSpeedInKnots = minManeuverEnteringSpeedInKnots; + this.maxManeuverEnteringSpeedInKnots = maxManeuverEnteringSpeedInKnots; + this.minManeuverExitingSpeedInKnots = minManeuverExitingSpeedInKnots; + this.maxManeuverExitingSpeedInKnots = maxManeuverExitingSpeedInKnots; + } + + public Double getMinManeuverDuration() { + return minManeuverDuration; + } + + public Double getMaxManeuverDuration() { + return maxManeuverDuration; + } + + public Double getMinManeuverEnteringSpeedInKnots() { + return minManeuverEnteringSpeedInKnots; + } + + public Double getMaxManeuverEnteringSpeedInKnots() { + return maxManeuverEnteringSpeedInKnots; + } + + public Double getMinManeuverExitingSpeedInKnots() { + return minManeuverExitingSpeedInKnots; + } + + public Double getMaxManeuverExitingSpeedInKnots() { + return maxManeuverExitingSpeedInKnots; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((maxManeuverDuration == null) ? 0 : maxManeuverDuration.hashCode()); + result = prime * result + + ((maxManeuverEnteringSpeedInKnots == null) ? 0 : maxManeuverEnteringSpeedInKnots.hashCode()); + result = prime * result + + ((maxManeuverExitingSpeedInKnots == null) ? 0 : maxManeuverExitingSpeedInKnots.hashCode()); + result = prime * result + ((minManeuverDuration == null) ? 0 : minManeuverDuration.hashCode()); + result = prime * result + + ((minManeuverEnteringSpeedInKnots == null) ? 0 : minManeuverEnteringSpeedInKnots.hashCode()); + result = prime * result + + ((minManeuverExitingSpeedInKnots == null) ? 0 : minManeuverExitingSpeedInKnots.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + ManeuverSettingsImpl other = (ManeuverSettingsImpl) obj; + if (maxManeuverDuration == null) { + if (other.maxManeuverDuration != null) + return false; + } else if (!maxManeuverDuration.equals(other.maxManeuverDuration)) + return false; + if (maxManeuverEnteringSpeedInKnots == null) { + if (other.maxManeuverEnteringSpeedInKnots != null) + return false; + } else if (!maxManeuverEnteringSpeedInKnots.equals(other.maxManeuverEnteringSpeedInKnots)) + return false; + if (maxManeuverExitingSpeedInKnots == null) { + if (other.maxManeuverExitingSpeedInKnots != null) + return false; + } else if (!maxManeuverExitingSpeedInKnots.equals(other.maxManeuverExitingSpeedInKnots)) + return false; + if (minManeuverDuration == null) { + if (other.minManeuverDuration != null) + return false; + } else if (!minManeuverDuration.equals(other.minManeuverDuration)) + return false; + if (minManeuverEnteringSpeedInKnots == null) { + if (other.minManeuverEnteringSpeedInKnots != null) + return false; + } else if (!minManeuverEnteringSpeedInKnots.equals(other.minManeuverEnteringSpeedInKnots)) + return false; + if (minManeuverExitingSpeedInKnots == null) { + if (other.minManeuverExitingSpeedInKnots != null) + return false; + } else if (!minManeuverExitingSpeedInKnots.equals(other.minManeuverExitingSpeedInKnots)) + return false; + return true; + } + +} diff --git a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/SailingDataMiningSerializationDummy.java b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/SailingDataMiningSerializationDummy.java index 8040117307a..6a1d1886db3 100644 --- a/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/SailingDataMiningSerializationDummy.java +++ b/java/com.sap.sailing.datamining.shared/src/com/sap/sailing/datamining/shared/SailingDataMiningSerializationDummy.java @@ -28,6 +28,8 @@ public final class SailingDataMiningSerializationDummy implements SerializationD private ManeuverSpeedDetailsAggregationImpl maneuverSpeedDetailsAggregationImpl; private ManeuverSpeedDetailsSettings maneuverSpeedDetailsSettings; private ManeuverSpeedDetailsSettingsImpl maneuverSpeedDetailsSettingsImpl; + private ManeuverSettings maneuverSettings; + private ManeuverSettingsImpl maneuverSettingsImpl; private SailingDataMiningSerializationDummy() { } diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties index dafc7c7d1e3..ccf7c5d1364 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages.properties @@ -141,4 +141,6 @@ RatioBetweenInitialAndFinalManeuverSpeed=Ratio between initial and final maneuve AvgTrendForTWAs=Avg per TWA MedianTrendForTWAs=Median per TWA ManeuverDurationInSeconds=Maneuver duration in seconds -BeatAngleAtManeuverClimax=Beat-angle at maneuver climax \ No newline at end of file +BeatAngleAtManeuverClimax=Beat-angle at maneuver climax +ManeuverEnteringSpeedInKnots=Maneuver entering speed (kts) +ManeuverExitingSpeedInKnots=Maneuver exiting speed (kts) \ No newline at end of file diff --git a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_de.properties b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_de.properties index b43b468891f..13f120eee93 100644 --- a/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_de.properties +++ b/java/com.sap.sailing.datamining/resources/stringmessages/Sailing_StringMessages_de.properties @@ -141,4 +141,6 @@ RatioBetweenInitialAndFinalManeuverSpeed=Verhältnis zwischen Anfangs- und Endge AvgTrendForTWAs=Durchschnitt pro TWA MedianTrendForTWAs=Median pro TWA ManeuverDurationInSeconds=Manöver-Dauer in Sekunden -BeatAngleAtManeuverClimax=Beat-Angle während Manöver-Höhepunkt \ No newline at end of file +BeatAngleAtManeuverClimax=Beat-Angle während Manöver-Höhepunkt +ManeuverEnteringSpeedInKnots=Manöver Eingangsgeschwindigkeit (kn) +ManeuverExitingSpeedInKnots=Manöver Ausgangsgeschwindigkeit (kn) \ No newline at end of file diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingDataRetrievalChainDefinitions.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingDataRetrievalChainDefinitions.java index 61c006d2a5d..9074a9efff9 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingDataRetrievalChainDefinitions.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/SailingDataRetrievalChainDefinitions.java @@ -35,6 +35,8 @@ import com.sap.sailing.datamining.impl.components.TrackedRaceRetrievalProcessor; import com.sap.sailing.datamining.impl.components.WindFixRetrievalProcessor; import com.sap.sailing.datamining.impl.components.WindTrackRetrievalProcessor; import com.sap.sailing.datamining.impl.data.LeaderboardGroupWithContext; +import com.sap.sailing.datamining.shared.ManeuverSettings; +import com.sap.sailing.datamining.shared.ManeuverSettingsImpl; import com.sap.sailing.datamining.shared.ManeuverSpeedDetailsSettings; import com.sap.sailing.datamining.shared.ManeuverSpeedDetailsSettingsImpl; import com.sap.sailing.server.RacingEventService; @@ -111,7 +113,7 @@ public class SailingDataRetrievalChainDefinitions { final DataRetrieverChainDefinition maneuverRetrieverChainDefinition = new SimpleDataRetrieverChainDefinition<>( legOfCompetitorRetrieverChainDefinition, HasManeuverContext.class, "ManeuverSailingDomainRetrieverChain"); maneuverRetrieverChainDefinition.endWith(TrackedLegOfCompetitorRetrievalProcessor.class, ManeuverRetrievalProcessor.class, - HasManeuverContext.class, "Maneuver"); + HasManeuverContext.class, ManeuverSettings.class, ManeuverSettingsImpl.createDefault(), "Maneuver"); dataRetrieverChainDefinitions.add(maneuverRetrieverChainDefinition); DataRetrieverChainDefinition speedDetailsDataRetrieverChainDefinition = new SimpleDataRetrieverChainDefinition<>( diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasManeuverContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasManeuverContext.java index 1820730db54..abbb949d917 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasManeuverContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/data/HasManeuverContext.java @@ -10,7 +10,7 @@ import com.sap.sse.datamining.annotations.Statistic; public interface HasManeuverContext extends HasWindOnTrackedLeg, HasManeuver, HasTrackedLegOfCompetitor { @Connector(scanForStatistics=false) HasTrackedLegOfCompetitorContext getTrackedLegOfCompetitorContext(); - + @Dimension(messageKey="ManeuverType", ordinal=12) ManeuverType getManeuverType(); diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/ManeuverRetrievalProcessor.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/ManeuverRetrievalProcessor.java index 2f012425313..00d05f91345 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/ManeuverRetrievalProcessor.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/components/ManeuverRetrievalProcessor.java @@ -7,6 +7,7 @@ import java.util.concurrent.ExecutorService; import com.sap.sailing.datamining.data.HasManeuverContext; import com.sap.sailing.datamining.data.HasTrackedLegOfCompetitorContext; import com.sap.sailing.datamining.impl.data.ManeuverWithContext; +import com.sap.sailing.datamining.shared.ManeuverSettings; import com.sap.sailing.domain.common.NoWindException; import com.sap.sailing.domain.tracking.Maneuver; import com.sap.sse.common.TimePoint; @@ -15,8 +16,11 @@ import com.sap.sse.datamining.impl.components.AbstractRetrievalProcessor; public class ManeuverRetrievalProcessor extends AbstractRetrievalProcessor { - public ManeuverRetrievalProcessor(ExecutorService executor, Collection> resultReceivers, int retrievalLevel) { + private final ManeuverSettings settings; + + public ManeuverRetrievalProcessor(ExecutorService executor, Collection> resultReceivers, ManeuverSettings settings, int retrievalLevel) { super(HasTrackedLegOfCompetitorContext.class, HasManeuverContext.class, executor, resultReceivers, retrievalLevel); + this.settings = settings; } @Override @@ -27,7 +31,21 @@ public class ManeuverRetrievalProcessor extends AbstractRetrievalProcessor maneuvers = element.getTrackedLegOfCompetitor().getManeuvers(finishTime, false); for (Maneuver maneuver : maneuvers) { - maneuversWithContext.add(new ManeuverWithContext(element, maneuver)); + ManeuverWithContext maneuverWithContext = new ManeuverWithContext(element, maneuver); + //Compute only figures which are really required for filtering + double maneuverDuration = settings.getMinManeuverDuration() != null || settings.getMaxManeuverDuration() != null ? maneuverWithContext.getManeuverDuration() : 0; + double maneuverEnteringSpeed = settings.getMinManeuverEnteringSpeedInKnots() != null || settings.getMaxManeuverEnteringSpeedInKnots() != null ? maneuverWithContext.getManeuverEnteringSpeed() : 0; + double maneuverExitingSpeed = settings.getMinManeuverExitingSpeedInKnots() != null || settings.getMaxManeuverExitingSpeedInKnots() != null ? maneuverWithContext.getManeuverExitingSpeed() : 0; + + if(!(settings.getMinManeuverDuration() != null && maneuverDuration < settings.getMinManeuverDuration() || + settings.getMaxManeuverDuration() != null && maneuverDuration > settings.getMaxManeuverDuration() || + settings.getMinManeuverEnteringSpeedInKnots() != null && maneuverEnteringSpeed < settings.getMinManeuverEnteringSpeedInKnots() || + settings.getMaxManeuverEnteringSpeedInKnots() != null && maneuverEnteringSpeed > settings.getMaxManeuverEnteringSpeedInKnots() || + settings.getMinManeuverExitingSpeedInKnots() != null && maneuverExitingSpeed < settings.getMinManeuverExitingSpeedInKnots() || + settings.getMaxManeuverExitingSpeedInKnots() != null && maneuverExitingSpeed > settings.getMaxManeuverExitingSpeedInKnots())) { + + maneuversWithContext.add(maneuverWithContext); + } } } catch (NoWindException e) { throw new IllegalStateException("No wind retrieving the maneuvers", e); diff --git a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/ManeuverWithContext.java b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/ManeuverWithContext.java index 12aeeab748d..b010bf23900 100644 --- a/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/ManeuverWithContext.java +++ b/java/com.sap.sailing.datamining/src/com/sap/sailing/datamining/impl/data/ManeuverWithContext.java @@ -25,6 +25,18 @@ public class ManeuverWithContext implements HasManeuverContext { this.maneuver = maneuver; } + public Double getManeuverEnteringSpeed() { + Competitor competitor = getTrackedLegOfCompetitorContext().getTrackedLegOfCompetitor().getCompetitor(); + TrackedRace trackedRace = getTrackedLegOfCompetitorContext().getTrackedLegContext().getTrackedRaceContext().getTrackedRace(); + return trackedRace.getTrack(competitor).getEstimatedSpeed(maneuver.getTimePointBefore()).getKnots(); + } + + public Double getManeuverExitingSpeed() { + Competitor competitor = getTrackedLegOfCompetitorContext().getTrackedLegOfCompetitor().getCompetitor(); + TrackedRace trackedRace = getTrackedLegOfCompetitorContext().getTrackedLegContext().getTrackedRaceContext().getTrackedRace(); + return trackedRace.getTrack(competitor).getEstimatedSpeed(maneuver.getTimePointAfter()).getKnots(); + } + @Override public Double getManeuverDuration() { return maneuver.getTimePointBefore().until(maneuver.getTimePointAfter()).asSeconds(); diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Maneuver.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Maneuver.java index 03d24b60606..ccc49053cfd 100755 --- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Maneuver.java +++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/tracking/Maneuver.java @@ -2,11 +2,9 @@ package com.sap.sailing.domain.tracking; import com.sap.sailing.domain.common.Distance; import com.sap.sailing.domain.common.ManeuverType; -import com.sap.sailing.domain.common.SpeedWithBearing; import com.sap.sailing.domain.common.Tack; import com.sap.sailing.domain.common.tracking.GPSFix; import com.sap.sse.common.TimePoint; -import com.sap.sse.datamining.annotations.Connector; import com.sap.sse.datamining.annotations.Dimension; import com.sap.sse.datamining.annotations.Statistic; @@ -16,12 +14,6 @@ public interface Maneuver extends GPSFix { @Dimension(messageKey="Tack", ordinal=13) Tack getNewTack(); - @Connector(messageKey="SpeedBefore", ordinal=0) - SpeedWithBearing getSpeedWithBearingBefore(); - - @Connector(messageKey="SpeedAfter", ordinal=1) - SpeedWithBearing getSpeedWithBearingAfter(); - @Statistic(messageKey="DirectionChange", resultDecimals=2, ordinal=2) double getDirectionChangeInDegrees(); diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java index deb8d2c5b48..fb469d9e347 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java @@ -1886,4 +1886,11 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages, String errorLoadingRegattaStructure(UUID event, String message); String showEstimatedDuration(); String estimatedDuration(); + String maneuver(); + String minManeuverDuration(); + String maxManeuverDuration(); + String minManeuverEnteringSpeedInKnots(); + String maxManeuverEnteringSpeedInKnots(); + String minManeuverExitingSpeedInKnots(); + String maxManeuverExitingSpeedInKnots(); } diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties index cceb8a92f08..52812953ebe 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties @@ -1866,4 +1866,11 @@ errorLoadingRegattaStructure=Error trying to load regattas for event with id {0} showEstimatedDuration=Show estimated duration estimatedDuration=estimated duration: maneuverSpeedDetails=Maneuver speed details -maneuverDirectionNormalization=Maneuver direction normalization \ No newline at end of file +maneuverDirectionNormalization=Maneuver direction normalization +maneuver=Maneuver +minManeuverDuration=Min. maneuver duration (s) +maxManeuverDuration=Max. maneuver duration (s) +minManeuverEnteringSpeedInKnots=Min. maneuver entering speed (kts) +maxManeuverEnteringSpeedInKnots=Max. maneuver entering speed (kts) +minManeuverExitingSpeedInKnots=Min. maneuver exiting speed (kts) +maxManeuverExitingSpeedInKnots=Max. maneuver exiting speed (kts) \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties index 7b668605617..69f9ea938ee 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_de.properties @@ -1870,4 +1870,11 @@ estimatedDistance=Geschätzte Distanz estimatedTime=Geschätzte Renndauer noUpcomingRaceDataAvailable=Es liegen keine Daten über Rennstarts vor showEstimatedDuration=Zeige geschätzte Renndauer -estimatedDuration=Geschätzte Renndauer: \ No newline at end of file +estimatedDuration=Geschätzte Renndauer: +maneuver=Manöver +minManeuverDuration=Min. Manöverdauer (s) +maxManeuverDuration=Max. Manöverdauer (s) +minManeuverEnteringSpeedInKnots=Min. Manöver-Eingangsgeschwindigkeit (kn) +maxManeuverEnteringSpeedInKnots=Max. Manöver-Eingangsgeschwindigkeit (kn) +minManeuverExitingSpeedInKnots=Min. Manöver-Ausgangsgeschwindigkeit (kn) +maxManeuverExitingSpeedInKnots=Max. Manöver-Ausgangsgeschwindigkeit (kn) \ No newline at end of file diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManager.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManager.java index 54d0290ab48..1a011160a99 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManager.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/DataMiningSettingsInfoManager.java @@ -3,9 +3,12 @@ package com.sap.sailing.gwt.ui.datamining; import java.util.HashMap; import java.util.Map; +import com.sap.sailing.datamining.shared.ManeuverSettings; +import com.sap.sailing.datamining.shared.ManeuverSettingsImpl; import com.sap.sailing.datamining.shared.ManeuverSpeedDetailsSettings; import com.sap.sailing.datamining.shared.ManeuverSpeedDetailsSettingsImpl; import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sailing.gwt.ui.datamining.presentation.ManeuverSettingsDialogComponent; import com.sap.sailing.gwt.ui.datamining.presentation.ManeuverSpeedDetailsSettingsDialogComponent; import com.sap.sailing.gwt.ui.polarmining.PolarDataMiningSettingsDialogComponent; import com.sap.sailing.polars.datamining.shared.PolarDataMiningSettings; @@ -29,6 +32,10 @@ public class DataMiningSettingsInfoManager { ManeuverSpeedDetailsSettingsInfo maneuverSpeedDetailsSettingsInfo = new ManeuverSpeedDetailsSettingsInfo(); infosMappedBySettingsType.put(ManeuverSpeedDetailsSettings.class, maneuverSpeedDetailsSettingsInfo); infosMappedBySettingsType.put(ManeuverSpeedDetailsSettingsImpl.class, maneuverSpeedDetailsSettingsInfo); + + ManeuverSettingsInfo maneuverSettingsInfo = new ManeuverSettingsInfo(); + infosMappedBySettingsType.put(ManeuverSettings.class, maneuverSettingsInfo); + infosMappedBySettingsType.put(ManeuverSettingsImpl.class, maneuverSettingsInfo); } public DataMiningSettingsInfo getSettingsInfo(Class settingsType) { @@ -55,6 +62,26 @@ public class DataMiningSettingsInfoManager { } + private class ManeuverSettingsInfo implements DataMiningSettingsInfo { + + @SuppressWarnings("unchecked") + @Override + public SettingsDialogComponent createSettingsDialogComponent(SettingsType settings) { + return (SettingsDialogComponent) new ManeuverSettingsDialogComponent((ManeuverSettings) settings); + } + + @Override + public String getLocalizedName(StringMessages stringMessages) { + return stringMessages.maneuver(); + } + + @Override + public String getId() { + return "ManeuverSettingsInfo"; + } + + } + private class ManeuverSpeedDetailsSettingsInfo implements DataMiningSettingsInfo { @SuppressWarnings("unchecked") diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSettingsDialogComponent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSettingsDialogComponent.java new file mode 100644 index 00000000000..10ab409d5ba --- /dev/null +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSettingsDialogComponent.java @@ -0,0 +1,89 @@ +package com.sap.sailing.gwt.ui.datamining.presentation; + +import com.google.gwt.user.client.ui.DoubleBox; +import com.google.gwt.user.client.ui.FocusWidget; +import com.google.gwt.user.client.ui.Grid; +import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.VerticalPanel; +import com.google.gwt.user.client.ui.Widget; +import com.sap.sailing.datamining.shared.ManeuverSettings; +import com.sap.sailing.datamining.shared.ManeuverSettingsImpl; +import com.sap.sailing.gwt.ui.client.StringMessages; +import com.sap.sse.gwt.client.dialog.DataEntryDialog; +import com.sap.sse.gwt.client.dialog.DataEntryDialog.Validator; +import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; + +public class ManeuverSettingsDialogComponent implements SettingsDialogComponent { + + private ManeuverSettings settings; + private StringMessages stringMessages; + private DoubleBox minManeuverDurationBox; + private DoubleBox maxManeuverDurationBox; + private DoubleBox minManeuverEnteringSpeedBox; + private DoubleBox maxManeuverEnteringSpeedBox; + private DoubleBox minManeuverExitingSpeedBox; + private DoubleBox maxManeuverExitingSpeedBox; + + public ManeuverSettingsDialogComponent(ManeuverSettings settings) { + this.settings = settings; + this.stringMessages = StringMessages.INSTANCE; + } + + @Override + public Widget getAdditionalWidget(DataEntryDialog dialog) { + VerticalPanel vp = new VerticalPanel(); + Grid grid = new Grid(6, 2); + grid.setCellPadding(5); + vp.add(grid); + setupGrid(grid, dialog); + return vp; + } + + private void setupGrid(Grid grid, DataEntryDialog dialog) { + Label minManeuverDurationLabel = dialog.createLabel(stringMessages.minManeuverDuration()); + grid.setWidget(0, 0, minManeuverDurationLabel); + minManeuverDurationBox = dialog.createDoubleBox(settings.getMinManeuverDuration(), 10); + grid.setWidget(0, 1, minManeuverDurationBox); + + Label maxManeuverDurationLabel = dialog.createLabel(stringMessages.maxManeuverDuration()); + grid.setWidget(1, 0, maxManeuverDurationLabel); + maxManeuverDurationBox = dialog.createDoubleBox(settings.getMaxManeuverDuration(), 10); + grid.setWidget(1, 1, maxManeuverDurationBox); + + Label minManeuverEnteringSpeedLabel = dialog.createLabel(stringMessages.minManeuverEnteringSpeedInKnots()); + grid.setWidget(2, 0, minManeuverEnteringSpeedLabel); + minManeuverEnteringSpeedBox = dialog.createDoubleBox(settings.getMinManeuverEnteringSpeedInKnots(), 10); + grid.setWidget(2, 1, minManeuverEnteringSpeedBox); + + Label maxManeuverEnteringSpeedLabel = dialog.createLabel(stringMessages.maxManeuverEnteringSpeedInKnots()); + grid.setWidget(3, 0, maxManeuverEnteringSpeedLabel); + maxManeuverEnteringSpeedBox = dialog.createDoubleBox(settings.getMaxManeuverEnteringSpeedInKnots(), 10); + grid.setWidget(3, 1, maxManeuverEnteringSpeedBox); + + Label minManeuverExitingSpeedLabel = dialog.createLabel(stringMessages.minManeuverExitingSpeedInKnots()); + grid.setWidget(4, 0, minManeuverExitingSpeedLabel); + minManeuverExitingSpeedBox = dialog.createDoubleBox(settings.getMinManeuverExitingSpeedInKnots(), 10); + grid.setWidget(4, 1, minManeuverExitingSpeedBox); + + Label maxManeuverExitingSpeedLabel = dialog.createLabel(stringMessages.maxManeuverExitingSpeedInKnots()); + grid.setWidget(5, 0, maxManeuverExitingSpeedLabel); + maxManeuverExitingSpeedBox = dialog.createDoubleBox(settings.getMaxManeuverExitingSpeedInKnots(), 10); + grid.setWidget(5, 1, maxManeuverExitingSpeedBox); + } + + @Override + public ManeuverSettings getResult() { + return new ManeuverSettingsImpl(minManeuverDurationBox.getValue(), maxManeuverDurationBox.getValue(), minManeuverEnteringSpeedBox.getValue(), maxManeuverEnteringSpeedBox.getValue(), minManeuverExitingSpeedBox.getValue(), maxManeuverExitingSpeedBox.getValue()); + } + + @Override + public FocusWidget getFocusWidget() { + return minManeuverDurationBox; + } + + @Override + public Validator getValidator() { + return null; + } + +} diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsSettingsDialogComponent.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsSettingsDialogComponent.java index d99e723fc08..627567d2ede 100644 --- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsSettingsDialogComponent.java +++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/datamining/presentation/ManeuverSpeedDetailsSettingsDialogComponent.java @@ -10,17 +10,10 @@ import com.sap.sailing.datamining.shared.ManeuverSpeedDetailsSettings; import com.sap.sailing.datamining.shared.ManeuverSpeedDetailsSettingsImpl; import com.sap.sailing.domain.common.NauticalSide; import com.sap.sailing.gwt.ui.client.StringMessages; -import com.sap.sailing.polars.datamining.shared.PolarDataMiningSettings; import com.sap.sse.gwt.client.dialog.DataEntryDialog; import com.sap.sse.gwt.client.dialog.DataEntryDialog.Validator; import com.sap.sse.gwt.client.shared.components.SettingsDialogComponent; -/** - * Provides a widget for configuring {@link PolarDataMiningSettings}, including validation. - * - * @author D054528 (Frederik Petersen) - * - */ public class ManeuverSpeedDetailsSettingsDialogComponent implements SettingsDialogComponent { private ManeuverSpeedDetailsSettings settings; @@ -45,8 +38,8 @@ public class ManeuverSpeedDetailsSettingsDialogComponent implements SettingsDial } private void setupGrid(Grid grid, DataEntryDialog dialog) { - Label minimumGraphDataSizeLabel = dialog.createLabel(stringMessages.maneuverDirectionNormalization()); - grid.setWidget(0, 0, minimumGraphDataSizeLabel); + Label directionNormalizationLabel = dialog.createLabel(stringMessages.maneuverDirectionNormalization()); + grid.setWidget(0, 0, directionNormalizationLabel); maneuverDirectionNoNormalizationRadioButton = dialog.createRadioButton("maneuverDirectionNormalization", stringMessages.disabled()); maneuverDirectionStarboardNormalizationRadioButton = dialog.createRadioButton("maneuverDirectionNormalization", stringMessages.starboardSide()); maneuverDirectionPortNormalizationRadioButton = dialog.createRadioButton("maneuverDirectionNormalization", stringMessages.portSide());