Picking now takes viewport transform into account.

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

4 files changed, 87 insertions, 60 deletions

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 6ec1a11..0b8e1ca 100755
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -79,6 +79,7 @@ is divided into following sections:
         <property file="nbproject/project.properties"/>

     </target>

     <target depends="-pre-init,-init-private,-init-libraries,-init-user,-init-project,-init-macrodef-property" name="-do-init">

+        <property name="platform.java" value="${java.home}/bin/java"/>

         <available file="${manifest.file}" property="manifest.available"/>

         <condition property="splashscreen.available">

             <and>

@@ -96,10 +97,11 @@ is divided into following sections:
                 </not>

             </and>

         </condition>

-        <condition property="manifest.available+main.class">

+        <condition property="profile.available">

             <and>

-                <isset property="manifest.available"/>

-                <isset property="main.class.available"/>

+                <isset property="javac.profile"/>

+                <length length="0" string="${javac.profile}" when="greater"/>

+                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>

             </and>

         </condition>

         <condition property="do.archive">

@@ -116,12 +118,6 @@ is divided into following sections:
                 </not>

             </and>

         </condition>

-        <condition property="manifest.available+main.class+mkdist.available">

-            <and>

-                <istrue value="${manifest.available+main.class}"/>

-                <isset property="do.mkdist"/>

-            </and>

-        </condition>

         <condition property="do.archive+manifest.available">

             <and>

                 <isset property="manifest.available"/>

@@ -140,24 +136,12 @@ is divided into following sections:
                 <istrue value="${do.archive}"/>

             </and>

         </condition>

-        <condition property="do.archive+manifest.available+main.class">

+        <condition property="do.archive+profile.available">

             <and>

-                <istrue value="${manifest.available+main.class}"/>

+                <isset property="profile.available"/>

                 <istrue value="${do.archive}"/>

             </and>

         </condition>

-        <condition property="manifest.available-mkdist.available">

-            <or>

-                <istrue value="${manifest.available}"/>

-                <isset property="do.mkdist"/>

-            </or>

-        </condition>

-        <condition property="manifest.available+main.class-mkdist.available">

-            <or>

-                <istrue value="${manifest.available+main.class}"/>

-                <isset property="do.mkdist"/>

-            </or>

-        </condition>

         <condition property="have.tests">

             <or>

                 <available file="${test.src.dir}"/>

@@ -216,7 +200,15 @@ is divided into following sections:
         </condition>

         <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>

         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">

-            <length length="0" string="${endorsed.classpath}" when="greater"/>

+            <and>

+                <isset property="endorsed.classpath"/>

+                <not>

+                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>

+                </not>

+            </and>

+        </condition>

+        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">

+            <isset property="profile.available"/>

         </condition>

         <condition else="false" property="jdkBug6558476">

             <and>

@@ -310,6 +302,7 @@ is divided into following sections:
                         <path path="@{classpath}"/>

                     </classpath>

                     <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>

+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>

                     <compilerarg line="${javac.compilerargs}"/>

                     <compilerarg value="-processorpath"/>

                     <compilerarg path="@{processorpath}:${empty.dir}"/>

@@ -349,6 +342,7 @@ is divided into following sections:
                         <path path="@{classpath}"/>

                     </classpath>

                     <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>

+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>

                     <compilerarg line="${javac.compilerargs}"/>

                     <customize/>

                 </javac>

@@ -487,7 +481,7 @@ is divided into following sections:
                     </fileset>

                 </union>

                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>

-                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="svg-salamander-core" testname="TestNG tests" workingDir="${work.dir}">

+                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="svg-salamander-core" testname="TestNG tests" workingDir="${work.dir}">

                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>

                     <propertyset>

                         <propertyref prefix="test-sys-prop."/>

@@ -881,8 +875,8 @@ is divided into following sections:
                     </chainedmapper>

                 </pathconvert>

                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>

-                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">

-                    <fileset dir="${build.classes.dir}"/>

+                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">

+                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>

                     <manifest>

                         <attribute name="Class-Path" value="${jar.classpath}"/>

                         <customize/>

@@ -894,7 +888,7 @@ is divided into following sections:
     <target name="-init-presetdef-jar">

         <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">

             <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">

-                <j2seproject1:fileset dir="${build.classes.dir}"/>

+                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>

             </jar>

         </presetdef>

     </target>

@@ -1014,41 +1008,25 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->

         <!-- You can override this target in the ../build.xml file. -->

     </target>

-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">

-        <j2seproject1:jar/>

-    </target>

-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">

-        <j2seproject1:jar manifest="${manifest.file}"/>

-    </target>

-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">

-        <j2seproject1:jar manifest="${manifest.file}">

-            <j2seproject1:manifest>

-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>

-            </j2seproject1:manifest>

-        </j2seproject1:jar>

-        <echo level="info">To run this application from the command line without Ant, try:</echo>

-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>

-        <property location="${dist.jar}" name="dist.jar.resolved"/>

