diff artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.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 740d65e4aa14
children
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java	Tue Oct 23 16:26:48 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java	Tue Oct 23 16:26:58 2018 +0200
@@ -161,7 +161,7 @@
 
     /**
      * Gets key to look up internationalized String for the charts subtitle.
-     * 
+     *
      * @return key to look up translated subtitle.
      */
     protected String getChartSubtitleKey() {
@@ -171,7 +171,7 @@
     /**
      * Gets key to look up internationalized String for the charts short
      * subtitle.
-     * 
+     *
      * @return key to look up translated subtitle.
      */
     protected String getChartShortSubtitleKey() {
@@ -216,7 +216,7 @@
 
     /**
      * Create Axis for given index.
-     * 
+     *
      * @return axis with according internationalized label.
      */
     @Override
@@ -274,7 +274,7 @@
 
     /**
      * Produce output.
-     * 
+     *
      * @param artifactAndFacet
      *            current facet and artifact.
      * @param attr
@@ -338,7 +338,7 @@
             return;
         }
 
-        final XYSeries series = new StyledXYSeries(aandf.getFacetDescription(), theme);
+        final XYSeries series = new StyledXYSeries(aandf.getFacetName(), aandf.getFacetDescription(), theme);
 
         if (log.isDebugEnabled()) {
             if (wkms.size() > 0) {
@@ -356,7 +356,7 @@
 
     /**
      * Get name of series (displayed in legend).
-     * 
+     *
      * @return name of the series.
      */
     protected String getSeriesName(final WQKms wqkms, final String mode) {
@@ -380,7 +380,7 @@
 
     /**
      * Do Area out.
-     * 
+     *
      * @param theme
      *            styling information.
      * @param visible
@@ -388,7 +388,10 @@
      */
     protected void doArea(final Object o, final ArtifactAndFacet aandf, final ThemeDocument theme, final boolean visible) {
         log.debug("LongitudinalSectionGenerator.doArea");
-        final StyledAreaSeriesCollection area = new StyledAreaSeriesCollection(theme);
+
+        final String facetName = aandf.getFacetName();
+
+        final StyledAreaSeriesCollection area = new StyledAreaSeriesCollection(facetName, theme);
 
         final String seriesName = aandf.getFacetDescription();
 
@@ -398,7 +401,7 @@
         XYSeries down = null;
 
         if (data.getUpperData() != null) {
-            up = new StyledXYSeries(seriesName, false, theme);
+            up = new StyledXYSeries(facetName, seriesName, false, theme);
             if (data.getUpperData() instanceof WQKms) {
                 if (FacetTypes.IS.Q(data.getUpperFacetName())) {
                     StyledSeriesBuilder.addPointsKmQ(up, (WQKms) data.getUpperData());
@@ -422,7 +425,7 @@
         if (data.getLowerData() != null) {
             // TODO: Sort this out: when the two series have the same name,
             // the renderer (or anything in between) will not work correctly.
-            down = new StyledXYSeries(seriesName + " ", false, theme);
+            down = new StyledXYSeries(facetName, seriesName + " ", false, theme);
             if (data.getLowerData() instanceof WQKms) {
                 if (FacetTypes.IS.Q(data.getLowerFacetName())) {
                     StyledSeriesBuilder.addPointsKmQ(down, (WQKms) data.getLowerData());

http://dive4elements.wald.intevation.org