Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java @ 1812:dd084cf3f284
Refactored to allow mainvalues in discharge curve diagrams, too.
flys-artifacts/trunk@3141 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 02 Nov 2011 12:12:48 +0000 |
| parents | eb35570df0e8 |
| children | dabd2ac83159 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java Wed Nov 02 11:30:26 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java Wed Nov 02 12:12:48 2011 +0000 @@ -101,11 +101,13 @@ if (name.equals(COMPUTED_DISCHARGE_Q)) { doQOut((WQKms) f.getData(artifact, context), facet, attr, visible); } - else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_Q)) { + else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_Q) + || name.equals(MAINVALUES_Q)) { doMainValueQAnnotations( f.getData(artifact, context), facet, attr, visible); } - else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_W)) { + else if (name.equals(COMPUTED_DISCHARGE_MAINVALUES_W) + || name.equals(MAINVALUES_W)) { doMainValueWAnnotations( f.getData(artifact, context), facet, attr, visible); } @@ -117,42 +119,6 @@ /** - * Store W MainValues as annotations for later plotting. - */ - protected void doMainValueWAnnotations( - Object o, - Facet facet, - Document theme, - boolean visible - ) { - logger.debug("ComputedDischargeCurveGenerator set W MainValues."); - - FLYSAnnotation fa = (FLYSAnnotation) o; - fa.setTheme(theme); - fa.setLabel(facet.getDescription()); - addAnnotations(fa, visible); - } - - - /** - * Store Q MainValues as annotations for later plotting. - */ - protected void doMainValueQAnnotations( - Object o, - Facet facet, - Document theme, - boolean visible - ) { - logger.debug("ComputedDischargeCurveGenerator set Q MainValues."); - - FLYSAnnotation fa = (FLYSAnnotation) o; - fa.setTheme(theme); - fa.setLabel(facet.getDescription()); - addAnnotations(fa, visible); - } - - - /** * Add Q-Series to plot. * @param wqkms actual data * @param theme theme to use.