Changeset 1078 for trunk/docx4j/src/main/java/org/docx4j/model/images/WordXmlPicture.java

Timestamp:

02/23/10 06:32:26 (2 years ago)

Author:

jharrop

Message:

Support for WMF (but not EMF, yet) as SVG in HTML output.

File:

• trunk/docx4j/src/main/java/org/docx4j/model/images/WordXmlPicture.java (modified) (7 diffs)

trunk/docx4j/src/main/java/org/docx4j/model/images/WordXmlPicture.java

@@ -28 +28 @@
 import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPartAbstractImage;
+import org.docx4j.openpackaging.parts.WordprocessingML.MetafileEmfPart;
+import org.docx4j.openpackaging.parts.WordprocessingML.MetafilePart;
+import org.docx4j.openpackaging.parts.WordprocessingML.MetafileWmfPart;
 import org.docx4j.openpackaging.parts.WordprocessingML.BinaryPartAbstractImage.CxCy;
+import org.docx4j.openpackaging.parts.WordprocessingML.MetafileWmfPart.SvgDocument;
 import org.docx4j.relationships.Relationship;
 import org.docx4j.wml.SectPr;
 import org.w3c.dom.Document;
 import org.w3c.dom.DocumentFragment;
+import org.w3c.dom.Element;
 import org.w3c.dom.Node;
+import org.w3c.dom.Text;
 import org.w3c.dom.css.CSSPrimitiveValue;
 import org.w3c.dom.css.CSSStyleDeclaration;
@@ -58 +64 @@
     Node imageElement = null;
     Node linkElement = null;
