You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ye...@apache.org on 2011/10/28 16:25:54 UTC

svn commit: r1190347 [2/2] - in /poi/trunk: src/ooxml/java/org/apache/poi/xslf/usermodel/ src/ooxml/testcases/org/apache/poi/xslf/usermodel/ src/ooxml/testcases/org/apache/poi/xwpf/usermodel/ test-data/slideshow/

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java?rev=1190347&r1=1190346&r2=1190347&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextParagraph.java Fri Oct 28 14:25:53 2011
@@ -19,28 +19,27 @@ package org.apache.poi.xslf.usermodel;
 import org.apache.poi.util.Beta;
 import org.apache.poi.util.Internal;
 import org.apache.poi.util.Units;
-import org.apache.poi.xslf.model.PropertyFetcher;
 import org.apache.poi.xslf.model.ParagraphPropertyFetcher;
 import org.apache.xmlbeans.XmlObject;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTRegularTextRun;
+import org.openxmlformats.schemas.drawingml.x2006.main.CTTextField;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraph;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTTextSpacing;
 import org.openxmlformats.schemas.drawingml.x2006.main.STTextAlignType;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextField;
 import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
 import org.openxmlformats.schemas.presentationml.x2006.main.STPlaceholderType;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
 import java.awt.*;
-import java.awt.geom.Rectangle2D;
-import java.awt.font.TextLayout;
-import java.awt.font.TextAttribute;
 import java.awt.font.LineBreakMeasurer;
-import java.text.AttributedString;
+import java.awt.font.TextAttribute;
+import java.awt.font.TextLayout;
+import java.awt.geom.Rectangle2D;
 import java.text.AttributedCharacterIterator;
