refactor: path structure

Author: JeremyMeissner

FreeFrame/Components/Importer.cs

@@ -23,8 +23,7 @@ static private (List<Shape>, SortedDictionary<int, List<Shape>>, bool) ImportFro
             using (XmlReader reader = XmlReader.Create(pStream))
             {
 
-                try
-                {
+                
                     while (reader.Read())
                     {
                         if (reader.HasAttributes)
@@ -62,6 +61,9 @@ static private (List<Shape>, SortedDictionary<int, List<Shape>>, bool) ImportFro
                         }
 
                     }
+                // TODO: Fix trycatch
+                try
+                {
                 }
                 catch (Exception)
                 {

FreeFrame/Components/Shapes/Path/DrawAttribute.cs

@@ -21,12 +21,16 @@ public abstract class DrawAttribute
 
         private bool _isRelative;
         public bool IsRelative { get => _isRelative; set => _isRelative = value; }
+
+        // Current X1,Y1 point
         public int Y1 { get => _y1; set => _y1 = value; }
         public int X1 { get => _x1; set => _x1 = value; }
+
+        // Current X,Y point
         public int X { get => _x; set => _x = value; }
         public int Y { get => _y; set => _y = value; }
 
-
+        // Last drawn values
         public static (int X, int Y, int X1, int Y1) Last = (0, 0, 0, 0);
 
         /// <summary>
@@ -950,46 +954,6 @@ public override (Vector2i position, Vector2i? controlPosition) Information()
         }
         public override string ToString() => String.Format("{0} {1} {2} {3} {4} {5} {6},{7}", IsRelative ? 'a' : 'A', _rx, _ry, _angle, Convert.ToInt32(_largeArcFlag), Convert.ToInt32(_sweepFlag), X, Y);
 
-        public override void UpdateLast()
-        {
-            throw new NotImplementedException();
-        }
-    }
-    /// <summary>
-    /// ClosePath, Z or z.
-    /// Use to draw a straight line from the current position to the first point in the path.
-    /// More info: https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/d#closepath
-    /// </summary>
-    public class ClosePath : DrawAttribute
-    {
-        public ClosePath() { }
-        /// <summary>
-        /// Draw a straight line from the current position to the first point in the path.
-        /// </summary>
-        public override List<Vector2i> GetSelectablePoints()
-        {
-            throw new NotImplementedException();
-        }
-
-        public override float[] GetVertices()
-        {
-            throw new NotImplementedException();
-        }
-        public override uint[] GetVerticesIndexes()
-        {
-            throw new NotImplementedException();
-        }
-
-        public override void MoveDelta(Vector2i deltaPosition)
-        {
-            throw new NotImplementedException();
-        }
-        public override (Vector2i position, Vector2i? controlPosition) Information()
-        {
-            throw new NotImplementedException();
-        }
-        public override string ToString() => "z";
-
         public override void UpdateLast()
         {
             throw new NotImplementedException();

FreeFrame/Components/Shapes/SVGCircle.cs

@@ -10,13 +10,19 @@ namespace FreeFrame.Components.Shapes
 {
     public class SVGCircle : Shape
     {
+        #region Default values
+        const int DefaultR = 0;
+        const int DefaultCY = 0;
+        const int DefaultCX = 0;
+        const string DefaultColor = "#000000FF";
+        #endregion
         public SVGCircle(XmlReader reader) : this(
             Convert.ToInt32(reader["r"]),
             Convert.ToInt32(reader["cx"]),
             Convert.ToInt32(reader["cy"]),
-            Convert.ToString(reader["fill"])) // TODO: Error handler if r, cx or cy are not here
+            Convert.ToString(reader["fill"] == null ? DefaultColor : reader["fill"]))
         { }
-        public SVGCircle() : this(0, 0, 0, "#000000FF") { }
+        public SVGCircle() : this(DefaultR, DefaultCX, DefaultCY, "#000000FF") { }
         public SVGCircle(int r, int cx, int cy, string color)
         {
             IsCornerRadiusChangeable = false;

FreeFrame/Components/Shapes/SVGLine.cs

@@ -24,7 +24,7 @@ public SVGLine(XmlReader reader) : this(
             Convert.ToInt32(reader["y1"]),
             Convert.ToInt32(reader["x2"]),
             Convert.ToInt32(reader["y2"]),
-            Convert.ToString(reader["fill"])) // TODO: Error handler if one of the properties in reader is note here, it should be dynamic
+            Convert.ToString(reader["fill"] == null ? DefaultColor : reader["fill"]))
         {
         }
         public SVGLine() : this(DefaultX1, DefaultY1, DefaultX2, DefaultY2, DefaultColor) { }

FreeFrame/Components/Shapes/SVGPath.cs

@@ -12,7 +12,12 @@ namespace FreeFrame.Components.Shapes
 {
     public class SVGPath : Shape
     {
+        #region Default values
+        const string DefaultColor = "#000000FF";
+        #endregion
 
+        // First point x,y of the path
+        int _x0, _y0 = 0;
         readonly Dictionary<char, Regex> _dAttributeRegex = new()
         {
             { 'm', new Regex(@" *(-?\d+) *, *(-?\d+) *") },
@@ -48,6 +53,13 @@ public SVGPath(XmlReader reader)
                 if (_dAttributeRegex.ContainsKey(lowerC))
                 {
                     match = _dAttributeRegex[lowerC].Match(d, startIndex); // Retrieve the associated regular expression
+
+                    if (startIndex == 0)
+                    {
+                        _x0 = Convert.ToInt32(match.Groups[1].Value);
+                        _y0 = Convert.ToInt32(match.Groups[2].Value);
+                    }
+
                     switch (lowerC)
                     {
                         case 'm':
@@ -78,7 +90,7 @@ public SVGPath(XmlReader reader)
                             DrawAttributes.Add(new EllipticalArc(match.Groups[1], match.Groups[2], match.Groups[3], match.Groups[4], match.Groups[5], match.Groups[6], match.Groups[7], c == 'a')); // 'a' is relative and 'A' absolute
                             break;
                         case 'z':
-                            DrawAttributes.Add(new ClosePath());
+                            DrawAttributes.Add(new LineTo(_x0, _y0));
                             break;
                         default:
                             throw new Exception("Unknowed properties in d");
@@ -87,7 +99,7 @@ public SVGPath(XmlReader reader)
                 }
             }
 
-            string color = reader["fill"] ?? throw new Exception("color not here");
+            string color = reader["fill"] ?? DefaultColor;
             Color = Importer.HexadecimalToRGB(color);
 
 

FreeFrame/Components/Shapes/SVGPolygon.cs

@@ -10,6 +10,10 @@ namespace FreeFrame.Components.Shapes
 {
     public class SVGPolygon : Shape
     {
+        #region Default values
+        const string DefaultColor = "#000000FF";
+        #endregion
+
         readonly Regex _pointsAttributeRegex = new(@" *(\d+) *, *(\d+) *"); // https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/points
 
         #region Geometry properties
@@ -18,8 +22,6 @@ public class SVGPolygon : Shape
         public List<Vector2i> Points { get => _points; set => _points = value; }
         #endregion
 
-        // TODO: Also add Polyline https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/points
-
         public SVGPolygon() { }
         public SVGPolygon(XmlReader reader)
         {
@@ -32,7 +34,7 @@ public SVGPolygon(XmlReader reader)
             foreach (Match match in matches)
                 Points.Add((Convert.ToInt32(match.Groups[1].Value), Convert.ToInt32(match.Groups[2].Value)));
 
-            string color = reader["fill"] ?? throw new Exception("color not here"); // TODO: Error handler if d is note here
+            string color = reader["fill"] ?? DefaultColor; // TODO: Error handler if d is note here
             Color = Importer.HexadecimalToRGB(color);
 
             // Fill geometry values

FreeFrame/Components/Shapes/SVGRectangle.cs

@@ -25,8 +25,8 @@ public SVGRectangle(XmlReader reader) : this(
             Convert.ToInt32(reader["x"]),
             Convert.ToInt32(reader["y"]),
             Convert.ToInt32(reader["rx"]),
-            Convert.ToInt32(reader["ry"]), 
-            Convert.ToString(reader["fill"])) // TODO: Error handler if one of the properties in reader is note here, it should be dynamic
+            Convert.ToInt32(reader["ry"]),
+            Convert.ToString(reader["fill"] == null ? DefaultColor : reader["fill"])) // TODO: Error handler if one of the properties in reader is note here, it should be dynamic
         {
         }
         public SVGRectangle() : this(DefaultWidth, DefaultHeight, DefaultX, DefaultY) { }