deweese 2003/02/25 02:30:57
Modified: sources/org/apache/batik/swing/svg JSVGComponent.java
Log:
1) JSVGComponent once again clears renderingTransform when loading a
document.
2) Cleaned up the relationship between computRenderingTransform and
updateRenderingTransform.
Revision Changes Path
1.63 +14 -30 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.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- JSVGComponent.java 24 Feb 2003 18:25:54 -0000 1.62
+++ JSVGComponent.java 25 Feb 2003 10:30:57 -0000 1.63
@@ -621,29 +621,11 @@
if ((svgDocument == null) || (gvtRoot == null))
return false;
- boolean ret = false;
- try {
- SVGSVGElement elt = svgDocument.getRootElement();
- Dimension d = getSize();
- if (d.width < 1) d.width = 1;
- if (d.height < 1) d.height = 1;
- AffineTransform at = ViewBox.getViewTransform
- (fragmentIdentifier, elt, d.width, d.height);
- CanvasGraphicsNode cgn = getCanvasGraphicsNode();
- if (!at.equals(cgn.getViewingTransform())) {
- cgn.setViewingTransform(at);
- if (renderer != null)
- renderer.setTree(gvtRoot);
- ret = true;
- }
-
- initialTransform = new AffineTransform();
- if (!initialTransform.equals(getRenderingTransform())) {
- setRenderingTransform(initialTransform, false);
- ret = true;
- }
- } catch (BridgeException e) {
- userAgent.displayError(e);
+ boolean ret = updateRenderingTransform();
+ initialTransform = new AffineTransform();
+ if (!initialTransform.equals(getRenderingTransform())) {
+ setRenderingTransform(initialTransform, false);
+ ret = true;
}
return ret;
}
@@ -941,13 +923,15 @@
setMySize(new Dimension((int)dim.getWidth(),
(int)dim.getHeight()));
SVGSVGElement elt = svgDocument.getRootElement();
- Dimension sz = getSize();
- if (sz.width < 1) sz.width = 1;
- if (sz.height < 1) sz.height = 1;
- AffineTransform vt = ViewBox.getViewTransform
- (fragmentIdentifier, elt, sz.width, sz.height);
+ Dimension d = getSize();
+ if (d.width < 1) d.width = 1;
+ if (d.height < 1) d.height = 1;
+ AffineTransform at = ViewBox.getViewTransform
+ (fragmentIdentifier, elt, d.width, d.height);
CanvasGraphicsNode cgn = getCanvasGraphicsNode(e.getGVTRoot());
- cgn.setViewingTransform(vt);
+ cgn.setViewingTransform(at);
+ initialTransform = new AffineTransform();
+ setRenderingTransform(initialTransform, false);
gvtRoot = null;
if (isDynamicDocument && JSVGComponent.this.eventsEnabled) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
