# HG changeset patch # User Felix Wolfsteller # Date 1320924708 0 # Node ID b1df3e64d8f5f20217b7eaafaa98ab64a4bba137 # Parent dd7d6614747edaae31f6a1f838eb9688155ece3e Handle WQKm and WKm Facets in Discharge Longitudinal Sections. flys-artifacts/trunk@3216 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r dd7d6614747e -r b1df3e64d8f5 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Thu Nov 10 11:30:05 2011 +0000 +++ b/flys-artifacts/ChangeLog Thu Nov 10 11:31:48 2011 +0000 @@ -1,3 +1,8 @@ +2011-11-10 Felix Wolfsteller + + * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java: + Handle other WQKm and WKm Facets. + 2011-11-10 Felix Wolfsteller * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java diff -r dd7d6614747e -r b1df3e64d8f5 flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java Thu Nov 10 11:30:05 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java Thu Nov 10 11:31:48 2011 +0000 @@ -13,6 +13,7 @@ import de.intevation.flys.artifacts.FLYSArtifact; import de.intevation.flys.artifacts.model.WQCKms; import de.intevation.flys.artifacts.model.WQKms; +import de.intevation.flys.artifacts.model.WKms; import de.intevation.flys.jfree.FLYSAnnotation; @@ -56,23 +57,26 @@ FLYSArtifact flys = (FLYSArtifact) artifact; Facet f = flys.getNativeFacet(facet); - if (name.equals(DISCHARGE_LONGITUDINAL_W)) { + if (IS.WQ_KM(name)) { doWOut((WQKms) f.getData(artifact, context), facet, attr, visible); } else if (name.equals(DISCHARGE_LONGITUDINAL_Q)) { doQOut((WQKms) f.getData(artifact, context), facet, attr, visible); } - else if (name.equals(LONGITUDINAL_ANNOTATION)) { - doAnnotations((FLYSAnnotation) f.getData(artifact, context), - facet, attr, visible); - } - if (name.equals(DISCHARGE_LONGITUDINAL_C)) { + else if (name.equals(DISCHARGE_LONGITUDINAL_C)) { doCorrectedWOut( (WQCKms) f.getData(artifact, context), facet, attr, visible); } + else if (IS.W_KM(name)) { + doWOut((WKms) f.getData(artifact, context), facet, attr, visible); + } + else if (name.equals(LONGITUDINAL_ANNOTATION)) { + doAnnotations((FLYSAnnotation) f.getData(artifact, context), + facet, attr, visible); + } else { logger.warn("Unknown facet name: " + name); }