Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthDevelopmentProcessor.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/FlowDepthDevelopmentProcessor.java Mon Jul 02 07:33:53 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/FlowDepthDevelopmentProcessor.java Mon Jul 02 13:00:59 2018 +0200 @@ -13,13 +13,16 @@ 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.artifacts.resources.Resources; import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; +import org.dive4elements.river.exports.DiagramGenerator; +import org.dive4elements.river.themes.ThemeDocument; -public final class FlowDepthDevelopmentProcessor extends AbstractSInfoLineProcessor<AbstractCalculationResult> { +public final class FlowDepthDevelopmentProcessor extends AbstractSInfoProcessor { private static final String I18N_AXIS_LABEL = "sinfo.chart.flow_depth_development.section.yaxis.label"; @@ -57,19 +60,18 @@ super(I18N_AXIS_LABEL, HANDLED_FACET_TYPES); } - @Override - protected double[][] doGetPoints(final AbstractCalculationResult data, final String facetName) { + protected SInfoResultType doGetType(final String facetName) { if (FACET_FLOW_DEPTH_DEVELOPMENT_FILTERED.contentEquals(facetName)) - return data.getStationPoints(SInfoResultType.flowdepthDevelopment); + return SInfoResultType.flowdepthDevelopment; if (FACET_FLOW_DEPTH_DEVELOPMENT_RAW.contentEquals(facetName)) - return data.getStationPoints(SInfoResultType.flowdepthDevelopment); + return SInfoResultType.flowdepthDevelopment; if (FACET_WATERLEVEL_DIFFERENCE_FILTERED.contentEquals(facetName)) - return data.getStationPoints(SInfoResultType.waterlevelDifference); + return SInfoResultType.waterlevelDifference; if (FACET_BEDHEIGHT_DIFFERENCE_FILTERED.contentEquals(facetName)) - return data.getStationPoints(SInfoResultType.bedHeightDifference); + return SInfoResultType.bedHeightDifference; final String error = String.format("Unknown facet name: %s", facetName); throw new UnsupportedOperationException(error); @@ -77,13 +79,13 @@ public static Facet createFlowDepthDevelopmentFilteredFacet(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_FLOW_DEPTH_DEVELOPMENT_YAXIS_LABEL, + return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_YAXIS_LABEL, FACET_FLOW_DEPTH_DEVELOPMENT_FILTERED, FACET_FLOW_DEPTH_DEVELOPMENT_FILTERED_DESCRIPTION); } public static Facet createFlowDepthDevelopmentRawFacet(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_FLOW_DEPTH_DEVELOPMENT_YAXIS_LABEL, + return AbstractSInfoProcessor.createFacet(context, hash, id, result, index, SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_YAXIS_LABEL, FACET_FLOW_DEPTH_DEVELOPMENT_RAW, FACET_FLOW_DEPTH_DEVELOPMENT_RAW_DESCRIPTION); } @@ -103,4 +105,10 @@ return new SInfoResultFacet(index, FACET_BEDHEIGHT_DIFFERENCE_FILTERED, facetFlowDepthFilteredDescription, SINFO_CHART_FLOW_DEPTH_DEVELOPMENT_YAXIS_LABEL, ComputeType.ADVANCE, id, hash); } + + @Override + protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) { + + return buildSeriesForType(generator, bundle, theme, visible, doGetType(bundle.getFacetName()), null); + } } \ No newline at end of file