diff gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java @ 334:e37930705daa

Changed the way of adding data to charts. Same parameters have one axis - not each parameter its own one. gnv-artifacts/trunk@400 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Mon, 07 Dec 2009 17:03:24 +0000
parents 1c427acb6c76
children
line wrap: on
line diff
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java	Mon Dec 07 10:33:31 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java	Mon Dec 07 17:03:24 2009 +0000
@@ -13,6 +13,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Vector;
 
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerConfigurationException;
@@ -222,7 +223,7 @@
                     "browser locales -  is " + locale.toString()
                 );
 
-                Collection parameters   = this.getParameters(uuid);
+                Collection parameters   = this.getCleanedParameters(uuid);
                 Collection measurements = this.getMeasurements(uuid);
                 Collection dates        = this.getDates(uuid);
 
@@ -272,7 +273,7 @@
 
                 createPDF(
                     outputStream,
-                    getParameters(uuid),
+                    getCleanedParameters(uuid),
                     getMeasurements(uuid),
                     getDates(uuid),
                     new ChartLabels(
@@ -308,7 +309,7 @@
 
                 createSVG(
                     outputStream,
-                    getParameters(uuid),
+                    getCleanedParameters(uuid),
                     getMeasurements(uuid),
                     getDates(uuid),
                     new ChartLabels(
@@ -374,6 +375,24 @@
     }
 
 
+    protected Collection getCleanedParameters(Collection parameters) {
+        Iterator iter        = parameters.iterator();
+        Collection parameter = new Vector(parameters);
+        while (iter.hasNext()) {
+            KeyValueDescibeData data = (KeyValueDescibeData)iter.next();
+            if (!data.isSelected())
+                parameter.remove(data);
+        }
+
+        return parameter;
+    }
+
+
+    protected Collection getCleanedParameters(String uuid) {
+        return getCleanedParameters(getParameters(uuid));
+    }
+
+
     /**
      * @param outputStream
      * @param chartResult

http://dive4elements.wald.intevation.org