+import java.text.AttributedString;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
 
 /**
  * Represents a paragraph of text within the containing text body.
@@ -187,7 +186,8 @@ public class XSLFTextParagraph implement
         ParagraphPropertyFetcher<Color> fetcher = new ParagraphPropertyFetcher<Color>(getLevel()){
             public boolean fetch(CTTextParagraphProperties props){
                 if(props.isSetBuClr()){
-                    setValue(theme.getColor(props.getBuClr()));
+                    XSLFColor c = new XSLFColor(props.getBuClr(), theme);
+                    setValue(c.getColor());
                     return true;
                 }
                 return false;
@@ -580,7 +580,7 @@ public class XSLFTextParagraph implement
 
             string.addAttribute(TextAttribute.FOREGROUND, run.getFontColor(), startIndex, endIndex);
             string.addAttribute(TextAttribute.FAMILY, run.getFontFamily(), startIndex, endIndex);
-            string.addAttribute(TextAttribute.SIZE, run.getFontSize(), startIndex, endIndex);
+            string.addAttribute(TextAttribute.SIZE, (float)run.getFontSize(), startIndex, endIndex);
             if(run.isBold()) {
                 string.addAttribute(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD, startIndex, endIndex);
             }
@@ -589,10 +589,17 @@ public class XSLFTextParagraph implement
             }
             if(run.isUnderline()) {
                 string.addAttribute(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON, startIndex, endIndex);
+                string.addAttribute(TextAttribute.INPUT_METHOD_UNDERLINE, TextAttribute.UNDERLINE_LOW_TWO_PIXEL, startIndex, endIndex);
             }
             if(run.isStrikethrough()) {
                 string.addAttribute(TextAttribute.STRIKETHROUGH, TextAttribute.STRIKETHROUGH_ON, startIndex, endIndex);
             }
+            if(run.isSubscript()) {
+                string.addAttribute(TextAttribute.SUPERSCRIPT, TextAttribute.SUPERSCRIPT_SUB, startIndex, endIndex);
+            }
+            if(run.isSuperscript()) {
+                string.addAttribute(TextAttribute.SUPERSCRIPT, TextAttribute.SUPERSCRIPT_SUPER, startIndex, endIndex);
+            }
 
             startIndex = endIndex;
         }
@@ -646,8 +653,8 @@ public class XSLFTextParagraph implement
                         bit.getAttribute(TextAttribute.FOREGROUND) : buColor);
                 str.addAttribute(TextAttribute.FAMILY, buFont);
 
-                double fontSize = (Double)bit.getAttribute(TextAttribute.SIZE);
-                double buSz = getBulletFontSize();
+                float fontSize = (Float)bit.getAttribute(TextAttribute.SIZE);
+                float buSz = (float)getBulletFontSize();
                 if(buSz > 0) fontSize *= buSz* 0.01;
                 else fontSize = -buSz;
 

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java?rev=1190347&r1=1190346&r2=1190347&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextRun.java Fri Oct 28 14:25:53 2011
@@ -18,17 +18,14 @@ package org.apache.poi.xslf.usermodel;
 
 import org.apache.poi.util.Beta;
 import org.apache.poi.xslf.model.CharacterPropertyFetcher;
-import org.apache.xmlbeans.XmlObject;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTRegularTextRun;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTSRgbColor;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTSolidColorFillProperties;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTTextFont;
+import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
 import org.openxmlformats.schemas.drawingml.x2006.main.STTextStrikeType;
 import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTTextParagraphProperties;
-import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
-import org.openxmlformats.schemas.presentationml.x2006.main.STPlaceholderType;
 
 import java.awt.*;
 
@@ -78,7 +75,8 @@ public class XSLFTextRun {
             public boolean fetch(CTTextCharacterProperties props){
                 CTSolidColorFillProperties solidFill = props.getSolidFill();
                 if(solidFill != null){
-                    setValue(theme.getSolidFillColor(solidFill));
+                    Color c = new XSLFColor(solidFill, theme).getColor();
+                    setValue(c);
                     return true;
                 }
                 return false;
@@ -203,6 +201,40 @@ public class XSLFTextRun {
     }
 
     /**
+     * @return whether a run of text will be formatted as a superscript text. Default is false.
+     */
+    public boolean isSuperscript() {
+        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){
+            public boolean fetch(CTTextCharacterProperties props){
+                if(props.isSetBaseline()){
+                    setValue(props.getBaseline() > 0);
+                    return true;
+                }
+                return false;
+            }
+        };
+        fetchCharacterProperty(fetcher);
+        return fetcher.getValue() == null ? false : fetcher.getValue();
+    }
+
+    /**
+     * @return whether a run of text will be formatted as a superscript text. Default is false.
+     */
+    public boolean isSubscript() {
+        CharacterPropertyFetcher<Boolean> fetcher = new CharacterPropertyFetcher<Boolean>(_p.getLevel()){
+            public boolean fetch(CTTextCharacterProperties props){
+                if(props.isSetBaseline()){
+                    setValue(props.getBaseline() < 0);
+                    return true;
+                }
+                return false;
+            }
+        };
+        fetchCharacterProperty(fetcher);
+        return fetcher.getValue() == null ? false : fetcher.getValue();
+    }
+
+    /**
      * Specifies whether this run of text will be formatted as bold text
      *
      * @param bold whether this run of text will be formatted as bold text
@@ -314,4 +346,4 @@ public class XSLFTextRun {
         return ok;
     }
 
-}
\ No newline at end of file
+}

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java?rev=1190347&r1=1190346&r2=1190347&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java Fri Oct 28 14:25:53 2011
@@ -23,9 +23,6 @@ import org.apache.poi.util.Beta;
 import org.apache.poi.util.Units;
 import org.apache.poi.xslf.model.PropertyFetcher;
 import org.apache.poi.xslf.model.TextBodyPropertyFetcher;
-import org.apache.poi.xslf.model.geom.Context;
-import org.apache.poi.xslf.model.geom.CustomGeometry;
-import org.apache.poi.xslf.model.geom.Path;
 import org.apache.xmlbeans.XmlObject;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBody;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTTextBodyProperties;
@@ -36,9 +33,8 @@ import org.openxmlformats.schemas.drawin
 import org.openxmlformats.schemas.presentationml.x2006.main.CTPlaceholder;
 
 import java.awt.*;
-import java.awt.geom.GeneralPath;
-import java.awt.image.BufferedImage;
 import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -392,19 +388,19 @@ public abstract class XSLFTextShape exte
         // shadow
         XSLFShadow shadow = getShadow();
 
-        Color fillColor = getFillColor();
-        Color lineColor = getLineColor();
+        Paint fill = getFill(graphics);
+        Paint line = getLinePaint(graphics);
         if(shadow != null) {
-        	//shadow.draw(graphics);
+        	shadow.draw(graphics);
         }
-        if (fillColor != null) {
-        	graphics.setColor(fillColor);
-            applyFill(graphics);
+
+        if(fill != null) {
+            graphics.setPaint(fill);
             graphics.fill(outline);
         }
 
-        if (lineColor != null){
-            graphics.setColor(lineColor);
+        if (line != null){
+            graphics.setPaint(line);
             applyStroke(graphics);
             graphics.draw(outline);
         }

Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java?rev=1190347&r1=1190346&r2=1190347&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTheme.java Fri Oct 28 14:25:53 2011
@@ -24,28 +24,22 @@ import org.apache.poi.util.Internal;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSchemeColor;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTBaseStyles;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTColor;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTColorScheme;
-import org.openxmlformats.schemas.drawingml.x2006.main.ThemeDocument;
 import org.openxmlformats.schemas.drawingml.x2006.main.CTOfficeStyleSheet;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSRgbColor;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTSolidColorFillProperties;
-import org.openxmlformats.schemas.drawingml.x2006.main.CTPresetColor;
+import org.openxmlformats.schemas.drawingml.x2006.main.ThemeDocument;
 
 import javax.xml.namespace.QName;
-
-import java.awt.Color;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Map;
 import java.util.HashMap;
+import java.util.Map;
 
 @Beta
 public class XSLFTheme extends POIXMLDocumentPart {
     private CTOfficeStyleSheet _theme;
-    private Map<String, XSLFColor> _schemeColors;
+    private Map<String, CTColor> _schemeColors;
     
     XSLFTheme() {
         super();
@@ -64,12 +58,13 @@ public class XSLFTheme extends POIXMLDoc
     	CTBaseStyles elems = _theme.getThemeElements();
     	CTColorScheme scheme = elems.getClrScheme();
     	// The color scheme is responsible for defining a list of twelve colors. 
-    	_schemeColors = new HashMap<String, XSLFColor>(12);
+    	_schemeColors = new HashMap<String, CTColor>(12);
     	for(XmlObject o : scheme.selectPath("*")){
     		CTColor c = (CTColor)o;
     		String name = c.getDomNode().getLocalName();
-    		_schemeColors.put(name, new XSLFColor(c));
+    		_schemeColors.put(name, c);
     	}
+
     	_schemeColors.put("bg1", _schemeColors.get("lt1"));
     	_schemeColors.put("bg2", _schemeColors.get("lt2"));
         _schemeColors.put("tx1", _schemeColors.get("dk1"));
@@ -89,141 +84,10 @@ public class XSLFTheme extends POIXMLDoc
      * 
      * @return a theme color or <code>null</code> if not found
      */
