Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/process/AreaProcessor.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 | d8e753d0fdb9 |
| children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/process/AreaProcessor.java Tue Oct 23 16:26:48 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/process/AreaProcessor.java Tue Oct 23 16:26:58 2018 +0200 @@ -34,6 +34,7 @@ private static final Logger log = Logger.getLogger(AreaProcessor.class); protected XYSeries getSeries( + String facetName, String seriesName, Object data, String facetType, @@ -43,7 +44,7 @@ return null; } - XYSeries series = new StyledXYSeries(seriesName, false, theme); + XYSeries series = new StyledXYSeries(facetName,seriesName, false, theme); if (facetType.equals(FacetTypes.DISCHARGE_LONGITUDINAL_C)) { WQCKms wqckms = (WQCKms) data; @@ -85,7 +86,7 @@ boolean visible) { CallContext context = generator.getContext(); String seriesName = bundle.getFacetDescription(); - StyledAreaSeriesCollection area = new StyledAreaSeriesCollection(theme); + StyledAreaSeriesCollection area = new StyledAreaSeriesCollection(bundle.getFacetName(),theme); log.debug("Area Processor processing: " + seriesName); @@ -94,9 +95,9 @@ String lowerFacetName = data.getLowerFacetName(); String upperFacetName = data.getUpperFacetName(); - XYSeries up = getSeries( + XYSeries up = getSeries(bundle.getFacetName(), seriesName, data.getUpperData(), upperFacetName, theme); - XYSeries down = getSeries( + XYSeries down = getSeries(bundle.getFacetName(), seriesName + " ", data.getLowerData(), lowerFacetName, theme);