diff flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java @ 923:7ca4a287cd0e

#135 Modified the way to store datasets for different chart axes. flys-artifacts/trunk@2275 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Fri, 01 Jul 2011 11:16:11 +0000
parents f959faaa7c4a
children f7761914f745
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java	Fri Jul 01 08:33:52 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java	Fri Jul 01 11:16:11 2011 +0000
@@ -4,11 +4,9 @@
 
 import org.apache.log4j.Logger;
 
-import org.jfree.chart.JFreeChart;
 import org.jfree.chart.plot.XYPlot;
 import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
 import org.jfree.data.xy.XYSeries;
-import org.jfree.data.xy.XYSeriesCollection;
 
 import org.w3c.dom.Document;
 
@@ -33,24 +31,9 @@
         Logger.getLogger(DischargeLongitudinalSectionGenerator.class);
 
 
-    /** The storage for the corrected W series to be drawn in this chart.*/
-    protected XYSeriesCollection cw;
-
 
     public DischargeLongitudinalSectionGenerator() {
         super();
-
-        this.cw = new XYSeriesCollection();
-    }
-
-
-    @Override
-    public void addDatasets(JFreeChart chart) {
-        super.addDatasets(chart);
-
-        XYPlot plot = (XYPlot) chart.getPlot();
-
-        plot.setDataset(2, cw);
     }
 
 
@@ -58,36 +41,28 @@
     protected void adjustPlot(XYPlot plot) {
         super.adjustPlot(plot);
 
-        // TODO REMOVE THIS CODE, IF WE HAVE INTRODUCED THEMES!
-        XYLineAndShapeRenderer rw = (XYLineAndShapeRenderer)
-            plot.getRendererForDataset(w);
-
-        XYLineAndShapeRenderer rcw = null;
-        try {
-            rcw = (XYLineAndShapeRenderer) rw.clone();
-        }
-        catch (Exception e) {
-            logger.error(e, e);
-        }
-
-        int cwNum = cw.getSeriesCount();
+        //// TODO REMOVE THIS CODE, IF WE HAVE INTRODUCED THEMES!
+        //XYLineAndShapeRenderer rw = (XYLineAndShapeRenderer)
+        //    plot.getRendererForDataset(w);
 
-        for (int i = 0; i < cwNum; i++) {
-            rcw.setSeriesPaint(i, Color.RED);
-        }
-
-        plot.setRenderer(2, rcw);
-    }
+        //XYLineAndShapeRenderer rcw = null;
+        //try {
+        //    rcw = (XYLineAndShapeRenderer) rw.clone();
+        //}
+        //catch (Exception e) {
+        //    logger.error(e, e);
+        //}
 
+        //int cwNum = cw.getSeriesCount();
 
-    protected void adjustAxes(XYPlot plot) {
-        super.adjustAxes(plot);
+        //for (int i = 0; i < cwNum; i++) {
+        //    rcw.setSeriesPaint(i, Color.RED);
+        //}
 
-        plot.mapDatasetToRangeAxis(2, 0);
+        //plot.setRenderer(2, rcw);
     }
 
 
-
     @Override
     public void doOut(Artifact artifact, Facet facet, Document attr) {
         logger.debug("DischargeLongitudinalSectionGenerator.doOut");
@@ -135,7 +110,8 @@
             for (int i = 0; i < size; i++) {
                 series.add(wqckms.getKms(i), wqckms.getC(i));
             }
-            cw.addSeries(series);
+
+            addFirstAxisSeries(series);
         }
 
         if (wqckms.guessWaterIncreasing()) {

http://dive4elements.wald.intevation.org