-    public XSLFColor getColor(String name){
+    CTColor getCTColor(String name){
     	return _schemeColors.get(name);
     }
     
-    Color getSchemeColor(CTSchemeColor schemeColor){
-        String colorRef = schemeColor.getVal().toString();
-        int alpha = 0xFF;
-        if(schemeColor.sizeOfAlphaArray() > 0){
-            int aval = schemeColor.getAlphaArray(0).getVal();
-            alpha =  Math.round(255 * aval / 100000f);
-        }
-        Color themeColor = _schemeColors.get(colorRef).getColor(alpha);
-
-        int lumMod = 100, lumOff = 0;
-        if (schemeColor.sizeOfLumModArray() > 0) {
-            lumMod = schemeColor.getLumModArray(0).getVal() / 1000;
-        }
-        if (schemeColor.sizeOfLumOffArray() > 0) {
-            lumOff = schemeColor.getLumOffArray(0).getVal() / 1000;
-        }
-        if(schemeColor.sizeOfShadeArray() > 0) {
-            lumMod = schemeColor.getShadeArray(0).getVal() / 1000;
-        }
-        Color color = modulateLuminanace(themeColor, lumMod, lumOff);
-
-        if(schemeColor.sizeOfTintArray() > 0) {
-            float tint = schemeColor.getTintArray(0).getVal() / 100000f;
-            int red = Math.round(tint * themeColor.getRed() + (1 - tint) * 255);
-            int green = Math.round(tint * themeColor.getGreen() + (1 - tint) * 255);
-            int blue = Math.round(tint * themeColor.getBlue() + (1 - tint) * 255);
-            color = new Color(red, green, blue);
-        }
-
-        return color;
-    }
-
-    /**
-     * TODO get rid of code duplication. Re-write to use xpath instead of beans
-     */
-    Color getPresetColor(CTPresetColor presetColor){
-        String colorName = presetColor.getVal().toString();
-        Color color;
-        try {
-            color = (Color)Color.class.getField(colorName).get(null);
-        } catch (Exception e){
-            color = Color.black;
-        }
-        if(presetColor.sizeOfAlphaArray() > 0){
-            int aval = presetColor.getAlphaArray(0).getVal();
-            int alpha =  Math.round(255 * aval / 100000f);
-            color = new Color(color.getRed(), color.getGreen(), color.getBlue(), alpha); 
-        }
-
-        int lumMod = 100, lumOff = 0;
-        if (presetColor.sizeOfLumModArray() > 0) {
-            lumMod = presetColor.getLumModArray(0).getVal() / 1000;
-        }
-        if (presetColor.sizeOfLumOffArray() > 0) {
-            lumOff = presetColor.getLumOffArray(0).getVal() / 1000;
-        }
-        if(presetColor.sizeOfShadeArray() > 0) {
-            lumMod = presetColor.getShadeArray(0).getVal() / 1000;
-        }
-        color = modulateLuminanace(color, lumMod, lumOff);
-
-        if(presetColor.sizeOfTintArray() > 0) {
-            float tint = presetColor.getTintArray(0).getVal() / 100000f;
-            int red = Math.round(tint * color.getRed() + (1 - tint) * 255);
-            int green = Math.round(tint * color.getGreen() + (1 - tint) * 255);
-            int blue = Math.round(tint * color.getBlue() + (1 - tint) * 255);
-            color = new Color(red, green, blue);
-        }
-
-        return color;
-    }
-
-    public Color brighter(Color color, double tint) {
-        int r = color.getRed();
-        int g = color.getGreen();
-        int b = color.getBlue();
-
-        /* From 2D group:
-         * 1. black.brighter() should return grey
-         * 2. applying brighter to blue will always return blue, brighter
-         * 3. non pure color (non zero rgb) will eventually return white
-         */
-        int i = (int)(1.0/(1.0-tint));
-        if ( r == 0 && g == 0 && b == 0) {
-           return new Color(i, i, i);
-        }
-        if ( r > 0 && r < i ) r = i;
-        if ( g > 0 && g < i ) g = i;
-        if ( b > 0 && b < i ) b = i;
-
-        return new Color(Math.min((int)(r/tint), 255),
-                         Math.min((int)(g/tint), 255),
-                         Math.min((int)(b/tint), 255));
-    }
-
-    Color getSrgbColor(CTSRgbColor srgb){
-        byte[] val = srgb.getVal();
-        int alpha = 0xFF;
-        if(srgb.sizeOfAlphaArray() > 0){
-            int aval = srgb.getAlphaArray(0).getVal();
-            alpha =  Math.round(255 * aval / 100000f);
-        }
-        return new Color(0xFF & val[0], 0xFF & val[1], 0xFF & val[2], alpha);
-    }
-
-    Color getSolidFillColor(CTSolidColorFillProperties solidFill){
-        Color color;
-        if (solidFill.isSetSrgbClr()) {
-            color = getSrgbColor(solidFill.getSrgbClr());
-        } else if (solidFill.isSetSchemeClr()) {
-            color = getSchemeColor(solidFill.getSchemeClr());
-        } else {
-            // TODO support other types
-            color = Color.black;
-        }
-        return color;
-    }
-
-    Color getColor(CTColor solidFill){
-        Color color;
-        if (solidFill.isSetSrgbClr()) {
-            color = getSrgbColor(solidFill.getSrgbClr());
-        } else if (solidFill.isSetSchemeClr()) {
-            color = getSchemeColor(solidFill.getSchemeClr());
-        } else {
-            // TODO support other types
-            color = Color.black;
-        }
-        return color;
-    }
-
      /**
      * While developing only!
      */
@@ -247,26 +111,6 @@ public class XSLFTheme extends POIXMLDoc
         out.close();
     }
 
