comparison artifacts/src/main/java/org/dive4elements/river/exports/DischargeLongitudinalSectionGenerator.java @ 6930:750ce031e8e0

DischargeLongitudinalSectionGenerator: Use QOutProcessor, fix compilation.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Tue, 27 Aug 2013 16:16:13 +0200
parents 1b35b2ddfc28
children 2b022ca95b3b
comparison
equal deleted inserted replaced
6929:35ecfd1a861a 6930:750ce031e8e0
17 17
18 import org.dive4elements.river.artifacts.model.FacetTypes; 18 import org.dive4elements.river.artifacts.model.FacetTypes;
19 import org.dive4elements.river.artifacts.model.WQCKms; 19 import org.dive4elements.river.artifacts.model.WQCKms;
20 import org.dive4elements.river.artifacts.model.WQKms; 20 import org.dive4elements.river.artifacts.model.WQKms;
21 import org.dive4elements.river.exports.process.Processor; 21 import org.dive4elements.river.exports.process.Processor;
22 import org.dive4elements.river.exports.process.QOutProcessor;
22 import org.dive4elements.river.exports.process.WOutProcessor; 23 import org.dive4elements.river.exports.process.WOutProcessor;
23 24
24 import org.dive4elements.river.jfree.RiverAnnotation; 25 import org.dive4elements.river.jfree.RiverAnnotation;
25 import org.dive4elements.river.jfree.StyledXYSeries; 26 import org.dive4elements.river.jfree.StyledXYSeries;
26 import org.dive4elements.river.themes.ThemeDocument; 27 import org.dive4elements.river.themes.ThemeDocument;
59 return; 60 return;
60 } 61 }
61 62
62 Facet facet = artifactFacet.getFacet(); 63 Facet facet = artifactFacet.getFacet();
63 64
64 if (name.contains(DISCHARGE_LONGITUDINAL_Q)) { 65 if (name.equals(DISCHARGE_LONGITUDINAL_C)) {
65 doQOut(
66 (WQKms) artifactFacet.getData(context),
67 artifactFacet,
68 attr,
69 visible);
70 }
71 else if (name.equals(DISCHARGE_LONGITUDINAL_C)) {
72 doCorrectedWOut( 66 doCorrectedWOut(
73 (WQCKms) artifactFacet.getData(context), 67 (WQCKms) artifactFacet.getData(context),
74 facet, 68 facet,
75 attr, 69 attr,
76 visible); 70 visible);
82 else if (FacetTypes.IS.MANUALPOINTS(name)) { 76 else if (FacetTypes.IS.MANUALPOINTS(name)) {
83 doPoints(artifactFacet.getData(context), 77 doPoints(artifactFacet.getData(context),
84 artifactFacet, 78 artifactFacet,
85 attr, visible, YAXIS.W.idx); 79 attr, visible, YAXIS.W.idx);
86 } 80 }
87 else if (name.equals(STATIC_WQKMS_Q)) {
88 doQOut(
89 (WQKms) artifactFacet.getData(context),
90 artifactFacet,
91 attr,
92 visible);
93 }
94 else { 81 else {
95 Processor processor = new WOutProcessor(); 82 Processor processor = new WOutProcessor();
83 Processor qProcessor = new QOutProcessor();
96 if (processor.canHandle(name)) { 84 if (processor.canHandle(name)) {
97 processor.doOut(this, artifactFacet, attr, visible, YAXIS.W.idx); 85 processor.doOut(this, artifactFacet, attr, visible, YAXIS.W.idx);
86 }
87 else if (qProcessor.canHandle(name)) {
88 qProcessor.doOut(this, artifactFacet, attr, visible, YAXIS.Q.idx);
98 } 89 }
99 else { 90 else {
100 logger.warn("Unknown facet name: " + name); 91 logger.warn("Unknown facet name: " + name);
101 } 92 }
102 } 93 }

http://dive4elements.wald.intevation.org