Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/exports/process/WOutProcessor.java @ 7113:099f9faf5bf9 generator-refactoring

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Process corrected WQkms (WQCKms) also in the WOutProcessor
author Andre Heinecke <aheinecke@intevation.de>
date Tue, 24 Sep 2013 11:42:04 +0200
parents 4cd6a87396d5
children e3333da25634
comparison
equal deleted inserted replaced
7112:7b88b87958ac 7113:099f9faf5bf9
14 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; 14 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
15 import org.dive4elements.artifacts.CallContext; 15 import org.dive4elements.artifacts.CallContext;
16 import org.dive4elements.river.artifacts.D4EArtifact; 16 import org.dive4elements.river.artifacts.D4EArtifact;
17 import org.dive4elements.river.artifacts.model.FacetTypes; 17 import org.dive4elements.river.artifacts.model.FacetTypes;
18 import org.dive4elements.river.artifacts.model.WKms; 18 import org.dive4elements.river.artifacts.model.WKms;
19 import org.dive4elements.river.artifacts.model.WQCKms;
19 import org.dive4elements.river.exports.StyledSeriesBuilder; 20 import org.dive4elements.river.exports.StyledSeriesBuilder;
20 import org.dive4elements.river.exports.XYChartGenerator; 21 import org.dive4elements.river.exports.XYChartGenerator;
21 import org.dive4elements.river.exports.DiagramGenerator; 22 import org.dive4elements.river.exports.DiagramGenerator;
22 import org.dive4elements.river.jfree.StyledAreaSeriesCollection; 23 import org.dive4elements.river.jfree.StyledAreaSeriesCollection;
23 import org.dive4elements.river.jfree.StyledXYSeries; 24 import org.dive4elements.river.jfree.StyledXYSeries;
45 DiagramGenerator generator, 46 DiagramGenerator generator,
46 ArtifactAndFacet bundle, 47 ArtifactAndFacet bundle,
47 ThemeDocument theme, 48 ThemeDocument theme,
48 boolean visible) { 49 boolean visible) {
49 CallContext context = generator.getCallContext(); 50 CallContext context = generator.getCallContext();
50 WKms wkms = (WKms) bundle.getData(context); 51 Object data = bundle.getData(context);
52 WKms wkms = (WKms) data;
51 53
52 logger.debug("doOut"); 54 logger.debug("Processing facet: " + bundle.getFacetName());
53 55
54 XYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme); 56 XYSeries series = new StyledXYSeries(bundle.getFacetDescription(), theme);
55 57
56 StyledSeriesBuilder.addPoints(series, wkms); 58 if (bundle.getFacetName().equals(FacetTypes.DISCHARGE_LONGITUDINAL_C)) {
59 // Add corrected values
60 WQCKms wqckms = (WQCKms) data;
61 int size = wqckms.size();
62 for (int i = 0; i < size; i++) {
63 series.add(wqckms.getKm(i), wqckms.getC(i), false);
64 }
65 } else {
66 StyledSeriesBuilder.addPoints(series, wkms);
67 }
57 generator.addAxisSeries(series, axisName, visible); 68 generator.addAxisSeries(series, axisName, visible);
58 69
59 // If a "band around the curve shall be drawn, add according area. 70 // If a "band around the curve shall be drawn, add according area.
60 double bandWidth = theme.parseBandWidth(); 71 double bandWidth = theme.parseBandWidth();
61 if (bandWidth > 0 ) { 72 if (bandWidth > 0 ) {
73 generator.addAreaSeries(area, axisName, visible); 84 generator.addAreaSeries(area, axisName, visible);
74 } 85 }
75 86
76 if (bundle.getFacetName().equals(FacetTypes.LONGITUDINAL_W) || 87 if (bundle.getFacetName().equals(FacetTypes.LONGITUDINAL_W) ||
77 bundle.getFacetName().equals(FacetTypes.DISCHARGE_LONGITUDINAL_W) || 88 bundle.getFacetName().equals(FacetTypes.DISCHARGE_LONGITUDINAL_W) ||
78 bundle.getFacetName().equals(FacetTypes.STATIC_WQKMS_W)) { 89 bundle.getFacetName().equals(FacetTypes.STATIC_WQKMS_W) ||
90 bundle.getFacetName().equals(FacetTypes.DISCHARGE_LONGITUDINAL_C)) {
79 /* Only use W values to check if the diagram should be inverted 91 /* Only use W values to check if the diagram should be inverted
80 * see flys/issue1290 for details */ 92 * see flys/issue1290 for details */
93 logger.debug("Check for RTL data: "+ wkms.guessRTLData());
81 generator.setInverted(wkms.guessRTLData()); 94 generator.setInverted(wkms.guessRTLData());
82 } 95 }
83 } 96 }
84 97
85 @Override 98 @Override
http://dive4elements.wald.intevation.org