You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2015/11/21 16:54:01 UTC
svn commit: r1715540 [1/2] - in /poi/trunk:
src/examples/src/org/apache/poi/hslf/examples/
src/java/org/apache/poi/sl/draw/ src/java/org/apache/poi/sl/usermodel/
src/java/org/apache/poi/util/ src/ooxml/java/org/apache/poi/xslf/usermodel/
src/ooxml/test...
Author: kiwiwings
Date: Sat Nov 21 15:54:01 2015
New Revision: 1715540
URL: http://svn.apache.org/viewvc?rev=1715540&view=rev
Log:
In preparation for table rendering, added table row heights and column widths to common sl.
To have better results in rendering switch anchor from java.awt.Rectangle to Rectangle2D.
Added:
poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestTable.java
poi/trunk/test-data/slideshow/table_test.ppt (with props)
poi/trunk/test-data/slideshow/table_test.pptx (with props)
Modified:
poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
poi/trunk/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java
poi/trunk/src/java/org/apache/poi/sl/draw/DrawBackground.java
poi/trunk/src/java/org/apache/poi/sl/draw/DrawPictureShape.java
poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
poi/trunk/src/java/org/apache/poi/sl/usermodel/GroupShape.java
poi/trunk/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
poi/trunk/src/java/org/apache/poi/sl/usermodel/Shape.java
poi/trunk/src/java/org/apache/poi/sl/usermodel/TableShape.java
poi/trunk/src/java/org/apache/poi/util/Units.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTextShape.java
poi/trunk/src/ooxml/testcases/org/apache/poi/sl/draw/TestDrawPictureShape.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java
poi/trunk/src/testcases/org/apache/poi/sl/draw/geom/TestPresetGeometries.java
Modified: poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/hslf/examples/ApacheconEU08.java Sat Nov 21 15:54:01 2015
@@ -22,6 +22,7 @@ import java.awt.Dimension;
import java.awt.Font;
import java.awt.Graphics2D;
import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.List;
@@ -183,8 +184,8 @@ public final class ApacheconEU08 {
table1.setRowHeight(1, 80);
Dimension dim = ppt.getPageSize();
- Rectangle oldAnchor = table1.getAnchor();
- table1.setAnchor(new Rectangle((dim.width-450)/2, 100, oldAnchor.width, oldAnchor.height));
+ Rectangle2D oldAnchor = table1.getAnchor();
+ table1.setAnchor(new Rectangle2D.Double((dim.width-450)/2, 100, oldAnchor.getWidth(), oldAnchor.getHeight()));
TextBox<?,?> box1 = slide.createTextBox();
box1.setHorizontalCentered(true);
Modified: poi/trunk/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java (original)
+++ poi/trunk/src/examples/src/org/apache/poi/hslf/examples/TableDemo.java Sat Nov 21 15:54:01 2015
@@ -78,7 +78,7 @@ public final class TableDemo {
table1.setColumnWidth(1, 150);
int pgWidth = ppt.getPageSize().width;
- table1.moveTo((pgWidth - table1.getAnchor().width)/2, 100);
+ table1.moveTo((pgWidth - table1.getAnchor().getWidth())/2., 100.);
//test data for the second taable
String[][] txt2 = {
@@ -125,5 +125,6 @@ public final class TableDemo {
ppt.write(out);
out.close();
+ ppt.close();
}
}
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/DrawBackground.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/DrawBackground.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/DrawBackground.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/DrawBackground.java Sat Nov 21 15:54:01 2015
@@ -20,7 +20,6 @@ package org.apache.poi.sl.draw;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Paint;
-import java.awt.Rectangle;
import java.awt.geom.Rectangle2D;
import org.apache.poi.sl.usermodel.Background;
@@ -36,12 +35,12 @@ public class DrawBackground extends Draw
@SuppressWarnings("rawtypes")
public void draw(Graphics2D graphics) {
Dimension pg = shape.getSheet().getSlideShow().getPageSize();
- final Rectangle anchor = new Rectangle(0, 0, (int)pg.getWidth(), (int)pg.getHeight());
+ final Rectangle2D anchor = new Rectangle2D.Double(0, 0, pg.getWidth(), pg.getHeight());
PlaceableShape<?,?> ps = new PlaceableShape(){
public ShapeContainer<?,?> getParent() { return null; }
- public Rectangle getAnchor() { return anchor; }
- public void setAnchor(Rectangle newAnchor) {}
+ public Rectangle2D getAnchor() { return anchor; }
+ public void setAnchor(Rectangle2D newAnchor) {}
public double getRotation() { return 0; }
public void setRotation(double theta) {}
public void setFlipHorizontal(boolean flip) {}
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/DrawPictureShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/DrawPictureShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/DrawPictureShape.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/DrawPictureShape.java Sat Nov 21 15:54:01 2015
@@ -20,7 +20,6 @@ package org.apache.poi.sl.draw;
import java.awt.Dimension;
import java.awt.Graphics2D;
import java.awt.Insets;
-import java.awt.Rectangle;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
@@ -70,12 +69,12 @@ public class DrawPictureShape extends Dr
PictureShape<?,?> ps = getShape();
Dimension dim = ps.getPictureData().getImageDimension();
- Rectangle origRect = ps.getAnchor();
- int x = (int)origRect.getX();
- int y = (int)origRect.getY();
- int w = (int)dim.getWidth();
- int h = (int)dim.getHeight();
- ps.setAnchor(new Rectangle(x, y, w, h));
+ Rectangle2D origRect = ps.getAnchor();
+ double x = origRect.getX();
+ double y = origRect.getY();
+ double w = dim.getWidth();
+ double h = dim.getHeight();
+ ps.setAnchor(new Rectangle2D.Double(x, y, w, h));
}
@@ -85,7 +84,7 @@ public class DrawPictureShape extends Dr
*
* @param target The target rectangle
*/
- public void resize(Rectangle target) {
+ public void resize(Rectangle2D target) {
resize(target, RectAlign.CENTER);
}
@@ -100,7 +99,7 @@ public class DrawPictureShape extends Dr
* The alignment within the target rectangle when resizing.
* A null value corresponds to RectAlign.CENTER
*/
- public void resize(Rectangle target, RectAlign align) {
+ public void resize(Rectangle2D target, RectAlign align) {
PictureShape<?,?> ps = getShape();
Dimension dim = ps.getPictureData().getImageDimension();
if (dim.width <= 0 || dim.height <= 0) {
@@ -170,6 +169,6 @@ public class DrawPictureShape extends Dr
break;
}
- ps.setAnchor(new Rectangle((int)x, (int)y, (int)w, (int)h));
+ ps.setAnchor(new Rectangle2D.Double(x, y, w, h));
}
}
Modified: poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/draw/DrawTextParagraph.java Sat Nov 21 15:54:01 2015
@@ -19,7 +19,6 @@ package org.apache.poi.sl.draw;
import java.awt.Graphics2D;
import java.awt.Paint;
-import java.awt.Rectangle;
import java.awt.font.FontRenderContext;
import java.awt.font.LineBreakMeasurer;
import java.awt.font.TextAttribute;
@@ -427,8 +426,8 @@ public class DrawTextParagraph implement
private PlaceableShape<?,?> getParagraphShape() {
PlaceableShape<?,?> ps = new PlaceableShape(){
public ShapeContainer<?,?> getParent() { return null; }
- public Rectangle getAnchor() { return paragraph.getParentShape().getAnchor(); }
- public void setAnchor(Rectangle anchor) {}
+ public Rectangle2D getAnchor() { return paragraph.getParentShape().getAnchor(); }
+ public void setAnchor(Rectangle2D anchor) {}
public double getRotation() { return 0; }
public void setRotation(double theta) {}
public void setFlipHorizontal(boolean flip) {}
Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/GroupShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/usermodel/GroupShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/usermodel/GroupShape.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/usermodel/GroupShape.java Sat Nov 21 15:54:01 2015
@@ -17,7 +17,7 @@
package org.apache.poi.sl.usermodel;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
public interface GroupShape<
S extends Shape<S,P>,
@@ -30,7 +30,7 @@ public interface GroupShape<
*
* @return the coordinate space of this group
*/
- Rectangle getInteriorAnchor();
+ Rectangle2D getInteriorAnchor();
/**
* Sets the coordinate space of this group. All children are constrained
@@ -38,5 +38,5 @@ public interface GroupShape<
*
* @param anchor the coordinate space of this group
*/
- void setInteriorAnchor(Rectangle anchor);
+ void setInteriorAnchor(Rectangle2D anchor);
}
Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/usermodel/PlaceableShape.java Sat Nov 21 15:54:01 2015
@@ -17,7 +17,7 @@
package org.apache.poi.sl.usermodel;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
public interface PlaceableShape<
S extends Shape<S,P>,
@@ -29,13 +29,13 @@ public interface PlaceableShape<
* @return the position of this shape within the drawing canvas.
* The coordinates are expressed in points
*/
- Rectangle getAnchor();
+ Rectangle2D getAnchor();
/**
* @param anchor the position of this shape within the drawing canvas.
* The coordinates are expressed in points
*/
- void setAnchor(Rectangle anchor);
+ void setAnchor(Rectangle2D anchor);
/**
* Rotation angle in degrees
Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/Shape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/usermodel/Shape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/usermodel/Shape.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/usermodel/Shape.java Sat Nov 21 15:54:01 2015
@@ -17,7 +17,7 @@
package org.apache.poi.sl.usermodel;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
public interface Shape<
S extends Shape<S,P>,
@@ -37,5 +37,5 @@ public interface Shape<
*
* @return the anchor of this shape
*/
- Rectangle getAnchor();
+ Rectangle2D getAnchor();
}
Modified: poi/trunk/src/java/org/apache/poi/sl/usermodel/TableShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/sl/usermodel/TableShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/sl/usermodel/TableShape.java (original)
+++ poi/trunk/src/java/org/apache/poi/sl/usermodel/TableShape.java Sat Nov 21 15:54:01 2015
@@ -28,6 +28,14 @@ public interface TableShape<
TableCell<S,P> getCell(int row, int col);
/**
+ * Gets the width (in points) of the n-th column
+ *
+ * @param idx the column index (0-based)
+ * @return the width (in points)
+ */
+ double getColumnWidth(int idx);
+
+ /**
* Sets the width (in points) of the n-th column
*
* @param idx the column index (0-based)
@@ -36,6 +44,14 @@ public interface TableShape<
void setColumnWidth(int idx, double width);
/**
+ * Gets the row height
+ *
+ * @param row the row index (0-based)
+ * @return the height (in points)
+ */
+ double getRowHeight(int row);
+
+ /**
* Sets the row height.
*
* @param row the row index (0-based)
Modified: poi/trunk/src/java/org/apache/poi/util/Units.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/util/Units.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/util/Units.java (original)
+++ poi/trunk/src/java/org/apache/poi/util/Units.java Sat Nov 21 15:54:01 2015
@@ -51,7 +51,7 @@ public class Units {
* @return emus
*/
public static int toEMU(double points){
- return (int)Math.round(EMU_PER_POINT*points);
+ return (int)Math.rint(EMU_PER_POINT*points);
}
/**
@@ -103,13 +103,13 @@ public class Units {
public static int pointsToMaster(double points) {
points *= MASTER_DPI;
points /= POINT_DPI;
- return (int)points;
+ return (int)Math.rint(points);
}
public static int pointsToPixel(double points) {
points *= PIXEL_DPI;
points /= POINT_DPI;
- return (int)points;
+ return (int)Math.rint(points);
}
public static double pixelToPoints(int pixel) {
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFBackground.java Sat Nov 21 15:54:01 2015
@@ -19,7 +19,7 @@ package org.apache.poi.xslf.usermodel;
import java.awt.Color;
import java.awt.Dimension;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import org.apache.poi.sl.draw.DrawPaint;
import org.apache.poi.sl.usermodel.Background;
@@ -43,9 +43,9 @@ public class XSLFBackground extends XSLF
}
@Override
- public Rectangle getAnchor(){
+ public Rectangle2D getAnchor(){
Dimension pg = getSheet().getSlideShow().getPageSize();
- return new Rectangle(0, 0, (int)pg.getWidth(), (int)pg.getHeight());
+ return new Rectangle2D.Double(0, 0, pg.getWidth(), pg.getHeight());
}
@Override
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFDrawing.java Sat Nov 21 15:54:01 2015
@@ -16,6 +16,9 @@
==================================================================== */
package org.apache.poi.xslf.usermodel;
+import java.awt.Color;
+import java.awt.geom.Rectangle2D;
+
import org.apache.poi.util.Beta;
import org.apache.xmlbeans.XmlObject;
import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualDrawingProps;
@@ -25,9 +28,6 @@ import org.openxmlformats.schemas.presen
import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture;
import org.openxmlformats.schemas.presentationml.x2006.main.CTShape;
-import java.awt.Color;
-import java.awt.Rectangle;
-
/**
* @author Yegor Kozlov
@@ -57,7 +57,7 @@ public class XSLFDrawing {
CTShape sp = _spTree.addNewSp();
sp.set(XSLFAutoShape.prototype(_shapeId++));
XSLFAutoShape shape = new XSLFAutoShape(sp, _sheet);
- shape.setAnchor(new Rectangle());
+ shape.setAnchor(new Rectangle2D.Double());
return shape;
}
@@ -65,7 +65,7 @@ public class XSLFDrawing {
CTShape sp = _spTree.addNewSp();
sp.set(XSLFFreeformShape.prototype(_shapeId++));
XSLFFreeformShape shape = new XSLFFreeformShape(sp, _sheet);
- shape.setAnchor(new Rectangle());
+ shape.setAnchor(new Rectangle2D.Double());
return shape;
}
@@ -73,7 +73,7 @@ public class XSLFDrawing {
CTShape sp = _spTree.addNewSp();
sp.set(XSLFTextBox.prototype(_shapeId++));
XSLFTextBox shape = new XSLFTextBox(sp, _sheet);
- shape.setAnchor(new Rectangle());
+ shape.setAnchor(new Rectangle2D.Double());
return shape;
}
@@ -81,7 +81,7 @@ public class XSLFDrawing {
CTConnector sp = _spTree.addNewCxnSp();
sp.set(XSLFConnectorShape.prototype(_shapeId++));
XSLFConnectorShape shape = new XSLFConnectorShape(sp, _sheet);
- shape.setAnchor(new Rectangle());
+ shape.setAnchor(new Rectangle2D.Double());
shape.setLineColor(Color.black);
shape.setLineWidth(0.75);
return shape;
@@ -91,7 +91,7 @@ public class XSLFDrawing {
CTGroupShape obj = _spTree.addNewGrpSp();
obj.set(XSLFGroupShape.prototype(_shapeId++));
XSLFGroupShape shape = new XSLFGroupShape(obj, _sheet);
- shape.setAnchor(new Rectangle());
+ shape.setAnchor(new Rectangle2D.Double());
return shape;
}
@@ -99,7 +99,7 @@ public class XSLFDrawing {
CTPicture obj = _spTree.addNewPic();
obj.set(XSLFPictureShape.prototype(_shapeId++, rel));
XSLFPictureShape shape = new XSLFPictureShape(obj, _sheet);
- shape.setAnchor(new Rectangle());
+ shape.setAnchor(new Rectangle2D.Double());
return shape;
}
@@ -107,7 +107,7 @@ public class XSLFDrawing {
CTGraphicalObjectFrame obj = _spTree.addNewGraphicFrame();
obj.set(XSLFTable.prototype(_shapeId++));
XSLFTable shape = new XSLFTable(obj, _sheet);
- shape.setAnchor(new Rectangle());
+ shape.setAnchor(new Rectangle2D.Double());
return shape;
}
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFFreeformShape.java Sat Nov 21 15:54:01 2015
@@ -19,7 +19,6 @@
package org.apache.poi.xslf.usermodel;
-import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
import java.awt.geom.GeneralPath;
import java.awt.geom.PathIterator;
@@ -61,7 +60,7 @@ public class XSLFFreeformShape extends X
public int setPath(GeneralPath path) {
CTPath2D ctPath = CTPath2D.Factory.newInstance();
- Rectangle bounds = path.getBounds();
+ Rectangle2D bounds = path.getBounds2D();
int x0 = Units.toEMU(bounds.getX());
int y0 = Units.toEMU(bounds.getY());
PathIterator it = path.getPathIterator(new AffineTransform());
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGraphicFrame.java Sat Nov 21 15:54:01 2015
@@ -19,7 +19,7 @@
package org.apache.poi.xslf.usermodel;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import javax.xml.namespace.QName;
@@ -28,6 +28,7 @@ import org.apache.poi.openxml4j.exceptio
import org.apache.poi.openxml4j.opc.PackagePart;
import org.apache.poi.openxml4j.opc.PackageRelationship;
import org.apache.poi.sl.draw.DrawNotImplemented;
+import org.apache.poi.sl.usermodel.PlaceableShape;
import org.apache.poi.sl.usermodel.ShapeType;
import org.apache.poi.util.Beta;
import org.apache.poi.util.Units;
@@ -44,7 +45,7 @@ import org.openxmlformats.schemas.presen
*/
@Beta
@DrawNotImplemented
-public class XSLFGraphicFrame extends XSLFShape {
+public class XSLFGraphicFrame extends XSLFShape implements PlaceableShape<XSLFShape, XSLFTextParagraph> {
/*package*/ XSLFGraphicFrame(CTGraphicalObjectFrame shape, XSLFSheet sheet){
super(shape,sheet);
}
@@ -54,18 +55,19 @@ public class XSLFGraphicFrame extends XS
}
@Override
- public Rectangle getAnchor(){
+ public Rectangle2D getAnchor(){
CTTransform2D xfrm = ((CTGraphicalObjectFrame)getXmlObject()).getXfrm();
CTPoint2D off = xfrm.getOff();
- int x = (int)Units.toPoints(off.getX());
- int y = (int)Units.toPoints(off.getY());
+ double x = Units.toPoints(off.getX());
+ double y = Units.toPoints(off.getY());
CTPositiveSize2D ext = xfrm.getExt();
- int cx = (int)Units.toPoints(ext.getCx());
- int cy = (int)Units.toPoints(ext.getCy());
- return new Rectangle(x, y, cx, cy);
+ double cx = Units.toPoints(ext.getCx());
+ double cy = Units.toPoints(ext.getCy());
+ return new Rectangle2D.Double(x, y, cx, cy);
}
- public void setAnchor(Rectangle anchor){
+ @Override
+ public void setAnchor(Rectangle2D anchor){
CTTransform2D xfrm = ((CTGraphicalObjectFrame)getXmlObject()).getXfrm();
CTPoint2D off = xfrm.isSetOff() ? xfrm.getOff() : xfrm.addNewOff();
long x = Units.toEMU(anchor.getX());
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFGroupShape.java Sat Nov 21 15:54:01 2015
@@ -19,7 +19,7 @@
package org.apache.poi.xslf.usermodel;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -79,19 +79,19 @@ implements XSLFShapeContainer, GroupShap
}
@Override
- public Rectangle getAnchor(){
+ public Rectangle2D getAnchor(){
CTGroupTransform2D xfrm = getXfrm();
CTPoint2D off = xfrm.getOff();
- int x = (int)Units.toPoints(off.getX());
- int y = (int)Units.toPoints(off.getY());
+ double x = Units.toPoints(off.getX());
+ double y = Units.toPoints(off.getY());
CTPositiveSize2D ext = xfrm.getExt();
- int cx = (int)Units.toPoints(ext.getCx());
- int cy = (int)Units.toPoints(ext.getCy());
- return new Rectangle(x,y,cx,cy);
+ double cx = Units.toPoints(ext.getCx());
+ double cy = Units.toPoints(ext.getCy());
+ return new Rectangle2D.Double(x,y,cx,cy);
}
@Override
- public void setAnchor(Rectangle anchor){
+ public void setAnchor(Rectangle2D anchor){
CTGroupTransform2D xfrm = getSafeXfrm();
CTPoint2D off = xfrm.isSetOff() ? xfrm.getOff() : xfrm.addNewOff();
long x = Units.toEMU(anchor.getX());
@@ -111,15 +111,16 @@ implements XSLFShapeContainer, GroupShap
* used for calculations of grouping, scaling, and rotation
* behavior of shapes placed within a group.
*/
- public Rectangle getInteriorAnchor(){
+ @Override
+ public Rectangle2D getInteriorAnchor(){
CTGroupTransform2D xfrm = getXfrm();
CTPoint2D off = xfrm.getChOff();
- int x = (int)Units.toPoints(off.getX());
- int y = (int)Units.toPoints(off.getY());
+ double x = Units.toPoints(off.getX());
+ double y = Units.toPoints(off.getY());
CTPositiveSize2D ext = xfrm.getChExt();
- int cx = (int)Units.toPoints(ext.getCx());
- int cy = (int)Units.toPoints(ext.getCy());
- return new Rectangle(x, y, cx, cy);
+ double cx = Units.toPoints(ext.getCx());
+ double cy = Units.toPoints(ext.getCy());
+ return new Rectangle2D.Double(x, y, cx, cy);
}
/**
@@ -128,7 +129,8 @@ implements XSLFShapeContainer, GroupShap
* used for calculations of grouping, scaling, and rotation
* behavior of shapes placed within a group.
*/
- public void setInteriorAnchor(Rectangle anchor) {
+ @Override
+ public void setInteriorAnchor(Rectangle2D anchor) {
CTGroupTransform2D xfrm = getSafeXfrm();
CTPoint2D off = xfrm.isSetChOff() ? xfrm.getChOff() : xfrm.addNewChOff();
long x = Units.toEMU(anchor.getX());
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFShadow.java Sat Nov 21 15:54:01 2015
@@ -18,7 +18,7 @@
package org.apache.poi.xslf.usermodel;
import java.awt.Color;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import org.apache.poi.sl.draw.DrawPaint;
import org.apache.poi.sl.usermodel.PaintStyle.SolidPaint;
@@ -48,11 +48,11 @@ public class XSLFShadow extends XSLFShap
}
@Override
- public Rectangle getAnchor(){
+ public Rectangle2D getAnchor(){
return _parent.getAnchor();
}
- public void setAnchor(Rectangle anchor){
+ public void setAnchor(Rectangle2D anchor){
throw new IllegalStateException("You can't set anchor of a shadow");
}
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFSimpleShape.java Sat Nov 21 15:54:01 2015
@@ -20,7 +20,7 @@
package org.apache.poi.xslf.usermodel;
import java.awt.Color;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -121,21 +121,21 @@ public abstract class XSLFSimpleShape ex
}
@Override
- public Rectangle getAnchor() {
+ public Rectangle2D getAnchor() {
CTTransform2D xfrm = getXfrm();
CTPoint2D off = xfrm.getOff();
- int x = (int)Units.toPoints(off.getX());
- int y = (int)Units.toPoints(off.getY());
+ double x = Units.toPoints(off.getX());
+ double y = Units.toPoints(off.getY());
CTPositiveSize2D ext = xfrm.getExt();
- int cx = (int)Units.toPoints(ext.getCx());
- int cy = (int)Units.toPoints(ext.getCy());
- return new Rectangle(x, y, cx, cy);
+ double cx = Units.toPoints(ext.getCx());
+ double cy = Units.toPoints(ext.getCy());
+ return new Rectangle2D.Double(x, y, cx, cy);
}
@Override
- public void setAnchor(Rectangle anchor) {
+ public void setAnchor(Rectangle2D anchor) {
CTTransform2D xfrm = getSafeXfrm();
CTPoint2D off = xfrm.isSetOff() ? xfrm.getOff() : xfrm.addNewOff();
long x = Units.toEMU(anchor.getX());
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xslf/usermodel/XSLFTable.java Sat Nov 21 15:54:01 2015
@@ -100,6 +100,7 @@ public class XSLFTable extends XSLFGraph
return _table.sizeOfTrArray();
}
+ @Override
public double getColumnWidth(int idx){
return Units.toPoints(
_table.getTblGrid().getGridColArray(idx).getW());
@@ -111,6 +112,11 @@ public class XSLFTable extends XSLFGraph
}
@Override
+ public double getRowHeight(int row) {
+ return Units.toPoints(_table.getTrArray(row).getH());
+ }
+
+ @Override
public void setRowHeight(int row, double height) {
_table.getTrArray(row).setH(Units.toEMU(height));
}
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=1715540&r1=1715539&r2=1715540&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 Sat Nov 21 15:54:01 2015
@@ -19,7 +19,7 @@
package org.apache.poi.xslf.usermodel;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -518,8 +518,8 @@ public abstract class XSLFTextShape exte
*
* @return a <code>Rectangle2D</code> that is the bounds of this shape.
*/
- public Rectangle resizeToFitText(){
- Rectangle anchor = getAnchor();
+ public Rectangle2D resizeToFitText(){
+ Rectangle2D anchor = getAnchor();
if(anchor.getWidth() == 0.) throw new POIXMLException(
"Anchor of the shape was not set.");
double height = getTextHeight();
Added: poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestTable.java?rev=1715540&view=auto
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestTable.java (added)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/sl/TestTable.java Sat Nov 21 15:54:01 2015
@@ -0,0 +1,64 @@
+/*
+ * ====================================================================
+ * 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.sl;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+
+import org.apache.poi.POIDataSamples;
+import org.apache.poi.sl.usermodel.SlideShow;
+import org.apache.poi.sl.usermodel.SlideShowFactory;
+import org.apache.poi.sl.usermodel.TableShape;
+import org.junit.Test;
+
+public class TestTable {
+ private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
+
+ @Test
+ public void testColWidthRowHeight() throws IOException {
+ // Test of table dimensions of same slideshow saved as ppt/x
+ // to check if both return similar (points) value
+ SlideShow<?,?> ppt = SlideShowFactory.create(_slTests.getFile("table_test.ppt"));
+ TableShape<?,?> ts = (TableShape<?,?>)ppt.getSlides().get(0).getShapes().get(0);
+ int cols = ts.getNumberOfColumns();
+ int rows = ts.getNumberOfRows();
+
+ SlideShow<?,?> pptx = SlideShowFactory.create(_slTests.getFile("table_test.pptx"));
+ TableShape<?,?> tsx = (TableShape<?,?>)pptx.getSlides().get(0).getShapes().get(0);
+ int colsx = tsx.getNumberOfColumns();
+ int rowsx = tsx.getNumberOfRows();
+
+ assertEquals(cols, colsx);
+ assertEquals(rows, rowsx);
+
+ for (int i=0; i<cols; i++) {
+ assertEquals(ts.getColumnWidth(i), tsx.getColumnWidth(i), 0.2);
+ }
+
+ for (int i=0; i<rows; i++) {
+ assertEquals(ts.getRowHeight(i), tsx.getRowHeight(i), 0.3);
+ }
+
+ pptx.close();
+ ppt.close();
+ }
+
+}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/sl/draw/TestDrawPictureShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/sl/draw/TestDrawPictureShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/sl/draw/TestDrawPictureShape.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/sl/draw/TestDrawPictureShape.java Sat Nov 21 15:54:01 2015
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import java.awt.Dimension;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import org.apache.poi.POIDataSamples;
import org.apache.poi.sl.usermodel.PictureData;
@@ -32,6 +32,7 @@ import org.apache.poi.sl.usermodel.Shape
import org.apache.poi.sl.usermodel.Slide;
import org.apache.poi.sl.usermodel.SlideShow;
import org.apache.poi.sl.usermodel.SlideShowFactory;
+import org.apache.poi.util.Units;
import org.junit.Test;
public class TestDrawPictureShape {
@@ -54,18 +55,32 @@ public class TestDrawPictureShape {
PictureData pd = picShape.getPictureData();
Dimension dimPd = pd.getImageDimension();
new DrawPictureShape(picShape).resize();
- Dimension dimShape = picShape.getAnchor().getSize();
+ Dimension dimShape = new Dimension(
+ (int)picShape.getAnchor().getWidth(),
+ (int)picShape.getAnchor().getHeight()
+ );
assertEquals(dimPd, dimShape);
- int newWidth = (int)(dimPd.getWidth()*(100d/dimPd.getHeight()));
+ double newWidth = (dimPd.getWidth()*(100d/dimPd.getHeight()));
// ... -1 is a rounding error
- Rectangle expRect = new Rectangle(50+300-newWidth-1, 50, newWidth, 100);
- Rectangle target = new Rectangle(50,50,300,100);
+ Rectangle2D expRect = new Rectangle2D.Double(rbf(50+300-newWidth, picShape), 50, rbf(newWidth, picShape), 100);
+ Rectangle2D target = new Rectangle2D.Double(50,50,300,100);
new DrawPictureShape(picShape).resize(target, RectAlign.BOTTOM_RIGHT);
- Rectangle actRect = picShape.getAnchor();
- assertEquals(expRect, actRect);
+ Rectangle2D actRect = picShape.getAnchor();
+ assertEquals(expRect.getX(), actRect.getX(), .0001);
+ assertEquals(expRect.getY(), actRect.getY(), .0001);
+ assertEquals(expRect.getWidth(), actRect.getWidth(), .0001);
+ assertEquals(expRect.getHeight(), actRect.getHeight(), .0001);
+ ss.close();
}
}
-
+ // round back and forth - points -> master -> points
+ static double rbf(double val, PictureShape<?,?> picShape) {
+ if (picShape.getClass().getName().contains("HSLF")) {
+ return Units.masterToPoints(Units.pointsToMaster(val));
+ } else {
+ return val;
+ }
+ }
}
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java Sat Nov 21 15:54:01 2015
@@ -20,13 +20,18 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import java.awt.Color;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import org.apache.poi.sl.usermodel.LineDecoration.DecorationShape;
import org.apache.poi.sl.usermodel.LineDecoration.DecorationSize;
-import org.apache.poi.sl.usermodel.*;
+import org.apache.poi.sl.usermodel.ShapeType;
import org.junit.Test;
-import org.openxmlformats.schemas.drawingml.x2006.main.*;
+import org.openxmlformats.schemas.drawingml.x2006.main.CTConnection;
+import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualConnectorProperties;
+import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndLength;
+import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndType;
+import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndWidth;
+import org.openxmlformats.schemas.drawingml.x2006.main.STShapeType;
import org.openxmlformats.schemas.presentationml.x2006.main.CTConnector;
/**
@@ -122,17 +127,17 @@ public class TestXSLFConnectorShape {
XSLFAutoShape rect1 = slide.createAutoShape();
rect1.setShapeType(ShapeType.RECT);
- rect1.setAnchor(new Rectangle(100, 100, 100, 100));
+ rect1.setAnchor(new Rectangle2D.Double(100, 100, 100, 100));
rect1.setFillColor(Color.blue);
XSLFAutoShape rect2 = slide.createAutoShape();
rect2.setShapeType(ShapeType.RECT);
- rect2.setAnchor(new Rectangle(300, 300, 100, 100));
+ rect2.setAnchor(new Rectangle2D.Double(300, 300, 100, 100));
rect2.setFillColor(Color.red);
XSLFConnectorShape connector1 = slide.createConnector();
- connector1.setAnchor(new Rectangle(200, 150, 100, 200));
+ connector1.setAnchor(new Rectangle2D.Double(200, 150, 100, 200));
CTConnector ctConnector = (CTConnector)connector1.getXmlObject();
ctConnector.getSpPr().getPrstGeom().setPrst(STShapeType.BENT_CONNECTOR_3);
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java Sat Nov 21 15:54:01 2015
@@ -16,11 +16,11 @@
==================================================================== */
package org.apache.poi.xslf.usermodel;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
-import java.awt.Rectangle;
import java.awt.geom.Ellipse2D;
import java.awt.geom.GeneralPath;
+import java.awt.geom.Rectangle2D;
import org.junit.Test;
@@ -35,7 +35,7 @@ public class TestXSLFFreeformShape {
XSLFSlide slide = ppt.createSlide();
XSLFFreeformShape shape1 = slide.createFreeform();
// comples path consisting of a rectangle and an ellipse inside it
- GeneralPath path1 = new GeneralPath(new Rectangle(150, 150, 300, 300));
+ GeneralPath path1 = new GeneralPath(new Rectangle2D.Double(150, 150, 300, 300));
path1.append(new Ellipse2D.Double(200, 200, 100, 50), false);
shape1.setPath(path1);
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java Sat Nov 21 15:54:01 2015
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertSam
import static org.junit.Assert.assertTrue;
import java.awt.Dimension;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import org.junit.Test;
@@ -40,11 +40,11 @@ public class TestXSLFGroupShape {
XSLFGroupShape group = slide.createGroup();
assertEquals(1, slide.getShapes().size());
- Rectangle interior = new Rectangle(-10, -10, 20, 20);
+ Rectangle2D interior = new Rectangle2D.Double(-10, -10, 20, 20);
group.setInteriorAnchor(interior);
assertEquals(interior, group.getInteriorAnchor());
- Rectangle anchor = new Rectangle(0, 0, 792, 612);
+ Rectangle2D anchor = new Rectangle2D.Double(0, 0, 792, 612);
group.setAnchor(anchor);
assertEquals(anchor, group.getAnchor());
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java Sat Nov 21 15:54:01 2015
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertTru
import java.awt.Color;
import java.awt.Graphics2D;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
import java.io.IOException;
import java.util.List;
@@ -74,7 +74,7 @@ public class TestXSLFTextParagraph {
"of text within a shape. Properties here apply to all text " +
"residing within the corresponding paragraph.");
- Rectangle anchor = new Rectangle(50, 50, 300, 200);
+ Rectangle2D anchor = new Rectangle2D.Double(50, 50, 300, 200);
sh.setAnchor(anchor);
DrawTextParagraphProxy dtp = new DrawTextParagraphProxy(p);
@@ -172,7 +172,7 @@ public class TestXSLFTextParagraph {
"of text within a shape. Properties here apply to all text " +
"residing within the corresponding paragraph.");
- sh.setAnchor(new Rectangle(50, 50, 300, 200));
+ sh.setAnchor(new Rectangle2D.Double(50, 50, 300, 200));
DrawTextParagraphProxy dtp = new DrawTextParagraphProxy(p);
BufferedImage img = new BufferedImage(1, 1, BufferedImage.TYPE_INT_RGB);
@@ -184,13 +184,13 @@ public class TestXSLFTextParagraph {
assertEquals(4, lines.size());
// decrease the shape width from 300 pt to 100 pt
- sh.setAnchor(new Rectangle(50, 50, 100, 200));
+ sh.setAnchor(new Rectangle2D.Double(50, 50, 100, 200));
dtp.breakText(graphics);
lines = dtp.getLines();
assertEquals(12, lines.size());
// decrease the shape width from 300 pt to 100 pt
- sh.setAnchor(new Rectangle(50, 50, 600, 200));
+ sh.setAnchor(new Rectangle2D.Double(50, 50, 600, 200));
dtp.breakText(graphics);
lines = dtp.getLines();
assertEquals(2, lines.size());
@@ -224,7 +224,7 @@ public class TestXSLFTextParagraph {
assertEquals("POI", lines.get(1).getString());
XSLFAutoShape sh2 = slide.createAutoShape();
- sh2.setAnchor(new Rectangle(50, 50, 300, 200));
+ sh2.setAnchor(new Rectangle2D.Double(50, 50, 300, 200));
XSLFTextParagraph p2 = sh2.addNewTextParagraph();
XSLFTextRun r2 = p2.addNewTextRun();
r2.setFontFamily("serif"); // this should always be available
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFFreeformShape.java Sat Nov 21 15:54:01 2015
@@ -17,7 +17,6 @@
package org.apache.poi.hslf.usermodel;
-import java.awt.Rectangle;
import java.awt.geom.AffineTransform;
import java.awt.geom.GeneralPath;
import java.awt.geom.PathIterator;
@@ -90,7 +89,7 @@ public final class HSLFFreeformShape ext
@Override
public int setPath(GeneralPath path) {
- Rectangle bounds = path.getBounds();
+ Rectangle2D bounds = path.getBounds2D();
PathIterator it = path.getPathIterator(new AffineTransform());
List<byte[]> segInfo = new ArrayList<byte[]>();
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFGroupShape.java Sat Nov 21 15:54:01 2015
@@ -17,7 +17,7 @@
package org.apache.poi.hslf.usermodel;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -73,7 +73,7 @@ implements HSLFShapeContainer, GroupShap
}
@Override
- public void setAnchor(Rectangle anchor) {
+ public void setAnchor(Rectangle2D anchor) {
EscherClientAnchorRecord clientAnchor = getEscherChild(EscherClientAnchorRecord.RECORD_ID);
boolean isInitialized = !(clientAnchor.getDx1() == 0 && clientAnchor.getRow1() == 0);
@@ -85,7 +85,7 @@ implements HSLFShapeContainer, GroupShap
}
@Override
- public void setInteriorAnchor(Rectangle anchor){
+ public void setInteriorAnchor(Rectangle2D anchor){
EscherSpgrRecord spgr = getEscherChild(EscherSpgrRecord.RECORD_ID);
int x1 = Units.pointsToMaster(anchor.getX());
@@ -100,16 +100,16 @@ implements HSLFShapeContainer, GroupShap
}
@Override
- public Rectangle getInteriorAnchor(){
+ public Rectangle2D getInteriorAnchor(){
EscherSpgrRecord rec = getEscherChild(EscherSpgrRecord.RECORD_ID);
- int x1 = (int)Units.masterToPoints(rec.getRectX1());
- int y1 = (int)Units.masterToPoints(rec.getRectY1());
- int x2 = (int)Units.masterToPoints(rec.getRectX2());
- int y2 = (int)Units.masterToPoints(rec.getRectY2());
- return new Rectangle(x1,y1,x2-x1,y2-y1);
+ double x1 = Units.masterToPoints(rec.getRectX1());
+ double y1 = Units.masterToPoints(rec.getRectY1());
+ double x2 = Units.masterToPoints(rec.getRectX2());
+ double y2 = Units.masterToPoints(rec.getRectY2());
+ return new Rectangle2D.Double(x1,y1,x2-x1,y2-y1);
}
- protected void setExteriorAnchor(Rectangle anchor) {
+ protected void setExteriorAnchor(Rectangle2D anchor) {
EscherClientAnchorRecord clientAnchor = getEscherChild(EscherClientAnchorRecord.RECORD_ID);
//hack. internal variable EscherClientAnchorRecord.shortRecord can be
@@ -121,10 +121,10 @@ implements HSLFShapeContainer, GroupShap
clientAnchor.fillFields(header, 0, null);
// All coordinates need to be converted to Master units (576 dpi)
- clientAnchor.setFlag((short)Units.pointsToMaster(anchor.y));
- clientAnchor.setCol1((short)Units.pointsToMaster(anchor.x));
- clientAnchor.setDx1((short)Units.pointsToMaster(anchor.width + anchor.x));
- clientAnchor.setRow1((short)Units.pointsToMaster(anchor.height + anchor.y));
+ clientAnchor.setFlag((short)Units.pointsToMaster(anchor.getY()));
+ clientAnchor.setCol1((short)Units.pointsToMaster(anchor.getX()));
+ clientAnchor.setDx1((short)Units.pointsToMaster(anchor.getWidth() + anchor.getX()));
+ clientAnchor.setRow1((short)Units.pointsToMaster(anchor.getHeight() + anchor.getY()));
// TODO: does this make sense?
setInteriorAnchor(anchor);
@@ -177,20 +177,20 @@ implements HSLFShapeContainer, GroupShap
/**
* Moves and scales this <code>ShapeGroup</code> to the specified anchor.
*/
- protected void moveAndScale(Rectangle anchorDest){
- Rectangle anchorSrc = getAnchor();
- double scaleX = (anchorSrc.width == 0) ? 0 : anchorDest.width / (double)anchorSrc.width;
- double scaleY = (anchorSrc.height == 0) ? 0 : anchorDest.height / (double)anchorSrc.height;
+ protected void moveAndScale(Rectangle2D anchorDest){
+ Rectangle2D anchorSrc = getAnchor();
+ double scaleX = (anchorSrc.getWidth() == 0) ? 0 : anchorDest.getWidth() / anchorSrc.getWidth();
+ double scaleY = (anchorSrc.getHeight() == 0) ? 0 : anchorDest.getHeight() / anchorSrc.getHeight();
setExteriorAnchor(anchorDest);
for (HSLFShape shape : getShapes()) {
- Rectangle chanchor = shape.getAnchor();
- int x = (int)Math.rint(anchorDest.x+(chanchor.x-anchorSrc.x)*scaleX);
- int y = (int)Math.rint(anchorDest.y+(chanchor.y-anchorSrc.y)*scaleY);
- int width = (int)Math.rint(chanchor.width*scaleX);
- int height = (int)Math.rint(chanchor.height*scaleY);
- shape.setAnchor(new Rectangle(x, y, width, height));
+ Rectangle2D chanchor = shape.getAnchor();
+ double x = anchorDest.getX()+(chanchor.getX()-anchorSrc.getX())*scaleX;
+ double y = anchorDest.getY()+(chanchor.getY()-anchorSrc.getY())*scaleY;
+ double width = chanchor.getWidth()*scaleX;
+ double height = chanchor.getHeight()*scaleY;
+ shape.setAnchor(new Rectangle2D.Double(x, y, width, height));
}
}
@@ -200,7 +200,7 @@ implements HSLFShapeContainer, GroupShap
*
* @return the anchor of this shape group
*/
- public Rectangle getAnchor(){
+ public Rectangle2D getAnchor(){
EscherClientAnchorRecord clientAnchor = getEscherChild(EscherClientAnchorRecord.RECORD_ID);
int x1,y1,x2,y2;
if(clientAnchor == null){
@@ -216,11 +216,11 @@ implements HSLFShapeContainer, GroupShap
x2 = clientAnchor.getDx1();
y2 = clientAnchor.getRow1();
}
- Rectangle anchor= new Rectangle(
- (int)(x1 == -1 ? -1 : Units.masterToPoints(x1)),
- (int)(y1 == -1 ? -1 : Units.masterToPoints(y1)),
- (int)(x2 == -1 ? -1 : Units.masterToPoints(x2-x1)),
- (int)(y2 == -1 ? -1 : Units.masterToPoints(y2-y1))
+ Rectangle2D anchor= new Rectangle2D.Double(
+ (x1 == -1 ? -1 : Units.masterToPoints(x1)),
+ (y1 == -1 ? -1 : Units.masterToPoints(y1)),
+ (x2 == -1 ? -1 : Units.masterToPoints(x2-x1)),
+ (y2 == -1 ? -1 : Units.masterToPoints(y2-y1))
);
return anchor;
@@ -295,7 +295,7 @@ implements HSLFShapeContainer, GroupShap
public HSLFTextBox createTextBox() {
HSLFTextBox s = new HSLFTextBox(this);
s.setHorizontalCentered(true);
- s.setAnchor(new Rectangle(0, 0, 100, 100));
+ s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
addShape(s);
return s;
}
@@ -304,7 +304,7 @@ implements HSLFShapeContainer, GroupShap
public HSLFAutoShape createAutoShape() {
HSLFAutoShape s = new HSLFAutoShape(ShapeType.RECT, this);
s.setHorizontalCentered(true);
- s.setAnchor(new Rectangle(0, 0, 100, 100));
+ s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
addShape(s);
return s;
}
@@ -313,7 +313,7 @@ implements HSLFShapeContainer, GroupShap
public HSLFFreeformShape createFreeform() {
HSLFFreeformShape s = new HSLFFreeformShape(this);
s.setHorizontalCentered(true);
- s.setAnchor(new Rectangle(0, 0, 100, 100));
+ s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
addShape(s);
return s;
}
@@ -321,7 +321,7 @@ implements HSLFShapeContainer, GroupShap
@Override
public HSLFConnectorShape createConnector() {
HSLFConnectorShape s = new HSLFConnectorShape(this);
- s.setAnchor(new Rectangle(0, 0, 100, 100));
+ s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
addShape(s);
return s;
}
@@ -329,7 +329,7 @@ implements HSLFShapeContainer, GroupShap
@Override
public HSLFGroupShape createGroup() {
HSLFGroupShape s = new HSLFGroupShape(this);
- s.setAnchor(new Rectangle(0, 0, 100, 100));
+ s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
addShape(s);
return s;
}
@@ -340,7 +340,7 @@ implements HSLFShapeContainer, GroupShap
throw new IllegalArgumentException("pictureData needs to be of type HSLFPictureData");
}
HSLFPictureShape s = new HSLFPictureShape((HSLFPictureData)pictureData, this);
- s.setAnchor(new Rectangle(0, 0, 100, 100));
+ s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
addShape(s);
return s;
}
@@ -351,7 +351,7 @@ implements HSLFShapeContainer, GroupShap
throw new IllegalArgumentException("numRows and numCols must be greater than 0");
}
HSLFTable s = new HSLFTable(numRows,numCols,this);
- s.setAnchor(new Rectangle(0, 0, 100, 100));
+ s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
addShape(s);
return s;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFPictureShape.java Sat Nov 21 15:54:01 2015
@@ -18,7 +18,7 @@
package org.apache.poi.hslf.usermodel;
import java.awt.Insets;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import java.util.List;
import org.apache.poi.ddf.AbstractEscherOptRecord;
@@ -113,6 +113,7 @@ public class HSLFPictureShape extends HS
return _escherContainer;
}
+ @SuppressWarnings("resource")
@Override
public HSLFPictureData getPictureData(){
HSLFSlideShow ppt = getSheet().getSlideShow();
@@ -132,6 +133,7 @@ public class HSLFPictureShape extends HS
return null;
}
+ @SuppressWarnings("resource")
protected EscherBSERecord getEscherBSERecord(){
HSLFSlideShow ppt = getSheet().getSlideShow();
Document doc = ppt.getDocumentRecord();
@@ -184,7 +186,7 @@ public class HSLFPictureShape extends HS
EscherBSERecord bse = getEscherBSERecord();
bse.setRef(bse.getRef() + 1);
- Rectangle anchor = getAnchor();
+ Rectangle2D anchor = getAnchor();
if (anchor.isEmpty()){
new DrawPictureShape(this).resize();
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFShape.java Sat Nov 21 15:54:01 2015
@@ -19,7 +19,7 @@ package org.apache.poi.hslf.usermodel;
import java.awt.Color;
import java.awt.Graphics2D;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import java.util.Iterator;
import org.apache.poi.ddf.AbstractEscherOptRecord;
@@ -133,7 +133,7 @@ public abstract class HSLFShape implemen
*
* @return the anchor of this shape
*/
- public Rectangle getAnchor() {
+ public Rectangle2D getAnchor() {
EscherSpRecord spRecord = getEscherChild(EscherSpRecord.RECORD_ID);
int flags = spRecord.getFlags();
int x1,y1,x2,y2;
@@ -156,11 +156,11 @@ public abstract class HSLFShape implemen
}
// TODO: find out where this -1 value comes from at #57820 (link to ms docs?)
- Rectangle anchor = new Rectangle(
- (int)(x1 == -1 ? -1 : Units.masterToPoints(x1)),
- (int)(y1 == -1 ? -1 : Units.masterToPoints(y1)),
- (int)(x2 == -1 ? -1 : Units.masterToPoints(x2-x1)),
- (int)(y2 == -1 ? -1 : Units.masterToPoints(y2-y1))
+ Rectangle2D anchor = new Rectangle2D.Double(
+ (x1 == -1 ? -1 : Units.masterToPoints(x1)),
+ (y1 == -1 ? -1 : Units.masterToPoints(y1)),
+ (x2 == -1 ? -1 : Units.masterToPoints(x2-x1)),
+ (y2 == -1 ? -1 : Units.masterToPoints(y2-y1))
);
return anchor;
@@ -172,7 +172,7 @@ public abstract class HSLFShape implemen
*
* @param anchor new anchor
*/
- public void setAnchor(Rectangle anchor){
+ public void setAnchor(Rectangle2D anchor){
int x = Units.pointsToMaster(anchor.getX());
int y = Units.pointsToMaster(anchor.getY());
int w = Units.pointsToMaster(anchor.getWidth() + anchor.getX());
@@ -201,10 +201,10 @@ public abstract class HSLFShape implemen
* @param x the x coordinate of the top left corner of the shape
* @param y the y coordinate of the top left corner of the shape
*/
- public final void moveTo(float x, float y) {
+ public final void moveTo(double x, double y) {
// This convenience method should be implemented via setAnchor in subclasses
// see HSLFGroupShape.setAnchor() for a reference
- Rectangle anchor = getAnchor();
+ Rectangle2D anchor = getAnchor();
anchor.setRect(x, y, anchor.getWidth(), anchor.getHeight());
setAnchor(anchor);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSheet.java Sat Nov 21 15:54:01 2015
@@ -18,7 +18,7 @@
package org.apache.poi.hslf.usermodel;
import java.awt.Graphics2D;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -402,7 +402,7 @@ public abstract class HSLFSheet implemen
public HSLFTextBox createTextBox() {
HSLFTextBox s = new HSLFTextBox();
s.setHorizontalCentered(true);
- s.setAnchor(new Rectangle(0, 0, 100, 100));
+ s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
addShape(s);
return s;
}
@@ -411,7 +411,7 @@ public abstract class HSLFSheet implemen
public HSLFAutoShape createAutoShape() {
HSLFAutoShape s = new HSLFAutoShape(ShapeType.RECT);
s.setHorizontalCentered(true);
- s.setAnchor(new Rectangle(0, 0, 100, 100));
+ s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
addShape(s);
return s;
}
@@ -420,7 +420,7 @@ public abstract class HSLFSheet implemen
public HSLFFreeformShape createFreeform() {
HSLFFreeformShape s = new HSLFFreeformShape();
s.setHorizontalCentered(true);
- s.setAnchor(new Rectangle(0, 0, 100, 100));
+ s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
addShape(s);
return s;
}
@@ -428,7 +428,7 @@ public abstract class HSLFSheet implemen
@Override
public HSLFConnectorShape createConnector() {
HSLFConnectorShape s = new HSLFConnectorShape();
- s.setAnchor(new Rectangle(0, 0, 100, 100));
+ s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
addShape(s);
return s;
}
@@ -436,7 +436,7 @@ public abstract class HSLFSheet implemen
@Override
public HSLFGroupShape createGroup() {
HSLFGroupShape s = new HSLFGroupShape();
- s.setAnchor(new Rectangle(0, 0, 100, 100));
+ s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
addShape(s);
return s;
}
@@ -447,7 +447,7 @@ public abstract class HSLFSheet implemen
throw new IllegalArgumentException("pictureData needs to be of type HSLFPictureData");
}
HSLFPictureShape s = new HSLFPictureShape((HSLFPictureData)pictureData);
- s.setAnchor(new Rectangle(0, 0, 100, 100));
+ s.setAnchor(new Rectangle2D.Double(0, 0, 100, 100));
addShape(s);
return s;
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTable.java Sat Nov 21 15:54:01 2015
@@ -17,7 +17,7 @@
package org.apache.poi.hslf.usermodel;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -76,13 +76,13 @@ implements HSLFShapeContainer, TableShap
if(numRows < 1) throw new IllegalArgumentException("The number of rows must be greater than 1");
if(numCols < 1) throw new IllegalArgumentException("The number of columns must be greater than 1");
- int x=0, y=0, tblWidth=0, tblHeight=0;
+ double x=0, y=0, tblWidth=0, tblHeight=0;
cells = new HSLFTableCell[numRows][numCols];
for (int i = 0; i < cells.length; i++) {
x = 0;
for (int j = 0; j < cells[i].length; j++) {
cells[i][j] = new HSLFTableCell(this);
- Rectangle anchor = new Rectangle(x, y, HSLFTableCell.DEFAULT_WIDTH, HSLFTableCell.DEFAULT_HEIGHT);
+ Rectangle2D anchor = new Rectangle2D.Double(x, y, HSLFTableCell.DEFAULT_WIDTH, HSLFTableCell.DEFAULT_HEIGHT);
cells[i][j].setAnchor(anchor);
x += HSLFTableCell.DEFAULT_WIDTH;
}
@@ -90,7 +90,7 @@ implements HSLFShapeContainer, TableShap
}
tblWidth = x;
tblHeight = y;
- setExteriorAnchor(new Rectangle(0, 0, tblWidth, tblHeight));
+ setExteriorAnchor(new Rectangle2D.Double(0, 0, tblWidth, tblHeight));
EscherContainerRecord spCont = (EscherContainerRecord) getSpContainer().getChild(0);
AbstractEscherOptRecord opt = new EscherOptRecord();
@@ -159,13 +159,18 @@ implements HSLFShapeContainer, TableShap
private static class TableCellComparator implements Comparator<HSLFShape> {
public int compare( HSLFShape o1, HSLFShape o2 ) {
- Rectangle anchor1 = o1.getAnchor();
- Rectangle anchor2 = o2.getAnchor();
- int delta = anchor1.y - anchor2.y;
- if (delta == 0) delta = anchor1.x - anchor2.x;
+ Rectangle2D anchor1 = o1.getAnchor();
+ Rectangle2D anchor2 = o2.getAnchor();
+ double delta = anchor1.getY() - anchor2.getY();
+ if (delta == 0) {
+ delta = anchor1.getX() - anchor2.getX();
+ }
// descending size
- if (delta == 0) delta = (anchor2.width*anchor2.height)-(anchor1.width*anchor1.height);
- return delta;
+ if (delta == 0) {
+ delta = (anchor2.getWidth()*anchor2.getHeight())-(anchor1.getWidth()*anchor1.getHeight());
+ }
+
+ return (int)Math.signum(delta);
}
}
@@ -176,7 +181,7 @@ implements HSLFShapeContainer, TableShap
htc.add((HSLFTableCell)h);
}
}
-
+
if (htc.isEmpty()) {
throw new IllegalStateException("HSLFTable without HSLFTableCells");
}
@@ -186,12 +191,12 @@ implements HSLFShapeContainer, TableShap
List<HSLFTableCell[]> lst = new ArrayList<HSLFTableCell[]>();
List<HSLFTableCell> row = new ArrayList<HSLFTableCell>();
- int y0 = htc.get(0).getAnchor().y;
+ double y0 = htc.get(0).getAnchor().getY();
for (HSLFTableCell sh : htc) {
- Rectangle anchor = sh.getAnchor();
- boolean isNextRow = (anchor.y > y0);
+ Rectangle2D anchor = sh.getAnchor();
+ boolean isNextRow = (anchor.getY() > y0);
if (isNextRow) {
- y0 = anchor.y;
+ y0 = anchor.getY();
lst.add(row.toArray(new HSLFTableCell[row.size()]));
row.clear();
}
@@ -207,7 +212,7 @@ implements HSLFShapeContainer, TableShap
final double lx1, lx2, ly1, ly2;
LineRect(HSLFLine l) {
this.l = l;
- Rectangle r = l.getAnchor();
+ Rectangle2D r = l.getAnchor();
lx1 = r.getMinX();
lx2 = r.getMaxX();
ly1 = r.getMinY();
@@ -240,7 +245,7 @@ implements HSLFShapeContainer, TableShap
// TODO: this only works for non-rotated tables
for (HSLFTableCell[] tca : cells) {
for (HSLFTableCell tc : tca) {
- final Rectangle cellAnchor = tc.getAnchor();
+ final Rectangle2D cellAnchor = tc.getAnchor();
/**
* x1/y1 --------+
@@ -322,29 +327,53 @@ implements HSLFShapeContainer, TableShap
}
@Override
+ public double getRowHeight(int row) {
+ if (row < 0 || row >= cells.length) {
+ throw new IllegalArgumentException("Row index '"+row+"' is not within range [0-"+(cells.length-1)+"]");
+ }
+
+ return cells[row][0].getAnchor().getHeight();
+ }
+
+ @Override
public void setRowHeight(int row, double height) {
+ if (row < 0 || row >= cells.length) {
+ throw new IllegalArgumentException("Row index '"+row+"' is not within range [0-"+(cells.length-1)+"]");
+ }
+
int pxHeight = Units.pointsToPixel(height);
- int currentHeight = cells[row][0].getAnchor().height;
- int dy = pxHeight - currentHeight;
+ double currentHeight = cells[row][0].getAnchor().getHeight();
+ double dy = pxHeight - currentHeight;
for (int i = row; i < cells.length; i++) {
for (int j = 0; j < cells[i].length; j++) {
- Rectangle anchor = cells[i][j].getAnchor();
+ Rectangle2D anchor = cells[i][j].getAnchor();
if(i == row) {
- anchor.height = pxHeight;
+ anchor.setRect(anchor.getX(), anchor.getY(), anchor.getWidth(), pxHeight);
} else {
- anchor.y += dy;
+ anchor.setRect(anchor.getX(), anchor.getY()+dy, anchor.getWidth(), pxHeight);
}
cells[i][j].setAnchor(anchor);
}
}
- Rectangle tblanchor = getAnchor();
- tblanchor.height += dy;
+ Rectangle2D tblanchor = getAnchor();
+ tblanchor.setRect(tblanchor.getX(), tblanchor.getY(), tblanchor.getWidth(), tblanchor.getHeight() + dy);
setExteriorAnchor(tblanchor);
}
@Override
+ public double getColumnWidth(int col) {
+ if (col < 0 || col >= cells[0].length) {
+ throw new IllegalArgumentException("Column index '"+col+"' is not within range [0-"+(cells[0].length-1)+"]");
+ }
+
+ // TODO: check for merged cols
+ double width = cells[0][col].getAnchor().getWidth();
+ return width;
+ }
+
+ @Override
public void setColumnWidth(int col, final double width){
if (col < 0 || col >= cells[0].length) {
throw new IllegalArgumentException("Column index '"+col+"' is not within range [0-"+(cells[0].length-1)+"]");
@@ -352,20 +381,20 @@ implements HSLFShapeContainer, TableShap
double currentWidth = cells[0][col].getAnchor().getWidth();
double dx = width - currentWidth;
for (HSLFTableCell cols[] : cells) {
- Rectangle anchor = cols[col].getAnchor();
- anchor.width = (int)Math.rint(width);
+ Rectangle2D anchor = cols[col].getAnchor();
+ anchor.setRect(anchor.getX(), anchor.getY(), width, anchor.getHeight());
cols[col].setAnchor(anchor);
if (col < cols.length - 1) {
for (int j = col+1; j < cols.length; j++) {
anchor = cols[j].getAnchor();
- anchor.x += dx;
+ anchor.setRect(anchor.getX()+dx, anchor.getY(), anchor.getWidth(), anchor.getHeight());
cols[j].setAnchor(anchor);
}
}
}
- Rectangle tblanchor = getAnchor();
- tblanchor.width += dx;
+ Rectangle2D tblanchor = getAnchor();
+ tblanchor.setRect(tblanchor.getX(), tblanchor.getY(), tblanchor.getWidth() + dx, tblanchor.getHeight());
setExteriorAnchor(tblanchor);
}
@@ -393,7 +422,7 @@ implements HSLFShapeContainer, TableShap
}
@Override
- protected void moveAndScale(Rectangle anchorDest){
+ protected void moveAndScale(Rectangle2D anchorDest){
super.moveAndScale(anchorDest);
updateRowHeightsProperty();
}
@@ -403,7 +432,7 @@ implements HSLFShapeContainer, TableShap
EscherArrayProperty p = opt.lookup(EscherProperties.GROUPSHAPE__TABLEROWPROPERTIES);
byte[] val = new byte[4];
for (int rowIdx = 0; rowIdx < cells.length; rowIdx++) {
- int rowHeight = Units.pointsToMaster(cells[rowIdx][0].getAnchor().height);
+ int rowHeight = Units.pointsToMaster(cells[rowIdx][0].getAnchor().getHeight());
LittleEndian.putInt(val, 0, rowHeight);
p.setElement(rowIdx, val);
}
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTableCell.java Sat Nov 21 15:54:01 2015
@@ -18,7 +18,7 @@
package org.apache.poi.hslf.usermodel;
import java.awt.Color;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import org.apache.poi.ddf.AbstractEscherOptRecord;
import org.apache.poi.ddf.EscherContainerRecord;
@@ -85,40 +85,40 @@ public final class HSLFTableCell extends
if (line == null) {
return;
}
- Rectangle cellAnchor = getAnchor();
- Rectangle lineAnchor = new Rectangle();
+ Rectangle2D cellAnchor = getAnchor();
+ double x,y,w,h;
switch(edge){
case top:
- lineAnchor.x = cellAnchor.x;
- lineAnchor.y = cellAnchor.y;
- lineAnchor.width = cellAnchor.width;
- lineAnchor.height = 0;
+ x = cellAnchor.getX();
+ y = cellAnchor.getY();
+ w = cellAnchor.getWidth();
+ h = 0;
break;
case right:
- lineAnchor.x = cellAnchor.x + cellAnchor.width;
- lineAnchor.y = cellAnchor.y;
- lineAnchor.width = 0;
- lineAnchor.height = cellAnchor.height;
+ x = cellAnchor.getX() + cellAnchor.getWidth();
+ y = cellAnchor.getY();
+ w = 0;
+ h = cellAnchor.getHeight();
break;
case bottom:
- lineAnchor.x = cellAnchor.x;
- lineAnchor.y = cellAnchor.y + cellAnchor.height;
- lineAnchor.width = cellAnchor.width;
- lineAnchor.height = 0;
+ x = cellAnchor.getX();
+ y = cellAnchor.getY() + cellAnchor.getHeight();
+ w = cellAnchor.getWidth();
+ h = 0;
break;
case left:
- lineAnchor.x = cellAnchor.x;
- lineAnchor.y = cellAnchor.y;
- lineAnchor.width = 0;
- lineAnchor.height = cellAnchor.height;
+ x = cellAnchor.getX();
+ y = cellAnchor.getY();
+ w = 0;
+ h = cellAnchor.getHeight();
break;
default:
throw new IllegalArgumentException();
}
- line.setAnchor(lineAnchor);
+ line.setAnchor(new Rectangle2D.Double(x,y,w,h));
}
- public void setAnchor(Rectangle anchor){
+ public void setAnchor(Rectangle2D anchor){
super.setAnchor(anchor);
anchorBorder(BorderEdge.top, borderTop);
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFTextShape.java Sat Nov 21 15:54:01 2015
@@ -20,7 +20,6 @@ package org.apache.poi.hslf.usermodel;
import static org.apache.poi.hslf.record.RecordTypes.OEPlaceholderAtom;
import static org.apache.poi.hslf.record.RecordTypes.RoundTripHFPlaceholder12;
-import java.awt.Rectangle;
import java.awt.font.FontRenderContext;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
@@ -209,7 +208,11 @@ implements TextShape<HSLFShape,HSLFTextP
} catch (IOException e){
throw new HSLFException(e);
}
- if(getAnchor().equals(new Rectangle()) && !"".equals(getText())) resizeToFitText();
+ boolean isInitialAnchor = getAnchor().equals(new Rectangle2D.Double());
+ boolean isFilledTxt = !"".equals(getText());
+ if (isInitialAnchor && isFilledTxt) {
+ resizeToFitText();
+ }
}
for (HSLFTextParagraph htp : _paragraphs) {
htp.setShapeId(getShapeId());
@@ -250,10 +253,10 @@ implements TextShape<HSLFShape,HSLFTextP
* @return a <code>Rectangle2D</code> that is the bounds of this shape.
*/
public Rectangle2D resizeToFitText(){
- Rectangle anchor = getAnchor();
+ Rectangle2D anchor = getAnchor();
if(anchor.getWidth() == 0.) {
logger.log(POILogger.WARN, "Width of shape wasn't set. Defaulting to 200px");
- anchor.setSize(200, (int)anchor.getHeight());
+ anchor.setRect(anchor.getX(), anchor.getY(), 200., anchor.getHeight());
setAnchor(anchor);
}
double height = getTextHeight();
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestMovieShape.java Sat Nov 21 15:54:01 2015
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -50,7 +50,7 @@ public final class TestMovieShape {
HSLFPictureData thumbnailData = ppt.addPicture(_slTests.readFile("tomcat.png"), PictureType.PNG);
MovieShape shape = new MovieShape(movieIdx, thumbnailData);
- shape.setAnchor(new Rectangle(300,225,120,90));
+ shape.setAnchor(new Rectangle2D.Double(300,225,120,90));
slide.addShape(shape);
assertEquals(path, shape.getPath());
Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java?rev=1715540&r1=1715539&r2=1715540&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java (original)
+++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java Sat Nov 21 15:54:01 2015
@@ -20,10 +20,11 @@ package org.apache.poi.hslf.model;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
-import java.awt.Rectangle;
+import java.awt.geom.Rectangle2D;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
import java.util.List;
@@ -50,23 +51,36 @@ public final class TestOleEmbedding {
* @throws Exception if an error occurs.
*/
@Test
- public void testOleEmbedding2003() throws Exception {
+ public void testOleEmbedding2003() throws IOException {
HSLFSlideShowImpl slideShow = new HSLFSlideShowImpl(_slTests.openResourceAsStream("ole2-embedding-2003.ppt"));
// Placeholder EMFs for clients that don't support the OLE components.
List<HSLFPictureData> pictures = slideShow.getPictureData();
assertEquals("Should be two pictures", 2, pictures.size());
- //assertDigestEquals("Wrong data for picture 1", "8d1fbadf4814f321bb1ccdd056e3c788", pictures[0].getData());
- //assertDigestEquals("Wrong data for picture 2", "987a698e83559cf3d38a0deeba1cc63b", pictures[1].getData());
+
+ long checkSums[] = { 0xD37A4204l, 0x26A62F68l, 0x82853169l, 0xE0E45D2Bl };
+ int checkId = 0;
+
+ // check for checksum to be uptodate
+ for (HSLFPictureData pd : pictures) {
+ long checkEMF = IOUtils.calculateChecksum(pd.getData());
+ assertEquals(checkSums[checkId++], checkEMF);
+ }
// Actual embedded objects.
HSLFObjectData[] objects = slideShow.getEmbeddedObjects();
assertEquals("Should be two objects", 2, objects.length);
- //assertDigestEquals("Wrong data for objecs 1", "0d1fcc61a83de5c4894dc0c88e9a019d", objects[0].getData());
- //assertDigestEquals("Wrong data for object 2", "b323604b2003a7299c77c2693b641495", objects[1].getData());
+ for (HSLFObjectData od : objects) {
+ long checkEMF = IOUtils.calculateChecksum(od.getData());
+ assertEquals(checkSums[checkId++], checkEMF);
+ }
+
+ slideShow.close();
}
+
+
@Test
- public void testOLEShape() throws Exception {
+ public void testOLEShape() throws IOException {
HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("ole2-embedding-2003.ppt"));
HSLFSlide slide = ppt.getSlides().get(0);
@@ -97,12 +111,12 @@ public final class TestOleEmbedding {
}
assertEquals("Expected 2 OLE shapes", 2, cnt);
+ ppt.close();
}
@Test
- public void testEmbedding() throws Exception {
- HSLFSlideShowImpl _hslfSlideShow = HSLFSlideShowImpl.create();
- HSLFSlideShow ppt = new HSLFSlideShow(_hslfSlideShow);
+ public void testEmbedding() throws IOException {
+ HSLFSlideShow ppt = new HSLFSlideShow();
File pict = POIDataSamples.getSlideShowInstance().getFile("clock.jpg");
HSLFPictureData pictData = ppt.addPicture(pict, PictureType.JPEG);
@@ -117,7 +131,7 @@ public final class TestOleEmbedding {
OLEShape oleShape1 = new OLEShape(pictData);
oleShape1.setObjectID(oleObjectId1);
slide1.addShape(oleShape1);
- oleShape1.setAnchor(new Rectangle(100,100,100,100));
+ oleShape1.setAnchor(new Rectangle2D.Double(100,100,100,100));
// add second slide with different order in object creation
HSLFSlide slide2 = ppt.createSlide();
@@ -131,7 +145,7 @@ public final class TestOleEmbedding {
oleShape2.setObjectID(oleObjectId2);
slide2.addShape(oleShape2);
- oleShape2.setAnchor(new Rectangle(100,100,100,100));
+ oleShape2.setAnchor(new Rectangle2D.Double(100,100,100,100));
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ppt.write(bos);
@@ -148,6 +162,8 @@ public final class TestOleEmbedding {
poiData1.close();
poiData2.close();
-
+ ppt.close();
}
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org