diff flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java @ 924:f7761914f745

An initial implementation to render chart series based on the XML configuration in themes.xml. flys-artifacts/trunk@2276 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Fri, 01 Jul 2011 14:46:13 +0000
parents 7ca4a287cd0e
children 0cb1a70b8b92
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java	Fri Jul 01 11:16:11 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java	Fri Jul 01 14:46:13 2011 +0000
@@ -1,11 +1,7 @@
 package de.intevation.flys.exports;
 
-import java.awt.Color;
-
 import org.apache.log4j.Logger;
 
-import org.jfree.chart.plot.XYPlot;
-import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer;
 import org.jfree.data.xy.XYSeries;
 
 import org.w3c.dom.Document;
@@ -38,32 +34,6 @@
 
 
     @Override
-    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();
-
-        //for (int i = 0; i < cwNum; i++) {
-        //    rcw.setSeriesPaint(i, Color.RED);
-        //}
-
-        //plot.setRenderer(2, rcw);
-    }
-
-
-    @Override
     public void doOut(Artifact artifact, Facet facet, Document attr) {
         logger.debug("DischargeLongitudinalSectionGenerator.doOut");
 
@@ -81,13 +51,13 @@
         Facet        f    = flys.getNativeFacet(facet);
 
         if (name.equals(DISCHARGE_LONGITUDINAL_W)) {
-            doWOut((WQKms) f.getData(artifact, context));
+            doWOut((WQKms) f.getData(artifact, context), attr);
         }
         else if (name.equals(DISCHARGE_LONGITUDINAL_Q)) {
-            doQOut((WQKms) f.getData(artifact, context));
+            doQOut((WQKms) f.getData(artifact, context), attr);
         }
         else if (name.equals(DISCHARGE_LONGITUDINAL_C)) {
-            doCorrectedWOut((WQCKms) f.getData(artifact, context));
+            doCorrectedWOut((WQCKms) f.getData(artifact, context), attr);
         }
         else {
             logger.warn("Unknown facet name: " + name);
@@ -99,14 +69,18 @@
      * Adds a new series for the corrected W curve.
      *
      * @param wqckms The object that contains the corrected W values.
+     * @param theme The theme that contains styling information.
      */
-    protected void doCorrectedWOut(WQCKms wqckms) {
+    protected void doCorrectedWOut(WQCKms wqckms, Document theme) {
         logger.debug("DischargeLongitudinalSectionGenerator.doCorrectedWOut");
 
         int size = wqckms.size();
 
         if (size > 0) {
-            XYSeries series = new XYSeries(getSeriesNameForCorrected(wqckms, "W"));
+            XYSeries series = new StyledXYSeries(
+                getSeriesNameForCorrected(wqckms, "W"),
+                theme);
+
             for (int i = 0; i < size; i++) {
                 series.add(wqckms.getKms(i), wqckms.getC(i));
             }

http://dive4elements.wald.intevation.org