feat: <polygon> readable

Author: JeremyMeissner

FreeFrame/Components/Importer.cs

@@ -33,6 +33,9 @@ static public List<Shape> ImportFromStream(Stream pStream)
                             case "xml":
                             case "svg":
                                 break; // Skip knowned elements
+                            case "polygon":
+                                shapes.Add(new SVGPolygon(reader));
+                                break;
                             case "path":
                                 shapes.Add(new SVGPath(reader));
                                 break;
@@ -54,7 +57,7 @@ static public List<Shape> ImportFromStream(Stream pStream)
         static public List<Shape> ImportFromFile(string pFilename)
         {
             if (!File.Exists(pFilename))
-                throw new ArgumentException($"'{pFilename}' file cannot be found.", nameof(pFilename)); //TODO: replace by a simple alert window
+                throw new ArgumentException($"'{pFilename}' file cannot be found.", nameof(pFilename)); // TODO: replace by a simple alert window
 
             byte[] byteArray = Encoding.UTF8.GetBytes(File.ReadAllText(pFilename));
 

FreeFrame/Components/Shapes/SVGPath.cs

@@ -100,7 +100,7 @@ public SVGPath(XmlReader reader) //: this()
         }
         public override string ToString() 
         {
-            string output = "";
+            string output = "d: ";
             _drawAttribute.ForEach(d => output += d.ToString() + " ");
             return output.Trim();
         }

FreeFrame/Components/Shapes/SVGPolygon.cs

@@ -1,22 +1,36 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Xml;
+using System.Text.RegularExpressions;
 
 namespace FreeFrame.Components.Shapes
 {
     public class SVGPolygon : Shape
     {
+        readonly Regex _pointsRegex = new(@" *(\d+) *, *(\d+) *"); // https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/points
+
         #region Geometry properties
-        List<float> points = new List<float>();
+        List<(int, int)> _points = new();
         #endregion
-        public SVGPolygon()
+
+        // TODO: Also add Polyline https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/points
+
+        public SVGPolygon(XmlReader reader)
         {
-            // TODO: Finish this class
+            string points = reader["points"] ?? throw new Exception("points not here"); // TODO: Error handler if points is note here
+            MatchCollection matches = _pointsRegex.Matches(points); // Retrieve every points
+
+            foreach (Match match in matches)
+                _points.Add((Convert.ToInt32(match.Groups[1].Value), Convert.ToInt32(match.Groups[2].Value)));
         }
 
         public override string ToString()
         {
-            throw new NotImplementedException();
+            string output = "points: ";
+            foreach ((int x, int y) point in _points)
+                output += string.Format("{0},{1} ", point.x, point.y);
+            return output.Trim();
         }
     }
 }

FreeFrameTests/ImporterTests.cs

@@ -34,7 +34,20 @@ public void ImportFromStream_Test_Path()
             List<Shape> result = Importer.ImportFromString(svgString);
 
             // Assert
-            Assert.AreEqual("M 20,0 C 0,100 200,100 180,0 m 50,10 L 10,21 H 10 V 10 s 20,20 10,10 Q 10,10 0,0 t 10,10 A 100 100 60 1 0 20,20 z", ((SVGPath)result[0]).ToString());
+            Assert.AreEqual("d: M 20,0 C 0,100 200,100 180,0 m 50,10 L 10,21 H 10 V 10 s 20,20 10,10 Q 10,10 0,0 t 10,10 A 100 100 60 1 0 20,20 z", ((SVGPath)result[0]).ToString());
+        }
+        [TestMethod]
+        public void ImportFromStream_Test_Polygon()
+        {
+            // Arrange
+            string svgString = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" +
+                "<svg xmlns=\"http://www.w3.org/2000/svg\" version=\"1.1\" width=\"1000\" height=\"1000\">" +
+                "<polygon points=\"50,0 21,90 98,35 2,35 79,90\" stroke=\"black\"/>" +
+                "</svg>";
+            List<Shape> result = Importer.ImportFromString(svgString);
+
+            // Assert
+            Assert.AreEqual("points: 50,0 21,90 98,35 2,35 79,90", ((SVGPolygon)result[0]).ToString());
         }
         [TestMethod]
         public void ImportFromStream_Test_Rectangle()