Changeset 793

Timestamp:

01/30/14 16:09:19 (10 years ago)

Author:

jts21

Message:

Undo last commit since it caused jagged edges in rotated images in exported PDFs. Now image rotation in PDFs causes incorrect positioning again. Also added proper image scaling. TODO: Fix rotation and add image tiling

Location:

trunk/src/org/expeditee

Files:

• io/PDF2Writer.java (modified) (1 diff)
• items/Picture.java (modified) (14 diffs)

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

@@ -100 +100 @@
         @Override
         protected void writePicture(Picture pic) throws IOException {
-                Image image = pic.getImageToDraw();
+                Image image = pic.getCroppedImage();
                 try {
                         PdfContentByte cb = _pdfWriter.getDirectContent();
                         com.lowagie.text.Image iTextImage = com.lowagie.text.Image.getInstance(image, null);
-                        // 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());
+                        iTextImage.setAbsolutePosition(pic.getX(), _pdfWriter.getPageSize().getHeight() - pic.getY() - pic.getHeight());
+                        iTextImage.scalePercent(pic.getScale() * 100);
+                        iTextImage.setRotationDegrees((float) - pic.getRotate());
                         cb.addImage(iTextImage);
                 } catch (DocumentException e) {

trunk/src/org/expeditee/items/Picture.java

@@ -9 +9 @@
 import java.awt.Polygon;
 import java.awt.Rectangle;
-import java.awt.RenderingHints;
 import java.awt.Shape;
 import java.awt.Stroke;
@@ -17 +16 @@
 import java.awt.image.BufferedImage;
 import java.awt.image.CropImageFilter;
-import java.awt.image.DataBufferInt;
 import java.awt.image.FilteredImageSource;
 import java.awt.image.ImageObserver;
@@ -23 +21 @@
 import java.io.IOException;
 import java.text.DecimalFormat;
-import java.util.Arrays;
 
 import javax.imageio.ImageIO;
@@ -58 +55 @@
 
         protected Image _image = null;
-        protected Image _imageToDraw = null;
 
         private int _scaleType = RATIO;
@@ -206 +202 @@
                         _scale = 1F;
                 }
-                
-                updateImageToDraw();
         }
 
@@ -338 +332 @@
         public void setWidth(Integer width) {
                 _scale = width * 1F / (_end.x - _start.x);
-                _imageToDraw = null;
         }
 
@@ -375 +368 @@
         }
         
-        protected void updateImageToDraw() {
-                _imageToDraw = null;
+        public void paintImageTiling(Graphics2D g) {
                 if (_image == null) {
                         return;
@@ -445 +437 @@
                 }
                 
-                double angle = Math.PI * _rotate / 180;
-                double sin = Math.abs(Math.sin(angle)), cos = Math.abs(Math.cos(angle));
-        int w = tmp.getWidth(), h = tmp.getHeight();
-        int neww = (int)Math.floor(w * cos + h * sin), newh = (int)Math.floor(h * cos + w * sin);
-                
-                BufferedImage rotated = new BufferedImage(neww, newh, BufferedImage.TYPE_INT_ARGB);
-                Arrays.fill(((DataBufferInt)rotated.getRaster().getDataBuffer()).getData(), 0);
-                
-                Graphics2D g = rotated.createGraphics();
-                g.translate((neww - w) / 2, (newh - h) / 2);
-                g.rotate(angle, tmp.getWidth() / 2, tmp.getHeight() / 2);
-                g.drawRenderedImage(tmp, null);
-                
-                _imageToDraw = rotated;//.getScaledInstance(rotated.getWidth(), rotated.getHeight(), Image.SCALE_REPLICATE);
-        }
-        
-        public Image getImageToDraw() {
-                return _imageToDraw;
-        }
-        
-        // TODO:
-        //  - Fix positioning (need to use something like polygon position)
-        //  - Use anti-aliasing for rotation
-        
-        public void paintImageTiling(Graphics2D g) {
-
-//              BufferedImage tmp = getImageToDraw();
-//              if(tmp == null) {
-//                      return;
-//              }
-//              tmp.
-//              g.drawImage(tmp, at, _imageObserver);
-                if(_imageToDraw == null) {
-                        updateImageToDraw();
-                }
-                Rectangle b = getPolygon().getBounds();
-                g.drawImage(_imageToDraw, b.x + 1, b.y + 1, _imageObserver);
+                AffineTransform at = new AffineTransform();
+                at.translate(dX1, dY1);
+                at.rotate(Math.PI * _rotate / 180, tmp.getWidth() / 2, tmp.getHeight() / 2);
+                g.drawImage(tmp, at, _imageObserver);
+                // g.drawImage(tmp, dX1, dY1, dX2, dY2, 0, 0, tmp.getWidth(), tmp.getHeight(), _imageObserver);
         }
 
@@ -559 +519 @@
                 Picture p = createPicture();
                 p._image = _image;
-                p._imageToDraw = null;
                 p._mode = _mode;
                 // Doing Duplicate item duplicates link mark which we dont want to do
@@ -616 +575 @@
         public void setScale(float scale) {
                 _scale = scale;
-                _imageToDraw = null;
         }
         
@@ -671 +629 @@
                 updateSource();
                 updatePolygon();
-                updateImageToDraw();
                 // Make sure items that are resized display the border
                 invalidateAll();
@@ -834 +791 @@
                 updateSource();
                 super.translate(origin, ratio);
-                _imageToDraw = null;
         }
 
@@ -861 +817 @@
                 setScale(getScale() * scale);
                 super.scale(scale, originX, originY);
-                _imageToDraw = null;
         }
         
         public void setFlipX(boolean flip) {
                 _flipX = flip;
-                _imageToDraw = null;
         }
         
         public void setFlipY(boolean flip) {
                 _flipY = flip;
-                _imageToDraw = null;
         }
         
@@ -886 +839 @@
                 updateSource();
                 updatePolygon();
-                _imageToDraw = null;
         }