deweese 2003/03/27 09:57:09
Modified: sources/org/apache/batik/apps/svgbrowser
JSVGViewerFrame.java
sources/org/apache/batik/swing/svg JSVGComponent.java
Log:
X & Y values in JSVGViewerFrame are now once again in the viewBox coordinate
system (as is the W/H when mouse is out of the window).
Revision Changes Path
1.92 +7 -4
xml-batik/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java
Index: JSVGViewerFrame.java
===================================================================
RCS file:
/home/cvs/xml-batik/sources/org/apache/batik/apps/svgbrowser/JSVGViewerFrame.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- JSVGViewerFrame.java 14 Mar 2003 21:53:22 -0000 1.91
+++ JSVGViewerFrame.java 27 Mar 2003 17:57:08 -0000 1.92
@@ -605,7 +605,8 @@
statusBar.setYPosition(e.getY());
} else {
try {
- AffineTransform at = svgCanvas.getRenderingTransform();
+ AffineTransform at;
+ at = svgCanvas.getViewBoxTransform();
if (at != null) {
at = at.createInverse();
Point2D p2d =
@@ -630,7 +631,8 @@
statusBar.setHeight(dim.height);
} else {
try {
- AffineTransform at = svgCanvas.getRenderingTransform();
+ AffineTransform at;
+ at = svgCanvas.getViewBoxTransform();
if (at != null) {
at = at.createInverse();
Point2D o =
@@ -659,7 +661,8 @@
statusBar.setHeight(dim.height);
} else {
try {
- AffineTransform at = svgCanvas.getRenderingTransform();
+ AffineTransform at;
+ at = svgCanvas.getViewBoxTransform();
if (at != null) {
at = at.createInverse();
Point2D o =
1.67 +17 -1 xml-batik/sources/org/apache/batik/swing/svg/JSVGComponent.java
Index: JSVGComponent.java
===================================================================
RCS file: /home/cvs/xml-batik/sources/org/apache/batik/swing/svg/JSVGComponent.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- JSVGComponent.java 14 Mar 2003 21:53:19 -0000 1.66
+++ JSVGComponent.java 27 Mar 2003 17:57:08 -0000 1.67
@@ -620,6 +620,22 @@
}
/**
+ * Returns the transform from viewBox coords to screen coords
+ */
+ public AffineTransform getViewBoxTransform() {
+ AffineTransform at = getRenderingTransform();
+ if (at == null) at = new AffineTransform();
+ else at = new AffineTransform(at);
+ CanvasGraphicsNode cgn = getCanvasGraphicsNode();
+ if (cgn != null) {
+ AffineTransform vAT = cgn.getViewingTransform();
+ if (vAT != null)
+ at.concatenate(vAT);
+ }
+ return at;
+ }
+
+ /**
* Computes the transform used for rendering.
* Returns true if the component needs to be repainted.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
