Fix up LightVector a bit.

Author: LoneWandererProductions

CommonLibraryGuiTests/Solaris.cs CommonLibraryGuiTests/AuroraTests.csCommonLibraryGuiTests/Solaris.cs renamed to CommonLibraryGuiTests/AuroraTests.cs

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryGuiTests
- * FILE:        CommonLibraryGuiTests/AuroraTests.cs
+ * FILE:        AuroraTests.cs
  * PURPOSE:     Tests the Aurorae Display
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */
@@ -22,7 +22,7 @@ namespace CommonLibraryGuiTests
     /// <summary>
     ///     Some Basic tests for the Aurora Engine and the image Combining
     /// </summary>
-    public sealed class Solaris
+    public sealed class AuroraTests
     {
         /// <summary>
         ///     The codebase

CommonLibraryGuiTests/BitmapComparisonTests.cs

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryGuiTests
- * FILE:        CommonLibraryGuiTests/BitmapRenderingTests.cs
+ * FILE:        BitmapRenderingTests.cs
  * PURPOSE:     Mostly Performance tests for our Wpf BitmapImage Viewer
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */

CommonLibraryGuiTests/CommonCtrl.cs

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryGuiTests
- * FILE:        CommonLibraryGuiTests/CommonCtrl.cs
+ * FILE:        CommonCtrl.cs
  * PURPOSE:     Tests for CommonCtrl some Controls, not all yet
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */

CommonLibraryGuiTests/CommonDialogs.cs

@@ -1,7 +1,7 @@
 /*
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     CommonLibraryGuiTests
- * FILE:        CommonLibraryGuiTests/CommonDialogs.cs
+ * FILE:        CommonDialogs.cs
  * PURPOSE:     Tests for CommonCtrl some Controls, not all yet
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  */

CommonLibraryGuiTests/WpfVectorRendererTests.cs

@@ -0,0 +1,79 @@
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     CommonLibraryGuiTests
+ * FILE:        WpfVectorRendererTests.cs
+ * PURPOSE:     Basic tests for the WpfVectorRenderer, especially to catch the "Double Offset" bug where the line's internal coordinates are incorrectly offset by the StartCoordinates.
+ * PROGRAMER:   Peter Geinitz (Wayfarer)
+ */
+
+
+using System.Collections.Generic;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Shapes;
+using NUnit.Framework;
+using System.Threading;
+using System.Linq;
+using LightVector;
+
+namespace CommonLibraryGuiTests
+{
+    /// <summary>
+    /// Simple tests for the WpfVectorRenderer, especially to catch the "Double Offset" bug where the line's internal coordinates are incorrectly offset by the StartCoordinates.
+    /// </summary>
+    [TestFixture]
+    [Apartment(ApartmentState.STA)]
+    public class WpfVectorRendererTests
+    {
+        /// <summary>
+        /// Renders to container verify normalization.
+        /// </summary>
+        [Test]
+        public void RenderToContainer_VerifyNormalization()
+        {
+            // Arrange
+            var startPoint = new Point(50, 50);
+            var line = new LineObject { Direction = new System.Numerics.Vector2(10, 10), Thickness = 2 };
+            var saveObj = new SaveObject { Graphic = line, Type = GraphicTypes.Line, StartCoordinates = startPoint };
+
+            var renderer = new WpfVectorRenderer(new List<SaveObject> { saveObj });
+
+            // Act
+            var canvas = (Canvas)renderer.RenderToContainer();
+            var renderedLine = canvas.Children.OfType<Line>().First();
+
+            // Assert
+            // Because of normalization, the line is shifted. 
+            // It should now be at 'padding' (Thickness / 2)
+            Assert.That(Canvas.GetLeft(renderedLine), Is.EqualTo(1.0d), "Line should be shifted to the edge of the canvas.");
+            Assert.That(renderedLine.X1, Is.EqualTo(0), "Internal offset must remain 0.");
+        }
+
+        /// <summary>
+        /// Renders to image verify dimensions match bounds.
+        /// </summary>
+        [Test]
+        public void RenderToImage_VerifyDimensionsMatchBounds()
+        {
+            // Arrange
+            var circle = new CircleObject { Radius = 100, Thickness = 10 };
+            var saveObj = new SaveObject
+            {
+                Graphic = circle,
+                Type = GraphicTypes.Circle,
+                StartCoordinates = new Point(0, 0),
+                Layer = 0
+            };
+
+            var renderer = new WpfVectorRenderer(new List<SaveObject> { saveObj });
+
+            // Act
+            var image = renderer.RenderToImage();
+
+            // Assert
+            // Circle radius 100 + thickness 10 = total diameter 210.
+            // Our GetGraphicBounds should account for this.
+            Assert.That(image.Width, Is.GreaterThanOrEqualTo(200), "Image must be wide enough for the diameter.");
+        }
+    }
+}

LightVector/BezierCurve.cs

@@ -2,7 +2,7 @@
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     LightVector
  * FILE:        LightVector/BezierCurve.cs
- * PURPOSE:     Hold the CurvBecier e Object
+ * PURPOSE:     Hold the Curve Bezier Object
  * PROGRAMER:   Peter Geinitz (Wayfarer)
  * SOURCES:     https://docs.microsoft.com/de-de/dotnet/api/system.drawing.graphics.drawcurve?view=netframework-4.8
  */

LightVector/GraphicLine.cs

@@ -12,6 +12,7 @@
 // ReSharper disable UnusedMember.Global
 
 using System.Collections.Generic;
+using System.Windows.Ink;
 using System.Windows.Media;
 using System.Xml.Serialization;
 
@@ -26,6 +27,16 @@ namespace LightVector
     [System.Serializable]
     public abstract class GraphicObject
     {
+        /// <summary>
+        /// The fill
+        /// </summary>
+        private SolidColorBrush _fill;
+
+        /// <summary>
+        /// The stroke
+        /// </summary>
+        private SolidColorBrush _stroke = Brushes.Black;
+
         /// <summary>
         ///     Optional
         /// </summary>
@@ -36,7 +47,15 @@ public abstract class GraphicObject
         ///     Optional
         /// </summary>
         [XmlIgnore]
-        public SolidColorBrush Stroke { get; set; } = Brushes.Black;
+        public SolidColorBrush Stroke
+        {
+            get => _stroke;
+            set
+            {
+                _stroke = value;
+                if (_stroke?.CanFreeze == true) _stroke.Freeze();
+            }
+        }
 
         /// <summary>
         ///     Workaround for XML serialization of Stroke
@@ -53,7 +72,15 @@ public string StrokeColor
         ///     If filled we will get filled curves
         /// </summary>
         [XmlIgnore]
-        public SolidColorBrush Fill { get; set; }
+        public SolidColorBrush Fill
+        {
+            get => _fill;
+            set
+            {
+                _fill = value;
+                if (_fill?.CanFreeze == true) _fill.Freeze();
+            }
+        }
 
         /// <summary>
         ///     Workaround for XML serialization of Fill