Changeset 820

Timestamp:

02/04/14 10:04:59 (10 years ago)

Author:

jts21

Message:

Implement PDF page background color, and fix exceptions on null color

File:

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

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

@@ -37 +37 @@
 
         private Document _pdfDocument;
-
+        private Dimension _pageSize;
         private PdfWriter _pdfWriter;
         private float _height;
 
         public PDF2Writer() {
-                Dimension d = FrameGraphics.getMaxSize();
-                _pdfDocument = new Document(new Rectangle(d.width, d.height));
+                _pageSize = FrameGraphics.getMaxSize();
+                _pdfDocument = new Document(new Rectangle(_pageSize.width, _pageSize.height));
         }
 
@@ -58 +58 @@
                         _pdfDocument.addCreator("Expeditee");
                         _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();
@@ -128 +134 @@
                 if(circle.getThickness() > 0) {
                         cb.setLineWidth(circle.getThickness());
-                        cb.setColorStroke(circle.getColor());
+                        cb.setColorStroke(circle.getPaintColor());
                         cb.fillStroke();
                 } else {
@@ -181 +187 @@
                         }
                         cb.closePath();
-                        cb.setColorFill(currentItem.getFillColor());
-                        if(currentItem.getThickness() > 0) {
+                        Color fill = currentItem.getFillColor();
+                        if(fill != null) {
+                        cb.setColorFill(fill);
+                        if(currentItem.getThickness() > 0) {
+                                cb.setLineWidth(currentItem.getThickness());
+                                cb.setColorStroke(currentLine.getPaintColor());
+                                cb.fillStroke();
+                        } else {
+                                cb.fill();
+                        }
+                        } else if(currentItem.getThickness() > 0) {
                                 cb.setLineWidth(currentItem.getThickness());
-                                cb.setColorStroke(currentLine.getColor());
-                                cb.fillStroke();
-                        } else {
-                                cb.fill();
+                                cb.setColorStroke(currentLine.getPaintColor());
+                                cb.stroke();
                         }
                 } else {
@@ -200 +213 @@
                                         if(l.getThickness() >= 0) {
                                                 cb.setLineWidth(l.getThickness());
-                                                cb.setColorStroke(l.getColor());
+                                                cb.setColorStroke(l.getPaintColor());
                                                 cb.stroke();
                                         }
-                                        fillPolygon(cb, ((Line) l).getStartArrow(), l.getColor(), l.getColor(), l.getThickness());
-                                        fillPolygon(cb, ((Line) l).getEndArrow(), l.getColor(), l.getColor(), l.getThickness());
+                                        fillPolygon(cb, ((Line) l).getStartArrow(), l.getPaintColor(), l.getPaintColor(), l.getThickness());
+                                        fillPolygon(cb, ((Line) l).getEndArrow(), l.getPaintColor(), l.getPaintColor(), l.getThickness());
                                 }
                         }