diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/VelocityProcessor.java @ 9203:9831f6c60473

AbstractSInfoLineProcessor refactoring
author gernotbelger
date Mon, 02 Jul 2018 13:00:59 +0200
parents 23945061daec
children 08f46ccd37ba
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/VelocityProcessor.java	Mon Jul 02 07:33:53 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/VelocityProcessor.java	Mon Jul 02 13:00:59 2018 +0200
@@ -13,11 +13,14 @@
 import java.util.HashSet;
 import java.util.Set;
 
+import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.artifactdatabase.state.Facet;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
+import org.dive4elements.river.exports.DiagramGenerator;
+import org.dive4elements.river.themes.ThemeDocument;
 
-public final class VelocityProcessor extends AbstractSInfoLineProcessor<AbstractTkhCalculationResult> {
+public final class VelocityProcessor extends AbstractSInfoProcessor {
 
     public static final String FACET_TKH_VELOCITY_FILTERED = "sinfo_facet_velocity";
 
@@ -37,11 +40,10 @@
         super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES);
     }
 
-    @Override
-    protected double[][] doGetPoints(final AbstractTkhCalculationResult data, final String facetName) {
+    protected SInfoResultType doGetType(final String facetName) {
 
         if (FACET_TKH_VELOCITY_FILTERED.contentEquals(facetName))
-            return data.getStationPoints(SInfoResultType.velocity);
+            return SInfoResultType.velocity;
 
         final String error = String.format("Unknown facet name: %s", facetName);
         throw new UnsupportedOperationException(error);
@@ -49,7 +51,13 @@
 
     public static Facet createVelocityFacet(final CallContext context, final String hash, final String id, final AbstractCalculationResult result,
             final int index) {
-        return AbstractSInfoLineProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_VELOCITY_YAXIS_LABEL, FACET_TKH_VELOCITY_FILTERED,
+        return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_VELOCITY_YAXIS_LABEL, FACET_TKH_VELOCITY_FILTERED,
                 I18N_FACET_TKH_VELOCITY_FILTERED_DESCRIPTION);
     }
+
+    @Override
+    protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
+        // TODO Auto-generated method stub
+        return buildSeriesForType(generator, bundle, theme, visible, doGetType(bundle.getFacetName()), GAP_DISTANCE);
+    }
 }
\ No newline at end of file

http://dive4elements.wald.intevation.org