# HG changeset patch # User Felix Wolfsteller # Date 1328712353 0 # Node ID 300d50f74dab7d0f76174861e52ddc2a5a49c1ec # Parent bc23341bf3221d67f20a48c00ac1f87af3d82bd1 Handle manual points in discharge curve generator. flys-artifacts/trunk@3970 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r bc23341bf322 -r 300d50f74dab flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Wed Feb 08 14:37:35 2012 +0000 +++ b/flys-artifacts/ChangeLog Wed Feb 08 14:45:53 2012 +0000 @@ -1,3 +1,8 @@ +2012-02-08 Felix Wolfsteller + + * src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java: + Handle Manual Point Facets, added TODO. + 2012-02-08 Felix Wolfsteller * src/main/java/de/intevation/flys/artifacts/model/CrossSectionFacet.java: diff -r bc23341bf322 -r 300d50f74dab flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java Wed Feb 08 14:37:35 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java Wed Feb 08 14:45:53 2012 +0000 @@ -27,6 +27,7 @@ import de.intevation.flys.jfree.FLYSAnnotation; import de.intevation.flys.jfree.StyledXYSeries; + /** * An OutGenerator that generates discharge curves. * @@ -112,6 +113,7 @@ } + /* TODO is this one really needed? */ @Override protected boolean zoomX(XYPlot plot, ValueAxis axis, Range range, Range x) { boolean zoomin = super.zoom(plot, axis, range, x); @@ -123,6 +125,7 @@ return zoomin; } + /** * Create Y-Axis. * First Axis: W. @@ -167,6 +170,11 @@ doAnnotations((FLYSAnnotation) artifactFacet.getData(context), artifactFacet.getFacet(), theme, visible); } + else if (FacetTypes.IS.MANUALPOINTS(name)) { + doPoints(artifactFacet.getData(context), + artifactFacet.getFacetDescription(), + theme, visible, YAXIS.W.idx); + } else { logger.warn("DischargeCurveGenerator.doOut: Unknown facet name: " + name); return;