#59056 - Render individual slideshow shapes

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1732974 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/poi/sl/draw/DrawFactory.java b/src/java/org/apache/poi/sl/draw/DrawFactory.java
index a7edeafbb074742ffabc1476a7bc8773a46e7f4d..d0584dadb3069bdcab860a932e1f7fd9a8011db9 100644 (file)
--- a/src/java/org/apache/poi/sl/draw/DrawFactory.java
+++ b/src/java/org/apache/poi/sl/draw/DrawFactory.java
@@ -19,6 +19,8 @@ package org.apache.poi.sl.draw;
 \r
 import java.awt.Graphics2D;\r
 import java.awt.font.TextLayout;\r
+import java.awt.geom.AffineTransform;\r
+import java.awt.geom.Rectangle2D;\r
 import java.text.AttributedString;\r
 import java.util.HashMap;\r
 import java.util.Map;\r
@@ -168,7 +170,41 @@ public class DrawFactory {
         return new DrawPaint(shape);\r
     }\r
 \r
+    /**\r
+     * Convenience method for drawing single shapes.\r
+     * For drawing whole slides, use {@link Slide#draw(Graphics2D)}\r
+     *\r
+     * @param graphics the graphics context to draw to\r
+     * @param shape the shape\r
+     * @param bounds the bounds within the graphics context to draw to \r
+     */\r
+    public void drawShape(Graphics2D graphics, Shape<?,?> shape, Rectangle2D bounds) {\r
+        Rectangle2D shapeBounds = shape.getAnchor();\r
+        if (shapeBounds.isEmpty() || (bounds != null && bounds.isEmpty())) {\r
+            return;\r
+        }\r
 \r
+        AffineTransform txg = (AffineTransform)graphics.getRenderingHint(Drawable.GROUP_TRANSFORM);\r
+        AffineTransform tx = new AffineTransform();\r
+        try {\r
+            if (bounds != null) {\r
+                double scaleX = bounds.getWidth()/shapeBounds.getWidth();\r
+                double scaleY = bounds.getHeight()/shapeBounds.getHeight();\r
+                tx.translate(bounds.getCenterX(), bounds.getCenterY());\r
+                tx.scale(scaleX, scaleY);\r
+                tx.translate(-shapeBounds.getCenterX(), -shapeBounds.getCenterY());\r
+            }\r
+            graphics.setRenderingHint(Drawable.GROUP_TRANSFORM, tx);\r
+            \r
+            Drawable d = getDrawable(shape);\r
+            d.applyTransform(graphics);\r
+            d.draw(graphics);\r
+        } finally {\r
+            graphics.setRenderingHint(Drawable.GROUP_TRANSFORM, txg);\r
+        }\r
+    }\r
+    \r
+    \r
     /**\r
      * Replace font families for Windows JVM 6, which contains a font rendering error.\r
      * This is likely to be removed, when POI upgrades to JDK 7\r

diff --git a/src/java/org/apache/poi/sl/usermodel/Shape.java b/src/java/org/apache/poi/sl/usermodel/Shape.java
index 4d053df6fefdc19490ab2911ec6cb3c29887f56f..0115f8b9a791b156d47de3775aec804a24aaf182 100644 (file)
--- a/src/java/org/apache/poi/sl/usermodel/Shape.java
+++ b/src/java/org/apache/poi/sl/usermodel/Shape.java
@@ -17,6 +17,7 @@
 
 package org.apache.poi.sl.usermodel;
 
+import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 
 public interface Shape<
@@ -24,17 +25,26 @@ public interface Shape<
     P extends TextParagraph<S,P,?>
 > {
        ShapeContainer<S,P> getParent();
-       
+
    /**
     * @return the sheet this shape belongs to
     */
    Sheet<S,P> getSheet();
-   
+
    /**
     * Returns the anchor (the bounding box rectangle) of this shape.
     * All coordinates are expressed in points (72 dpi).
     *
     * @return the anchor of this shape
     */
-   Rectangle2D getAnchor();   
+   Rectangle2D getAnchor();
+   
+   /**
+    * Convenience method to draw a single shape
+    *
+    * @param graphics the graphics context
+    * @param bounds the rectangle to fit the shape to.
+    *   if null, the bounds of the shape are used.
+    */
+   void draw(Graphics2D graphics, Rectangle2D bounds);
 }

diff --git a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
index b9f98c3a807766dbccaa4582f448bdd6411d96dd..29ca2e6541a8b41cc7b82e133547e3fb65dd31c3 100644 (file)
--- a/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
+++ b/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShape.java
@@ -19,6 +19,8 @@
 \r
 package org.apache.poi.xslf.usermodel;\r
 \r
+import java.awt.Graphics2D;\r
+import java.awt.geom.Rectangle2D;\r
 import java.io.IOException;\r
 import java.io.InputStream;\r
 import java.util.Arrays;\r
@@ -27,6 +29,7 @@ import java.util.Comparator;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;\r
 import org.apache.poi.openxml4j.opc.PackagePart;\r
 import org.apache.poi.openxml4j.opc.PackageRelationship;\r
