Mercurial > dive4elements > gnv-client
diff gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java @ 327:22a6493e8460
New options in chart template: visibility of lines and points in charts and point's size.
gnv-artifacts/trunk@393 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Wed, 02 Dec 2009 10:50:12 +0000 |
| parents | 3eff9241ea1e |
| children | 1c427acb6c76 |
line wrap: on
line diff
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java Tue Dec 01 16:27:56 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/transition/timeseries/TimeSeriesOutputTransition.java Wed Dec 02 10:50:12 2009 +0000 @@ -218,6 +218,10 @@ String exportFormat = getExportFormat(mimeType); + // TODO Remove this and parse input data + boolean linesVisible = true; + boolean shapesVisible = true; + PreferredLocale[] locales = callMeta.getLanguages(); Locale[] serverLocales = RessourceFactory.getInstance().getLocales(); @@ -239,7 +243,9 @@ exportFormat, locale, chartWidth, - chartHeight + chartHeight, + linesVisible, + shapesVisible ); } else if (outputMode.equalsIgnoreCase("pdf")) { @@ -250,6 +256,10 @@ Locale locale = callMeta.getPreferredLocale(serverLocales); + // TODO Remove this and parse input data + boolean linesVisible = true; + boolean shapesVisible = true; + log.debug( "Best locale - regarding intersection of server and " + "browser locales - is " + locale.toString() @@ -267,7 +277,9 @@ uuid, "A4", true, - locale + locale, + linesVisible, + shapesVisible ); } else if (outputMode.equalsIgnoreCase("svg")) { @@ -275,6 +287,10 @@ int width = 600; int height = 400; + // TODO Remove this and parse input data + boolean linesVisible = true; + boolean shapesVisible = true; + Locale[] serverLocales = RessourceFactory.getInstance().getLocales(); Locale locale = @@ -297,7 +313,9 @@ uuid, locale, width, - height + height, + linesVisible, + shapesVisible ); } else if (outputMode.equalsIgnoreCase("csv")) { @@ -473,7 +491,9 @@ String exportFormat, Locale locale, int width, - int height + int height, + boolean linesVisible, + boolean shapesVisible ) throws IOException, TechnicalChartException { @@ -485,7 +505,9 @@ dates, getChartResult(uuid), locale, // Locale - uuid + uuid, + linesVisible, + shapesVisible ); if (chart == null) { @@ -517,7 +539,9 @@ String uuid, String exportFormat, boolean landscape, - Locale locale + Locale locale, + boolean linesVisible, + boolean shapesVisible ) { Chart chart = getChart( chartLables, @@ -526,7 +550,9 @@ dates, getChartResult(uuid), locale, - uuid + uuid, + linesVisible, + shapesVisible ); if (chart == null) { @@ -566,7 +592,9 @@ String uuid, Locale locale, int width, - int height + int height, + boolean linesVisible, + boolean shapesVisible ) { Chart chart = getChart( chartLables, @@ -575,7 +603,9 @@ dates, getChartResult(uuid), locale, - uuid + uuid, + linesVisible, + shapesVisible ); if (chart == null) { @@ -601,7 +631,9 @@ Collection dates, Collection result, Locale locale, - String uuid + String uuid, + boolean linesVisible, + boolean shapesVisible ) { Chart chart = null; @@ -622,7 +654,9 @@ dates, result, timeGapDefinitions, - locale + locale, + linesVisible, + shapesVisible ); chart.generateChart();