Menu
▾
▴
svgdomcsharp-cvs — Keep track of CVS updates
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(41) |
Oct
(14) |
Nov
(62) |
Dec
|
|---|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12283/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths Modified Files: SvgPathSegArc.cs SvgPathSegCurvetoCubicAbs.cs SvgPathSegCurvetoCubicRel.cs SvgPathSegCurvetoCubicSmoothAbs.cs SvgPathSegCurvetoCubicSmoothRel.cs SvgPathSegCurvetoQuadraticAbs.cs SvgPathSegCurvetoQuadraticRel.cs SvgPathSegCurvetoQuadraticSmoothAbs.cs SvgPathSegCurvetoQuadraticSmoothRel.cs SvgPathSegLinetoAbs.cs SvgPathSegLinetoHorizontalAbs.cs SvgPathSegLinetoHorizontalRel.cs SvgPathSegLinetoRel.cs SvgPathSegLinetoVerticalAbs.cs SvgPathSegLinetoVerticalRel.cs SvgPathSegMoveTo.cs Log Message: Library wide changes for scripting support and automated re-rendering Index: SvgPathSegLinetoAbs.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegLinetoAbs.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegLinetoAbs.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegLinetoAbs.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -16,13 +16,15 @@ public float X { get{return x;} + set{x = value;} } private float y; public float Y { get{return y;} - } + set{y = value;} + } public override PointF AbsXY { Index: SvgPathSegCurvetoCubicAbs.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegCurvetoCubicAbs.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegCurvetoCubicAbs.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegCurvetoCubicAbs.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -29,37 +29,43 @@ public float X { get{return x;} + set{x = value;} } private float y; public float Y { get{return y;} - } + set{y = value;} + } private float x1; public float X1 { get{return x1;} - } + set{x1 = value;} + } private float y1; public float Y1 { get{return y1;} - } + set{y1 = value;} + } private float x2; public float X2 { get{return x2;} - } + set{x2 = value;} + } private float y2; public float Y2 { get{return y2;} - } + set{y2 = value;} + } #endregion #region public methods Index: SvgPathSegCurvetoQuadraticSmoothRel.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegCurvetoQuadraticSmoothRel.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegCurvetoQuadraticSmoothRel.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegCurvetoQuadraticSmoothRel.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -29,7 +29,8 @@ public float X { get{return x;} - } + set{x = value;} + } private float y; /// <summary> @@ -38,7 +39,8 @@ public float Y { get{return y;} - } + set{y = value;} + } #endregion #region public methods Index: SvgPathSegCurvetoQuadraticAbs.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegCurvetoQuadraticAbs.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegCurvetoQuadraticAbs.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegCurvetoQuadraticAbs.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -28,25 +28,29 @@ public float X { get{return x;} - } + set{x = value;} + } private float y; public float Y { get{return y;} - } + set{y = value;} + } private float x1; public float X1 { get{return x1;} - } + set{x1 = value;} + } private float y1; public float Y1 { get{return y1;} - } + set{y1 = value;} + } #endregion #region public methods Index: SvgPathSegLinetoHorizontalRel.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegLinetoHorizontalRel.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegLinetoHorizontalRel.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegLinetoHorizontalRel.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -15,7 +15,8 @@ public float X { get{return x;} - } + set{x = value;} + } public override PointF AbsXY { Index: SvgPathSegCurvetoCubicSmoothRel.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegCurvetoCubicSmoothRel.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegCurvetoCubicSmoothRel.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegCurvetoCubicSmoothRel.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -29,24 +29,28 @@ public float X { get{return x;} - } + set{x = value;} + } private float y; public float Y { get{return y;} - } + set{y = value;} + } private float x2; public float X2 { get{return x2;} - } + set{x2 = value;} + } private float y2; public float Y2 { get{return y2;} + set{y2 = value;} } #endregion Index: SvgPathSegLinetoVerticalAbs.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegLinetoVerticalAbs.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegLinetoVerticalAbs.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegLinetoVerticalAbs.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -15,7 +15,8 @@ public float Y { get{return y;} - } + set{y = value;} + } public override PointF AbsXY { Index: SvgPathSegCurvetoCubicSmoothAbs.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegCurvetoCubicSmoothAbs.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegCurvetoCubicSmoothAbs.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegCurvetoCubicSmoothAbs.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -25,25 +25,29 @@ public float X { get{return x;} - } + set{x = value;} + } private float y; public float Y { get{return y;} - } + set{y = value;} + } private float x2; public float X2 { get{return x2;} - } + set{x2 = value;} + } private float y2; public float Y2 { get{return y2;} - } + set{y2 = value;} + } #endregion #region public methods Index: SvgPathSegCurvetoCubicRel.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegCurvetoCubicRel.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegCurvetoCubicRel.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegCurvetoCubicRel.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -30,37 +30,43 @@ public float X { get{return x;} + set{x = value;} } private float y; public float Y { get{return y;} - } + set{y = value;} + } private float x1; public float X1 { get{return x1;} - } + set{x1 = value;} + } private float y1; public float Y1 { get{return y1;} - } + set{y1 = value;} + } private float x2; public float X2 { get{return x2;} - } + set{x2 = value;} + } private float y2; public float Y2 { get{return y2;} - } + set{y2 = value;} + } #endregion #region public methods Index: SvgPathSegLinetoRel.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegLinetoRel.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegLinetoRel.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegLinetoRel.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -16,13 +16,15 @@ public float X { get{return x;} - } + set{x = value;} + } private float y; public float Y { get{return y;} - } + set{y = value;} + } public override PointF AbsXY { Index: SvgPathSegArc.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegArc.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegArc.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegArc.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -39,43 +39,50 @@ public float X { get{return x;} + set {x = value;} } private float y; public float Y { get{return y;} - } + set {y = value;} + } private float r1; public float R1 { get{return r1;} - } + set {r1 = value;} + } private float r2; public float R2 { get{return r2;} - } + set {r2 = value;} + } private float angle; public float Angle { get{return angle;} - } + set {angle = value;} + } private bool largeArcFlag; public bool LargeArcFlag { get{return largeArcFlag;} - } + set {largeArcFlag = value;} + } private bool sweepFlag; public bool SweepFlag { get{return sweepFlag;} - } + set {sweepFlag = value;} + } #endregion Index: SvgPathSegLinetoVerticalRel.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegLinetoVerticalRel.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegLinetoVerticalRel.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegLinetoVerticalRel.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -15,7 +15,8 @@ public float Y { get{return y;} - } + set{y = value;} + } public override PointF AbsXY { Index: SvgPathSegMoveTo.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegMoveTo.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- SvgPathSegMoveTo.cs 6 Apr 2003 22:12:18 -0000 1.4 +++ SvgPathSegMoveTo.cs 19 Nov 2005 03:13:23 -0000 1.5 @@ -52,12 +52,14 @@ public float X { get{return x;} - } + set{x = value;} + } protected float y; public float Y { get{return y;} - } + set{y = value;} + } } } Index: SvgPathSegLinetoHorizontalAbs.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegLinetoHorizontalAbs.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegLinetoHorizontalAbs.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegLinetoHorizontalAbs.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -15,7 +15,8 @@ public float X { get{return x;} - } + set{x = value;} + } public override PointF AbsXY { Index: SvgPathSegCurvetoQuadraticSmoothAbs.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegCurvetoQuadraticSmoothAbs.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegCurvetoQuadraticSmoothAbs.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegCurvetoQuadraticSmoothAbs.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -29,7 +29,8 @@ public float X { get{return x;} - } + set{x = value;} + } private float y; /// <summary> @@ -38,7 +39,8 @@ public float Y { get{return y;} - } + set{y = value;} + } #endregion #region public methods Index: SvgPathSegCurvetoQuadraticRel.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Paths/SvgPathSegCurvetoQuadraticRel.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPathSegCurvetoQuadraticRel.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgPathSegCurvetoQuadraticRel.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -29,25 +29,29 @@ public float X { get{return x;} - } + set{x = value;} + } private float y; public float Y { get{return y;} - } + set{y = value;} + } private float x1; public float X1 { get{return x1;} - } + set{x1 = value;} + } private float y1; public float Y1 { get{return y1;} - } + set{y1 = value;} + } #endregion #region pubic methods |
|
From: Jeff R. <jef...@us...> - 2005-11-19 03:13:36
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorDom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12283/src/SharpVectorDom Modified Files: AssemblyInfo.cs Log Message: Library wide changes for scripting support and automated re-rendering Index: AssemblyInfo.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorDom/AssemblyInfo.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- AssemblyInfo.cs 12 Feb 2005 17:24:53 -0000 1.2 +++ AssemblyInfo.cs 19 Nov 2005 03:13:23 -0000 1.3 @@ -1,6 +1,8 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Runtime.CompilerServices; +using System.Security; +using System.Security.Permissions; // // General Information about an assembly is controlled through the following @@ -14,7 +16,8 @@ [assembly: AssemblyProduct("")] [assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] +[assembly: AssemblyCulture("")] +[assembly: AllowPartiallyTrustedCallers] // // Version information for an assembly consists of the following four values: |
|
From: Jeff R. <jef...@us...> - 2005-11-19 03:13:36
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Svg/Document Structure In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12283/src/SharpVectorBindings/SharpVectors/Dom/Svg/Document Structure Modified Files: ISvgSVGElement.cs Log Message: Library wide changes for scripting support and automated re-rendering Index: ISvgSVGElement.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Svg/Document Structure/ISvgSVGElement.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ISvgSVGElement.cs 29 Jul 2004 07:38:19 -0000 1.2 +++ ISvgSVGElement.cs 19 Nov 2005 03:13:22 -0000 1.3 @@ -75,7 +75,7 @@ /// </summary> string ContentScriptType { - get; + get;set; } /// <summary> @@ -83,7 +83,7 @@ /// </summary> string ContentStyleType { - get; + get;set; } /// <summary> |
|
From: Jeff R. <jef...@us...> - 2005-11-19 03:13:36
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Svg/Scripting In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12283/src/SharpVectorBindings/SharpVectors/Dom/Svg/Scripting Modified Files: ISvgScriptElement.cs Log Message: Library wide changes for scripting support and automated re-rendering Index: ISvgScriptElement.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Svg/Scripting/ISvgScriptElement.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ISvgScriptElement.cs 9 Aug 2003 23:24:57 -0000 1.1 +++ ISvgScriptElement.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -1,14 +1,19 @@ namespace SharpVectors.Dom.Svg { - /// <summary> - /// The SvgScriptElement interface corresponds to the 'script' element. - /// </summary> - /// <developer>ke...@ke...</developer> - /// <completed>99</completed> - public interface ISvgScriptElement : - ISvgElement, - ISvgURIReference, - ISvgExternalResourcesRequired + /// <summary> + /// The SvgScriptElement interface corresponds to the 'script' element. + /// </summary> + /// <developer>ke...@ke...</developer> + /// <completed>99</completed> + public interface ISvgScriptElement : + ISvgElement, + ISvgURIReference, + ISvgExternalResourcesRequired + { + string Type { + get; + set; } + } } |
|
From: Jeff R. <jef...@us...> - 2005-11-19 03:13:36
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Svg/Filters In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12283/src/SharpVectorBindings/SharpVectors/Dom/Svg/Filters Modified Files: ISvgFEConvolveMatrixElement.cs ISvgFEFuncAElement.cs ISvgFEFuncBElement.cs Log Message: Library wide changes for scripting support and automated re-rendering Index: ISvgFEConvolveMatrixElement.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Svg/Filters/ISvgFEConvolveMatrixElement.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ISvgFEConvolveMatrixElement.cs 9 Aug 2003 23:24:57 -0000 1.1 +++ ISvgFEConvolveMatrixElement.cs 19 Nov 2005 03:13:22 -0000 1.2 @@ -20,6 +20,6 @@ ISvgAnimatedEnumeration EdgeMode{get;} ISvgAnimatedNumber KernelUnitLengthX{get;} ISvgAnimatedNumber KernelUnitLengthY{get;} - ISvgAnimatedBoolean PreserveAlpha{get;} + bool PreserveAlpha{get;} } } Index: ISvgFEFuncBElement.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Svg/Filters/ISvgFEFuncBElement.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ISvgFEFuncBElement.cs 9 Aug 2003 23:24:57 -0000 1.1 +++ ISvgFEFuncBElement.cs 19 Nov 2005 03:13:22 -0000 1.2 @@ -6,7 +6,7 @@ /// </summary> /// <developer>do...@do...</developer> /// <completed>100</completed> - public interface ISvgBEFuncGElement: + public interface ISvgFEFuncBElement: ISvgComponentTransferFunctionElement { } Index: ISvgFEFuncAElement.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Svg/Filters/ISvgFEFuncAElement.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ISvgFEFuncAElement.cs 9 Aug 2003 23:24:57 -0000 1.1 +++ ISvgFEFuncAElement.cs 19 Nov 2005 03:13:22 -0000 1.2 @@ -6,7 +6,7 @@ /// </summary> /// <developer>do...@do...</developer> /// <completed>100</completed> - public interface ISvgAEFuncGElement: + public interface ISvgFEFuncAElement: ISvgComponentTransferFunctionElement { } |
|
From: Jeff R. <jef...@us...> - 2005-11-19 03:13:36
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorRenderingEngine/SharpVectors/Renderer/Gdi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12283/src/SharpVectorRenderingEngine/SharpVectors/Renderer/Gdi Modified Files: GdiRenderer.cs GraphicsNode.cs GraphicsWrapper.cs Log Message: Library wide changes for scripting support and automated re-rendering Index: GraphicsNode.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorRenderingEngine/SharpVectors/Renderer/Gdi/GraphicsNode.cs,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- GraphicsNode.cs 11 Sep 2005 18:26:09 -0000 1.40 +++ GraphicsNode.cs 19 Nov 2005 03:13:24 -0000 1.41 @@ -44,9 +44,9 @@ element is ISvgPatternElement) { // check overflow property - CssValue overflow = element.GetComputedCssValue("overflow", String.Empty) as CssValue; + CssValue overflow = ((SvgElement)element).GetComputedCssValue("overflow", String.Empty) as CssValue; // TODO: clip can have "rect(10 10 auto 10)" - CssPrimitiveValue clip = element.GetComputedCssValue("clip", String.Empty) as CssPrimitiveValue; + CssPrimitiveValue clip = ((SvgElement)element).GetComputedCssValue("clip", String.Empty) as CssPrimitiveValue; string sOverflow = null; @@ -112,13 +112,13 @@ if ( element is IGraphicsElement || element is IContainerElement) { - CssPrimitiveValue clipPath = element.GetComputedCssValue("clip-path", String.Empty) as CssPrimitiveValue; + CssPrimitiveValue clipPath = ((SvgElement)element).GetComputedCssValue("clip-path", String.Empty) as CssPrimitiveValue; if(clipPath != null && clipPath.PrimitiveType == CssPrimitiveType.Uri) { - string absoluteUri = element.ResolveUri(clipPath.GetStringValue()); + string absoluteUri = ((SvgElement)element).ResolveUri(clipPath.GetStringValue()); - SvgClipPathElement eClipPath = element.OwnerDocument.GetNodeByUri(absoluteUri) as SvgClipPathElement; + SvgClipPathElement eClipPath = ((SvgDocument)element.OwnerDocument).GetNodeByUri(absoluteUri) as SvgClipPathElement; if ( eClipPath != null ) { @@ -163,7 +163,7 @@ { Graphics graphics = gr.Graphics; - string colorRendering = element.GetComputedStringValue("color-rendering", String.Empty); + string colorRendering = ((SvgElement)element).GetComputedStringValue("color-rendering", String.Empty); switch(colorRendering) { case "optimizeSpeed": @@ -184,7 +184,7 @@ // Unfortunately the text rendering hints are not applied because the // text path is recorded and painted to the Graphics object as a path // not as text. - string textRendering = element.GetComputedStringValue("text-rendering", String.Empty); + string textRendering = ((SvgElement)element).GetComputedStringValue("text-rendering", String.Empty); switch(textRendering) { case "optimizeSpeed": @@ -208,7 +208,7 @@ } else { - string shapeRendering = element.GetComputedStringValue("shape-rendering", String.Empty); + string shapeRendering = ((SvgElement)element).GetComputedStringValue("shape-rendering", String.Empty); switch(shapeRendering) { case "optimizeSpeed": Index: GdiRenderer.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorRenderingEngine/SharpVectors/Renderer/Gdi/GdiRenderer.cs,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- GdiRenderer.cs 23 Oct 2005 23:39:29 -0000 1.38 +++ GdiRenderer.cs 19 Nov 2005 03:13:24 -0000 1.39 @@ -27,7 +27,7 @@ /// Renders a Svg image to GDI+ /// </summary> public class GdiRenderer - : ISvgRenderer + : ISvgRenderer, IDisposable { #region Private Fields @@ -89,7 +89,7 @@ /// <summary> /// The renderer's <see cref="SvgWindow">SvgWindow</see> object. /// </summary> - private SvgWindow window; + private ISvgWindow window; /// <summary> /// @@ -154,7 +154,7 @@ /// <value> /// The <see cref="Window">Window</see> of the renderer. /// </value> - public SvgWindow Window { + public ISvgWindow Window { get { return window; @@ -271,23 +271,24 @@ /// corresponds to the given <see cref="XmlElement">XmlElement</see>. /// </returns> public RenderingNode GetRenderingNode( - XmlElement node) + ISvgElement node) { - string name = node.NamespaceURI + ":" + node.LocalName; + SvgElement svgNode = (SvgElement)node; + string name = svgNode.NamespaceURI + ":" + svgNode.LocalName; RenderingNode result; if (nodeByTagName.ContainsKey(name)) { - object[] args = new object[] {(SvgElement)node}; + object[] args = new object[] {svgNode}; result = (RenderingNode) nodeByTagName.CreateInstance(name, args); } else if (node is ISharpGDIPath) { - result = new GDIPathGraphicsNode((SvgElement)node); + result = new GDIPathGraphicsNode(svgNode); } else { - result = new GraphicsNode((SvgElement)node); + result = new GraphicsNode(svgNode); } return result; @@ -325,7 +326,7 @@ // TODO: Handle xml:base here? // Right now just skip this... it can't be resolved, must assume it is absolute } - XmlElement elm = ((SvgDocument)Window.Document).GetNodeByUri(url) as XmlElement; + ISvgElement elm = ((SvgDocument)Window.Document).GetNodeByUri(url) as ISvgElement; if(elm != null) { @@ -353,6 +354,11 @@ if (rasterImage == null || rasterImage.Width != innerWidth || rasterImage.Height != innerHeight) { // Nope, so create one + if (rasterImage != null) + { + rasterImage.Dispose(); + rasterImage = null; + } rasterImage = new Bitmap(innerWidth, innerHeight); } @@ -373,16 +379,21 @@ invalidatedRasterImage.Height < invalidRect.Bottom) { // Nope, so create one + if (invalidatedRasterImage != null) + { + invalidatedRasterImage.Dispose(); + invalidatedRasterImage = null; + } invalidatedRasterImage = new Bitmap((int)invalidRect.Right, (int)invalidRect.Bottom); } // Make a GraphicsWrapper object from the regionRasterImage and clear it to the background color - graphics = GraphicsWrapper.FromImage(invalidatedRasterImage); + graphics = GraphicsWrapper.FromImage(invalidatedRasterImage, false); graphics.Clear(backColor); } else { // Make a GraphicsWrapper object from the rasterImage and clear it to the background color - graphics = GraphicsWrapper.FromImage(rasterImage); + graphics = GraphicsWrapper.FromImage(rasterImage, false); graphics.Clear(backColor); } } @@ -424,6 +435,8 @@ } else { + if (idMapRaster != null && idMapRaster != graphics.IdMapRaster) + idMapRaster.Dispose(); idMapRaster = graphics.IdMapRaster; } @@ -451,12 +464,19 @@ /// The bitmap on which the rendering was performed. /// </returns> public Bitmap Render( - SvgElement node) + ISvgElement node) { - RendererBeforeRender(); - node.Render(this); + RectangleF updatedRect; + if (invalidRect != RectangleF.Empty) + updatedRect = new RectangleF(invalidRect.X, invalidRect.Y, invalidRect.Width, invalidRect.Height); + else + updatedRect = RectangleF.Empty; + RendererBeforeRender(); + ((SvgElement)node).Render(this); RendererAfterRender(); - return rasterImage; + if (onRender != null) + OnRender(updatedRect); + return rasterImage; } /// <summary> @@ -470,11 +490,18 @@ /// The bitmap on which the rendering was performed. /// </returns> public Bitmap Render( - SvgDocument node) + ISvgDocument node) { - RendererBeforeRender(); - node.Render(this); + RectangleF updatedRect; + if (invalidRect != RectangleF.Empty) + updatedRect = new RectangleF(invalidRect.X, invalidRect.Y, invalidRect.Width, invalidRect.Height); + else + updatedRect = RectangleF.Empty; + RendererBeforeRender(); + ((SvgDocument)node).Render(this); RendererAfterRender(); + if (onRender != null) + OnRender(updatedRect); return rasterImage; } @@ -495,7 +522,20 @@ #endregion #region Event handlers - + private RenderEvent onRender; + public RenderEvent OnRender + { + get + { + return onRender; + } + set + { + onRender = value; + } + + } + /// <summary> /// Processes mouse events. /// </summary> @@ -518,7 +558,7 @@ GraphicsNode grNode = _getGraphicsNodeFromColor(pixel); if (grNode != null) { - SvgElement grElement = grNode.Element; + SvgElement grElement = (SvgElement)grNode.Element; IEventTarget target; if (grElement.ElementInstance != null) target = grElement.ElementInstance as IEventTarget; @@ -894,5 +934,22 @@ #endif #endregion - } + + #region IDisposable Members + + public void Dispose() + { + if (idMapRaster != null) + idMapRaster.Dispose(); + if (invalidatedRasterImage != null) + invalidatedRasterImage.Dispose(); + if (rasterImage != null) + rasterImage.Dispose(); + if (graphics != null) + graphics.Dispose(); + + } + + #endregion + } } Index: GraphicsWrapper.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorRenderingEngine/SharpVectors/Renderer/Gdi/GraphicsWrapper.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- GraphicsWrapper.cs 23 Dec 2004 17:39:16 -0000 1.4 +++ GraphicsWrapper.cs 19 Nov 2005 03:13:24 -0000 1.5 @@ -17,7 +17,7 @@ /// <summary> /// Wraps a Graphics object since it's sealed /// </summary> - public class GraphicsWrapper + public class GraphicsWrapper : IDisposable { #region Private Fields private bool _isStatic; @@ -27,8 +27,9 @@ #endregion #region Constructors - private GraphicsWrapper(Image image) + private GraphicsWrapper(Image image, bool isStatic) { + this._isStatic = isStatic; if(!IsStatic) { _idMapImage = new Bitmap(image.Width, image.Height); @@ -39,19 +40,40 @@ } _graphics = Graphics.FromImage(image); } + + private GraphicsWrapper(IntPtr hdc, bool isStatic) + { + this._isStatic = isStatic; + if(!IsStatic) + { + // This will get resized when the actual size is known + _idMapImage = new Bitmap(0, 0); + _idMapGraphics = Graphics.FromImage(_idMapImage); + _idMapGraphics.InterpolationMode = InterpolationMode.NearestNeighbor; + _idMapGraphics.SmoothingMode = SmoothingMode.None; + _idMapGraphics.CompositingQuality = CompositingQuality.Invalid; + } + _graphics = Graphics.FromHdc(hdc); + } #endregion - public static GraphicsWrapper FromImage(Image image) + public static GraphicsWrapper FromImage(Image image, bool isStatic) { - return new GraphicsWrapper(image); + return new GraphicsWrapper(image, isStatic); } + public static GraphicsWrapper FromHdc(IntPtr hdc, bool isStatic) + { + return new GraphicsWrapper(hdc, isStatic); + } + #region Properties public bool IsStatic { get{return _isStatic;} set{ _isStatic = value; + _idMapGraphics.Dispose(); _idMapGraphics = null; } } @@ -231,5 +253,4 @@ internal GraphicsContainer mainGraphicsContainer; } - } |
|
From: Jeff R. <jef...@us...> - 2005-11-19 03:13:35
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SvgComponents In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12283/src/SvgComponents Modified Files: SvgComponents.csproj SvgPictureBox.cs Log Message: Library wide changes for scripting support and automated re-rendering Index: SvgPictureBox.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SvgComponents/SvgPictureBox.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SvgPictureBox.cs 11 Sep 2005 18:31:10 -0000 1.2 +++ SvgPictureBox.cs 19 Nov 2005 03:13:24 -0000 1.3 @@ -9,14 +9,26 @@ using System.Windows.Forms; using System.Xml; using System.Reflection; +using System.Text; +using System.Security; +using System.Security.Permissions; + +using SharpVectors.Dom.Events; using SharpVectors.Dom.Svg; using SharpVectors.Xml; using SharpVectors.Renderer.Gdi; +using SharpVectors.Renderer; +using SharpVectors.Dom.Svg.Rendering; using SharpVectors.Dom; using SharpVectors.Dom.Css; +using SharpVectors.Scripting; +using SharpVectors.Collections; +using SharpVectors.Net; using System.Threading; +[assembly: AllowPartiallyTrustedCallers] + namespace SvgComponents { public class SvgPictureBox : System.Windows.Forms.Control @@ -35,12 +47,42 @@ SetStyle(ControlStyles.AllPaintingInWmPaint, true); SetStyle(ControlStyles.DoubleBuffer, true); + scriptEngineByMimeType = new TypeDictionary(); + SetMimeTypeEngineType("application/ecmascript", typeof(JScriptEngine)); + renderer = new GdiRenderer(); + renderer.OnRender = new RenderEvent(this.OnRender); window = new SvgWindow(this, renderer); } #endregion #region Events + public void OnRender(RectangleF updatedRect) + { + if (surface != null) + { + if (updatedRect == RectangleF.Empty) + Draw(surface); + else + Draw(surface, updatedRect); + } + else + { + surface = CreateGraphics(); + if (updatedRect == RectangleF.Empty) + Draw(surface); + else + Draw(surface, updatedRect); + surface.Dispose(); + surface = null; + } + + // Collect the rendering regions for later updates + SvgDocument doc = (window.Document as SvgDocument); + SvgElement root = (doc.RootElement as SvgElement); + //root.CacheRenderingRegion(renderer); + } + private int lastX = -1; private int lastY = -1; protected override void OnMouseMove(MouseEventArgs e) @@ -139,16 +181,22 @@ if(value != null && value.Length > 0) { + // Load the source window.Src = value; + // Initialize the style sheets SetupStyleSheets(); + // Execute all script elements + UnloadEngines(); + InitializeEvents(); + ExecuteScripts(); //JR if (autoSize) { ISvgSvgElement svgEl = window.Document.RootElement; this.Width = (int)svgEl.Width.BaseVal.Value; this.Height = (int)svgEl.Height.BaseVal.Value; - ((CssXmlElement)svgEl).CssInvalidate(); } + renderer.InvalidRect = RectangleF.Empty; Render(); loaded = true; } @@ -168,6 +216,11 @@ try { #endif + // Worry about clearing the graphics nodes map... + renderer.ClearMap(); + System.GC.Collect(); + System.Threading.Thread.Sleep(1); + if(xml != null && xml.Length > 0) { if(xml != null && xml.Length > 0) @@ -200,8 +253,6 @@ { if ( this.window != null ) { renderAndInvalidate(); - System.GC.Collect(); - System.Threading.Thread.Sleep(1); } } @@ -252,21 +303,6 @@ #endif renderer.Render(window.Document as SvgDocument); - if (surface != null) - Draw(surface); - else - { - surface = CreateGraphics(); - Draw(surface); - surface.Dispose(); - surface = null; - } - - // Collect the rendering regions for later updates - SvgDocument doc = (window.Document as SvgDocument); - SvgElement root = (doc.RootElement as SvgElement); - root.CacheRenderingRegion(renderer); - #if RELEASE } catch(Exception e) @@ -278,30 +314,25 @@ private void updateAndInvalidate(RectangleF rect) { -#if RELEASE - try - { -#endif renderer.InvalidateRect(rect); - renderer.Render(window.Document as SvgDocument); + renderAndInvalidate(); + } - if (surface != null) - Draw(surface, rect); - else + public void DrawTo(IntPtr hdc) + { + if ( !this.DesignMode ) { - surface = CreateGraphics(); - Draw(surface, rect); - surface.Dispose(); - surface = null; + if ( window != null ) + { + GraphicsWrapper gw = GraphicsWrapper.FromHdc(hdc, true); + GdiRenderer r = ((GdiRenderer)window.Renderer); + gw.Clear(r.BackColor); + r.GraphicsWrapper = gw; + window.Renderer.Render((SvgDocument)window.Document); + r.GraphicsWrapper = null; + gw.Dispose(); + } } - -#if RELEASE - } - catch(Exception e) - { - MessageBox.Show("An exception occured while rendering: " + e.Message); - } -#endif } public void Draw(Graphics gr) @@ -396,6 +427,212 @@ } #endregion + #region Scripting Methods and Properties + private TypeDictionary scriptEngineByMimeType; + private Hashtable scriptEngines = new Hashtable(); + + public void SetMimeTypeEngineType(string mimeType, Type engineType) + { + scriptEngineByMimeType[mimeType] = engineType; + } + + public ScriptEngine GetScriptEngineByMimeType(string mimeType) + { + ScriptEngine engine = null; + + if (mimeType == "") + mimeType = ((ISvgWindow)window).Document.RootElement.GetAttribute("contentScriptType"); + + if (mimeType == "" || mimeType == "text/ecmascript" || mimeType == "text/javascript" || mimeType == "application/javascript") + mimeType = "application/ecmascript"; + + if (!scriptEngines.Contains(mimeType)) + { + object[] args = new object[] { (window as ISvgWindow) }; + engine = (ScriptEngine)scriptEngineByMimeType.CreateInstance(mimeType, args); + scriptEngines.Add(mimeType,engine); + engine.Initialise(); + } + + if (engine == null) + engine = (ScriptEngine) scriptEngines[mimeType]; + + return engine; + } + + + /// <summary> + /// Clears the existing script engine list from any previously running instances + /// </summary> + private void UnloadEngines() + { + // Dispose of all running engines from previous document instances + foreach (string mimeType in scriptEngines.Keys) + { + ScriptEngine engine = (ScriptEngine)scriptEngines[mimeType]; + engine.Close(); + engine = null; + } + // Clear the list + scriptEngines.Clear(); + ClosureEventMonitor.Clear(); + ScriptTimerMonitor.Reset(); + } + + /// <summary> + /// Add event listeners for on* events within the document + /// </summary> + private void InitializeEvents() + { + SvgDocument document = (SvgDocument)window.Document; + document.NamespaceManager.AddNamespace("svg", "http://www.w3.org/2000/svg"); + + XmlNodeList nodes = document.SelectNodes(@"//*[namespace-uri()='http://www.w3.org/2000/svg'] + [local-name()='svg' or + local-name()='g' or + local-name()='defs' or + local-name()='symbol' or + local-name()='use' or + local-name()='switch' or + local-name()='image' or + local-name()='path' or + local-name()='rect' or + local-name()='circle' or + local-name()='ellipse' or + local-name()='line' or + local-name()='polyline' or + local-name()='polygon' or + local-name()='text' or + local-name()='tref' or + local-name()='tspan' or + local-name()='textPath' or + local-name()='altGlyph' or + local-name()='a' or + local-name()='foreignObject'] + /@*[name()='onfocusin' or + name()='onfocusout' or + name()='onactivate' or + name()='onclick' or + name()='onmousedown' or + name()='onmouseup' or + name()='onmouseover' or + name()='onmousemove' or + name()='onmouseout' or + name()='onload']", document.NamespaceManager); + + foreach (XmlNode node in nodes) + { + IAttribute att = (IAttribute)node; + IEventTarget targ = (IEventTarget)att.OwnerElement; + ScriptEventMonitor mon = new ScriptEventMonitor((VsaScriptEngine)GetScriptEngineByMimeType(""), att, window); + string eventName = null; + switch (att.Name) + { + case "onfocusin": + eventName = "focusin"; + break; + case "onfocusout": + eventName = "focusout"; + break; + case "onactivate": + eventName = "activate"; + break; + case "onclick": + eventName = "click"; + break; + case "onmousedown": + eventName = "mousedown"; + break; + case "onmouseup": + eventName = "mouseup"; + break; + case "onmouseover": + eventName = "mouseover"; + break; + case "onmousemove": + eventName = "mousemove"; + break; + case "onmouseout": + eventName = "mouseout"; + break; + case "onload": + eventName = "SVGLoad"; + break; + } + targ.AddEventListener(eventName, new EventListener(mon.EventHandler), false); + } + } + + /// <summary> /// Collect the text in all script elements, build engine and execute. /// </summary> + private void ExecuteScripts() + { + Hashtable codeByMimeType = new Hashtable(); + StringBuilder codeBuilder; + SvgDocument document = (SvgDocument)window.Document; + + XmlNodeList scripts = document.GetElementsByTagName("script", SvgDocument.SvgNamespace); + StringBuilder code = new StringBuilder(); + + foreach ( XmlElement script in scripts ) + { + string type = script.GetAttribute("type"); + + if ( GetScriptEngineByMimeType(type) != null ) + { + // make sure we have a StringBuilder for this MIME type + if ( !codeByMimeType.Contains(type) ) + codeByMimeType[type] = new StringBuilder(); + + // grab this MIME type's codeBuilder + codeBuilder = (StringBuilder) codeByMimeType[type]; + + if ( script.HasChildNodes ) + { + // process each child that is text node or a CDATA section + foreach ( XmlNode node in script.ChildNodes ) + { + if ( node.NodeType == XmlNodeType.CDATA || node.NodeType == XmlNodeType.Text ) + { + codeBuilder.Append(node.Value); + } + } + } + + if (script.HasAttribute("href", "http://www.w3.org/1999/xlink")) + { + string href = script.GetAttribute("href", "http://www.w3.org/1999/xlink"); + Uri baseUri = new Uri(((XmlDocument)((ISvgWindow)window).Document).BaseURI); + Uri hUri = new Uri(baseUri, href); + ExtendedHttpWebRequestCreator creator = new ExtendedHttpWebRequestCreator(); + ExtendedHttpWebRequest request = (ExtendedHttpWebRequest)creator.Create(hUri); + ExtendedHttpWebResponse response = (ExtendedHttpWebResponse)request.GetResponse(); + Stream rs = response.GetResponseStream(); + StreamReader sr = new StreamReader(rs); + codeBuilder.Append(sr.ReadToEnd()); + rs.Close(); + } + } + } + + // execute code for all script engines + foreach ( string mimeType in codeByMimeType.Keys ) + { + codeBuilder = (StringBuilder) codeByMimeType[mimeType]; + + if ( codeBuilder.Length > 0 ) + { + ScriptEngine engine = GetScriptEngineByMimeType(mimeType); + engine.Execute( codeBuilder.ToString() ); + } + } + + // load the root element + ((ISvgWindow)window).Document.RootElement.DispatchEvent(new Event("SVGLoad", false, true)); + } + + #endregion + + #region Component Designer generated code /// <summary> /// Required method for Designer support - do not modify @@ -411,6 +648,8 @@ /// </summary> protected override void Dispose( bool disposing ) { + renderer.Dispose(); + if( disposing ) { if(components != null) Index: SvgComponents.csproj =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SvgComponents/SvgComponents.csproj,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- SvgComponents.csproj 12 Sep 2005 15:08:23 -0000 1.14 +++ SvgComponents.csproj 19 Nov 2005 03:13:24 -0000 1.15 @@ -179,6 +179,21 @@ Project = "{FE34CBC0-D23C-4A95-BA64-83A031814010}" Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" /> + <Reference + Name = "Microsoft.Vsa" + AssemblyName = "Microsoft.Vsa" + HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\Microsoft.Vsa.dll" + /> + <Reference + Name = "Microsoft.JScript" + AssemblyName = "Microsoft.JScript" + HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\Microsoft.JScript.dll" + /> + <Reference + Name = "SharpVectorScripting" + Project = "{2C56C191-EB9D-4658-84EE-73D2605896E6}" + Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" + /> </References> </Build> <Files> |
|
From: Jeff R. <jef...@us...> - 2005-11-19 03:13:34
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12283/src/SharpVectorBindings/SharpVectors/Dom Modified Files: IAttribute.cs Log Message: Library wide changes for scripting support and automated re-rendering Index: IAttribute.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/IAttribute.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- IAttribute.cs 15 Aug 2003 11:08:27 -0000 1.1 +++ IAttribute.cs 19 Nov 2005 03:13:22 -0000 1.2 @@ -1,4 +1,5 @@ using System; +using System.Xml; namespace SharpVectors.Dom { @@ -8,5 +9,14 @@ public interface IAttribute : INode { + XmlElement OwnerElement + { + get; + } + + bool Specified + { + get; + } } } |
|
From: Jeff R. <jef...@us...> - 2005-11-19 03:13:34
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12283/src/SharpVectorBindings Modified Files: SharpVectorBindings.csproj Log Message: Library wide changes for scripting support and automated re-rendering Index: SharpVectorBindings.csproj =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectorBindings.csproj,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- SharpVectorBindings.csproj 12 Sep 2005 15:08:22 -0000 1.13 +++ SharpVectorBindings.csproj 19 Nov 2005 03:13:22 -0000 1.14 @@ -1204,6 +1204,16 @@ BuildAction = "Compile" /> <File + RelPath = "SharpVectors\Dom\Svg\Rendering\ISvgRenderer.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "SharpVectors\Dom\Svg\Rendering\RenderingNode.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "SharpVectors\Dom\Svg\Scripting\ISvgScriptElement.cs" SubType = "Code" BuildAction = "Compile" |
|
From: Jeff R. <jef...@us...> - 2005-11-19 03:13:34
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Scripting In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12283/src/SharpVectorObjectModel/SharpVectors/dom/svg/Scripting Modified Files: SvgScriptElement.cs Log Message: Library wide changes for scripting support and automated re-rendering Index: SvgScriptElement.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Scripting/SvgScriptElement.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgScriptElement.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgScriptElement.cs 19 Nov 2005 03:13:23 -0000 1.2 @@ -22,6 +22,12 @@ } #endregion + public string Type + { + get { return GetAttribute("type"); } + set { SetAttribute("type", value); } + } + #region Implementation of ISvgURIReference private SvgURIReference svgURIReference; public ISvgAnimatedString Href |
|
From: Jeff R. <jef...@us...> - 2005-11-19 03:13:34
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Svg In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12283/src/SharpVectorBindings/SharpVectors/Dom/Svg Modified Files: ISvgWindow.cs Log Message: Library wide changes for scripting support and automated re-rendering Index: ISvgWindow.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Svg/ISvgWindow.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ISvgWindow.cs 9 Aug 2003 22:39:31 -0000 1.1 +++ ISvgWindow.cs 19 Nov 2005 03:13:22 -0000 1.2 @@ -1,5 +1,6 @@ using System; using SharpVectors.Dom.Stylesheets; +using SharpVectors.Dom.Svg.Rendering; using System.Xml; namespace SharpVectors.Dom.Svg @@ -8,18 +9,14 @@ { IStyleSheet DefaultStyleSheet{get;} ISvgDocument Document{get;} - /*Event Evt{get;}*/ long InnerHeight{get;} long InnerWidth{get;} string Src{get;set;} - - void ClearInterval (object interval); - void ClearTimeout (object timeout); - /*void GetURL (string uri, EventListener callback); */ - XmlDocumentFragment ParseXML (string source, XmlDocument document); - /*void PostURL (string uri, string data, EventListener callback, string mimeType, string contentEncoding);*/ + XmlDocumentFragment ParseXML (string source, XmlDocument document); string PrintNode (XmlNode node); - object SetInterval (string code, long delay); - object SetTimeout (string code, long delay); - } + void Alert(string message); + ISvgRenderer Renderer { get; } + /*void GetURL (string uri, EventListener callback); */ + /*void PostURL (string uri, string data, EventListener callback, string mimeType, string contentEncoding);*/ + } } |
|
From: Jeff R. <jef...@us...> - 2005-11-19 03:10:31
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorScripting/SharpVectors/Scripting/Wrapping In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11802/Wrapping Log Message: Directory /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorScripting/SharpVectors/Scripting/Wrapping added to the repository |
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Document Structure In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/src/SharpVectorObjectModel/SharpVectors/dom/svg/Document Structure Modified Files: SvgDocument.cs SvgElementInstance.cs SvgSymbolElement.cs SvgTransformableElement.cs SvgUseElement.cs Log Message: Library wide fixes for Unit Test completion, only Mutation events left to implement for current test coverage Index: SvgSymbolElement.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Document Structure/SvgSymbolElement.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- SvgSymbolElement.cs 27 May 2003 20:44:00 -0000 1.5 +++ SvgSymbolElement.cs 23 Oct 2005 23:39:29 -0000 1.6 @@ -40,6 +40,8 @@ return svgFitToViewBox.PreserveAspectRatio; } } - #endregion + #endregion + + } } Index: SvgElementInstance.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Document Structure/SvgElementInstance.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgElementInstance.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgElementInstance.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -10,19 +10,8 @@ public SvgElementInstance(XmlNode refNode, SvgUseElement useElement, SvgElementInstance parent) { correspondingUseElement = (ISvgUseElement)useElement; - parentNode = (SvgElementInstance)parent; - - if(refNode is SvgElement) - { - correspondingElement = (ISvgElement)refNode; - ((SvgElement)refNode).ElementInstance = this; - } - else - { - correspondingElement = null; - } - + correspondingElement = (ISvgElement)refNode; eventTarget = new EventTarget(this); } Index: SvgTransformableElement.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Document Structure/SvgTransformableElement.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgTransformableElement.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgTransformableElement.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -59,10 +59,10 @@ public ISvgRect GetBBox() { - return new SvgRect(GetBRect()); + return new SvgRect(GetBRect(0)); } - public RectangleF GetBRect() + public RectangleF GetBRect(float margin) { if(this is ISharpGDIPath) { @@ -70,18 +70,23 @@ GraphicsPath gp = gdiPathElm.GetGraphicsPath(); SvgMatrix svgMatrix = (SvgMatrix)this.GetScreenCTM(); RectangleF bounds = gp.GetBounds(svgMatrix.ToMatrix()); - bounds = RectangleF.Inflate(bounds, 20, 20); + bounds = RectangleF.Inflate(bounds, margin, margin); return bounds; } else if (this is ISvgUseElement) { SvgUseElement use = (SvgUseElement)this; + SvgTransformableElement refEl = use.ReferencedElement as SvgTransformableElement; + if (refEl == null) + return RectangleF.Empty; + XmlElement refElParent = (XmlElement)refEl.ParentNode; OwnerDocument.Static = true; - XmlNode parent = ParentNode; - SvgGElement newChild = use.WrappedReferencedElement; - parent.ReplaceChild(newChild, this); - RectangleF bbox = newChild.GetBRect(); - parent.ReplaceChild(this, newChild); + use.CopyToReferencedElement(refEl); + this.AppendChild(refEl); + RectangleF bbox = refEl.GetBRect(margin); + this.RemoveChild(refEl); + use.RestoreReferencedElement(refEl); + refElParent.AppendChild(refEl); OwnerDocument.Static = false; return bbox; } @@ -96,7 +101,7 @@ if (childNode is ISvgTransformable) { transformChild = (SvgTransformableElement)childNode; - RectangleF bbox = transformChild.GetBRect(); + RectangleF bbox = transformChild.GetBRect(margin); if (bbox != RectangleF.Empty) { if(union == RectangleF.Empty) union = bbox; @@ -236,7 +241,10 @@ if (renderingNode.ScreenRegion != RectangleF.Empty) return; - renderingNode.ScreenRegion = GetBRect(); + //TODO this is still fairly experimental, a margin of 20 gives us some overlap for leeway + //TODO in general, overlap is necessary to handle strokes, which are not covered in bbox, but are + //TODO for rendering purposes (same with markers) + renderingNode.ScreenRegion = GetBRect(0); } } Index: SvgDocument.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Document Structure/SvgDocument.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgDocument.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgDocument.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -607,7 +607,7 @@ if (res == null) return null; else - return (XmlElement)res; + return (Element)res; } #endregion Index: SvgUseElement.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Document Structure/SvgUseElement.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgUseElement.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgUseElement.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -3,6 +3,7 @@ using System.Drawing; using SharpVectors.Dom.Svg.Rendering; using SharpVectors.Dom.Css; +using System.Collections; namespace SharpVectors.Dom.Svg { @@ -18,72 +19,6 @@ } #endregion - #region Private members - private SvgGElement gElm = null; - public SvgGElement WrappedReferencedElement - { - get - { - if (gElm == null) - { - gElm = (SvgGElement)OwnerDocument.CreateElement(String.Empty, "g", SvgDocument.SvgNamespace); - foreach ( XmlNode att in Attributes ) - { - if ( att.LocalName != "x" && - att.LocalName != "y" && - att.LocalName != "width" && - att.LocalName != "height" && - !(att.LocalName == "href" && att.NamespaceURI == SvgDocument.XLinkNamespace)) - { - gElm.SetAttribute(att.LocalName, att.Value); - } - } - - gElm.SetAttribute("transform", - GetAttribute("transform") + " translate(" + X.AnimVal.Value + "," + Y.AnimVal.Value + ")"); - - XmlElement refElm = ReferencedElement; - - if ( refElm is SvgSymbolElement ) - { - SvgSvgElement svgElm = (SvgSvgElement)OwnerDocument.CreateElement(String.Empty, "svg", SvgDocument.SvgNamespace); - svgElm.SetAttribute("width", (HasAttribute("width")) ? GetAttribute("width") : "100%"); - svgElm.SetAttribute("height", (HasAttribute("height")) ? GetAttribute("height") : "100%"); - - foreach (XmlNode att in refElm.Attributes ) - { - if ( att.NamespaceURI.Length == 0 && att.LocalName != "width" && att.LocalName != "height") - { - svgElm.SetAttribute(att.LocalName, att.Value); - } - } - - foreach(XmlNode child in refElm.ChildNodes) - { - svgElm.AppendChild(OwnerDocument.ImportNode(child.Clone(), true)); - //svgElm.AppendChild(child.Clone()); - } - gElm.AppendChild(svgElm); - } - else if ( refElm is SvgSvgElement ) - { - SvgSvgElement svgElm = (SvgSvgElement)OwnerDocument.ImportNode(refElm.Clone(), true); - if (HasAttribute("width")) - svgElm.SetAttribute("width", GetAttribute("width")); - if (HasAttribute("height")) - svgElm.SetAttribute("height", GetAttribute("height")); - gElm.AppendChild(svgElm); - } - else if ( refElm != null ) - { - gElm.AppendChild(OwnerDocument.ImportNode(refElm.Clone(), true)); - } - } - return gElm; - } - } - #endregion - #region Implementation of ISvgUseElement private ISvgAnimatedLength x; public ISvgAnimatedLength X @@ -144,7 +79,7 @@ { if(instanceRoot == null) { - instanceRoot = new SvgElementInstance(WrappedReferencedElement.FirstChild, this, null); + instanceRoot = new SvgElementInstance(ReferencedElement, this, null); } return instanceRoot; } @@ -222,19 +157,15 @@ { case "x": x = null; - gElm = null; return; case "y": y = null; - gElm = null; return; case "width": width = null; - gElm = null; return; case "height": height = null; - gElm = null; return; } } @@ -244,45 +175,82 @@ { case "href": instanceRoot = null; - gElm = null; break; } } - if (gElm != null) - { - // Try to pass the attribute onto the conceptual tree - gElm.SetAttribute(attribute.LocalName, attribute.NamespaceURI, attribute.Value); - return; - } - base.HandleAttributeChange(attribute); } public void ReferencedNodeChange(Object src, XmlNodeChangedEventArgs args) { - //!!!!!!!!!!!!!!!! This is getting called too often! + //TODO - This is getting called too often! //instanceRoot = null; - //gElm = null; } - #endregion + #endregion + + #region Rendering + private string saveTransform = null; + private string saveWidth = null; + private string saveHeight = null; + public void CopyToReferencedElement(XmlElement refEl) + { + // X and Y become a translate portion of any transform, width and height may get passed on + if (X.AnimVal.Value != 0 || Y.AnimVal.Value != 0) + { + saveTransform = this.GetAttribute("transform"); + this.SetAttribute("transform", saveTransform + " translate(" + X.AnimVal.Value + "," + Y.AnimVal.Value + ")"); + } + if (refEl is SvgSymbolElement) + { + refEl.SetAttribute("width", (HasAttribute("width")) ? GetAttribute("width") : "100%"); + refEl.SetAttribute("height", (HasAttribute("height")) ? GetAttribute("height") : "100%"); + } + if (refEl is SvgSymbolElement) + { + saveWidth = refEl.GetAttribute("width"); + saveHeight = refEl.GetAttribute("height"); + if (HasAttribute("width")) + refEl.SetAttribute("width", GetAttribute("width")); + if (HasAttribute("height")) + refEl.SetAttribute("height", GetAttribute("height")); + } + } + + public void RestoreReferencedElement(XmlElement refEl) + { + if (saveTransform != null) + this.SetAttribute("transform", saveTransform); + if (saveWidth != null) + { + refEl.SetAttribute("width", saveWidth); + refEl.SetAttribute("height", saveHeight); + } + } - #region Rendering public override void Render(ISvgRenderer renderer) { + XmlElement refEl = ReferencedElement; + if (refEl == null) + return; + XmlElement refElParent = (XmlElement)refEl.ParentNode; OwnerDocument.Static = true; - XmlNode parent = ParentNode; - SvgGElement newChild = WrappedReferencedElement; - // todo: there has to be a better time to do this (e.g. trigger the instance tree creation)? - ISvgElementInstance inst = InstanceRoot; - parent.ReplaceChild(newChild, this); - newChild.Render(renderer); - parent.ReplaceChild(this, newChild); + CopyToReferencedElement(refEl); + refElParent.RemoveChild(refEl); + this.AppendChild(refEl); + base.Render(renderer); + this.RemoveChild(refEl); + RestoreReferencedElement(refEl); + refElParent.AppendChild(refEl); OwnerDocument.Static = false; } public override void CacheRenderingRegion(ISvgRenderer renderer) { + SvgTransformableElement refEl = ReferencedElement as SvgTransformableElement; + if (refEl == null) + return; + if(renderingNode == null) { renderingNode = renderer.GetRenderingNode(this); @@ -292,13 +260,16 @@ if (renderingNode != null && renderingNode.ScreenRegion != RectangleF.Empty) return; + XmlElement refElParent = (XmlElement)refEl.ParentNode; OwnerDocument.Static = true; - XmlNode parent = ParentNode; - SvgGElement newChild = WrappedReferencedElement; - parent.ReplaceChild(newChild, this); - newChild.CacheRenderingRegion(renderer); - renderingNode.ScreenRegion = newChild.RenderingNode.ScreenRegion; - parent.ReplaceChild(this, newChild); + CopyToReferencedElement(refEl); + refElParent.RemoveChild(refEl); + this.AppendChild(refEl); + refEl.CacheRenderingRegion(renderer); + renderingNode.ScreenRegion = refEl.RenderingNode.ScreenRegion; + this.RemoveChild(refEl); + RestoreReferencedElement(refEl); + refElParent.AppendChild(refEl); OwnerDocument.Static = false; } @@ -306,9 +277,8 @@ { if (renderingNode != null) renderingNode.ScreenRegion = RectangleF.Empty; - // Invalidate the shadow tree - SvgGElement newChild = WrappedReferencedElement; - newChild.InvalidateRenderingRegion(); + if (ReferencedElement != null && ReferencedElement is SvgElement) + ((SvgElement)ReferencedElement).InvalidateRenderingRegion(); } #endregion |
|
From: Jeff R. <jef...@us...> - 2005-10-23 23:39:48
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Basic types In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/src/SharpVectorObjectModel/SharpVectors/dom/svg/Basic types Modified Files: SvgElement.cs SvgPointList.cs Log Message: Library wide fixes for Unit Test completion, only Mutation events left to implement for current test coverage Index: SvgElement.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Basic types/SvgElement.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgElement.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ SvgElement.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -67,17 +67,19 @@ public virtual void Render(ISvgRenderer renderer) { - if(renderingNode == null) - { - renderingNode = renderer.GetRenderingNode(this); - } - - if ( !(this is ISharpDoNotPaint) && renderingNode != null ) { - if (!renderingNode.NeedRender(renderer)) return; - renderingNode.BeforeRender(renderer); - renderingNode.Render(renderer); - RenderChildren(renderer); - renderingNode.AfterRender(renderer); + if ( !(this is ISharpDoNotPaint) || (this is SvgSymbolElement && this.ParentNode is SvgUseElement)) { + if (renderingNode == null) + { + renderingNode = renderer.GetRenderingNode(this); + } + if (renderingNode != null) + { + if (!renderingNode.NeedRender(renderer)) return; + renderingNode.BeforeRender(renderer); + renderingNode.Render(renderer); + RenderChildren(renderer); + renderingNode.AfterRender(renderer); + } } } Index: SvgPointList.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorObjectModel/SharpVectors/dom/svg/Basic types/SvgPointList.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- SvgPointList.cs 6 Mar 2005 08:31:31 -0000 1.1 +++ SvgPointList.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -88,7 +88,7 @@ // Special handling for two commas if (c==',') { - if (seenComma) + if (seenComma && sNum < 0) throw new SvgException(SvgExceptionType.SvgInvalidValueErr); seenComma = true; } |
|
From: Jeff R. <jef...@us...> - 2005-10-23 23:39:48
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Basic types In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Basic types Modified Files: SvgPointListTests.cs Log Message: Library wide fixes for Unit Test completion, only Mutation events left to implement for current test coverage Index: SvgPointListTests.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Basic types/SvgPointListTests.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SvgPointListTests.cs 26 Apr 2003 19:50:04 -0000 1.2 +++ SvgPointListTests.cs 23 Oct 2005 23:39:29 -0000 1.3 @@ -106,6 +106,13 @@ Assertion.AssertEquals(4, p2.Y); Assertion.AssertEquals(5, p3.X); Assertion.AssertEquals(6, p3.Y); + bool except = false; + try + { + svgPointList.FromString("1,2, 3 , , 5,6"); } + catch (SvgException) + { except = true; } Assertion.Assert("Double comma should give an invalid value SVG exception", except); + } [Test] |
|
From: Jeff R. <jef...@us...> - 2005-10-23 23:39:48
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Document structure In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Document structure Modified Files: SvgDocumentTests.cs SvgUseElementTests.cs Log Message: Library wide fixes for Unit Test completion, only Mutation events left to implement for current test coverage Index: SvgUseElementTests.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Document structure/SvgUseElementTests.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SvgUseElementTests.cs 1 May 2003 23:05:46 -0000 1.2 +++ SvgUseElementTests.cs 23 Oct 2005 23:39:29 -0000 1.3 @@ -36,9 +36,7 @@ public void TestInternalReference() { SvgUseElement elm = Util.GetXmlElement("<use xlink:href='#foo' /><rect id='foo' width='100' height='100' />", "", "use") as SvgUseElement; - SvgRectElement rect = elm.OwnerDocument.SelectSingleNode("//*[@id='foo']") as SvgRectElement; - Assertion.AssertNotNull(elm.InstanceRoot); Assertion.AssertEquals(elm, elm.InstanceRoot.CorrespondingUseElement); Assertion.AssertEquals(rect, elm.InstanceRoot.CorrespondingElement); Index: SvgDocumentTests.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Dom/Svg/Document structure/SvgDocumentTests.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- SvgDocumentTests.cs 10 May 2003 23:16:54 -0000 1.3 +++ SvgDocumentTests.cs 23 Oct 2005 23:39:29 -0000 1.4 @@ -1,6 +1,6 @@ using System; using System.IO; using System.Xml; using NUnit.Framework; using SharpVectors.Dom.Svg; namespace SharpVectors.UnitTests.Svg.DocumentStructure { [TestFixture] public class SvgDocumentTests { #region Fields private ISvgDocument document; private string baseDir = @"Dom.Svg\"; private SvgWindow window = new SvgWindow(75,75, null); #endregion #region Title tests [Test] public void TestEmptyTitle() { Load("title_empty.svg"); Assertion.AssertEquals("", document.Title); } [Test] public void TestTitle() { Load("title.svg"); Assertion.AssertEquals("This is a test title", document.Title); } [Test] public void TestMultipleTitles() { Load("title_multiple.svg"); Assertion.AssertEquals("This is the title", document.Title); } [Test] public void TestNestedTitle() { Load("title_nested.svg"); Assertion.AssertEquals("", document.Title); } [Test] public void TestMultilineTitle() { Load("title_multiline.svg"); Assertion.AssertEquals("This is a title using multiple lines", document.Title); } #endregion #region Referrer and Domain [Test] public void TestReferrer() { Load("title_empty.svg"); Assertion.AssertEquals("", document.Referrer); } [Test] public void TestUnknownDomain() { Load("title_empty.svg"); Assertion.AssertNull(document.Domain); } [Test] public void TestKnownDomain() - { SvgWindow wnd = new SvgWindow(75, 75, null); SvgDocument doc = new SvgDocument(wnd); doc.Load("http://www.protocol7.com/svg.net/people.svg"); Assertion.AssertEquals("www.protocol7.com", doc.Domain); } #endregion [Test] public void TestRootElement() + { SvgWindow wnd = new SvgWindow(75, 75, null); SvgDocument doc = new SvgDocument(wnd); doc.Load("http://www.shiny-donkey.com/shinyDonkey.svg"); Assertion.AssertEquals("www.shiny-donkey.com", doc.Domain); } #endregion [Test] public void TestRootElement() { Load("title_empty.svg"); Assertion.AssertSame(((XmlDocument)document).DocumentElement, document.RootElement); } [Test] public void TestWindow() { Load("title_empty.svg"); Assertion.AssertSame(window, document.Window); } #region Support Methods private void Load(string svgFile) { string fullPath = new FileInfo(baseDir+svgFile).FullName; window.Src = fullPath; document = window.Document; } #endregion } } \ No newline at end of file |
|
From: Jeff R. <jef...@us...> - 2005-10-23 23:39:47
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorCss/SharpVectors/Dom/Css In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/src/SharpVectorCss/SharpVectors/Dom/Css Modified Files: CssTests.cs RgbColor.cs XPathSelector.cs Log Message: Library wide fixes for Unit Test completion, only Mutation events left to implement for current test coverage Index: XPathSelector.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorCss/SharpVectors/Dom/Css/XPathSelector.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- XPathSelector.cs 28 Jun 2003 20:37:30 -0000 1.5 +++ XPathSelector.cs 23 Oct 2005 23:39:29 -0000 1.6 @@ -672,7 +672,7 @@ } [Test] - [Ignore("DTD support disabled")] + [Ignore("This test will fail if run because we are searching for id nodes based on attribute name, not DTD ID type")] public void TestIdMatchingNoDtd() { // id on <b> is not defined in the DTD as ID @@ -786,7 +786,6 @@ public void TestTargetMatching() { Console.WriteLine(doc.Url); - } */ @@ -929,7 +928,6 @@ { XPathSelector xsel = new XPathSelector(sel, nsTable); xsel.Matches(e); - // Console.WriteLine(xsel.XPath); } } Index: CssTests.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorCss/SharpVectors/Dom/Css/CssTests.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CssTests.cs 28 Jun 2003 21:50:03 -0000 1.1 +++ CssTests.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -63,7 +63,7 @@ [Test] public void TestCssStyleRule() { - rule = (CssStyleRule)cssStyleSheet.CssRules[0]; + rule = (CssStyleRule)cssStyleSheet.CssRules[0]; Assertion.AssertNull(rule.ParentRule); Assertion.AssertEquals("g", rule.SelectorText); Assertion.AssertEquals("g{fill:#123456 !important;opacity:0.5;}", rule.CssText); @@ -75,14 +75,15 @@ [Test] public void TestCssStyleDeclaration() { - CssStyleDeclaration csd = (CssStyleDeclaration)rule.Style; - Assertion.AssertEquals("fill:#123456 !important;opacity:0.5;", csd.CssText); - Assertion.AssertEquals(2, csd.Length); - Assertion.AssertSame(rule, csd.ParentRule); - Assertion.AssertEquals("important", csd.GetPropertyPriority("fill")); - Assertion.AssertEquals("0.5", csd.GetPropertyValue("opacity")); - Assertion.AssertEquals("", csd.GetPropertyPriority("opacity")); - Assertion.AssertEquals("#123456", csd.GetPropertyValue("fill")); + rule = (CssStyleRule)cssStyleSheet.CssRules[0]; + CssStyleDeclaration csd = (CssStyleDeclaration)rule.Style; + Assertion.AssertEquals("fill:#123456 !important;opacity:0.5;", csd.CssText); + Assertion.AssertEquals(2, csd.Length); + Assertion.AssertSame(rule, csd.ParentRule); + Assertion.AssertEquals("important", csd.GetPropertyPriority("fill")); + Assertion.AssertEquals("0.5", csd.GetPropertyValue("opacity")); + Assertion.AssertEquals("", csd.GetPropertyPriority("opacity")); + Assertion.AssertEquals("#123456", csd.GetPropertyValue("fill")); csd.SetProperty("opacity", "0.8", ""); Assertion.AssertEquals("0.8", csd.GetPropertyValue("opacity")); Index: RgbColor.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorCss/SharpVectors/Dom/Css/RgbColor.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- RgbColor.cs 6 Mar 2005 08:07:04 -0000 1.1 +++ RgbColor.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -169,10 +169,11 @@ #region Unit tests #if TEST - [TestFixture] + [TestFixture] public class RgbColorTests { RgbColor color; + [Test] public void TestAbsoluteRgb() { color = new RgbColor("rgb( 100 , 123,15)"); |
|
From: Jeff R. <jef...@us...> - 2005-10-23 23:39:47
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Events In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/src/SharpVectorBindings/SharpVectors/Dom/Events Modified Files: IMutationEvent.cs IMutationNameEvent.cs Log Message: Library wide fixes for Unit Test completion, only Mutation events left to implement for current test coverage Index: IMutationEvent.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Events/IMutationEvent.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- IMutationEvent.cs 10 Aug 2003 12:04:19 -0000 1.4 +++ IMutationEvent.cs 23 Oct 2005 23:39:29 -0000 1.5 @@ -34,7 +34,7 @@ /// event it indicates the <see cref="IAttr">IAttr</see> node which /// was modified, added, or removed. /// </remarks> - IXmlNode RelatedNode + INode RelatedNode { get; } @@ -137,7 +137,7 @@ string typeArg, bool canBubbleArg, bool cancelableArg, - IXmlNode relatedNodeArg, + INode relatedNodeArg, string prevValueArg, string newValueArg, string attrNameArg, @@ -202,7 +202,7 @@ string typeArg, bool canBubbleArg, bool cancelableArg, - IXmlNode relatedNodeArg, + INode relatedNodeArg, string prevValueArg, string newValueArg, string attrNameArg, Index: IMutationNameEvent.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Events/IMutationNameEvent.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- IMutationNameEvent.cs 10 Aug 2003 10:59:58 -0000 1.1 +++ IMutationNameEvent.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -74,7 +74,7 @@ string typeArg, bool canBubbleArg, bool cancelableArg, - IXmlNode relatedNodeArg, + INode relatedNodeArg, string prevNamespaceUri, string prevNodeName); @@ -123,7 +123,7 @@ string typeArg, bool canBubbleArg, bool cancelableArg, - IXmlNode relatedNodeArg, + INode relatedNodeArg, string prevNamespaceUri, string prevNodeName); } |
|
From: Jeff R. <jef...@us...> - 2005-10-23 23:39:47
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorRenderingEngine/SharpVectors/Renderer/Gdi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/src/SharpVectorRenderingEngine/SharpVectors/Renderer/Gdi Modified Files: GdiRenderer.cs Log Message: Library wide fixes for Unit Test completion, only Mutation events left to implement for current test coverage Index: GdiRenderer.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorRenderingEngine/SharpVectors/Renderer/Gdi/GdiRenderer.cs,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- GdiRenderer.cs 11 Sep 2005 18:26:09 -0000 1.37 +++ GdiRenderer.cs 23 Oct 2005 23:39:29 -0000 1.38 @@ -865,11 +865,7 @@ public void DispatchMouseEvents_1() { DispatchMouseEvents_SvgControl svgControl = new DispatchMouseEvents_SvgControl(); - string codebase = Assembly.GetExecutingAssembly().CodeBase; - Uri uri = new Uri(codebase); - FileInfo fileInfo = new FileInfo(uri.LocalPath); - string unitTestDir = fileInfo.Directory + "\\" + "interactive_test_01.svg"; - Console.WriteLine(unitTestDir); + string unitTestDir = System.IO.Directory.GetCurrentDirectory() + "\\" + "interactive_test_01.svg"; svgControl.Src = unitTestDir; // Get start rect and add a UI listener |
|
From: Jeff R. <jef...@us...> - 2005-10-23 23:39:47
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorDom/SharpVectors/Dom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/src/SharpVectorDom/SharpVectors/Dom Modified Files: Document.cs Element.cs Log Message: Library wide fixes for Unit Test completion, only Mutation events left to implement for current test coverage Index: Element.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorDom/SharpVectors/Dom/Element.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Element.cs 14 Aug 2003 13:40:50 -0000 1.1 +++ Element.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -150,22 +150,26 @@ IEventTarget eventTarget = (IEventTarget)doc.DocumentElement; // Add first event listener - eventTarget.AddEventListener("mousemove", new EventListener(OnMouseMove), true); + eventTarget.AddEventListener("mousemove", new EventListener(OnMouseMove), false); eventTarget.DispatchEvent(new Event("uievent", "mousemove", true, false)); Assertion.AssertEquals(1, increment); // Add second event listener - eventTarget.AddEventListener("mousemove", new EventListener(OnMouseMove), true); + // "If multiple identical EventListeners are registered on the same EventTarget with the same + // parameters the duplicate instances are discarded. They do not cause the EventListener to + // be called twice and since they are discarded they do not need to be removed with the removeEventListener method." + eventTarget.AddEventListener("mousemove", new EventListener(OnMouseMove), false); eventTarget.DispatchEvent(new Event("uievent", "mousemove", true, false)); Assertion.AssertEquals(2, increment); // Remove first event listener - eventTarget.RemoveEventListener("mousemove", new EventListener(OnMouseMove), true); + eventTarget.RemoveEventListener("mousemove", new EventListener(OnMouseMove), false); eventTarget.DispatchEvent(new Event("uievent", "mousemove", true, false)); Assertion.AssertEquals(2, increment); // Remove second event listener - eventTarget.RemoveEventListener("mousemove", new EventListener(OnMouseMove), true); + // "Calling removeEventListener with arguments which do not identify any currently registered EventListener on the EventTarget has no effect." + eventTarget.RemoveEventListener("mousemove", new EventListener(OnMouseMove), false); eventTarget.DispatchEvent(new Event("uievent", "mousemove", true, false)); Assertion.AssertEquals(2, increment); } Index: Document.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorDom/SharpVectors/Dom/Document.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Document.cs 23 Dec 2004 17:35:26 -0000 1.6 +++ Document.cs 23 Oct 2005 23:39:29 -0000 1.7 @@ -707,7 +707,11 @@ IElement IDocument.GetElementById( string elementId) { - return (IElement)GetElementById(elementId); + object res = GetElementById(elementId); + if (res != null) + return (IElement)res; + else + return null; } string IDocument.ActualEncoding |
|
From: Jeff R. <jef...@us...> - 2005-10-23 23:39:47
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUtil/SharpVectors/Net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/src/SharpVectorUtil/SharpVectors/Net Modified Files: DataWebRequest.cs ExtendedHttpWebRequest.cs Log Message: Library wide fixes for Unit Test completion, only Mutation events left to implement for current test coverage Index: DataWebRequest.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUtil/SharpVectors/Net/DataWebRequest.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- DataWebRequest.cs 6 Mar 2005 08:14:30 -0000 1.5 +++ DataWebRequest.cs 23 Oct 2005 23:39:30 -0000 1.6 @@ -7,7 +7,7 @@ { public static bool Register() { - //!!!! return WebRequest.RegisterPrefix("data", new DataWebRequest()); + return WebRequest.RegisterPrefix("data", new DataWebRequest()); return false; } Index: ExtendedHttpWebRequest.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUtil/SharpVectors/Net/ExtendedHttpWebRequest.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- ExtendedHttpWebRequest.cs 6 Mar 2005 08:14:30 -0000 1.6 +++ ExtendedHttpWebRequest.cs 23 Oct 2005 23:39:30 -0000 1.7 @@ -29,7 +29,7 @@ #region Registration public static bool Register() { - //!!!! return WebRequest.RegisterPrefix("http://", new ExtendedHttpWebRequestCreator()); + return WebRequest.RegisterPrefix("http://", new ExtendedHttpWebRequestCreator()); return false; } #endregion |
|
From: Jeff R. <jef...@us...> - 2005-10-23 23:39:47
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorDom/SharpVectors/Dom/Events In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/src/SharpVectorDom/SharpVectors/Dom/Events Modified Files: Event.cs EventListenerMap.cs EventTarget.cs MutationEvent.cs MutationNameEvent.cs Log Message: Library wide fixes for Unit Test completion, only Mutation events left to implement for current test coverage Index: MutationNameEvent.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorDom/SharpVectors/Dom/Events/MutationNameEvent.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- MutationNameEvent.cs 15 Aug 2003 08:51:52 -0000 1.1 +++ MutationNameEvent.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -38,7 +38,7 @@ string eventType, bool bubbles, bool cancelable, - IXmlNode relatedNode, + INode relatedNode, string prevNamespaceUri, string prevNodeName) { @@ -55,7 +55,7 @@ string eventType, bool bubbles, bool cancelable, - IXmlNode relatedNode, + INode relatedNode, string prevNamespaceUri, string prevNodeName) { Index: EventListenerMap.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorDom/SharpVectors/Dom/Events/EventListenerMap.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- EventListenerMap.cs 14 Aug 2003 13:40:50 -0000 1.1 +++ EventListenerMap.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -129,7 +129,6 @@ { string namespaceUri = @event.NamespaceUri; string eventType = @event.Type; - for (int i = 0; i < count; i++) { string entryNamespaceUri = entries[i].NamespaceUri; Index: Event.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorDom/SharpVectors/Dom/Events/Event.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Event.cs 17 Aug 2003 11:00:56 -0000 1.2 +++ Event.cs 23 Oct 2005 23:39:29 -0000 1.3 @@ -201,8 +201,9 @@ #region Unit tests #if TEST + [TestFixture] - public class EventTests + public class EventTests { public class EventMonitor { @@ -622,10 +623,10 @@ @event.InitEvent("foo", true, false); ((IEventTarget)document).AddEventListener("foo", new EventListener(eventMonitor.EventHandler), false); - ((IEventTarget)document).DispatchEvent(@event); - Assertion.AssertEquals(eventMonitor.AtEvents, 1); - Assertion.AssertEquals(eventMonitor.BubbledEvents, 0); - Assertion.AssertEquals(eventMonitor.CapturedEvents, 0); + ((IEventTarget)document).DispatchEvent(@event); + Assertion.AssertEquals(1, eventMonitor.AtEvents); + Assertion.AssertEquals(0, eventMonitor.BubbledEvents); + Assertion.AssertEquals(0, eventMonitor.CapturedEvents); } /// <test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2" name="dispatchEvent09"> @@ -645,7 +646,7 @@ ((IEventTarget)document).AddEventListener("foo", new EventListener(eventMonitor.EventHandler), true); ((IEventTarget)document).DispatchEvent(@event); - Assertion.AssertEquals(eventMonitor.AtEvents, 0); + Assertion.AssertEquals(eventMonitor.AtEvents, 0); Assertion.AssertEquals(eventMonitor.BubbledEvents, 0); Assertion.AssertEquals(eventMonitor.CapturedEvents, 0); } Index: MutationEvent.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorDom/SharpVectors/Dom/Events/MutationEvent.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- MutationEvent.cs 17 Aug 2003 11:00:56 -0000 1.2 +++ MutationEvent.cs 23 Oct 2005 23:39:29 -0000 1.3 @@ -15,7 +15,7 @@ { #region Private Fields - private IXmlNode relatedNode; + private INode relatedNode; private string prevValue; private string newValue; private string attrName; @@ -33,7 +33,7 @@ #region IMutationEvent interface - public IXmlNode RelatedNode + public INode RelatedNode { get { @@ -77,7 +77,7 @@ string eventType, bool bubbles, bool cancelable, - IXmlNode relatedNode, + INode relatedNode, string prevValue, string newValue, string attrName, @@ -97,7 +97,7 @@ string eventType, bool bubbles, bool cancelable, - IXmlNode relatedNode, + INode relatedNode, string prevValue, string newValue, string attrName, Index: EventTarget.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorDom/SharpVectors/Dom/Events/EventTarget.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- EventTarget.cs 21 Jan 2005 04:47:39 -0000 1.4 +++ EventTarget.cs 23 Oct 2005 23:39:29 -0000 1.5 @@ -108,13 +108,14 @@ ancestors.Add(currInstance); } currNode = (XmlNode)currInstance.CorrespondingUseElement; + ancestors.Add(currNode); } // Build actual ancestors - while (currNode != null) + while (currNode != null && currNode.ParentNode != null) { - ancestors.Add(currNode); currNode = currNode.ParentNode; + ancestors.Add(currNode); } @@ -146,13 +147,13 @@ } } - if (!realEvent.stopped) + if (!realEvent.stopped) { - realEvent.eventPhase = EventPhase.AtTarget; + realEvent.eventPhase = EventPhase.AtTarget; realEvent.currentTarget = this.eventTarget; this.eventTarget.FireEvent(realEvent); } - + if (!realEvent.stopped) { realEvent.eventPhase = EventPhase.BubblingPhase; |
|
From: Jeff R. <jef...@us...> - 2005-10-23 23:39:46
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/src/SharpVectorBindings/SharpVectors/Dom Modified Files: IElement.cs INode.cs IXmlElement.cs Log Message: Library wide fixes for Unit Test completion, only Mutation events left to implement for current test coverage Index: IElement.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/IElement.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- IElement.cs 15 Aug 2003 11:08:27 -0000 1.1 +++ IElement.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -6,7 +6,7 @@ /// Summary description for IElement. /// </summary> public interface IElement - : INode + : IXmlElement { } } Index: IXmlElement.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/IXmlElement.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- IXmlElement.cs 9 Aug 2003 22:39:31 -0000 1.1 +++ IXmlElement.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -4,7 +4,7 @@ namespace SharpVectors.Dom { public interface IXmlElement - : IXmlNode + : INode { bool HasAttributes { Index: INode.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/INode.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- INode.cs 14 Aug 2003 13:40:50 -0000 1.1 +++ INode.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -5,7 +5,7 @@ /// <summary> /// Summary description for INode. /// </summary> - public interface INode + public interface INode : IXmlNode { } } |
|
From: Jeff R. <jef...@us...> - 2005-10-23 23:39:46
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Renderer/Gdi In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/src/SharpVectorUnitTests/SharpVectors/Renderer/Gdi Modified Files: BitmapComparator.cs CompareUtil.cs Log Message: Library wide fixes for Unit Test completion, only Mutation events left to implement for current test coverage Index: CompareUtil.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Renderer/Gdi/CompareUtil.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- CompareUtil.cs 15 Jun 2003 22:15:11 -0000 1.1 +++ CompareUtil.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -23,8 +23,7 @@ { string fromTestPath = pngImagePath.Replace(".png", "_fromtest.png"); renderedImage.Save(fromTestPath); - Console.WriteLine("Image saved as: " + fromTestPath); - } + } return result; } } Index: BitmapComparator.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorUnitTests/SharpVectors/Renderer/Gdi/BitmapComparator.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- BitmapComparator.cs 15 Jun 2003 22:15:11 -0000 1.3 +++ BitmapComparator.cs 23 Oct 2005 23:39:29 -0000 1.4 @@ -78,11 +78,11 @@ if ( diffCount > 0 ) { average = sum / diffCount; - Console.WriteLine("diffCount = " + diffCount.ToString()); + /*Console.WriteLine("diffCount = " + diffCount.ToString()); Console.WriteLine("minimum = " + minimum.ToString()); Console.WriteLine("maximum = " + maximum.ToString()); Console.WriteLine("average = " + average.ToString()); - Console.WriteLine("sum = " + sum.ToString()); + Console.WriteLine("sum = " + sum.ToString());*/ } else { @@ -92,7 +92,7 @@ } else { - Console.WriteLine("The dimensions of the two images do not match"); + // Console.WriteLine("The dimensions of the two images do not match"); } return result; |
|
From: Jeff R. <jef...@us...> - 2005-10-23 23:39:45
|
Update of /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Svg/Basic Data Types and Interfaces In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18901/src/SharpVectorBindings/SharpVectors/Dom/Svg/Basic Data Types and Interfaces Modified Files: ISvgElement.cs Log Message: Library wide fixes for Unit Test completion, only Mutation events left to implement for current test coverage Index: ISvgElement.cs =================================================================== RCS file: /cvsroot/svgdomcsharp/SharpVectorGraphics/src/SharpVectorBindings/SharpVectors/Dom/Svg/Basic Data Types and Interfaces/ISvgElement.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ISvgElement.cs 9 Aug 2003 22:50:14 -0000 1.1 +++ ISvgElement.cs 23 Oct 2005 23:39:29 -0000 1.2 @@ -11,7 +11,7 @@ /// </summary> /// <developer>ni...@pr...</developer> /// <completed>100</completed> - public interface ISvgElement : IXmlElement + public interface ISvgElement : IElement { /// <summary> /// The value of the id attribute on the given element. |
![http://www.protocol7.com/svg.net/people.svg");](http://www.protocol7.com/svg.net/people.svg");){kind=link}
![http://www.shiny-donkey.com/shinyDonkey.svg");](http://www.shiny-donkey.com/shinyDonkey.svg");){kind=link}