Changeset 817

Timestamp:

02/03/14 16:49:39 (10 years ago)

Author:

jts21

Message:

Implement line thickness for PDFs

File:

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

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

@@ -122 +122 @@
                 PdfContentByte cb = _pdfWriter.getDirectContent();
                 cb.circle(circle.getCenter().getX(), _pdfWriter.getPageSize().getHeight() - circle.getCenter().getY(), (float) circle.getRadius());
-                cb.setColorStroke(circle.getColor());
                 cb.setColorFill(circle.getFillColor());
-                cb.fillStroke();
+                if(circle.getThickness() > 0) {
+                        cb.setLineWidth(circle.getThickness());
+                        cb.setColorStroke(circle.getColor());
+                        cb.fillStroke();
+                } else {
+                        cb.fill();
+                }
         }
         
@@ -155 +160 @@
                                 seenLines.add(currentLine);
                         }
+                        cb.closePath();
                         cb.setColorFill(currentItem.getFillColor());
-                        cb.setColorStroke(currentLine.getColor());
-                        cb.closePathFillStroke();
+                        if(currentItem.getThickness() > 0) {
+                                cb.setLineWidth(currentItem.getThickness());
+                                cb.setColorStroke(currentLine.getColor());
+                                cb.fillStroke();
+                        } else {
+                                cb.fill();
+                        }
                 } else {
                         for(Item l : line.getStartItem().getAllConnected()) {
@@ -166 +177 @@
                                         cb.moveTo(start.getX(), height - start.getY());
                                         cb.lineTo(end.getX(), height - end.getY());
-                                        cb.setColorStroke(l.getColor());
-                                        cb.closePathStroke();
+                                        cb.closePath();
+                                        if(l.getThickness() > 0) {
+                                                cb.setLineWidth(l.getThickness());
+                                                cb.setColorStroke(l.getColor());
+                                                cb.stroke();
+                                        }
                                         Polygon arrow = ((Line) l).getStartArrow();
                                         if(arrow != null) {
@@ -174 +189 @@
                                                         cb.lineTo(arrow.xpoints[i], height - arrow.ypoints[i]);
                                                 }
+                                                cb.closePath();
                                                 cb.setColorFill(l.getColor());
-                                                cb.closePath();
-                                                cb.fill();
+                                                if(l.getThickness() > 0) {
+                                                cb.setLineWidth(l.getThickness());
+                                                cb.setColorStroke(l.getColor());
+                                                cb.stroke();
+                                        } else {
+                                                cb.fill();
+                                        }
                                         }
                                         arrow = ((Line) l).getEndArrow();
@@ -184 +205 @@
                                                         cb.lineTo(arrow.xpoints[i], height - arrow.ypoints[i]);
                                                 }
+                                                cb.closePath();
                                                 cb.setColorFill(l.getColor());
-                                                cb.closePath();
-                                                cb.fill();
+                                                if(l.getThickness() > 0) {
+                                                cb.setLineWidth(l.getThickness());
+                                                cb.setColorStroke(l.getColor());
+                                                cb.fillStroke();
+                                        } else {
+                                                cb.fill();
+                                        }
                                         }
                                 }