Added pickng by rectangular areas. Fixed bug with picking by point.

git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@45 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b

1 files changed, 7 insertions, 12 deletions

diff --git a/src/main/java/com/kitfox/svg/ImageSVG.java b/src/main/java/com/kitfox/svg/ImageSVG.java
index 2d981bc..eb61215 100644
--- a/src/main/java/com/kitfox/svg/ImageSVG.java
+++ b/src/main/java/com/kitfox/svg/ImageSVG.java
@@ -122,20 +122,15 @@ public class ImageSVG extends RenderableElement
 

     void pick(Point2D point, Vector retVec) throws SVGException

     {

-        /*

-        Point2D xPoint = new Point2D.Double();

-        try

-        {

-            xform.inverseTransform(point, xPoint);

-        } 

-        catch (NoninvertibleTransformException ex)

+        if (getBoundingBox().contains(point))

         {

-            throw new SVGException(ex);

+            retVec.add(getPath(null));

         }

-        */

-        

-//        if (bounds.contains(xPoint))

-        if (getBoundingBox().contains(point))

+    }

+

+    void pick(Rectangle2D pickArea, AffineTransform ltw, Vector retVec) throws SVGException

+    {

+        if (ltw.createTransformedShape(getBoundingBox()).intersects(pickArea))

         {

             retVec.add(getPath(null));

         }