-    public static Color modulateLuminanace(Color c, int lumMod, int lumOff) {
-        Color color;
-        if (lumOff > 0) {
-            color = new Color(
-                    (int) (Math.round((255 - c.getRed()) * (100.0 - lumMod) / 100.0 + c.getRed())),
-                    (int) (Math.round((255 - c.getGreen()) * lumOff / 100.0 + c.getGreen())),
-                    (int) (Math.round((255 - c.getBlue()) * lumOff / 100.0 + c.getBlue())),
-                    c.getAlpha()
-            );
-        } else {
-            color = new Color(
-                    (int) (Math.round(c.getRed() * lumMod / 100.0)),
-                    (int) (Math.round(c.getGreen() * lumMod / 100.0)),
-                    (int) (Math.round(c.getBlue() * lumMod / 100.0)),
-                    c.getAlpha()
-            );
-        }
-        return color;
-    }
-
     public String getMajorFont(){
         return _theme.getThemeElements().getFontScheme().getMajorFont().getLatin().getTypeface();
     }

Added: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java?rev=1190347&view=auto
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java (added)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java Fri Oct 28 14:25:53 2011
@@ -0,0 +1,50 @@
+/*
+ *  ====================================================================
+ *    Licensed to the Apache Software Foundation (ASF) under one or more
+ *    contributor license agreements.  See the NOTICE file distributed with
+ *    this work for additional information regarding copyright ownership.
+ *    The ASF licenses this file to You under the Apache License, Version 2.0
+ *    (the "License"); you may not use this file except in compliance with
+ *    the License.  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ * ====================================================================
+ */
+
+package org.apache.poi.xslf.usermodel;
+
+import junit.framework.TestCase;
+import org.apache.poi.xslf.XSLFTestDataSamples;
+
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.image.BufferedImage;
+
+/**
+ * Date: 10/26/11
+ *
+ * @author Yegor Kozlov
+ */
+public class TestPPTX2PNG extends TestCase {
+    public void testRender(){
+        String[] testFiles = {"layouts.pptx", "sample.pptx", "shapes.pptx",
+                "45541_Header.pptx", "backgrounds.pptx"};
+        for(String sampleFile : testFiles){
+            XMLSlideShow pptx = XSLFTestDataSamples.openSampleDocument(sampleFile);
+            Dimension pg = pptx.getPageSize();
+            for(XSLFSlide slide : pptx.getSlides()){
+                BufferedImage img = new BufferedImage(pg.width, pg.height, BufferedImage.TYPE_INT_RGB);
+                Graphics2D graphics = img.createGraphics();
+
+                slide.draw(graphics);
+
+            }
+        }
+    }
+}

