Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/process/FlowVelocityProcessor.java @ 8730:cb33de3434a8
(issue1754) Proper subtitle handling for Radius
This deduplicates the subtitle and zoom / radius calculation code
by moving it out of the processors. Doing this fixes cases where
the subtitle would be removed when a the according filtered facet
was removed although it should still have shown the Range for example.
Range is now also added as a subtitle for the difference diagrams.
This adds some tasty hack (with cheese) to determine wether or
not the user has set the subtitle. See the comment in
getChartSubtitlePure in LongitudinalSectionGenerator2 for details.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Thu, 30 Apr 2015 13:06:51 +0200 |
| parents | e4606eae8ea5 |
| children | 8dbb969091c5 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/FlowVelocityProcessor.java Thu Apr 30 13:02:37 2015 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/FlowVelocityProcessor.java Thu Apr 30 13:06:51 2015 +0200 @@ -15,10 +15,7 @@ import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.D4EArtifact; -import org.dive4elements.river.artifacts.access.RiverAccess; -import org.dive4elements.river.artifacts.context.RiverContext; import org.dive4elements.river.artifacts.model.FacetTypes; -import org.dive4elements.river.artifacts.model.ZoomScale; import org.dive4elements.river.exports.DiagramGenerator; import org.dive4elements.river.exports.StyledSeriesBuilder; import org.dive4elements.river.jfree.StyledXYSeries; @@ -37,9 +34,6 @@ "chart.flow_velocity.section.yaxis.label"; public static final String I18N_AXIS_LABEL_DEFAULT = "Geschwindigkeit v [m/s]"; - public static final String I18N_SUBTITLE_RADIUS = - "chart.subtitle.radius"; - protected String yAxisLabel; @@ -82,24 +76,6 @@ return; } StyledSeriesBuilder.addPoints(series, points, true); - Double start = (Double)context.getContextValue("startkm"); - Double end = (Double)context.getContextValue("endkm"); - if (start != null && end != null) { - log.debug("start: " + start + " end: " + end); - D4EArtifact artifact = (D4EArtifact)bundle.getArtifact(); - RiverContext fc = (RiverContext)context.globalContext(); - // Adaptive smoothing, based on zoom factor/diagram extents. - ZoomScale scales = (ZoomScale)fc.get("zoomscale"); - RiverAccess access = new RiverAccess((D4EArtifact)artifact); - String river = access.getRiverName(); - - double radius = scales.getRadius(river, start, end); - context.putContextValue("radius", radius); - generator.addSubtitle(Resources.getMsg( - context.getMeta(), - I18N_SUBTITLE_RADIUS, - new Object[] { "$RADIUS" })); - } generator.addAxisSeries(series, axisName, visible); }