Changeset 821

Timestamp:

02/04/14 15:33:39 (10 years ago)

Author:

jts21

Message:

Add support for writetree to PDF2,
Links followed by writetree are clickable in the PDF (and have the Expeditee linkmark next to them).
To Fix:

• The clickable bounding box of rotated images is just a non-rotated rectangle covering the entire rotated image (and also covering the whitespace or any other items around the corners of the image). This is due to anchors apparently not working when they're rotated (seriously, there's a way to rotate them, but once rotated they can't be clicked to follow their link)
• Currently polygons don't get linked, because there doesn't seem to be a way to make a non-rectangular anchor, nor to actually put a polygon inside an anchor (I suppose it could be done by just putting an empty anchor of the correct dimensions over the top of the polygon)

Location:

trunk/src/org/expeditee

Files:

• io/PDF2Writer.java (modified) (9 diffs)
• items/Item.java (modified) (1 diff)

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

@@ -5 +5 @@
 import java.awt.Image;
 import java.awt.Polygon;
+import java.awt.geom.AffineTransform;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import org.expeditee.gui.Frame;
@@ -21 +25 @@
 import org.expeditee.settings.UserSettings;
 
+import com.lowagie.text.Anchor;
+import com.lowagie.text.Chunk;
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
@@ -26 +32 @@
 import com.lowagie.text.FontFactory;
 import com.lowagie.text.Rectangle;
+import com.lowagie.text.pdf.ColumnText;
 import com.lowagie.text.pdf.PdfContentByte;
 import com.lowagie.text.pdf.PdfWriter;
 
 /**
- * 
- * @author root
+ * @author jts21
  *
  */
