diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCurveGenerator.java @ 9268:ae9dee74e43e

Fixed: current station of duration chart was not changed
author gernotbelger
date Wed, 18 Jul 2018 18:53:15 +0200
parents e5367900dd6d
children 740d65e4aa14
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCurveGenerator.java	Wed Jul 18 15:34:53 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCurveGenerator.java	Wed Jul 18 18:53:15 2018 +0200
@@ -10,6 +10,7 @@
 
 import java.awt.Font;
 import java.awt.geom.Point2D;
+import java.io.OutputStream;
 
 import org.apache.log4j.Logger;
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
@@ -18,6 +19,7 @@
 import org.dive4elements.river.artifacts.model.WQDay;
 import org.dive4elements.river.exports.IdentifiableNumberAxis;
 import org.dive4elements.river.exports.XYChartGenerator;
+import org.dive4elements.river.exports.fixings.FixChartGenerator;
 import org.dive4elements.river.jfree.Bounds;
 import org.dive4elements.river.jfree.RiverAnnotation;
 import org.dive4elements.river.jfree.StyledXYSeries;
@@ -27,6 +29,7 @@
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.data.Range;
 import org.jfree.data.xy.XYSeries;
+import org.w3c.dom.Document;
 
 /**
  * An OutGenerator that generates duration curves.
@@ -64,6 +67,13 @@
         super();
     }
 
+    @Override
+    public void init(final String outName, final Document request, final OutputStream out, final CallContext context) {
+        super.init(outName, request, out, context);
+
+        FixChartGenerator.initCurrentKm(request, context);
+    }
+
     /**
      * Create Axis for given index.
      *
@@ -88,10 +98,11 @@
     }
 
     @Override
-    protected String getDefaultChartSubtitle(final CallContext context) {
-
-        final double[] dist = getRange();
-        return msg(I18N_CHART_SUBTITLE, "", getRiverName(), dist[0]);
+    protected String getChartSubtitle(final CallContext context) {
+        // REMARK: can't use getDeaultChartSubtitle, because the standard implementation of getChartSubtitle will
+        // always use the subtitle from the settings, which will automatically be set during init.
+        final double currentKm = FixChartGenerator.getCurrentKm(context);
+        return msg(I18N_CHART_SUBTITLE, "", getRiverName(), currentKm);
     }
 
     @Override

http://dive4elements.wald.intevation.org