+    
+    private MetafilePart metaFile;
 
     /** Extension function to create an HTML <img> element
@@ -80 +88 @@
                          picLink,  linkData, true);
         
-        Document d = picture.createHtmlImageElement();
-
-                DocumentFragment docfrag = d.createDocumentFragment();
+        return getHtmlDocumentFragment(picture);
+
+    }
+    
+    public static DocumentFragment getHtmlDocumentFragment(WordXmlPicture picture) {
+        
+        DocumentFragment docfrag=null;
+        Document d=null;
+        try {
+                if (picture==null) {
+                        log.warn("picture was null!");
+                DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();        
+                         try {
+                                d = factory.newDocumentBuilder().newDocument();
+                        } catch (ParserConfigurationException e1) {
+                                // TODO Auto-generated catch block
+                                e1.printStackTrace();
+                        }
+                        Element span = d.createElement("span");
+                        span.setAttribute("style", "color:red;");
+                        d.appendChild(span);
+                        
+                        Text err = d.createTextNode( "[null img]" );
+                        span.appendChild(err);
+                
+                } else if (picture.metaFile==null) {
+                                // Usual case           
+                            d = picture.createHtmlImageElement();
+                        } else if (picture.metaFile instanceof MetafileWmfPart) {
+                                
+                                SvgDocument svgdoc = ((MetafileWmfPart)picture.metaFile).toSVG();
+                                d = svgdoc.getDomDocument();
+                                
+                        } else if (picture.metaFile instanceof MetafileEmfPart) {
+                                
+                        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();        
+                                 d = factory.newDocumentBuilder().newDocument();
+                                
+                                //log.info("Document: " + document.getClass().getName() );
+
+                                Node span = d.createElement("span");                    
+                                d.appendChild(span);
+                                
+                                Text err = d.createTextNode( "[TODO emf image]" );
+                                span.appendChild(err);
+                                
+                        }
+                } catch (Exception e) {
+                        log.error(e);
+                DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();        
+                         try {
+                                d = factory.newDocumentBuilder().newDocument();
+                        } catch (ParserConfigurationException e1) {
+                                // TODO Auto-generated catch block
+                                e1.printStackTrace();
+                        }
+                        Element span = d.createElement("span");
+                        span.setAttribute("style", "color:red;");
+                        d.appendChild(span);
+                        
+                        Text err = d.createTextNode( e.getMessage() );
+                        span.appendChild(err);
+                }
+                docfrag = d.createDocumentFragment();
                 docfrag.appendChild(d.getDocumentElement());
-
                 return docfrag;
     }
@@ -179 +247 @@
                 if (rel.getTargetMode() == null
                                                 || rel.getTargetMode().equals("Internal")) {
-
-                        BinaryPartAbstractImage part = (BinaryPartAbstractImage)wmlPackage.getMainDocumentPart()
-                                                        .getRelationshipsPart().getPart(rel);
+                        
+                        
+                        BinaryPart part = (BinaryPart)wmlPackage.getMainDocumentPart()
+                                                .getRelationshipsPart().getPart(rel);
+                        
+                        if (part instanceof MetafilePart) {
+                                
+                                picture.metaFile = (MetafilePart)part;
+                                
+                        } else {
+
+                                BinaryPartAbstractImage imagepart = (BinaryPartAbstractImage)part;
+                                                
+                                                String uri = handlePart(imageDirPath, picture, imagepart);
+                                                // Scale it?  Shouldn't be necessary, since Word should
+                                                // be providing the height/width
+        //                                      try {
+        //                                              ImageInfo imageInfo = BinaryPartAbstractImage.getImageInfo(uri);
+        //                                              
+        //                                              List<SectionWrapper> sections = wmlPackage.getDocumentModel().getSections();
+        //                                              PageDimensions page = sections.get(sections.size()-1).getPageDimensions();
+        //                                              
+        //                                              picture.ensureFitsPage(imageInfo, page );
+        //                                      } catch (Exception e) {
+        //                                              e.printStackTrace();
+        //                                      }
+
+                        }
                                         
-                                        String uri = handlePart(imageDirPath, picture, part);
-                                        // Scale it?  Shouldn't be necessary, since Word should
-                                        // be providing the height/width
-//                                      try {
-//                                              ImageInfo imageInfo = BinaryPartAbstractImage.getImageInfo(uri);
-//                                              
-//                                              List<SectionWrapper> sections = wmlPackage.getDocumentModel().getSections();
-//                                              PageDimensions page = sections.get(sections.size()-1).getPageDimensions();
-//                                              
-//                                              picture.ensureFitsPage(imageInfo, page );
-//                                      } catch (Exception e) {
-//                                              e.printStackTrace();
-//                                      }
-
                                 } else { // External
                                         picture.setSrc(rel.getTarget());
+                                        
+                                        // TODO: handle external metafiles
                                 }
 
@@ -420 +501 @@
                          shape,  imageData, true);
         
-        if (picture==null) {
-                
-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-            Document d;
-                        try {
-                                d = factory.newDocumentBuilder().newDocument();
-                        return d.createDocumentFragment();
-                        } catch (ParserConfigurationException e) {
-                                log.error(e);
-                                return null;
-                        }  
-                        
-        } else {
-        
-                Document d = picture.createHtmlImageElement();
-        
-                        DocumentFragment docfrag = d.createDocumentFragment();
-                        docfrag.appendChild(d.getDocumentElement());
-        
-                        return docfrag;
-        }        
+        return getHtmlDocumentFragment(picture);
     }
 
@@ -526 +587 @@
                                 || rel.getTargetMode().equals("Internal") ) {
                         
-                        BinaryPartAbstractImage part = (BinaryPartAbstractImage)wmlPackage.getMainDocumentPart()
+                        BinaryPart part = (BinaryPartAbstractImage)wmlPackage.getMainDocumentPart()
                                         .getRelationshipsPart().getPart(rel);
-                                String uri = handlePart(imageDirPath, picture, part);
+                        
+                        if (part instanceof MetafilePart) {
+                                
+                                picture.metaFile = (MetafilePart)part;
+                                
+                        } else {
+                        
+                        BinaryPartAbstractImage imagepart = (BinaryPartAbstractImage)part;                              
+                        String uri = handlePart(imageDirPath, picture, imagepart);
                                 
                                 // Scale it?  Shouldn't be necessary, since Word should
@@ -542 +611 @@
 //                                      e.printStackTrace();
 //                              }
-                                
+                        }                               
                         
                 } else {