Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/process/BedDiffHeightYearProcessor.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 | aef7542dd3ca |
| children | 8dbb969091c5 |
comparison
equal
deleted
inserted
replaced
| 8729:88b831b7bead | 8730:cb33de3434a8 |
|---|---|
| 15 | 15 |
| 16 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; | 16 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; |
| 17 import org.dive4elements.artifacts.CallContext; | 17 import org.dive4elements.artifacts.CallContext; |
| 18 import org.dive4elements.river.artifacts.D4EArtifact; | 18 import org.dive4elements.river.artifacts.D4EArtifact; |
| 19 import org.dive4elements.river.artifacts.access.RiverAccess; | 19 import org.dive4elements.river.artifacts.access.RiverAccess; |
| 20 import org.dive4elements.river.artifacts.context.RiverContext; | |
| 21 import org.dive4elements.river.artifacts.model.FacetTypes; | 20 import org.dive4elements.river.artifacts.model.FacetTypes; |
| 22 import org.dive4elements.river.artifacts.model.ZoomScale; | |
| 23 import org.dive4elements.river.artifacts.resources.Resources; | 21 import org.dive4elements.river.artifacts.resources.Resources; |
| 24 import org.dive4elements.river.exports.StyledSeriesBuilder; | 22 import org.dive4elements.river.exports.StyledSeriesBuilder; |
| 25 import org.dive4elements.river.exports.DiagramGenerator; | 23 import org.dive4elements.river.exports.DiagramGenerator; |
| 26 import org.dive4elements.river.exports.XYChartGenerator; | 24 import org.dive4elements.river.exports.XYChartGenerator; |
| 27 import org.dive4elements.river.jfree.StyledXYSeries; | 25 import org.dive4elements.river.jfree.StyledXYSeries; |
| 38 | 36 |
| 39 public static final String I18N_AXIS_LABEL = | 37 public static final String I18N_AXIS_LABEL = |
| 40 "chart.beddifference.height.yaxis.label"; | 38 "chart.beddifference.height.yaxis.label"; |
| 41 public static final String I18N_AXIS_LABEL_DEFAULT = | 39 public static final String I18N_AXIS_LABEL_DEFAULT = |
| 42 "delta S [cm / Jahr]"; | 40 "delta S [cm / Jahr]"; |
| 43 public static final String I18N_SUBTITLE_RADIUS = | |
| 44 "chart.subtitle.radius"; | |
| 45 | 41 |
| 46 @Override | 42 @Override |
| 47 public void doOut( | 43 public void doOut( |
| 48 DiagramGenerator generator, | 44 DiagramGenerator generator, |
| 49 ArtifactAndFacet bundle, | 45 ArtifactAndFacet bundle, |
| 59 // Should not happen if canHandle is correct | 55 // Should not happen if canHandle is correct |
| 60 log.error("Can't process " + data.getClass().getName() + " objects"); | 56 log.error("Can't process " + data.getClass().getName() + " objects"); |
| 61 return; | 57 return; |
| 62 } | 58 } |
| 63 | 59 |
| 64 setSubtitleRadius(generator, bundle, context); | |
| 65 | |
| 66 double[][] bData = (double[][]) data; | 60 double[][] bData = (double[][]) data; |
| 67 | 61 |
| 68 StyledXYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme); | 62 StyledXYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme); |
| 69 series.putMetaData(metaData, bundle.getArtifact(), context); | 63 series.putMetaData(metaData, bundle.getArtifact(), context); |
| 70 | 64 |
| 71 StyledSeriesBuilder.addPoints(series, bData, false, GAP_TOLERANCE); | 65 StyledSeriesBuilder.addPoints(series, bData, false, GAP_TOLERANCE); |
| 72 | 66 |
| 73 generator.addAxisSeries(series, axisName, visible); | 67 generator.addAxisSeries(series, axisName, visible); |
| 74 } | |
| 75 | |
| 76 private void setSubtitleRadius( | |
| 77 DiagramGenerator generator, | |
| 78 ArtifactAndFacet bundle, | |
| 79 CallContext context | |
| 80 ) { | |
| 81 Double start = (Double)context.getContextValue("startkm"); | |
| 82 Double end = (Double)context.getContextValue("endkm"); | |
| 83 if (start != null && end != null) { | |
| 84 D4EArtifact artifact = (D4EArtifact)bundle.getArtifact(); | |
| 85 RiverContext fc = (RiverContext)context.globalContext(); | |
| 86 // Adaptive smoothing, based on zoom factor/diagram extents. | |
| 87 ZoomScale scales = (ZoomScale)fc.get("zoomscale"); | |
| 88 RiverAccess access = new RiverAccess((D4EArtifact)artifact); | |
| 89 String river = access.getRiverName(); | |
| 90 | |
| 91 double radius = scales.getRadius(river, start, end); | |
| 92 context.putContextValue("radius", radius); | |
| 93 generator.addSubtitle(Resources.getMsg( | |
| 94 context.getMeta(), | |
| 95 I18N_SUBTITLE_RADIUS, | |
| 96 new Object[] { "$RADIUS" })); | |
| 97 } | |
| 98 } | 68 } |
| 99 | 69 |
| 100 @Override | 70 @Override |
| 101 public void doOut( | 71 public void doOut( |
| 102 XYChartGenerator generator, | 72 XYChartGenerator generator, |