-public class PDF2Writer extends DefaultFrameWriter {
-
+public class PDF2Writer extends DefaultTreeWriter {
+        
+        private class OrderedHashSet<T> implements Set<T> {
+                private List<T> _orderedList;
+                private HashSet<T> _hashSet;
+                public OrderedHashSet() {
+                        super();
+                        _orderedList = new LinkedList<T>();
+                        _hashSet = new HashSet<T>();
+                }
+                
+                @Override
+                public Iterator<T> iterator() {
+                        return _orderedList.iterator();
+                }
+                
+                @Override
+                public void clear() {
+                        _hashSet.clear();
+                        _orderedList.clear();
+                }
+                
+                @Override
+                public boolean add(T o) {
+                        return _hashSet.add(o) && _orderedList.add(o);
+                }
+                
+                @Override
+        public boolean remove(Object o) {
+                return _hashSet.remove(o) && _orderedList.remove(o);
+        }
+
+                @Override
+        public int size() {
+                return _orderedList.size();
+        }
+
+                @Override
+        public boolean isEmpty() {
+                return _orderedList.isEmpty();
+        }
+
+                @Override
+        public boolean contains(Object o) {
+                return _hashSet.contains(o);
+        }
+
+                @Override
+        public Object[] toArray() {
+                return _orderedList.toArray();
+        }
+
+                @SuppressWarnings("hiding")
+        @Override
+        public <T> T[] toArray(T[] a) {
+                return _orderedList.toArray(a);
+        }
+
+                @Override
+        public boolean containsAll(Collection<?> c) {
+                return _hashSet.containsAll(c);
+        }
+
+                @Override
+        public boolean addAll(Collection<? extends T> c) {
+                return _hashSet.addAll(c) && _orderedList.addAll(c);
+        }
+
+                @Override
+        public boolean retainAll(Collection<?> c) {
+                return _hashSet.retainAll(c) && _orderedList.retainAll(c);
+        }
+
+                @Override
+        public boolean removeAll(Collection<?> c) {
+                return _hashSet.removeAll(c) && _orderedList.removeAll(c);
+        }
+        }
+        
         private Document _pdfDocument;
         private Dimension _pageSize;
         private PdfWriter _pdfWriter;
         private float _height;
+        private boolean _first = true;
+        private OrderedHashSet<Frame> _frames = null;
 
         public PDF2Writer() {
@@ -57 +142 @@
                         _pdfDocument.addAuthor(UserSettings.UserName.get());
                         _pdfDocument.addCreator("Expeditee");
+                        _pdfDocument.addTitle(start.getTitle());
                         _height = _pdfWriter.getPageSize().getHeight();
-                        // set bg color
-                        PdfContentByte cb = _pdfWriter.getDirectContent();
-                        cb.setColorFill(start.getPaintBackgroundColor());
-                        System.out.println(start.getBackgroundColor());
-                        cb.rectangle(0, 0, _pageSize.width, _pageSize.height);
-                        cb.fillStroke();
                 } catch (DocumentException e) {
                         e.printStackTrace();
@@ -69 +149 @@
                 }
         }
-
-        @Override
-        protected void writeTitle(Text toWrite, List<Item> items)
-                        throws IOException {
-                _pdfDocument.addTitle(toWrite.getText());
-                writeText(toWrite);
-        }
-
+        
         @Override
         protected String finalise() throws IOException {
@@ -82 +155 @@
                 return super.finalise();
         }
-
+        
+        /**
+         * Used to make sure that only links with valid targets are used
+         * @param start
+         */
+        private boolean findValidLinksRecursive(Frame current, Set<Frame> known) {
+                if(current == null || known.contains(current))
+                        return false;
+                known.add(current);
+                
+                Frame child;
+                for(Item i : current.getItems()) {
+                        if(i.isAnnotation())
+                                continue;
+                        if((child = i.getChild()) != null)
+                                findValidLinksRecursive(child, known);
+                }
+                
+                return true;
+        }
+        
+        @Override
+        protected void outputTree(Frame toWrite) throws IOException {
+                if (toWrite == null)
+                        return;
+                _frames = new OrderedHashSet<Frame>();
+                
+                findValidLinksRecursive(toWrite, _frames);
+                
+                System.out.println(_frames);
+                
+                for(Frame f : _frames) {
+                        if(f == null)
+                                continue;
+                        writeStartFrame(f);
+                Text title = f.getTitleItem();
+                for(Item i : f.getItems()) {
+                        if(i != title) {
+                                this.writeItem(i);
+                        }
+                }
+                // draw title last since it needs to be handled separately from other items,
+                // and also drawn on top of shapes
+                if (title != null) {
+                        if (title.isAnnotation())
+                                this.writeAnnotationTitle(title);
+                        else
+                                this.writeTitle(title, f.getItems());
+                }
+                }
+        }
+        
+        @Override
+        protected void writeStartFrame(Frame starting) throws IOException {
+                // start a new page
+                if(!_first) {
+                        _pdfDocument.newPage();
+                } else {
+                        _first = false;
+                }
+                // set bg color
+                PdfContentByte cb = _pdfWriter.getDirectContent();
+                cb.setColorFill(starting.getPaintBackgroundColor());
+                System.out.println(starting.getBackgroundColor());
+                cb.rectangle(0, 0, _pageSize.width, _pageSize.height);
+                cb.fill();
+                // super.writeStartFrame(starting);
+        }
+        
+        private void drawPolygon(PdfContentByte cb, Polygon poly, Color fill, Color line, float lineThickness) {
+                if(poly != null) {
+                        cb.moveTo(poly.xpoints[0], _height - poly.ypoints[0]);
+                        for(int i = 1; i < poly.npoints; i++) {
+                                cb.lineTo(poly.xpoints[i], _height - poly.ypoints[i]);
+                        }
+                        cb.closePath();
+                        if(fill != null) {
+                                cb.setColorFill(fill);
+                                if(lineThickness > 0) {
+                                cb.setLineWidth(lineThickness);
+                                cb.setColorStroke(line);
+                                cb.fillStroke();
+                        } else {
+                                cb.fill();
+                        }
+                        } else {
+                                cb.setLineWidth(lineThickness);
+                                cb.setColorStroke(line);
+                                cb.stroke();
+                        }
+                }
+        }
+        
+        private void drawMark(PdfContentByte cb, Item i, float x, float y) {
+                if(i == null) return;
+                boolean hasLink = i.getLink() != null;
+                
+                if (hasLink) {
+                        
+                        Color lineColor = Color.BLACK, fillColor = null;
+                        Polygon poly = i.getLinkPoly();
+                        poly = new Polygon(poly.xpoints, poly.ypoints, poly.npoints);
+                        poly.translate((int) (x - Item.LEFT_MARGIN), (int) (_height - y - i.getBoundsHeight() / 2));
+                        
+                        drawPolygon(cb, poly, fillColor, lineColor, 0.5f);
+                }
+        }
+        
+        private void writeAnchor(PdfContentByte cb, Item i, Anchor a, float x, float y) {
+                if(i.getParent() != null && i.getParent().getTitleItem().equals(i)) {
+                        a.setName(i.getParent().getName());
+                }
+                if(_frames != null && i.getChild() != null && _frames.contains(i.getChild())) {
+                        a.setReference("#" + i.getAbsoluteLink());
+                        drawMark(cb, i, x, y);
+                }
+                
+                ColumnText.showTextAligned(cb, PdfContentByte.ALIGN_LEFT, a, x, y, 0);
+        }
+        
+        @Override
+        protected void writeTitle(Text title, List<Item> items) throws IOException {
+                writeText(title);
+        }
+        
         @Override
         protected void writeText(Text text) throws IOException {
                 PdfContentByte cb = _pdfWriter.getDirectContent();
-                // we tell the ContentByte we're ready to draw text
-                cb.beginText();
                 Font font = FontFactory.getFont(
                                 Conversion.getPdfFont(text.getFamily()), text.getSize(), text
                                                 .getPaintFont().getStyle(), text.getPaintColor());
-                cb.setFontAndSize(font.getBaseFont(), text.getSize());
-                // cb.setColorStroke(text.getPaintColor());
-                cb.setColorFill(text.getPaintColor());
-
+                
                 // we draw some text on a certain position
-                cb.setTextMatrix(text.getX(), _pdfWriter.getPageSize().getHeight() - text.getY());
+                float x = text.getX(), y = _pdfWriter.getPageSize().getHeight() - text.getY();
                 List<String> textLines = text.getTextList();
-                //cb.showText(textLines.get(0));
                 for(int i = 0; i < textLines.size(); i++){
-                        cb.showText(textLines.get(i));
-                        cb.moveText(0, -text.getLineHeight());
-                }
-                
-                // we tell the contentByte, we've finished drawing text
-                cb.endText();
+                        Chunk chunk = new Chunk(textLines.get(i), font);
+                        Anchor anchor = new Anchor(chunk);
+                        writeAnchor(cb, text, anchor, x, y);
+                        y -= text.getLineHeight();
+                }
         }
 
