# HG changeset patch # User Felix Wolfsteller # Date 1337867820 0 # Node ID de60d1dfdcdf129ad3172cdefabef633833b0477 # Parent 1ddfb54e5db651eb97c36d28ec72a779b65bcbde Let Generators handle slightly more types. flys-artifacts/trunk@4508 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 1ddfb54e5db6 -r de60d1dfdcdf flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Thu May 24 13:54:37 2012 +0000 +++ b/flys-artifacts/ChangeLog Thu May 24 13:57:00 2012 +0000 @@ -1,3 +1,11 @@ +2012-05-24 Felix Wolfsteller + + * src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java: + Render mainvalues as annotations. + + * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: + Render static wkms data. + 2012-05-24 Felix Wolfsteller * src/main/java/de/intevation/flys/exports/XYChartGenerator.java: diff -r 1ddfb54e5db6 -r de60d1dfdcdf flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java Thu May 24 13:54:37 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java Thu May 24 13:57:00 2012 +0000 @@ -142,6 +142,13 @@ attr, visible); } + else if (name.equals(STATIC_WKMS)) { + doWAnnotations( + artifactFacet.getData(context), + artifactFacet, + attr, + visible); + } else if (FacetTypes.IS.MANUALPOINTS(name)) { doPoints(artifactFacet.getData(context), artifactFacet, diff -r 1ddfb54e5db6 -r de60d1dfdcdf flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java Thu May 24 13:54:37 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ReferenceCurveGenerator.java Thu May 24 13:57:00 2012 +0000 @@ -25,6 +25,7 @@ import de.intevation.flys.artifacts.model.WWAxisTypes; import de.intevation.flys.jfree.StyledXYSeries; +import de.intevation.flys.jfree.FLYSAnnotation; import de.intevation.flys.utils.Formatter; @@ -176,6 +177,14 @@ theme, visible); } + else if (name.equals(MAINVALUES_W)) { + doAnnotations( + ((FLYSAnnotation) artifactFacet.getData(context)).flipStickyAxis(), + artifactFacet, + theme, + visible); + + } else { logger.warn("Unknown facet name: " + name); }