comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/AbstractSInfoLineProcessor.java @ 9123:1cc7653ca84f

Cleanup of ChartGenerator and ChartGenerator2 code. Put some of the copy/pasted code into a common abstraction.
author gernotbelger
date Tue, 05 Jun 2018 19:21:16 +0200
parents ee5ce13016ed
children 23945061daec
comparison
equal deleted inserted replaced
9122:b8e7f6becf78 9123:1cc7653ca84f
29 import org.dive4elements.river.jfree.StyledXYSeries; 29 import org.dive4elements.river.jfree.StyledXYSeries;
30 import org.dive4elements.river.themes.ThemeDocument; 30 import org.dive4elements.river.themes.ThemeDocument;
31 31
32 abstract class AbstractSInfoLineProcessor<RESULT extends AbstractSInfoCalculationResult> extends AbstractSInfoProcessor { 32 abstract class AbstractSInfoLineProcessor<RESULT extends AbstractSInfoCalculationResult> extends AbstractSInfoProcessor {
33 33
34 private static final double GAP_DISTANCE = 0.101;
35
34 public AbstractSInfoLineProcessor(final String i18nAxisLabel, final Set<String> handledFacetType) { 36 public AbstractSInfoLineProcessor(final String i18nAxisLabel, final Set<String> handledFacetType) {
35 super(i18nAxisLabel, handledFacetType); 37 super(i18nAxisLabel, handledFacetType);
36 } 38 }
37 39
38 @Override 40 @Override
39 protected final String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) { 41 protected final String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
40 42
41 final CallContext context = generator.getCallContext(); 43 final CallContext context = generator.getContext();
42 final Map<String, String> metaData = bundle.getFacet().getMetaData(); 44 final Map<String, String> metaData = bundle.getFacet().getMetaData();
43 45
44 final Artifact artifact = bundle.getArtifact(); 46 final Artifact artifact = bundle.getArtifact();
45 47
46 final StyledXYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme); 48 final StyledXYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme);
55 throw new IllegalStateException("Data is null for facet: " + facetName); 57 throw new IllegalStateException("Data is null for facet: " + facetName);
56 } 58 }
57 59
58 final double[][] points = generatePoints(context, artifact, data, facetName); 60 final double[][] points = generatePoints(context, artifact, data, facetName);
59 61
60 StyledSeriesBuilder.addPoints(series, points, true); 62 StyledSeriesBuilder.addPoints(series, points, true, GAP_DISTANCE);
61 generator.addAxisSeries(series, getAxisName(), visible); 63 generator.addAxisSeries(series, getAxisName(), visible);
62 64
63 return metaData.get("Y"); 65 return metaData.get("Y");
64 } 66 }
65 67

http://dive4elements.wald.intevation.org