Changeset 789

Timestamp:

01/30/14 11:11:40 (10 years ago)

Author:

jts21

Message:

Add support to PDF2Writer for rotated images, filled polyons, polylines, and arrows (complete with arrowheads)

Location:

trunk/src/org/expeditee

Files:

• io/PDF2Writer.java (modified) (3 diffs)
• items/Line.java (modified) (7 diffs)

trunk/src/org/expeditee/io/PDF2Writer.java

@@ -3 +3 @@
 import java.awt.Dimension;
 import java.awt.Image;
+import java.awt.Polygon;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Collection;
+import java.util.LinkedList;
 import java.util.List;
 
@@ -12 +14 @@
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.items.Item;
+import org.expeditee.items.Line;
 import org.expeditee.items.Picture;
 import org.expeditee.items.Text;
@@ -100 +103 @@
                 try {
                         PdfContentByte cb = _pdfWriter.getDirectContent();
-                        com.lowagie.text.Image iTextImage = com.lowagie.text.Image
-                                        .getInstance(image, null);
+                        com.lowagie.text.Image iTextImage = com.lowagie.text.Image.getInstance(image, null);
                         iTextImage.setAbsolutePosition(pic.getX(), _pdfWriter.getPageSize().getHeight() - pic.getY() - pic.getHeight());
+                        iTextImage.setRotationDegrees((float) - pic.getRotate());
                         cb.addImage(iTextImage);
                 } catch (DocumentException e) {
                         e.printStackTrace();
+                }
+        }
+        
+        private List<Line> seenLines = new LinkedList<Line>();
+        private List<Item> seenArrowHeads = new LinkedList<Item>();
+        @Override
+        protected void writeLine(Line line) throws IOException {
+                if(seenLines.contains(line)) {
+                        return;
+                }
+                PdfContentByte cb = _pdfWriter.getDirectContent();
+                float height = _pdfWriter.getPageSize().getHeight();
+                if(line.getStartItem().isEnclosed()) {
+                        seenLines.add(line);
+                        Line currentLine = line;
+                        Item currentItem = line.getStartItem();
+                        cb.moveTo(currentItem.getX(), height - currentItem.getY());
+                        for(;;) {
+                                currentItem = currentLine.getOppositeEnd(currentItem);
+                                cb.lineTo(currentItem.getX(), height - currentItem.getY());
+                                for(Line l : currentItem.getLines()) {
+                                        if(l.equals(currentLine)) {
+                                                continue;
+                                        }
+                                        currentLine = l;
+                                        break;
+                                }
+                                if(currentLine == null || currentLine.equals(line)) {
+                                        break;
+                                }
+                                seenLines.add(currentLine);
+                        }
+                        cb.setColorFill(currentItem.getFillColor());
+                        cb.setColorStroke(currentLine.getColor());
+                        cb.closePathFillStroke();
+                } else {
+                        for(Item l : line.getStartItem().getAllConnected()) {
+                                if(l instanceof Line && !seenLines.contains(l)) {
+                                        seenLines.add((Line) l);
+                                        Item start = ((Line) l).getStartItem();
+                                        Item end = ((Line) l).getEndItem();
+                                        cb.moveTo(start.getX(), height - start.getY());
+                                        cb.lineTo(end.getX(), height - end.getY());
+                                        cb.setColorStroke(l.getColor());
+                                        cb.closePathStroke();
+                                        Polygon arrow = ((Line) l).getStartArrow();
+                                        if(arrow != null) {
+                                                cb.moveTo(arrow.xpoints[0], height - arrow.ypoints[0]);
+                                                for(int i = 1; i < arrow.npoints; i++) {
+                                                        cb.lineTo(arrow.xpoints[i], height - arrow.ypoints[i]);
+                                                }
+                                                cb.setColorFill(l.getColor());
+                                                cb.closePath();
+                                                cb.fill();
+                                        }
+                                        arrow = ((Line) l).getEndArrow();
+                                        if(arrow != null) {
+                                                cb.moveTo(arrow.xpoints[0], height - arrow.ypoints[0]);
+                                                for(int i = 1; i < arrow.npoints; i++) {
+                                                        cb.lineTo(arrow.xpoints[i], height - arrow.ypoints[i]);
+                                                }
+                                                cb.setColorFill(l.getColor());
+                                                cb.closePath();
+                                                cb.fill();
+                                        }
+                                }
+                        }
                 }
         }