@@ -117 +307 @@
                         double sin = Math.sin(angle), cos = Math.cos(angle);
                         int w = pic.getWidth(), h = pic.getHeight();
-                        iTextImage.setAbsolutePosition((float) (pic.getX() + (w - Math.abs(w * cos + h * sin)) / 2),
-                                        (float) (_pdfWriter.getPageSize().getHeight() - pic.getY() - (h + Math.abs(w * sin + h * cos)) / 2));
                         iTextImage.scalePercent(pic.getScale() * 100);
                         iTextImage.setRotation(-angle);
-                        cb.addImage(iTextImage);
+                        Chunk chunk = new Chunk(iTextImage, 0, 0);
+                        Anchor anchor = new Anchor(chunk);
+                        writeAnchor(cb, pic, anchor,
+                                        (float) (pic.getX() + (w - Math.abs(w * cos + h * sin)) / 2),
+                                        (float) (_height - pic.getY() - (h + Math.abs(w * sin + h * cos)) / 2));
+                        // cb.addImage(iTextImage);
                 } catch (DocumentException e) {
                         e.printStackTrace();
@@ -138 +331 @@
                 } else {
                         cb.fill();
-                }
-        }
-        
-        private void fillPolygon(PdfContentByte cb, Polygon poly, Color fill, Color line, float lineThickness) {
-                if(poly != null) {
-                        cb.moveTo(poly.xpoints[0], _height - poly.ypoints[0]);
-                        for(int i = 1; i < poly.npoints; i++) {
-                                cb.lineTo(poly.xpoints[i], _height - poly.ypoints[i]);
-                        }
-                        cb.closePath();
-                        cb.setColorFill(fill);
-                        if(lineThickness > 0) {
-                                cb.setLineWidth(lineThickness);
-                                cb.setColorStroke(line);
-                                cb.fillStroke();
-                        } else {
-                                cb.fill();
-                        }
                 }
         }
@@ -216 +391 @@
                                                 cb.stroke();
                                         }
-                                        fillPolygon(cb, ((Line) l).getStartArrow(), l.getPaintColor(), l.getPaintColor(), l.getThickness());
-                                        fillPolygon(cb, ((Line) l).getEndArrow(), l.getPaintColor(), l.getPaintColor(), l.getThickness());
+                                        drawPolygon(cb, ((Line) l).getStartArrow(), l.getPaintColor(), l.getPaintColor(), l.getThickness());
+                                        drawPolygon(cb, ((Line) l).getEndArrow(), l.getPaintColor(), l.getPaintColor(), l.getThickness());
                                 }
                         }

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

@@ -638 +638 @@
 
         // TODO draw the link with a circle rather than a polygon!!
-        protected Polygon getLinkPoly() {
+        public Polygon getLinkPoly() {
                 if (_circle == null) {
                         int points = 16;