Split drawing code into separate files

Source/Basic Shapes/SvgCircle.Drawing.cs

@@ -0,0 +1,51 @@
+#if !NO_SDC
+using System.Drawing.Drawing2D;
+
+namespace Svg
+{
+    public partial class SvgCircle : SvgPathBasedElement
+    {
+        private GraphicsPath _path;
+
+        /// <summary>
+        /// Gets the <see cref="GraphicsPath"/> representing this element.
+        /// </summary>
+        public override GraphicsPath Path(ISvgRenderer renderer)
+        {
+            if (this._path == null || this.IsPathDirty)
+            {
+                var halfStrokeWidth = base.StrokeWidth / 2;
+
+                // If it is to render, don't need to consider stroke width.
+                // i.e stroke width only to be considered when calculating boundary
+                if (renderer != null)
+                {
+                    halfStrokeWidth = 0;
+                    this.IsPathDirty = false;
+                }
+
+                _path = new GraphicsPath();
+                _path.StartFigure();
+                var center = this.Center.ToDeviceValue(renderer, this);
+                var radius = this.Radius.ToDeviceValue(renderer, UnitRenderingType.Other, this) + halfStrokeWidth;
+                _path.AddEllipse(center.X - radius, center.Y - radius, 2 * radius, 2 * radius);
+                _path.CloseFigure();
+            }
+            return _path;
+        }
+
+        /// <summary>
+        /// Renders the circle using the specified <see cref="ISvgRenderer"/> object.
+        /// </summary>
+        /// <param name="renderer">The renderer object.</param>
+        protected override void Render(ISvgRenderer renderer)
+        {
+            // Don't draw if there is no radius set
+            if (this.Radius.Value > 0.0f)
+            {
+                base.Render(renderer);
+            }
+        }
+    }
+}
+#endif

Source/Basic Shapes/SvgCircle.cs

@@ -1,7 +1,3 @@
-#if !NO_SDC
-using System.Drawing.Drawing2D;
-#endif
-
 namespace Svg
 {
     /// <summary>
@@ -13,9 +9,7 @@ public partial class SvgCircle : SvgPathBasedElement
         private SvgUnit _centerX = 0f;
         private SvgUnit _centerY = 0f;
         private SvgUnit _radius = 0f;
-#if !NO_SDC
-        private GraphicsPath _path;
-#endif
+
         /// <summary>
         /// Gets the center point of the circle.
         /// </summary>
@@ -45,48 +39,6 @@ public virtual SvgUnit Radius
             get { return _radius; }
             set { _radius = value; Attributes["r"] = value; IsPathDirty = true; }
         }