trunk/src/org/expeditee/items/Line.java

@@ -11 +11 @@
 import java.awt.Stroke;
 import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -405 +406 @@
                 g.setStroke(new BasicStroke(getPaintThickness(), CAP,
                                 BasicStroke.JOIN_MITER));
-                paintArrow(g, _start, _startOffset, _endOffset);
-                paintArrow(g, _end, _endOffset, _startOffset);
+                paintArrow(g, getStartArrow());
+                paintArrow(g, getEndArrow());
 
                 if (_virtualSpot != null) {
@@ -429 +430 @@
 
         }
-
-        /**
-         * Based on code from DeSL (Arrow2D) http://sourceforge.net/projects/desl/
-         */
-        private void paintArrow(Graphics2D g, Item withArrow, Point startOffset,
-                        Point endOffset) {
+        
+        /**
+         * Gets the arrow head 
+         * @param withArrow
+         * @param startOffset
+         * @param endOffset
+         * @return
+         */
+        private Shape getArrow(Item withArrow, Point startOffset, Point endOffset) {
                 boolean disconnectMode = withArrow._mode == Item.HighlightMode.Disconnect;
                 // only draw an arrowhead if necessary
                 if (!(this._mode == Item.HighlightMode.Disconnect && disconnectMode)
                                 && (!withArrow.hasVisibleArrow() || withArrow.getLines().size() > 1))
-                        return;
+                        return null;
 
                 int x0, x1, y0, y1;
@@ -462 +466 @@
                 // floating
                 if (arrowLength != AUTO_ARROWHEAD_LENGTH && (arrowRatio < 0 || arrowNibPerc < 0)) {
-                        return;
+                        return null;
                 }
 
@@ -473 +477 @@
                 // wont show the arrow
                 if (length <= MINIMUM_ARROW_HEAD_LENGTH)
-                        return;
+                        return null;
                 if (arrowLength == AUTO_ARROWHEAD_LENGTH) {
                         arrowLength = getAutoArrowheadLength(length);
@@ -498 +502 @@
                 AffineTransform tx = AffineTransform.getRotateInstance(rad, x0, y0);
                 
+        int[] rx = new int[arrowhead.npoints];
+        int[] ry = new int[arrowhead.npoints];
+        
+        for(int i = 0; i < arrowhead.npoints; i++){
+            Point2D p = new Point2D.Double(arrowhead.xpoints[i], arrowhead.ypoints[i]);
+            tx.transform(p,p);
+            rx[i] = (int) p.getX();
+            ry[i] = (int) p.getY();
+        }
+        
+        return new Polygon(rx, ry, arrowhead.npoints);
+        }
+        
+        public Polygon getStartArrow() {
+                return (Polygon) getArrow(_start, _startOffset, _endOffset);
+        }
+        
+        public Polygon getEndArrow() {
+                return (Polygon) getArrow(_end, _endOffset, _startOffset);
+        }
+
+        /**
+         * Based on code from DeSL (Arrow2D) http://sourceforge.net/projects/desl/
+         */
+        private void paintArrow(Graphics2D g, Shape arrow) {
+                
+                if(arrow == null) {
+                        return;
+                }
                 
                 // TODO
@@ -508 +541 @@
                 g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
                 
-                g.draw(tx.createTransformedShape((Shape) arrowhead));
-                g.fill(tx.createTransformedShape((Shape) arrowhead));
+                g.draw(arrow);
+                g.fill(arrow);
         
         }