diff flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartOutputTab.java @ 549:e74bf6bfeeb6

Use the same code to create the attribute document for the chart creation in ChartOutputService and ChartInfoService. flys-client/trunk@2060 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 07 Jun 2011 10:03:19 +0000
parents aff225e07720
children 6050d49eaba3
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartOutputTab.java	Mon Jun 06 11:56:15 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartOutputTab.java	Tue Jun 07 10:03:19 2011 +0000
@@ -1,6 +1,8 @@
 package de.intevation.flys.client.client.ui.chart;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.rpc.AsyncCallback;
@@ -156,6 +158,7 @@
         yrange[0] = upper[1];
         yrange[1] = lower[1];
 
+        updateTransformer();
         updateChartPanel();
     }
 
@@ -196,8 +199,6 @@
      * Updates the Transform2D object using the chart info service.
      */
     public void updateTransformer() {
-        Canvas chart = getChartPanel();
-
         Config config = Config.getInstance();
         String url    = config.getServerUrl();
         String locale = config.getLocale();
@@ -207,8 +208,7 @@
             url,
             locale,
             mode.getName(),
-            chart.getWidth(),
-            chart.getHeight(),
+            getChartAttributes(),
             new AsyncCallback<Transform2D>() {
                 public void onFailure(Throwable caught) {
                     GWT.log("ERROR: " + caught.getMessage());
@@ -347,5 +347,26 @@
 
         return imgUrl;
     }
+
+
+    public Map getChartAttributes() {
+        Map<String, String> attr = new HashMap<String, String>();
+
+        Canvas chart = getChartPanel();
+        attr.put("width", chart.getWidth().toString());
+        attr.put("height", chart.getHeight().toString());
+
+        if (xrange != null) {
+            attr.put("minx", Double.toString(xrange[0]));
+            attr.put("maxx", Double.toString(xrange[1]));
+        }
+
+        if (yrange != null) {
+            attr.put("miny", Double.toString(yrange[0]));
+            attr.put("maxy", Double.toString(yrange[1]));
+        }
+
+        return attr;
+    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

http://dive4elements.wald.intevation.org