Changeset 819

Timestamp:

02/03/14 17:02:11 (10 years ago)

Author:

jts21

Message:

Fix bug in linehead polygon drawing, and extract polygon drawing to separate function

File:

• trunk/src/org/expeditee/io/PDF2Writer.java (modified) (7 diffs)

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

@@ -1 +1 @@
 package org.expeditee.io;
 
+import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Image;
@@ -38 +39 @@
 
         private PdfWriter _pdfWriter;
+        private float _height;
 
         public PDF2Writer() {
@@ -55 +57 @@
                         _pdfDocument.addAuthor(UserSettings.UserName.get());
                         _pdfDocument.addCreator("Expeditee");
+                        _height = _pdfWriter.getPageSize().getHeight();
                 } catch (DocumentException e) {
                         e.printStackTrace();
@@ -132 +135 @@
         }
         
+        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();
+                        }
+                }
+        }
+        
         private List<Line> seenLines = new LinkedList<Line>();
         @Override
@@ -139 +160 @@
                 }
                 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());
+                        cb.moveTo(currentItem.getX(), _height - currentItem.getY());
                         for(;;) {
                                 currentItem = currentLine.getOppositeEnd(currentItem);
-                                cb.lineTo(currentItem.getX(), height - currentItem.getY());
+                                cb.lineTo(currentItem.getX(), _height - currentItem.getY());
                                 for(Line l : currentItem.getLines()) {
                                         if(l.equals(currentLine)) {
@@ -175 +195 @@
                                         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.moveTo(start.getX(), _height - start.getY());
+                                        cb.lineTo(end.getX(), _height - end.getY());
                                         cb.closePath();
                                         if(l.getThickness() >= 0) {
@@ -183 +203 @@
                                                 cb.stroke();
                                         }
-                                        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.closePath();
-                                                cb.setColorFill(l.getColor());
-                                                if(l.getThickness() > 0) {
-                                                cb.setLineWidth(l.getThickness());
-                                                cb.setColorStroke(l.getColor());
-                                                cb.stroke();
-                                        } else {
-                                                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.closePath();
-                                                cb.setColorFill(l.getColor());
-                                                if(l.getThickness() > 0) {
-                                                cb.setLineWidth(l.getThickness());
-                                                cb.setColorStroke(l.getColor());
-                                                cb.fillStroke();
-                                        } else {
-                                                cb.fill();
-                                        }
-                                        }
+                                        fillPolygon(cb, ((Line) l).getStartArrow(), l.getColor(), l.getColor(), l.getThickness());
+                                        fillPolygon(cb, ((Line) l).getEndArrow(), l.getColor(), l.getColor(), l.getThickness());
                                 }
                         }