Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
9228:dba14da43f23 | 9229:0dcd1cd41915 |
---|---|
22 import org.dive4elements.river.artifacts.access.RiverAccess; | 22 import org.dive4elements.river.artifacts.access.RiverAccess; |
23 import org.dive4elements.river.artifacts.common.AbstractCalculationResult; | 23 import org.dive4elements.river.artifacts.common.AbstractCalculationResult; |
24 import org.dive4elements.river.artifacts.common.IResultType; | 24 import org.dive4elements.river.artifacts.common.IResultType; |
25 import org.dive4elements.river.artifacts.context.RiverContext; | 25 import org.dive4elements.river.artifacts.context.RiverContext; |
26 import org.dive4elements.river.artifacts.math.MovingAverage; | 26 import org.dive4elements.river.artifacts.math.MovingAverage; |
27 import org.dive4elements.river.artifacts.model.WQKms; | |
27 import org.dive4elements.river.artifacts.model.ZoomScale; | 28 import org.dive4elements.river.artifacts.model.ZoomScale; |
28 import org.dive4elements.river.artifacts.resources.Resources; | 29 import org.dive4elements.river.artifacts.resources.Resources; |
29 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; | 30 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; |
30 import org.dive4elements.river.exports.DiagramGenerator; | 31 import org.dive4elements.river.exports.DiagramGenerator; |
31 import org.dive4elements.river.exports.StyledSeriesBuilder; | 32 import org.dive4elements.river.exports.StyledSeriesBuilder; |
118 generator.addAxisSeries(series, getAxisName(), visible); | 119 generator.addAxisSeries(series, getAxisName(), visible); |
119 | 120 |
120 return metaData.get("Y"); | 121 return metaData.get("Y"); |
121 } | 122 } |
122 | 123 |
123 // protected final String buildSeriesForType1(final DiagramGenerator generator, final ArtifactAndFacet bundle, final | 124 protected final String buildStepLineSeriesForType(final double[][] points, final DiagramGenerator generator, final ArtifactAndFacet bundle, |
124 // ThemeDocument theme, | 125 final ThemeDocument theme, final boolean visible) { |
125 // final boolean visible, final IResultType resultType, final Double gapDistance) { | 126 |
126 // final CallContext context = generator.getContext(); | 127 final CallContext context = generator.getContext(); |
127 // final Map<String, String> metaData = bundle.getFacet().getMetaData(); | 128 final Map<String, String> metaData = bundle.getFacet().getMetaData(); |
128 // | 129 |
129 // final Artifact artifact = bundle.getArtifact(); | 130 final Artifact artifact = bundle.getArtifact(); |
130 // | 131 |
131 // final StyledXYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme); | 132 final StyledXYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme); |
132 // series.putMetaData(metaData, artifact, context); | 133 series.putMetaData(metaData, artifact, context); |
133 // | 134 |
134 // final String facetName = bundle.getFacetName(); | 135 final String facetName = bundle.getFacetName(); |
135 // | 136 |
136 // final AbstractCalculationResult data = (AbstractCalculationResult) bundle.getData(context); | 137 // Create WQKms to use the step points method |
137 // if (data == null) { | 138 // REMARK: must have any values in w array; not sure whether the name is needed |
138 // // Check has been here before so we keep it for security reasons | 139 final WQKms wqkms = new WQKms(points[0], points[1], points[1], facetName); |
139 // // this should never happen though. | 140 |
140 // throw new IllegalStateException("Data is null for facet: " + facetName); | 141 StyledSeriesBuilder.addStepPointsKmQ(series, wqkms); |
141 // } | 142 |
142 // | 143 generator.addAxisSeries(series, getAxisName(), visible); |
143 // final double[][] points = generatePoints(context, artifact, data, facetName, resultType, | 144 |
144 // bundle.getFacet().getIndex()); | 145 return metaData.get("Y"); |
145 // | 146 } |
146 // if (gapDistance == null) | |
147 // StyledSeriesBuilder.addPoints(series, points, true); | |
148 // else | |
149 // StyledSeriesBuilder.addPoints(series, points, true, gapDistance); | |
150 // | |
151 // generator.addAxisSeries(series, getAxisName(), visible); | |
152 // | |
153 // return metaData.get("Y"); | |
154 // } | |
155 | 147 |
156 protected final String buildSeriesForTkh(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, | 148 protected final String buildSeriesForTkh(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, |
157 final boolean visible) { | 149 final boolean visible) { |
158 | 150 |
159 final AbstractTkhCalculationResult data = (AbstractTkhCalculationResult) getResult(generator, bundle); | 151 final AbstractTkhCalculationResult data = (AbstractTkhCalculationResult) getResult(generator, bundle); |
199 return movingAverage(radius, points); | 191 return movingAverage(radius, points); |
200 } | 192 } |
201 | 193 |
202 return points; | 194 return points; |
203 } | 195 } |
204 | |
205 // private double[][] generatePoints(final CallContext context, final Artifact artifact, final AbstractCalculationResult | |
206 // data, final String facetName, | |
207 // final IResultType resultType, final int index) { | |
208 // | |
209 // final double[][] points = data.getStationPoints(resultType, index); | |
210 // if (facetName.endsWith(".filtered")) { | |
211 // final Double radius = findRadius(context, artifact); | |
212 // return movingAverage(radius, points); | |
213 // } | |
214 // | |
215 // return points; | |
216 // } | |
217 | 196 |
218 private double[][] movingAverage(final Double radius, final double[][] points) { | 197 private double[][] movingAverage(final Double radius, final double[][] points) { |
219 | 198 |
220 if (radius == null) | 199 if (radius == null) |
221 return points; | 200 return points; |