[PATCH 2 of 2] issue1393: Handle bedheightdiff-facets in LS Generator
Wald Commits
scm-commit at wald.intevation.org
Mon Jul 29 11:50:00 CEST 2013
# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1375091763 -7200
# Node ID e568788f519dc28773345c96fce66182116494b1
# Parent a3b0a543d673b31c583161b3c6a4010ecd39ab6a
issue1393: Handle bedheightdiff-facets in LS Generator.
diff -r a3b0a543d673 -r e568788f519d artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java Mon Jul 29 11:55:35 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java Mon Jul 29 11:56:03 2013 +0200
@@ -16,7 +16,13 @@
import org.dive4elements.river.artifacts.model.FacetTypes;
import org.dive4elements.river.artifacts.model.WKms;
import org.dive4elements.river.artifacts.model.WQKms;
+
+import org.dive4elements.river.exports.process.Processor;
+import org.dive4elements.river.exports.process.BedDiffHeightYearProcessor;
+import org.dive4elements.river.exports.process.BedDiffYearProcessor;
+import org.dive4elements.river.exports.process.BedheightProcessor;
import org.dive4elements.river.exports.process.WOutProcessor;
+
import org.dive4elements.river.jfree.RiverAnnotation;
import org.dive4elements.river.jfree.StyledAreaSeriesCollection;
import org.dive4elements.river.jfree.StyledXYSeries;
@@ -333,9 +339,22 @@
return;
}
- WOutProcessor processor = new WOutProcessor();
- if (processor.canHandle(name)) {
- processor.doOut(this, artifactAndFacet, attr, visible, YAXIS.W.idx);
+ WOutProcessor wProcessor = new WOutProcessor();
+ Processor bedp = new BedheightProcessor();
+ Processor bdyProcessor = new BedDiffYearProcessor();
+ Processor bdhyProcessor = new BedDiffHeightYearProcessor();
+
+ if (wProcessor.canHandle(name)) {
+ wProcessor.doOut(this, artifactAndFacet, attr, visible, YAXIS.W.idx);
+ }
+ else if (bedp.canHandle(name)) {
+ bedp.doOut(this, artifactAndFacet, attr, visible, YAXIS.W.idx);
+ }
+ else if (bdyProcessor.canHandle(name)) {
+ bdyProcessor.doOut(this, artifactAndFacet, attr, visible, YAXIS.W.idx);
+ }
+ else if (bdhyProcessor.canHandle(name)) {
+ bdhyProcessor.doOut(this, artifactAndFacet, attr, visible, YAXIS.W.idx);
}
else if (name.equals(LONGITUDINAL_Q)) {
doQOut(
More information about the Dive4elements-commits
mailing list