Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoProcessor.java @ 9229:0dcd1cd41915
Different themes/facets for left bank and right bank infrastructures in S-Info flood durations, some fixmes done
author | mschaefer |
---|---|
date | Thu, 05 Jul 2018 16:49:42 +0200 |
parents | 0fc9c82e744e |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoProcessor.java Thu Jul 05 13:46:36 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoProcessor.java Thu Jul 05 16:49:42 2018 +0200 @@ -24,6 +24,7 @@ import org.dive4elements.river.artifacts.common.IResultType; import org.dive4elements.river.artifacts.context.RiverContext; import org.dive4elements.river.artifacts.math.MovingAverage; +import org.dive4elements.river.artifacts.model.WQKms; import org.dive4elements.river.artifacts.model.ZoomScale; import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; @@ -120,38 +121,29 @@ return metaData.get("Y"); } - // protected final String buildSeriesForType1(final DiagramGenerator generator, final ArtifactAndFacet bundle, final - // ThemeDocument theme, - // final boolean visible, final IResultType resultType, final Double gapDistance) { - // final CallContext context = generator.getContext(); - // final Map<String, String> metaData = bundle.getFacet().getMetaData(); - // - // final Artifact artifact = bundle.getArtifact(); - // - // final StyledXYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme); - // series.putMetaData(metaData, artifact, context); - // - // final String facetName = bundle.getFacetName(); - // - // final AbstractCalculationResult data = (AbstractCalculationResult) bundle.getData(context); - // if (data == null) { - // // Check has been here before so we keep it for security reasons - // // this should never happen though. - // throw new IllegalStateException("Data is null for facet: " + facetName); - // } - // - // final double[][] points = generatePoints(context, artifact, data, facetName, resultType, - // bundle.getFacet().getIndex()); - // - // if (gapDistance == null) - // StyledSeriesBuilder.addPoints(series, points, true); - // else - // StyledSeriesBuilder.addPoints(series, points, true, gapDistance); - // - // generator.addAxisSeries(series, getAxisName(), visible); - // - // return metaData.get("Y"); - // } + protected final String buildStepLineSeriesForType(final double[][] points, final DiagramGenerator generator, final ArtifactAndFacet bundle, + final ThemeDocument theme, final boolean visible) { + + final CallContext context = generator.getContext(); + final Map<String, String> metaData = bundle.getFacet().getMetaData(); + + final Artifact artifact = bundle.getArtifact(); + + final StyledXYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme); + series.putMetaData(metaData, artifact, context); + + final String facetName = bundle.getFacetName(); + + // Create WQKms to use the step points method + // REMARK: must have any values in w array; not sure whether the name is needed + final WQKms wqkms = new WQKms(points[0], points[1], points[1], facetName); + + StyledSeriesBuilder.addStepPointsKmQ(series, wqkms); + + generator.addAxisSeries(series, getAxisName(), visible); + + return metaData.get("Y"); + } protected final String buildSeriesForTkh(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) { @@ -202,19 +194,6 @@ return points; } - // private double[][] generatePoints(final CallContext context, final Artifact artifact, final AbstractCalculationResult - // data, final String facetName, - // final IResultType resultType, final int index) { - // - // final double[][] points = data.getStationPoints(resultType, index); - // if (facetName.endsWith(".filtered")) { - // final Double radius = findRadius(context, artifact); - // return movingAverage(radius, points); - // } - // - // return points; - // } - private double[][] movingAverage(final Double radius, final double[][] points) { if (radius == null)