Changeset 726

Timestamp:

01/21/14 10:39:28 (10 years ago)

Author:

jts21

Message:

Fix Picture.isCropped(), and change Picture rotation values to use degrees instead of radians

File:

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

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

@@ -316 +316 @@
                 }
                 
-                AffineTransform.getRotateInstance(_rotate, centre.x, centre.y).transform(ori, 0, rot, 0, 4);
+                AffineTransform.getRotateInstance(Math.PI * _rotate / 180, centre.x, centre.y).transform(ori, 0, rot, 0, 4);
                 
                 _poly = new Polygon();
@@ -439 +439 @@
                 AffineTransform at = new AffineTransform();
                 at.translate(dX1, dY1);
-                at.rotate(_rotate, tmp.getWidth() / 2, tmp.getHeight() / 2);
+                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);
@@ -672 +672 @@
          */
         public boolean isCropped() {
-                return _end.x != 0 || _end.y != 0 || _start.y != 0 || _start.x != 0;
+                return (_end.x != 0 && _end.x != _image.getWidth(null)) || (_end.y != 0 && _end.y != _image.getHeight(null)) || _start.y != 0 || _start.x != 0;
         }