Change SvgSymbol namespace.

svg-net · Aug 15, 2019 · a0f2607 · a0f2607
1 parent 4914203
commit a0f2607
Show file tree

Hide file tree

Showing 2 changed files with 111 additions and 4 deletions.
diff --git a/Source/Document Structure/SvgSymbol.cs b/Source/Document Structure/SvgSymbol.cs
@@ -1,14 +1,120 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Drawing;
 
+namespace Svg.DocumentStructure
+{
+    /// <summary>
+    /// An element used to group SVG shapes.
+    /// </summary>
+    [SvgElement("symbol")]
+    public class SvgSymbol : SvgVisualElement
+    {
+        /// <summary>
+        /// Gets or sets the viewport of the element.
+        /// </summary>
+        /// <value></value>
+        [SvgAttribute("viewBox")]
+        public SvgViewBox ViewBox
+        {
+            get { return GetAttribute<SvgViewBox>("viewBox", false); }
+            set { Attributes["viewBox"] = value; }
+        }
+
+        /// <summary>
+        /// Gets or sets the aspect of the viewport.
+        /// </summary>
+        /// <value></value>
+        [SvgAttribute("preserveAspectRatio")]
+        public SvgAspectRatio AspectRatio
+        {
+            get { return GetAttribute<SvgAspectRatio>("preserveAspectRatio", false); }
+            set { Attributes["preserveAspectRatio"] = value; }
+        }
+
+        /// <summary>
+        /// Gets the <see cref="System.Drawing.Drawing2D.GraphicsPath"/> for this element.
+        /// </summary>
+        /// <value></value>
+        public override System.Drawing.Drawing2D.GraphicsPath Path(ISvgRenderer renderer)
+        {
+            return GetPaths(this, renderer);
+        }
+
+        /// <summary>
+        /// Gets the bounds of the element.
+        /// </summary>
+        /// <value>The bounds.</value>
+        public override System.Drawing.RectangleF Bounds
+        {
+            get
+            {
+                var r = new RectangleF();
+                foreach (var c in this.Children)
+                {
+                    if (c is SvgVisualElement)
+                    {
+                        // First it should check if rectangle is empty or it will return the wrong Bounds.
+                        // This is because when the Rectangle is Empty, the Union method adds as if the first values where X=0, Y=0
+                        if (r.IsEmpty)
+                        {
+                            r = ((SvgVisualElement)c).Bounds;
+                        }
+                        else
+                        {
+                            var childBounds = ((SvgVisualElement)c).Bounds;
+                            if (!childBounds.IsEmpty)
+                            {
+                                r = RectangleF.Union(r, childBounds);
+                            }
+                        }
+                    }
+                }
+
+                return TransformedBounds(r);
+            }
+        }
+
+        protected override bool Renderable { get { return false; } }
+
+        /// <summary>
+        /// Applies the required transforms to <see cref="ISvgRenderer"/>.
+        /// </summary>
+        /// <param name="renderer">The <see cref="ISvgRenderer"/> to be transformed.</param>
+        protected internal override bool PushTransforms(ISvgRenderer renderer)
+        {
+            if (!base.PushTransforms(renderer))
+                return false;
+            ViewBox.AddViewBoxTransform(AspectRatio, renderer, null);
+            return true;
+        }
+
+        // Only render if the parent is set to a Use element
+        protected override void Render(ISvgRenderer renderer)
+        {
+            if (_parent is SvgUse) base.Render(renderer);
+        }
+
+        public override SvgElement DeepCopy()
+        {
+            return DeepCopy<SvgSymbol>();
+        }
+
+        public override SvgElement DeepCopy<T>()
+        {
+            var newObj = base.DeepCopy<T>() as SvgSymbol;
+            if (this.Fill != null)
+                newObj.Fill = this.Fill.DeepCopy() as SvgPaintServer;
+            return newObj;
+        }
+    }
+}
+
 namespace Svg.Document_Structure
 {
     /// <summary>
     /// An element used to group SVG shapes.
     /// </summary>
+    [Obsolete("Use Svg.DocumentStructure.SvgSymbol.")]
     [SvgElement("symbol")]
     public class SvgSymbol : SvgVisualElement
     {

diff --git a/Source/SvgElement.cs b/Source/SvgElement.cs
@@ -7,6 +7,7 @@
 using System.Reflection;
 using System.Text;
 using System.Xml;
+using Svg.DocumentStructure;
 using Svg.Transforms;
 
 namespace Svg
@@ -876,7 +877,7 @@ protected void AddPaths(SvgElement elem, GraphicsPath path)
                 // Skip to avoid double calculate Symbol element
                 // symbol element is only referenced by use element 
                 // So here we need to skip when it is directly considered
-                if (child is Svg.Document_Structure.SvgSymbol)
+                if (child is SvgSymbol)
                     continue;
 
                 if (child is SvgVisualElement)