# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1267000526 0
# Node ID 800874dc0b29710044a195afaa27afa793cde39b
# Parent  bd67164cf28baf7c7d47925d8348596a5d75d2b8
Add histogram option parameter to http request for fetching histogram image.

gnv/trunk@705 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r bd67164cf28b -r 800874dc0b29 gnv/ChangeLog
--- a/gnv/ChangeLog	Tue Feb 23 17:43:16 2010 +0000
+++ b/gnv/ChangeLog	Wed Feb 24 08:35:26 2010 +0000
@@ -1,3 +1,9 @@
+2010-02-24  Ingo Weinzierl <ingo.weinzierl@intevation.de>
+
+	* src/main/webapp/WEB-INF/jsp/includes/display_histogram_inc.jsp: Append
+	  user inserted parameter from histogram options (width, height,  bin width,
+	  number of bins) to http request when fetching the histogram image.
+
 2010-02-23  Ingo Weinzierl <ingo.weinzierl@intevation.de>
 
 	* src/main/java/de/intevation/gnv/artifactdatabase/objects/DefaultOutputMode.java,
diff -r bd67164cf28b -r 800874dc0b29 gnv/src/main/webapp/WEB-INF/jsp/includes/display_histogram_inc.jsp
--- a/gnv/src/main/webapp/WEB-INF/jsp/includes/display_histogram_inc.jsp	Tue Feb 23 17:43:16 2010 +0000
+++ b/gnv/src/main/webapp/WEB-INF/jsp/includes/display_histogram_inc.jsp	Wed Feb 24 08:35:26 2010 +0000
@@ -2,14 +2,30 @@
 <%@ taglib uri="http://jakarta.apache.org/struts/tags-bean-el" prefix="bean-el" %>
 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModel"%>
 <%@page import="de.intevation.gnv.action.sessionmodel.SessionModelFactory"%>
+<%@page import="de.intevation.gnv.action.sessionmodel.DiagrammOptions"%>
+<%@page import="de.intevation.gnv.artifactdatabase.objects.OutputParameter"%>
+<%@page import="java.util.Collection"%>
+<%@page import="java.util.Iterator"%>
 <%
     SessionModel sm = SessionModelFactory.getInstance().getSessionModel(request);
 
-    String target   = "histogram";
-    String mimeType = sm.getOutputMode(target).getMimeType();
+    String parameterString = "";
+    String target          = "histogram";
+    String mimeType        = sm.getOutputMode(target).getMimeType();
+
+    DiagrammOptions diagrammOptions = sm.getDiagrammOptions();
+    Collection<OutputParameter> op  = sm.getOutputMode(target).getOutputParameters();
+
+    if (op != null){
+        Iterator<OutputParameter> it = op.iterator();
+        while (it.hasNext()){
+            OutputParameter parameter = it.next(); 
+            parameterString = parameterString +"&amp;"+parameter.getName()+"="+(diagrammOptions != null ? diagrammOptions.getValue(parameter.getName()): parameter.getValue());
+        }
+    }
 %>
 
 <jsp:include page="/WEB-INF/jsp/includes/display_histogram_options_inc.jsp"></jsp:include>
 <div class="histogram">
-    <img src='<%=response.encodeURL("out.do?mimetype="+mimeType+"&amp;target=histogram&amp;uid="+System.currentTimeMillis())%>' alt='<bean:message key="gnviewer.output.options.histogram.alt"/>'/>
+    <img src='<%=response.encodeURL("out.do?mimetype="+mimeType+"&amp;target=histogram"+parameterString+"&amp;uid="+System.currentTimeMillis())%>' alt='<bean:message key="gnviewer.output.options.histogram.alt"/>'/>
 </div>