Changeset 789 for trunk/src/org/expeditee/items

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)

File:

• trunk/src/org/expeditee/items/Line.java (modified) (7 diffs)

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);
         
         }