Changeset 607

Timestamp:

12/12/13 10:08:13 (11 years ago)

Author:

jts21

Message:

Make crop values outside of value bounds ( < 0

>= image bounds ) get scaled to correct values. Does not yet tile correctly.

File:

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

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

@@ -310 +310 @@
                 super.paintLink(g);
         }
-
-        @Override
-        public void paint(Graphics2D g) {
-                if (_image == null)
+        
+        public void paintImageTiling(Graphics2D g) {
+                if (_image == null) {
                         return;
-
+                }
+                
                 int width = getWidth();
                 int height = getHeight();
-
-                paintLink(g);
-
                 int dX1 = _source.getX();
                 int dY1 = _source.getY();
                 int dX2 = _source.getX() + width;
                 int dY2 = _source.getY() + height;
+                int iw = _image.getWidth(null);
+                int ih = _image.getHeight(null);
+                if(iw <= 0 || ih <= 0) {
+                        return;
+                }
+                while(_start.x >= iw) {
+                        _start.x -= iw;
+                        _end.x -= iw;
+                }
+                while(_start.y >= ih) {
+                        _start.y -= ih;
+                        _end.y -= ih;
+                }
+                while(_start.x < 0) {
+                        _start.x += iw;
+                        _end.x += iw;
+                }
+                while(_start.y < 0) {
+                        _start.y += ih;
+                        _end.y += ih;
+                }
+                int cw = getUnscaledWidth();
+                int ch = getUnscaledHeight();
+                
+                for(int x = dX1; x < dX2; x += cw) {
+                        for(int y = dY1; y < dY2; y += ch) {
+                                int endX = x + cw;
+                                if(endX > dX2) {
+                                        endX = dX2;
+                                }
+                                int endY = y + ch;
+                                if(endY > dY2) {
+                                        endY = dY2;
+                                }
+                                g.drawImage(_image, x, y, endX, endY, _start.x, _start.y, _end.x,
+                                        _end.y, _imageObserver);
+                        }
+                }
+        }
+
+        @Override
+        public void paint(Graphics2D g) {
+                if (_image == null)
+                        return;
+
+                paintLink(g);
 
                 // if we are showing the cropping, then show the original as transparent
@@ -332 +375 @@
                         g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,
                                         alpha));
-                        g.drawImage(_image, dX1, dY1, dX2, dY2, _start.x, _start.y, _end.x,
-                                        _end.y, _imageObserver);
+                        
+                        paintImageTiling(g);
 
                         g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,
@@ -340 +383 @@
                         Point topLeft = getTopLeftCrop();
                         Point bottomRight = getBottomRightCrop();
-                        Shape clip = new Rectangle(dX1 + topLeft.x, dY1 + topLeft.y,
+                        Shape clip = new Rectangle(_source.getX() + topLeft.x, _source.getY() + topLeft.y,
                                         bottomRight.x - topLeft.x, bottomRight.y - topLeft.y);
                         g.setColor(getPaintHighlightColor());
@@ -346 +389 @@
                         g.setClip(clip);
 
-                        g.drawImage(_image, dX1, dY1, dX2, dY2, _start.x, _start.y, _end.x,
-                                        _end.y, _imageObserver);
+                        paintImageTiling(g);
+                        
                         g.draw(clip);
                         // if the image is cropped, but we are not showing the cropping
                         // otherwise, paint normally
                 } else {
-                        g.drawImage(_image, dX1, dY1, dX2, dY2, _start.x, _start.y, _end.x,
-                                        _end.y, _imageObserver);
+                        paintImageTiling(g);
                 }