diff gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java @ 1050:7f3154331bc1

Use the chart size/height to export it to pdf. The chart's aspect ratio keeps alive if the size exceeds the maximum page size (issue290). gnv-artifacts/trunk@1124 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 25 May 2010 15:41:31 +0000
parents b5d852991cbf
children b30361464775
line wrap: on
line diff
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java	Tue May 25 13:57:48 2010 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/timeseries/TimeSeriesOutputState.java	Tue May 25 15:41:31 2010 +0000
@@ -375,6 +375,12 @@
                     );
                 }
                 else if (mode.equalsIgnoreCase("pdf")) {
+                    callContext.putContextValue("chart.width", chartWidth);
+                    callContext.putContextValue("chart.height", chartHeight);
+                    callContext.putContextValue("shapes.visible", sVisible);
+                    callContext.putContextValue("lines.visible", lVisible);
+                    callContext.putContextValue("locale", locale);
+
                     createPDF(
                         outputStream,
                         parameters,
@@ -384,9 +390,6 @@
                         uuid,
                         "A4",
                         true,
-                        lVisible,
-                        sVisible,
-                        locale,
                         callContext
                     );
                 }
@@ -846,9 +849,6 @@
         String       uuid,
         String       exportFormat,
         boolean      landscape,
-        boolean      linesVisible,
-        boolean      shapesVisible,
-        Locale       locale,
         CallContext  context
     ) {
         Chart chart = getChart(
@@ -858,10 +858,10 @@
             measurements,
             dates,
             getChartResult(uuid, context),
-            locale,
+            (Locale) context.getContextValue("locale"),
             uuid,
-            linesVisible,
-            shapesVisible,
+            Boolean.TRUE.equals(context.getContextValue("lines.visible")),
+            Boolean.TRUE.equals(context.getContextValue("shapes.visible")),
             context
         );
 
@@ -875,7 +875,8 @@
             chart.generateChart(),
             "A4",
             PDF_FORMAT_LANDSCAPE,
-            50F, 50F, 50F, 50F
+            50F, 50F, 50F, 50F,
+            context
         );
     }
 

http://dive4elements.wald.intevation.org