Changeset 6541 in main

Timestamp:

06/12/14 00:14:39 (7 years ago)

Author:

Garth Braithwaite

Message:

java and view - added svg to raster servlet

Location:

trunk

Files:

• ibisph-admin/src/main/webapp/WEB-INF/lib/ibisph-2.3.0.jar (modified) (previous)
• ibisph-view/src/main/webapp/WEB-INF/lib/ibisph-2.3.0.jar (modified) (previous)
• ibisph-view/src/main/webapp/WEB-INF/web.xml (modified) (2 diffs)
• ibisph-view/src/main/webapp/xslt/html/LeafletMapGraphic.xslt (modified) (1 diff)
• ibisph-view/src/main/webapp/xslt/html/indicator/profile/Kendo.xslt (modified) (1 diff)
• ibisph-view/src/main/webapp/xslt/html/indicator/profile/view_complete/SiteSpecific.xslt (modified) (3 diffs)
• ibisph/src/main/java/org/ibisph/util/XMLLib.java (modified) (2 diffs)
• ibisph/src/main/java/org/ibisph/web/servlet/SVGToRasterServlet.java (added)
• release_notes.doc (modified) (previous)

trunk/ibisph-view/src/main/webapp/WEB-INF/web.xml

@@ -193 +193 @@
         </servlet>
 
+        <servlet>
+                <description>
+                        Converts posted SVG to an image.
+                </description>
+                <servlet-name>svgToImageServlet</servlet-name>
+                <servlet-class>org.ibisph.web.servlet.SVGToRasterServlet</servlet-class>
+        </servlet>
 
         <!-- ======================================= S E R V L E T   M A P P I N G S -->
@@ -256 +263 @@
                 <servlet-name>captchaServlet</servlet-name>
                 <url-pattern>/captcha/*</url-pattern>
+        </servlet-mapping>
+
+        <servlet-mapping>
+                <servlet-name>svgToImageServlet</servlet-name>
+                <url-pattern>/svgtoimage/*</url-pattern>
         </servlet-mapping>
 

trunk/ibisph-view/src/main/webapp/xslt/html/LeafletMapGraphic.xslt

@@ -80 +80 @@
                         <div id="{$mapContainerID}"></div>
                 </div><br/>
+                <input type="button" onclick="getMapImage()" value="Convert to PNG"/>
+
         </xsl:template>
 

trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/Kendo.xslt

@@ -70 +70 @@
                         <div id="chart">Chart place holder...</div>
                 </div>
+
+                <input type="button" onclick="getChartImage()" value="Convert to PNG"/>
+                <div id="rasterImage"/>
 
                 <script type="text/javascript">

trunk/ibisph-view/src/main/webapp/xslt/html/indicator/profile/view_complete/SiteSpecific.xslt

@@ -124 +124 @@
                 // has to all be within the ready because the elements *MIGHT* not be defined in the DOM...
                         // another solution is to simply have the xslt build the options and then pass the options...
+var kendoChart;
                         $(document).ready(function()
                         {
@@ -129 +130 @@
 
                                 $("#grid").kendoGrid(baseKendoGridOptionsJSON);
-                                $("#chart").kendoChart(baseKendoChartOptionsJSON);
+                                kendoChart = $("#chart").kendoChart(baseKendoChartOptionsJSON);
                                 kendoDataSource.read();         // have to have after grid and chart because .autoBind = false.
 
@@ -139 +140 @@
         
                         }); //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ End of Function ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+                        function getChartImage()
+                        {
+                                var svg = kendoChart.data("kendoChart").svg();
+                                getImage(svg);
+                        }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ End of Function ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+                        function getMapImage()
+                        {
+<![CDATA[
+                                var svg = "<?xml version='1.0'?>" + $(".leaflet-overlay-pane").html();
+                                svg = svg.replace("<?xml version='1.0'?><svg", "<?xml version='1.0'?><svg xmlns='http://www.w3.org/2000/svg' version='1.1' ");
+                                getImage(svg);
+]]>
+                        }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ End of Function ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+                        function getImage(svg)
+                        {
+//svg = $(svg).replaceAll("stroke=''", "");
+alert("SVG: " +svg);
+
+                                this.xhr = $.ajax({
+                                        type: "POST"
+                                        ,url: "http://localhost/ibisph-view/svgtoimage/download.png"
+                                        ,crossDomain: true
+                                        ,headers: {
+                                                "accept": "image/png"
+                                                ,"content-Type": "image/svg+xml"
+                                        }
+                                        ,data: svg 
+                                        ,success: function(data, textStatus, jqXHR)
+                                        {
+                                                console.log("Converting SVG to Image - success status: "+ textStatus);
+                                                insertImageData(data);
+                                        }
+                                        ,error: function (jqXHR, textStatus, errorThrown)
+                                        {
+                                                console.log("Converting SVG to Image - ERROR: "+ errorThrown+", Status: ", textStatus);
+                                        }
+                                        //      ,dataType: "xml"
+                                });
+                        }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ End of Function ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
+                        function insertImageData(imageData)
+                        {
+<![CDATA[
+                                var imgSrc  = "data:image/png;base64," + imageData;
+                                var imgHTML = "<img src=\"" + imgSrc + "\"/>";
+                                $("#rasterImage").html(imgHTML);
+]]>
+                        }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ End of Function ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
                 </script>
         </xsl:template>

trunk/ibisph/src/main/java/org/ibisph/util/XMLLib.java

@@ -1 +1 @@
 package org.ibisph.util;
 
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
@@ -52 +53 @@
     throws TransformerException
   {
-    org.w3c.dom.Document w3cQueryModuleDocument = null;
+    org.w3c.dom.Document w3cDocument = null;
     SAXSource source = new DocumentSource(dom4jDocument);
     DOMResult result = new DOMResult(); 
     Transformer transformer =  TransformerFactory.newInstance().newTransformer(); 
     transformer.transform(source, result);
-    w3cQueryModuleDocument = (org.w3c.dom.Document)result.getNode();
-    return(w3cQueryModuleDocument);
-  } //------------------------------ End of Method ---------------------------
-  
-  
-  
-  
+    w3cDocument = (org.w3c.dom.Document)result.getNode();
+    return(w3cDocument);
+  } //------------------------------ End of Method ---------------------------
+
+
+  public static org.w3c.dom.Document getW3CDocument(String xml) throws org.xml.sax.SAXException, java.io.IOException {
+    return( getW3CDocument(new java.io.ByteArrayInputStream(xml.getBytes())) );
+  } //------------------------------ End of Method ---------------------------
+
+  public static org.w3c.dom.Document getW3CDocument(InputStream inputStream) 
+    throws org.xml.sax.SAXException, java.io.IOException 
+  {
+    javax.xml.parsers.DocumentBuilderFactory factory = javax.xml.parsers.DocumentBuilderFactory.newInstance();
+    factory.setNamespaceAware(true);
+    javax.xml.parsers.DocumentBuilder builder = null;
+    try {
+      builder = factory.newDocumentBuilder();
+    }
+    catch(javax.xml.parsers.ParserConfigurationException ex) {
+    }  
+    org.w3c.dom.Document document = builder.parse(inputStream);
+    inputStream.close();
+    return document;
+  } //------------------------------ End of Method ---------------------------
+
+
   /**
    * Localizes the parsing of an XML String into a new element.