Copied: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java (from r1189653, poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java)
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java?p2=poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java&p1=poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java&r1=1189653&r2=1190347&rev=1190347&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java Fri Oct 28 14:25:53 2011
@@ -18,83 +18,137 @@ package org.apache.poi.xslf.usermodel;
 
 import junit.framework.TestCase;
 
-import org.apache.poi.xslf.XSLFTestDataSamples;
-import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType;
+import org.openxmlformats.schemas.drawingml.x2006.main.CTColor;
+import org.openxmlformats.schemas.drawingml.x2006.main.CTSchemeColor;
+import org.openxmlformats.schemas.drawingml.x2006.main.STSchemeColorVal;
+import org.openxmlformats.schemas.drawingml.x2006.main.CTSRgbColor;
+import org.openxmlformats.schemas.drawingml.x2006.main.CTHslColor;
+import org.openxmlformats.schemas.drawingml.x2006.main.STPresetColorVal;
 
-import java.util.List;
+import java.awt.*;
 
 /**
  * @author Yegor Kozlov
  */
-public class TestXSLFShape extends TestCase {
+public class TestXSLFColor extends TestCase {
 
-    public void testReadTextShapes() {
-        XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx");
-        XSLFSlide[] slides = ppt.getSlides();
-
-        XSLFSlide slide1 = slides[0];
-        XSLFShape[] shapes1 = slide1.getShapes();
-        assertEquals(7, shapes1.length);
-        assertEquals("TextBox 3", shapes1[0].getShapeName());
-        XSLFAutoShape sh0 = (XSLFAutoShape) shapes1[0];
-        assertEquals("Learning PPTX", sh0.getText());
-        List<XSLFTextParagraph> paragraphs0 = sh0.getTextParagraphs();
-        assertEquals(1, paragraphs0.size());
-        XSLFTextParagraph p0 = paragraphs0.get(0);
-        assertEquals("Learning PPTX", p0.getText());
-        assertEquals(1, p0.getTextRuns().size());
-        XSLFTextRun r0 = p0.getTextRuns().get(0);
-        assertEquals("Learning PPTX", r0.getText());
-
-        XSLFSlide slide2 = slides[1];
-        XSLFShape[] shapes2 = slide2.getShapes();
-        assertTrue(shapes2[0] instanceof XSLFAutoShape);
-        assertEquals("PPTX Title", ((XSLFAutoShape) shapes2[0]).getText());
-        XSLFAutoShape sh1 = (XSLFAutoShape) shapes2[0];
-        List<XSLFTextParagraph> paragraphs1 = sh1.getTextParagraphs();
-        assertEquals(1, paragraphs1.size());
-        XSLFTextParagraph p1 = paragraphs1.get(0);
-        assertEquals("PPTX Title", p1.getText());
-        List<XSLFTextRun> r2 = paragraphs1.get(0).getTextRuns();
-        assertEquals(2, r2.size());
-        assertEquals("PPTX ", r2.get(0).getText());
-        assertEquals("Title", r2.get(1).getText());
-        // Title is underlined
-        assertEquals(STTextUnderlineType.SNG, r2.get(1).getXmlObject().getRPr().getU());
-
-
-        assertTrue(shapes2[1] instanceof XSLFAutoShape);
-        assertEquals("Subtitle\nAnd second line", ((XSLFAutoShape) shapes2[1]).getText());
-        XSLFAutoShape sh2 = (XSLFAutoShape) shapes2[1];
-        List<XSLFTextParagraph> paragraphs2 = sh2.getTextParagraphs();
-        assertEquals(2, paragraphs2.size());
-        assertEquals("Subtitle", paragraphs2.get(0).getText());
-        assertEquals("And second line", paragraphs2.get(1).getText());
-
-        assertEquals(1, paragraphs2.get(0).getTextRuns().size());
-        assertEquals(1, paragraphs2.get(1).getTextRuns().size());
-
-        assertEquals("Subtitle", paragraphs2.get(0).getTextRuns().get(0).getText());
-        assertTrue(paragraphs2.get(0).getTextRuns().get(0).getXmlObject().getRPr().getB());
-        assertEquals("And second line", paragraphs2.get(1).getTextRuns().get(0).getText());
+    public void testGetters() {
+        CTColor xml = CTColor.Factory.newInstance();
+        CTSRgbColor c = xml.addNewSrgbClr();
+        c.setVal(new byte[]{(byte)0xFF, 0, 0});
+
+        XSLFColor color = new XSLFColor(xml, null);
+
+        assertEquals(-1, color.getAlpha());
+        c.addNewAlpha().setVal(50000);
+        assertEquals(50, color.getAlpha());
+
+        assertEquals(-1, color.getAlphaMod());
+        c.addNewAlphaMod().setVal(50000);
+        assertEquals(50, color.getAlphaMod());
+
+        assertEquals(-1, color.getAlphaOff());
+        c.addNewAlphaOff().setVal(50000);
+        assertEquals(50, color.getAlphaOff());
+
+        assertEquals(-1, color.getLumMod());
+        c.addNewLumMod().setVal(50000);
+        assertEquals(50, color.getLumMod());
+
+        assertEquals(-1, color.getLumOff());
+        c.addNewLumOff().setVal(50000);
+        assertEquals(50, color.getLumOff());
+
+        assertEquals(-1, color.getSat());
+        c.addNewSat().setVal(50000);
+        assertEquals(50, color.getSat());
+
+        assertEquals(-1, color.getSatMod());
+        c.addNewSatMod().setVal(50000);
+        assertEquals(50, color.getSatMod());
+
+        assertEquals(-1, color.getSatOff());
+        c.addNewSatOff().setVal(50000);
+        assertEquals(50, color.getSatOff());
+
+        assertEquals(-1, color.getRed());
+        c.addNewRed().setVal(50000);
+        assertEquals(50, color.getRed());
+
+        assertEquals(-1, color.getGreen());
+        c.addNewGreen().setVal(50000);
+        assertEquals(50, color.getGreen());
+
+        assertEquals(-1, color.getBlue());
+        c.addNewBlue().setVal(50000);
+        assertEquals(50, color.getRed());
+
+        assertEquals(-1, color.getShade());
+        c.addNewShade().setVal(50000);
+        assertEquals(50, color.getShade());
+
+        assertEquals(-1, color.getTint());
+        c.addNewTint().setVal(50000);
+        assertEquals(50, color.getTint());
     }
 
-    public void testCreateShapes() {
-        XMLSlideShow ppt = new XMLSlideShow();
-        XSLFSlide slide = ppt.createSlide();
-        assertEquals(0, slide.getShapes().length);
+    public void testHSL() {
+        CTColor xml = CTColor.Factory.newInstance();
+        CTHslColor c = xml.addNewHslClr();
+        c.setHue2(14400000);
+        c.setSat2(100000);
+        c.setLum2(50000);
+
+        XSLFColor color = new XSLFColor(xml, null);
+        assertEquals(new Color(128, 00, 00), color.getColor());
+    }
+
+    public void testSRgb() {
+        CTColor xml = CTColor.Factory.newInstance();
+        xml.addNewSrgbClr().setVal(new byte[]{ (byte)0xFF, (byte)0xFF, 0});
+
+        XSLFColor color = new XSLFColor(xml, null);
+        assertEquals(new Color(0xFF, 0xFF, 0), color.getColor());
+    }
 
-        XSLFTextBox textBox = slide.createTextBox();
+    public void testSchemeColor() {
+        XMLSlideShow ppt = new XMLSlideShow();
+        XSLFTheme theme = ppt.createSlide().getTheme();
 
-        assertEquals(1, slide.getShapes().length);
-        assertSame(textBox, slide.getShapes()[0]);
+        CTColor xml = CTColor.Factory.newInstance();
+        xml.addNewSchemeClr().setVal(STSchemeColorVal.ACCENT_2);
 
-        assertEquals("", textBox.getText());
-        assertEquals(0, textBox.getTextParagraphs().size());
-        textBox.addNewTextParagraph().addNewTextRun().setText("Apache");
-        textBox.addNewTextParagraph().addNewTextRun().setText("POI");
-        assertEquals("Apache\nPOI", textBox.getText());
-        assertEquals(2, textBox.getTextParagraphs().size());
+        XSLFColor color = new XSLFColor(xml, theme);
+        // accent2 is theme1.xml is <a:srgbClr val="C0504D"/>
+        assertEquals(Color.decode("0xC0504D"), color.getColor());
+
+        xml = CTColor.Factory.newInstance();
+        xml.addNewSchemeClr().setVal(STSchemeColorVal.LT_1);
+        color = new XSLFColor(xml, theme);
+        // <a:sysClr val="window" lastClr="FFFFFF"/>
+        assertEquals(Color.decode("0xFFFFFF"), color.getColor());
+
+        xml = CTColor.Factory.newInstance();
+        xml.addNewSchemeClr().setVal(STSchemeColorVal.DK_1);
+        color = new XSLFColor(xml, theme);
+        // <a:sysClr val="windowText" lastClr="000000"/>
+        assertEquals(Color.decode("0x000000"), color.getColor());
     }
 
+    public void testPresetColor() {
+        CTColor xml = CTColor.Factory.newInstance();
+        xml.addNewPrstClr().setVal(STPresetColorVal.AQUAMARINE);
+        XSLFColor color = new XSLFColor(xml, null);
+        assertEquals(new Color(127, 255, 212), color.getColor());
+
+
+        for(String colorName : XSLFColor.presetColors.keySet()){
+            xml = CTColor.Factory.newInstance();
+            STPresetColorVal.Enum val = STPresetColorVal.Enum.forString(colorName);
+            assertNotNull(colorName, val);
+            xml.addNewPrstClr().setVal(val);
+            color = new XSLFColor(xml, null);
+            assertEquals(XSLFColor.presetColors.get(colorName), color.getColor());
+        }
+    }
 }
\ No newline at end of file

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java?rev=1190347&r1=1190346&r2=1190347&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java Fri Oct 28 14:25:53 2011
@@ -143,13 +143,13 @@ public class TestXSLFSimpleShape extends
             assertEquals(2.0, s.getLineWidth());
             assertEquals(LineCap.FLAT, s.getLineCap());
             // YK: calculated color is slightly different from PowerPoint
-            assertEquals(new Color(40, 65, 95), s.getLineColor());
+            assertEquals(new Color(39, 64, 94), s.getLineColor());
         }
 
         XSLFSimpleShape s0 = (XSLFSimpleShape) shapes[0];
         // fill is not set
         assertNull(s0.getSpPr().getSolidFill());
-        assertEquals(slide6.getTheme().getColor("accent1").getColor(), s0.getFillColor());
+        //assertEquals(slide6.getTheme().getColor("accent1").getColor(), s0.getFillColor());
         assertEquals(new Color(79, 129, 189), s0.getFillColor());
 
         // lighter 80%

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java?rev=1190347&r1=1190346&r2=1190347&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTheme.java Fri Oct 28 14:25:53 2011
@@ -33,7 +33,7 @@ public class TestXSLFTheme extends TestC
         assertNotNull(theme);
         
         assertEquals("Office Theme", theme.getName());
-        XSLFColor accent1 = theme.getColor("accent1");
-        assertNotNull(accent1);
+        //XSLFColor accent1 = theme.getColor("accent1");
+        //assertNotNull(accent1);
     }
 }

Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java?rev=1190347&r1=1190346&r2=1190347&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java Fri Oct 28 14:25:53 2011
@@ -138,7 +138,7 @@ public class TestXWPFPictureData extends
             for (XWPFRun run : paragraph.getRuns()) {
                 for (XWPFPicture picture : run.getEmbeddedPictures()) {
                     if (paragraph.getDocument() != null) {
-                        System.out.println(picture.getCTPicture());
+                        //System.out.println(picture.getCTPicture());
                         XWPFPictureData data = picture.getPictureData();
                         if(data != null) System.out.println(data.getFileName());
                     }

Added: poi/trunk/test-data/slideshow/backgrounds.pptx
URL: http://svn.apache.org/viewvc/poi/trunk/test-data/slideshow/backgrounds.pptx?rev=1190347&view=auto
==============================================================================
Binary file - no diff available.

Propchange: poi/trunk/test-data/slideshow/backgrounds.pptx
------------------------------------------------------------------------------
    svn:executable = *

Propchange: poi/trunk/test-data/slideshow/backgrounds.pptx
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org