Changeset 792 for trunk/src/org/expeditee/io

Timestamp:

01/30/14 15:55:59 (10 years ago)

Author:

jts21

Message:

Fix positioning of rotated images in exported PDFs. Also in the process made image rendering in general faster (no longer has to recalculate the image every time it redraws), at the cost of additional memory usage (not sure if that's an acceptable trade-off)

File:

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

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

@@ -100 +100 @@
         @Override
         protected void writePicture(Picture pic) throws IOException {
-                Image image = pic.getCroppedImage();
+                Image image = pic.getImageToDraw();
                 try {
                         PdfContentByte cb = _pdfWriter.getDirectContent();
                         com.lowagie.text.Image iTextImage = com.lowagie.text.Image.getInstance(image, null);
-                        iTextImage.setAbsolutePosition(pic.getX(), _pdfWriter.getPageSize().getHeight() - pic.getY() - pic.getHeight());
-                        iTextImage.setRotationDegrees((float) - pic.getRotate());
+                        // System.out.println(pic.getScale());
+                        // iTextImage.scalePercent(pic.getScale() * 100);
+                        iTextImage.setAbsolutePosition(pic.getPolygon().getBounds().x, _pdfWriter.getPageSize().getHeight() - pic.getPolygon().getBounds().y - image.getHeight(null));
+                        // iTextImage.setRotationDegrees((float) - pic.getRotate());
                         cb.addImage(iTextImage);
                 } catch (DocumentException e) {
@@ -113 +115 @@
         
         private List<Line> seenLines = new LinkedList<Line>();
-        private List<Item> seenArrowHeads = new LinkedList<Item>();
         @Override
         protected void writeLine(Line line) throws IOException {