diff artifacts/src/main/java/org/dive4elements/river/exports/ReferenceCurveGenerator.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 1cc7653ca84f
children
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ReferenceCurveGenerator.java	Tue Oct 23 16:26:48 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/ReferenceCurveGenerator.java	Tue Oct 23 16:26:58 2018 +0200
@@ -153,7 +153,7 @@
         final CallContext context = getContext();
         
         if (name.equals(facetName())) {
-            doReferenceOut(artifactFacet.getData(context), theme, visible);
+            doReferenceOut(name, artifactFacet.getData(context), theme, visible);
         }
         else if (FacetTypes.IS.MANUALPOINTS(name)) {
             doPoints(
@@ -191,6 +191,7 @@
 
     /** Register DataSeries with (maybe transformed) points. */
     public void doReferenceOut(
+        String facetName,
         Object        data,
         ThemeDocument theme,
         boolean       visible
@@ -205,7 +206,7 @@
 
         ApplyFunctionIterator iter = wwat.transform(ww, doNormalize());
 
-        XYSeries series = new StyledXYSeries(
+        XYSeries series = new StyledXYSeries(facetName,
             ww.getName(), false, theme);
 
         double [] values = new double[2];
@@ -228,7 +229,7 @@
         log.debug("ReferenceCurveGenerator.doPointOut");
 
         XYSeries series =
-            new StyledXYSeries(aandf.getFacetDescription(), theme);
+            new StyledXYSeries(aandf.getFacetName(),aandf.getFacetDescription(), theme);
 
         series.add(point.getX(), point.getY());
 

http://dive4elements.wald.intevation.org