-#if !NO_SDC
-
-        /// <summary>
-        /// Gets the <see cref="GraphicsPath"/> representing this element.
-        /// </summary>
-        public override GraphicsPath Path(ISvgRenderer renderer)
-        {
-            if (this._path == null || this.IsPathDirty)
-            {
-                var halfStrokeWidth = base.StrokeWidth / 2;
-
-                // If it is to render, don't need to consider stroke width.
-                // i.e stroke width only to be considered when calculating boundary
-                if (renderer != null)
-                {
-                    halfStrokeWidth = 0;
-                    this.IsPathDirty = false;
-                }
-
-                _path = new GraphicsPath();
-                _path.StartFigure();
-                var center = this.Center.ToDeviceValue(renderer, this);
-                var radius = this.Radius.ToDeviceValue(renderer, UnitRenderingType.Other, this) + halfStrokeWidth;
-                _path.AddEllipse(center.X - radius, center.Y - radius, 2 * radius, 2 * radius);
-                _path.CloseFigure();
-            }
-            return _path;
-        }
-
-        /// <summary>
-        /// Renders the circle using the specified <see cref="ISvgRenderer"/> object.
-        /// </summary>
-        /// <param name="renderer">The renderer object.</param>
-        protected override void Render(ISvgRenderer renderer)
-        {
-            // Don't draw if there is no radius set
-            if (this.Radius.Value > 0.0f)
-            {
-                base.Render(renderer);
-            }
-        }
-#endif
 
         public override SvgElement DeepCopy()
         {

Source/Basic Shapes/SvgEllipse.Drawing.cs

@@ -0,0 +1,53 @@
+#if !NO_SDC
+using System.Drawing.Drawing2D;
+
+namespace Svg
+{
+    public partial class SvgEllipse : SvgPathBasedElement
+    {
+        private GraphicsPath _path;
+
+        /// <summary>
+        /// Gets the <see cref="GraphicsPath"/> for this element.
+        /// </summary>
+        /// <value></value>
+        public override GraphicsPath Path(ISvgRenderer renderer)
+        {
+            if (this._path == null || this.IsPathDirty)
+            {
+                var halfStrokeWidth = base.StrokeWidth / 2;
+
+                // If it is to render, don't need to consider stroke width.
+                // i.e stroke width only to be considered when calculating boundary
+                if (renderer != null)
+                {
+                    halfStrokeWidth = 0;
+                    this.IsPathDirty = false;
+                }
+
+                var center = SvgUnit.GetDevicePoint(this.CenterX, this.CenterY, renderer, this);
+                var radiusX = this.RadiusX.ToDeviceValue(renderer, UnitRenderingType.Other, this) + halfStrokeWidth;
+                var radiusY = this.RadiusY.ToDeviceValue(renderer, UnitRenderingType.Other, this) + halfStrokeWidth;
+
+                this._path = new GraphicsPath();
+                _path.StartFigure();
+                _path.AddEllipse(center.X - radiusX, center.Y - radiusY, 2 * radiusX, 2 * radiusY);
+                _path.CloseFigure();
+            }
+            return _path;
+        }
+
+        /// <summary>
+        /// Renders the <see cref="SvgElement"/> and contents using the specified <see cref="ISvgRenderer"/> object.
+        /// </summary>
+        /// <param name="renderer">The <see cref="ISvgRenderer"/> object used for rendering.</param>
+        protected override void Render(ISvgRenderer renderer)
+        {
+            if (this.RadiusX.Value > 0.0f && this.RadiusY.Value > 0.0f)
+            {
+                base.Render(renderer);
+            }
+        }
+    }
+}
+#endif

Source/Basic Shapes/SvgEllipse.cs

@@ -1,7 +1,3 @@
-#if !NO_SDC
-using System.Drawing.Drawing2D;
-#endif
-
 namespace Svg
 {
     /// <summary>
@@ -15,10 +11,6 @@ public partial class SvgEllipse : SvgPathBasedElement
         private SvgUnit _radiusX = 0f;
         private SvgUnit _radiusY = 0f;
 
-#if !NO_SDC
-        private GraphicsPath _path;
-#endif
-
         [SvgAttribute("cx")]
         public virtual SvgUnit CenterX
         {
@@ -47,50 +39,6 @@ public virtual SvgUnit RadiusY
             set { _radiusY = value; Attributes["ry"] = value; IsPathDirty = true; }
         }
 
-#if !NO_SDC
-        /// <summary>
-        /// Gets the <see cref="GraphicsPath"/> for this element.
-        /// </summary>
-        /// <value></value>
-        public override GraphicsPath Path(ISvgRenderer renderer)
-        {
-            if (this._path == null || this.IsPathDirty)
-            {
-                var halfStrokeWidth = base.StrokeWidth / 2;
-
-                // If it is to render, don't need to consider stroke width.
-                // i.e stroke width only to be considered when calculating boundary
-                if (renderer != null)
-                {
-                    halfStrokeWidth = 0;
-                    this.IsPathDirty = false;
-                }
-
-                var center = SvgUnit.GetDevicePoint(this.CenterX, this.CenterY, renderer, this);
-                var radiusX = this.RadiusX.ToDeviceValue(renderer, UnitRenderingType.Other, this) + halfStrokeWidth;
-                var radiusY = this.RadiusY.ToDeviceValue(renderer, UnitRenderingType.Other, this) + halfStrokeWidth;
-
-                this._path = new GraphicsPath();
-                _path.StartFigure();
-                _path.AddEllipse(center.X - radiusX, center.Y - radiusY, 2 * radiusX, 2 * radiusY);
-                _path.CloseFigure();
-            }
-            return _path;
-        }
-
-        /// <summary>
-        /// Renders the <see cref="SvgElement"/> and contents using the specified <see cref="ISvgRenderer"/> object.
-        /// </summary>
-        /// <param name="renderer">The <see cref="ISvgRenderer"/> object used for rendering.</param>
-        protected override void Render(ISvgRenderer renderer)
-        {
-            if (this.RadiusX.Value > 0.0f && this.RadiusY.Value > 0.0f)
-            {
-                base.Render(renderer);
-            }
-        }
-#endif
-
         public override SvgElement DeepCopy()
         {
             return DeepCopy<SvgEllipse>();

Source/Basic Shapes/SvgLine.Drawing.cs

@@ -0,0 +1,42 @@
+#if !NO_SDC
+using System.Drawing;
+using System.Drawing.Drawing2D;
+
+namespace Svg
+{
+    public partial class SvgLine : SvgMarkerElement
+    {
+        private GraphicsPath _path;
+
+        public override GraphicsPath Path(ISvgRenderer renderer)
+        {
+            if ((this._path == null || this.IsPathDirty) && base.StrokeWidth > 0)
+            {
+                PointF start = new PointF(this.StartX.ToDeviceValue(renderer, UnitRenderingType.Horizontal, this),
+                    this.StartY.ToDeviceValue(renderer, UnitRenderingType.Vertical, this));
+                PointF end = new PointF(this.EndX.ToDeviceValue(renderer, UnitRenderingType.Horizontal, this),
+                    this.EndY.ToDeviceValue(renderer, UnitRenderingType.Vertical, this));
+
+                this._path = new GraphicsPath();
+
+                // If it is to render, don't need to consider stroke width.
+                // i.e stroke width only to be considered when calculating boundary
+                if (renderer != null)
+                {
+                    this._path.AddLine(start, end);
+                    this.IsPathDirty = false;
+                }
+                else
+                {    // only when calculating boundary
+                    _path.StartFigure();
+                    var radius = base.StrokeWidth / 2;
+                    _path.AddEllipse(start.X - radius, start.Y - radius, 2 * radius, 2 * radius);
+                    _path.AddEllipse(end.X - radius, end.Y - radius, 2 * radius, 2 * radius);
+                    _path.CloseFigure();
+                }
+            }
+            return this._path;
+        }
+    }
+}
+#endif

Source/Basic Shapes/SvgLine.cs

@@ -1,8 +1,3 @@
-using System.Drawing;
-#if !NO_SDC
-using System.Drawing.Drawing2D;
-#endif
-
 namespace Svg
 {
     /// <summary>
@@ -16,12 +11,6 @@ public partial class SvgLine : SvgMarkerElement
         private SvgUnit _endX = 0f;
         private SvgUnit _endY = 0f;
 
-        #if !NO_SDC
-
-        private GraphicsPath _path;
-
-        #endif
-
         [SvgAttribute("x1")]
         public SvgUnit StartX
         {
@@ -90,38 +79,6 @@ public override SvgPaintServer Fill
                 // Do nothing
             }
         }
-#if !NO_SDC
-
-        public override System.Drawing.Drawing2D.GraphicsPath Path(ISvgRenderer renderer)
-        {
-            if ((this._path == null || this.IsPathDirty) && base.StrokeWidth > 0)
-            {
-                PointF start = new PointF(this.StartX.ToDeviceValue(renderer, UnitRenderingType.Horizontal, this),
-                    this.StartY.ToDeviceValue(renderer, UnitRenderingType.Vertical, this));
-                PointF end = new PointF(this.EndX.ToDeviceValue(renderer, UnitRenderingType.Horizontal, this),
-                    this.EndY.ToDeviceValue(renderer, UnitRenderingType.Vertical, this));
-
-                this._path = new GraphicsPath();
-
-                // If it is to render, don't need to consider stroke width.
-                // i.e stroke width only to be considered when calculating boundary
-                if (renderer != null)
-                {
-                    this._path.AddLine(start, end);
-                    this.IsPathDirty = false;
-                }
-                else
-                {    // only when calculating boundary
-                    _path.StartFigure();
-                    var radius = base.StrokeWidth / 2;
-                    _path.AddEllipse(start.X - radius, start.Y - radius, 2 * radius, 2 * radius);
-                    _path.AddEllipse(end.X - radius, end.Y - radius, 2 * radius, 2 * radius);
-                    _path.CloseFigure();
-                }
-            }
-            return this._path;
-        }
-#endif
 
         public override SvgElement DeepCopy()
         {