-        <pathconvert property="run.classpath.with.dist.jar">

-            <path path="${run.classpath}"/>

-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>

-        </pathconvert>

-        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>

-    </target>

-    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">

+    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">

         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>

         <touch file="${tmp.manifest.file}" verbose="false"/>

     </target>

-    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">

+    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">

         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>

         <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>

     </target>

-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">

+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">

         <manifest file="${tmp.manifest.file}" mode="update">

             <attribute name="Main-Class" value="${main.class}"/>

         </manifest>

     </target>

-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">

+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">

+        <manifest file="${tmp.manifest.file}" mode="update">

+            <attribute name="Profile" value="${javac.profile}"/>

+        </manifest>

+    </target>

+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">

         <basename file="${application.splash}" property="splashscreen.basename"/>

         <mkdir dir="${build.classes.dir}/META-INF"/>

         <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>

@@ -1056,23 +1034,41 @@ is divided into following sections:
             <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>

         </manifest>

     </target>

-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">

+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">

         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>

         <echo level="info">To run this application from the command line without Ant, try:</echo>

         <property location="${dist.jar}" name="dist.jar.resolved"/>

         <echo level="info">java -jar "${dist.jar.resolved}"</echo>

     </target>

-    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">

+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">

+        <j2seproject1:jar manifest="${tmp.manifest.file}"/>

+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>

+        <property location="${dist.jar}" name="dist.jar.resolved"/>

+        <pathconvert property="run.classpath.with.dist.jar">

+            <path path="${run.classpath}"/>

+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>

+        </pathconvert>

+        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">

+            <isset property="main.class.available"/>

+        </condition>

+        <condition else="debug" property="jar.usage.level" value="info">

+            <isset property="main.class.available"/>

+        </condition>

+        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>

+    </target>

+    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">

         <delete>

             <fileset file="${tmp.manifest.file}"/>

         </delete>

     </target>

-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>

+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>

+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>

     <target name="-post-jar">

         <!-- Empty placeholder for easier customization. -->

         <!-- You can override this target in the ../build.xml file. -->

     </target>

-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>

+    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>

+    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>

     <!--

                 =================

                 EXECUTION SECTION

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 5b86bc4..d96dd94 100755
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.stylesheet.CRC32=be360661
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.

 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.

 nbproject/build-impl.xml.data.CRC32=478066e1

-nbproject/build-impl.xml.script.CRC32=1f28feac

-nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46

+nbproject/build-impl.xml.script.CRC32=99b9f3f7

+nbproject/build-impl.xml.stylesheet.CRC32=5a01deb7@1.68.1.46

diff --git a/src/main/java/com/kitfox/svg/SVGRoot.java b/src/main/java/com/kitfox/svg/SVGRoot.java
index 5edc476..fdd5065 100644
--- a/src/main/java/com/kitfox/svg/SVGRoot.java
+++ b/src/main/java/com/kitfox/svg/SVGRoot.java
@@ -43,7 +43,10 @@ import java.awt.Graphics2D;
 import java.awt.Rectangle;

 import java.awt.Shape;

 import java.awt.geom.AffineTransform;

+import java.awt.geom.NoninvertibleTransformException;

+import java.awt.geom.Point2D;

 import java.awt.geom.Rectangle2D;

+import java.util.List;

 

 /**

  * The root element of an SVG tree.

@@ -263,6 +266,34 @@ public class SVGRoot extends Group
         g.setTransform(cachedXform);

     }

 

+    public void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List retVec) throws SVGException

+    {

+        if (viewXform != null)

+        {

+            ltw = new AffineTransform(ltw);

+            ltw.concatenate(viewXform);

+        }

+        

+        super.pick(pickArea, ltw, boundingBox, retVec);

+    }

+    

+    public void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException

+    {

+        Point2D xPoint = new Point2D.Double(point.getX(), point.getY());

+        if (viewXform != null)

+        {

+            try

+            {

+                viewXform.inverseTransform(point, xPoint);

+            } catch (NoninvertibleTransformException ex)

+            {

+                throw new SVGException(ex);

+            }

+        }

+        

+        super.pick(xPoint, boundingBox, retVec);

+    }

+

     public Shape getShape()

     {

         Shape shape = super.getShape();

diff --git a/src/main/java/com/kitfox/svg/ShapeElement.java b/src/main/java/com/kitfox/svg/ShapeElement.java
index 9a954fe..e3b7ac2 100644
--- a/src/main/java/com/kitfox/svg/ShapeElement.java
+++ b/src/main/java/com/kitfox/svg/ShapeElement.java
@@ -86,7 +86,7 @@ abstract public class ShapeElement extends RenderableElement
 

     void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException

     {

-        StyleAttribute styleAttrib = new StyleAttribute();

+//        StyleAttribute styleAttrib = new StyleAttribute();

 //        if (getStyle(styleAttrib.setName("fill")) && getShape().contains(point))

         if ((boundingBox ? getBoundingBox() : getShape()).contains(point))

         {