Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCurveGenerator.java @ 9556:9b8e8fc1f408
Use facetName in all processors as themeType for legend aggregation.
| author | gernotbelger |
|---|---|
| date | Tue, 23 Oct 2018 16:26:58 +0200 |
| parents | 929d645691ae |
| children | 9b39cfd39e59 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCurveGenerator.java Tue Oct 23 16:26:48 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCurveGenerator.java Tue Oct 23 16:26:58 2018 +0200 @@ -163,6 +163,11 @@ final CallContext context = getContext(); + // TODO: mainvalues.q + // TODO: mainvalues.w + // } else if (name.equals(MAINVALUES_Q) || name.equals(MAINVALUES_W)) { + // doAnnotations((RiverAnnotation) artifactFacet.getData(context), artifactFacet, attr, visible); + if (name.equals(DURATION_W)) { doWOut((WQDay) (artifactFacet.getData(context)), artifactFacet, attr, visible); } else if (name.equals(DURATION_Q)) { @@ -170,8 +175,9 @@ } else if (name.equals(FloodDurationCurveProcessor.FACET_FLOOD_DURATION_MAINVALUES_Q) || name.equals(FloodDurationCurveProcessor.FACET_FLOOD_DURATION_MAINVALUES_W)) { doAnnotations((RiverAnnotation) artifactFacet.getData(context), artifactFacet, attr, visible); - } - else if (FloodDurationCurveProcessor.isInfrastructureFacet(name) && (artifactFacet.getData(context) != null)) { + } else if (FloodDurationCurveProcessor.isInfrastructureFacet(name) && (artifactFacet.getData(context) != null)) { + doAnnotations((RiverAnnotation) artifactFacet.getData(context), artifactFacet, attr, visible); + } else if (name.equals(MAINVALUES_Q) || name.equals(MAINVALUES_W)) { doAnnotations((RiverAnnotation) artifactFacet.getData(context), artifactFacet, attr, visible); } // else if (name.equals(RELATIVE_POINT)) { @@ -195,7 +201,7 @@ protected void doWOut(final WQDay wqdays, final ArtifactAndFacet aaf, final ThemeDocument theme, final boolean visible) { // log.debug("DurationCurveGenerator.doWOut"); - final XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme); + final XYSeries series = new StyledXYSeries(aaf.getFacetName(), aaf.getFacetDescription(), theme); final int size = wqdays.size(); for (int i = 0; i < size; i++) { final int day = wqdays.getDay(i); @@ -208,7 +214,7 @@ protected void doPointOut(final Point2D point, final ArtifactAndFacet aandf, final ThemeDocument theme, final boolean visible) { // log.debug("DurationCurveGenerator.doPointOut"); - final XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme); + final XYSeries series = new StyledXYSeries(aandf.getFacetName(), aandf.getFacetDescription(), theme); series.add(point.getX(), point.getY()); addAxisSeries(series, YAXIS.W.idx, visible); } @@ -223,7 +229,7 @@ protected void doQOut(final WQDay wqdays, final ArtifactAndFacet aaf, final ThemeDocument theme, final boolean visible) { // log.debug("DurationCurveGenerator.doQOut"); - final XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme); + final XYSeries series = new StyledXYSeries(aaf.getFacetName(), aaf.getFacetDescription(), theme); final int size = wqdays.size(); for (int i = 0; i < size; i++) { final int day = wqdays.getDay(i);