+import org.apache.poi.sl.draw.DrawFactory;\r
 import org.apache.poi.sl.draw.DrawPaint;\r
 import org.apache.poi.sl.usermodel.ColorStyle;\r
 import org.apache.poi.sl.usermodel.PaintStyle;\r
@@ -537,4 +540,9 @@ public abstract class XSLFShape implements Shape<XSLFShape,XSLFTextParagraph> {
         }\r
         return (fillProps == null) ? null : selectPaint(fillProps, phClr, theme.getPackagePart());\r
     }\r
+    \r
+    @Override\r
+    public void draw(Graphics2D graphics, Rectangle2D bounds) {\r
+        DrawFactory.getInstance(graphics).drawShape(graphics, this, bounds);\r
+    }\r
 }
\ No newline at end of file

diff --git a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
index 12f781ee431e371beffd9d9796bd00169a85a848..ff53b50759e9ec0473b046b1eab8d8b071241a37 100644 (file)
--- a/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
+++ b/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
@@ -38,6 +38,7 @@ import org.apache.poi.hslf.record.ColorSchemeAtom;
 import org.apache.poi.hslf.record.HSLFEscherClientDataRecord;
 import org.apache.poi.hslf.record.Record;
 import org.apache.poi.hslf.record.RecordTypes;
+import org.apache.poi.sl.draw.DrawFactory;
 import org.apache.poi.sl.usermodel.FillStyle;
 import org.apache.poi.sl.usermodel.Shape;
 import org.apache.poi.sl.usermodel.ShapeContainer;
@@ -447,8 +448,9 @@ public abstract class HSLFShape implements Shape<HSLFShape,HSLFTextParagraph> {
         return getFill().getFillStyle();
     }
 
-    public void draw(Graphics2D graphics){
-        logger.log(POILogger.INFO, "Rendering " + getShapeName());
+    @Override
+    public void draw(Graphics2D graphics, Rectangle2D bounds){
+        DrawFactory.getInstance(graphics).drawShape(graphics, this, bounds);
     }
 
     public AbstractEscherOptRecord getEscherOptRecord() {

diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
index e3b2683e531a054b923b27db053f0db9b28afd63..612c714810d9a4c16994186f80a23cd259ee08f1 100644 (file)
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
@@ -24,6 +24,9 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -52,6 +55,7 @@ import org.apache.poi.hslf.record.SlideListWithText;
 import org.apache.poi.hslf.record.SlideListWithText.SlideAtomsSet;
 import org.apache.poi.hslf.record.TextHeaderAtom;
 import org.apache.poi.hssf.usermodel.DummyGraphics2d;
+import org.apache.poi.sl.draw.DrawFactory;
 import org.apache.poi.sl.draw.DrawPaint;
 import org.apache.poi.sl.draw.DrawTextParagraph;
 import org.apache.poi.sl.usermodel.PaintStyle;
@@ -879,6 +883,26 @@ public final class TestBugs {
         
         ppt.close();
     }
+
+    @Test
+    public void bug59056() throws IOException {
+        HSLFSlideShow ppt = open("54541_cropped_bitmap.ppt");
+        
+        for (HSLFShape shape : ppt.getSlides().get(0).getShapes()) {
+            BufferedImage img = new BufferedImage(500, 300, BufferedImage.TYPE_INT_ARGB);
+            Graphics2D graphics = img.createGraphics();
+            Rectangle2D box = new Rectangle2D.Double(50,50,300,100);
+            graphics.setPaint(Color.red);
+            graphics.fill(box);
+            box = new Rectangle2D.Double(box.getX()+1,box.getY()+1,box.getWidth()-2,box.getHeight()-2);
+            DrawFactory.getInstance(graphics).drawShape(graphics, shape, box);
+            graphics.dispose();
+            // ImageIO.write(img, "png", new File("bla"+shape.getShapeId()+".png"));
+        }
+            
+        ppt.close();
+        
+    }
     
     private static HSLFSlideShow open(String fileName) throws IOException {
         File sample = HSLFTestDataSamples.getSampleFile(fileName);

diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java
index 08d6c64211367d1b15b5994a9b30efc0c843e7a1..7a7a7b452d891ce4bf66357dd84106967d3dbdd7 100644 (file)
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestPicture.java
@@ -27,6 +27,7 @@ import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -106,13 +107,14 @@ public final class TestPicture {
         HSLFPictureData pd = HSLFPictureData.create(PictureType.PNG);
         
         HSLFPictureShape pict = new HSLFPictureShape(pd); //index to non-existing picture data
+        pict.setAnchor(new Rectangle2D.Double(50,50,100,100));
         pict.setSheet(slide);
         HSLFPictureData data = pict.getPictureData();
         assertNull(data);
 
         BufferedImage img = new BufferedImage(100, 100, BufferedImage.TYPE_INT_RGB);
         Graphics2D graphics = img.createGraphics();
-        pict.draw(graphics);
+        pict.draw(graphics, null);
         
         ppt.close();
     }