Changeset 653

Timestamp:

01/06/14 11:21:12 (10 years ago)

Author:

jts21

Message:

Implemented image rotation

File:

• trunk/src/org/expeditee/items/Picture.java (modified) (10 diffs)

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

@@ -12 +12 @@
 import java.awt.Stroke;
 import java.awt.Toolkit;
+import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
+import java.awt.image.BufferedImage;
 import java.awt.image.CropImageFilter;
 import java.awt.image.FilteredImageSource;
@@ -67 +69 @@
 
         private Point _end = new Point(0, 0);
+        
+        private double _rotate = 0;
         
         private boolean _flipX = false;
@@ -139 +143 @@
                         _end.setLocation(_image.getWidth(null), _image.getHeight(null));
                 size = size.trim();
+                String sizeLower = size.toLowerCase();
                 String[] values = size.split("\\s+");
                 // Now get the cropping values if there are any
@@ -156 +161 @@
                 }
                 
-                if(size.toLowerCase().contains("flipx")) {
+                if(sizeLower.contains("flipx")) {
                         _flipX = true;
                 }
                 
-                if(size.toLowerCase().contains("flipy")) {
+                if(sizeLower.contains("flipy")) {
                         _flipY = true;
+                }
+                
+                int index = sizeLower.indexOf("rotation=");
+                if(index != -1) {
+                        int tmp = sizeLower.indexOf(" ", index);
+                        String rotation;
+                        if(tmp == -1) {
+                                rotation = sizeLower.substring(index + "rotation=".length());
+                        } else {
+                                rotation = sizeLower.substring(index + "rotation=".length(), index + tmp);
+                        }
+                        _rotate = Double.parseDouble(rotation);
                 }
 
@@ -252 +269 @@
                         parseSize();
                 }
-                _poly = new Polygon();
+                
+                Point[] ori = new Point[4];
+                Point2D[] rot = new Point2D[4];
+                Point centre = new Point();
 
                 if (_cropStart == null || _cropEnd == null) {
                         int width = getWidth();
                         int height = getHeight();
+                        
+                        centre.x = _source.getX() + width / 2;
+                        centre.y = _source.getY() + height / 2;
 
                         int xdiff = -MARGIN_RIGHT; // -getLeftMargin();
 
                         // extra pixel around the image so the highlighting is visible
-                        _poly.addPoint(_source.getX() + 1 + xdiff, _source.getY() - 1);
-                        _poly.addPoint(_source.getX() + width, _source.getY() - 1);
-                        _poly.addPoint(_source.getX() + width, _source.getY() + height);
-                        _poly.addPoint(_source.getX() + 1 + xdiff, _source.getY() + height);
+//                      _poly.addPoint(_source.getX() + 1 + xdiff, _source.getY() - 1);
+//                      _poly.addPoint(_source.getX() + width, _source.getY() - 1);
+//                      _poly.addPoint(_source.getX() + width, _source.getY() + height);
+//                      _poly.addPoint(_source.getX() + 1 + xdiff, _source.getY() + height);
+                        
+                        ori[0] = new Point(_source.getX() + 1 + xdiff, _source.getY() - 1);
+                        ori[1] = new Point(_source.getX() + width, _source.getY() - 1);
+                        ori[2] = new Point(_source.getX() + width, _source.getY() + height);
+                        ori[3] = new Point(_source.getX() + 1 + xdiff, _source.getY() + height);
+                        
                 } else {
                         Point topLeft = getTopLeftCrop();
                         Point bottomRight = getBottomRightCrop();
+                        
+                        centre.x = _source.getX() + (bottomRight.x - topLeft.x) / 2;
+                        centre.y = _source.getY() + (bottomRight.y - topLeft.y) / 2;
+                        
                         Rectangle clip = new Rectangle(topLeft.x + _source.getX(),
                                         topLeft.y + _source.getY(), bottomRight.x - topLeft.x,
                                         bottomRight.y - topLeft.y).getBounds();
-                        _poly.addPoint((int) clip.getMinX() - 1, (int) clip.getMinY() - 1);
-                        _poly.addPoint((int) clip.getMinX() - 1, (int) clip.getMaxY());
-                        _poly.addPoint((int) clip.getMaxX(), (int) clip.getMaxY());
-                        _poly.addPoint((int) clip.getMaxX(), (int) clip.getMinY() - 1);
-
+//                      _poly.addPoint((int) clip.getMinX() - 1, (int) clip.getMinY() - 1);
+//                      _poly.addPoint((int) clip.getMinX() - 1, (int) clip.getMaxY());
+//                      _poly.addPoint((int) clip.getMaxX(), (int) clip.getMaxY());
+//                      _poly.addPoint((int) clip.getMaxX(), (int) clip.getMinY() - 1);
+                        
+                        ori[0] = new Point((int) clip.getMinX() - 1, (int) clip.getMinY() - 1);
+                        ori[1] = new Point((int) clip.getMinX() - 1, (int) clip.getMaxY());
+                        ori[2] = new Point((int) clip.getMaxX(), (int) clip.getMaxY());
+                        ori[3] = new Point((int) clip.getMaxX(), (int) clip.getMinY() - 1);
+
+                }
+                
+                AffineTransform.getRotateInstance(_rotate, centre.x, centre.y).transform(ori, 0, rot, 0, 4);
+                
+                _poly = new Polygon();
+                for(Point2D p : rot) {
+                        _poly.addPoint((int)p.getX(), (int)p.getY());
                 }
         }
@@ -339 +384 @@
                 int dY2 = _source.getY() + getHeight();
                 
+                BufferedImage tmp = new BufferedImage(getWidth(), getHeight(), BufferedImage.TYPE_INT_RGB);
+                Graphics2D g2d = tmp.createGraphics();
+                int offX = (tmp.getWidth() - getWidth()) / 2;
+                int offY = (tmp.getHeight() - getHeight()) / 2;
+                
+                // g2d.rotate(rotate, tmp.getWidth() / 2, tmp.getHeight() / 2);
                 
                 int cropStartX = _start.x;
@@ -368 +419 @@
                                 }
                                 
-                                System.out.println(_flipX + " " + _flipY);
-                                
                                 int sx = _flipX ? cropEndX : cropStartX;
                                 int ex = _flipX ? cropStartX : cropEndX;
                                 int sy = _flipY ? cropEndY : cropStartY;
                                 int ey = _flipY ? cropStartY : cropEndY;
-                                g.drawImage(_image, x, y, endX, endY, sx, sy, ex, ey, _imageObserver);
+                                g2d.drawImage(_image, x - dX1 + offX, y - dY1 + offY, endX - dX1 + offX, endY - dY1 + offY, sx, sy, ex, ey, null);
                                 
                                 cropStartY = 0;
@@ -387 +436 @@
                         x = endX;
                 }
+                
+                AffineTransform at = new AffineTransform();
+                at.translate(dX1, dY1);
+                at.rotate(_rotate, 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);
         }
 
@@ -724 +779 @@
                         newText.append(" flipY");
                 }
+                if(Double.compare(_rotate, 0) != 0) {
+                        newText.append(" rotation=" + _rotate);
+                }
 
                 _source.setText(newText.toString());
@@ -776 +834 @@
                 return _flipY;
         }
+        
+        public void setRotate(double rotate) {
+                _rotate = rotate;
+                updateSource();
+                updatePolygon();
+        }
+        
+        public double getRotate() {
+                return _rotate;
+        }
 
 }