diff artifacts/src/main/java/org/dive4elements/river/exports/DischargeCurveGenerator.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/DischargeCurveGenerator.java	Tue Oct 23 16:26:48 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/DischargeCurveGenerator.java	Tue Oct 23 16:26:58 2018 +0200
@@ -238,7 +238,7 @@
             // In Base DischargeCurveGenerator, always at gauge, use WCm axis.
             dProcessor.doOut(this, artifactFacet, theme, visible, YAXIS.WCm.idx);
         } else if (name.equals(DISCHARGE_CURVE) || name.equals(GAUGE_DISCHARGE_CURVE)) {
-            doDischargeOut((D4EArtifact) artifactFacet.getArtifact(), artifactFacet.getData(context), artifactFacet.getFacetDescription(), theme, visible);
+            doDischargeOut(artifactFacet.getFacetName(),(D4EArtifact) artifactFacet.getArtifact(), artifactFacet.getData(context), artifactFacet.getFacetDescription(), theme, visible);
         } else if (FacetTypes.IS.MANUALPOINTS(name)) {
             doPoints(artifactFacet.getData(context), artifactFacet, theme, visible, YAXIS.W.idx);
         } else if (STATIC_WQ.equals(name)) {
@@ -251,8 +251,9 @@
 
     /**
      * Add series with discharge curve to diagram.
+     * @param string 
      */
-    protected void doDischargeOut(final D4EArtifact artifact, final Object o, final String description, final ThemeDocument theme, final boolean visible) {
+    protected void doDischargeOut(String facetName, final D4EArtifact artifact, final Object o, final String description, final ThemeDocument theme, final boolean visible) {
         log.debug("DischargeCurveGenerator.doDischargeOut");
         final WQKms wqkms = (WQKms) o;
 
@@ -272,7 +273,7 @@
             return;
         }
 
-        final XYSeries series = new StyledXYSeries(description, theme);
+        final XYSeries series = new StyledXYSeries(facetName, description, theme);
 
         StyledSeriesBuilder.addPointsQW(series, wqkms);
 
@@ -289,7 +290,7 @@
      */
     protected void doQOut(final Object wqkms, final ArtifactAndFacet aaf, final ThemeDocument theme, final boolean visible) {
         log.debug("DischargeCurveGenerator: doQOut (add W/Q data).");
-        final XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), theme);
+        final XYSeries series = new StyledXYSeries(aaf.getFacetName(), aaf.getFacetDescription(), theme);
 
         StyledSeriesBuilder.addPointsQW(series, (WQKms) wqkms);
 
@@ -356,7 +357,7 @@
         }
 
         // Otherwise add points.
-        final XYSeries series = new StyledXYSeries(title, theme);
+        final XYSeries series = new StyledXYSeries(aaf.getFacetName(),title, theme);
 
         if (translate != 0d) {
             StyledSeriesBuilder.addPointsQW(series, data, -translate, 100d);

http://dive4elements.wald.intevation.org