Release Version 1.7.0

Author: paulushub

Nuget/SharpVectors.1.7.0.nupkg

@@ -36,13 +36,15 @@ The SharpVectors library targets the following frameworks
 * .NET Framework, Version 4.8
 * .NET Standard, Version 2.1
 * .NET Core, Version 3.1
+* .NET 5.0
 
 The library can be used in WPF and Windows Forms applications.
 
 ### For the Library
 The library can be downloaded from the following sources
-* **NuGet**, [Version 1.6.0.0](https://www.nuget.org/packages/SharpVectors.Reloaded/). 
-* **GitHub Releases Page**, [Version 1.6.0.0](https://github.com/ElinamLLC/SharpVectors/releases).
+* **NuGet**, [Version 1.7.0.0 - SharpVectors](https://www.nuget.org/packages/SharpVectors/). 
+* **NuGet**, [Version 1.7.0.0 - SharpVectors.Reloaded](https://www.nuget.org/packages/SharpVectors.Reloaded/). 
+* **GitHub Releases Page**, [Version 1.7.0.0](https://github.com/ElinamLLC/SharpVectors/releases).
 
 ## Documentation
 An introduction and a tutorial with sample are available. See the [Documentation](Docs/Documentation.md) section for more information.

Nuget/SharpVectors.Reloaded.1.7.0.nupkg

@@ -22,6 +22,7 @@
 
 using DpiScale     = SharpVectors.Runtime.DpiScale;
 using DpiUtilities = SharpVectors.Runtime.DpiUtilities;
+using System.Linq;
 
 namespace WpfTestSvgControl
 {
@@ -124,6 +125,8 @@ public partial class DrawingPage : Page
         private FoldingManager _foldingManager;
         private XmlFoldingStrategy _foldingStrategy;
 
+        private IList<Color> _colors;
+
         #endregion
 
         #region Constructors and Destructor
@@ -180,7 +183,14 @@ public DrawingPage()
             this.Unloaded    += OnPageUnloaded;
             this.SizeChanged += OnPageSizeChanged;
 
-//            svgViewer.Hits   += OnDrawingHits;
+            //            svgViewer.Hits   += OnDrawingHits;
+
+            var colors = from System.Reflection.PropertyInfo property in typeof(Colors).GetProperties()
+                orderby property.Name
+                    //orderby ((Color)property.GetValue(null, null)).ToString()
+                    select (Color)property.GetValue(null, null);
+
+            _colors = colors.ToList();
         }
 
         //private void OnDrawingHits(object sender, SvgDrawingHitArgs args)
@@ -483,6 +493,56 @@ protected DrawingGroup WrapDrawing(DrawingGroup currentDrawing)
             return currentDrawing;
         }
 
+        System.Windows.Media.DrawingVisual _drawingVisual = null;
+
+
+        private void DrawDebugHitList(IList<Drawing> drawings, IList<WpfHitPath> hitPaths)
+        {
+            if (drawings == null)
+            {
+                return;
+            }
+            Trace.WriteLine(string.Format("Debug List Count: {0}, {1}", drawings.Count, hitPaths.Count));
+//            var hitDrawings = new DrawingGroup();
+
+            _drawingVisual = new System.Windows.Media.DrawingVisual();
+            DrawingContext drawingContext = _drawingVisual.RenderOpen();
+
+            //drawingContext.PushOpacity(0.5);
+
+            for (int i = 0; i < drawings.Count; i++)
+            {
+                var drawing = drawings[i];
+                var boundsDrawing = new GeometryDrawing(null,
+                    new Pen(Brushes.Green, 2), new RectangleGeometry(drawing.Bounds));
+                //hitDrawings.Children.Add(boundsDrawing);
+                if (drawings.Count == hitPaths.Count)
+                {
+                    var hitPath = hitPaths[i];
+                    drawingContext.PushTransform(hitPath.GetTransform(_drawingDocument, drawing));
+                }
+                else
+                {
+                    drawingContext.PushTransform((Transform)svgViewer.DisplayTransform.Inverse);
+                }
+                //TransformGroup transforms = new TransformGroup();
+                //transforms.Children.Add((Transform)svgViewer.DisplayTransform.Inverse);
+                //transforms.Children.Add(new MatrixTransform(1, 0, 0, 1, -107.61384, -0.044941));
+                //transforms.Children.Add(new MatrixTransform(1, 0, 0, 1, 118.57143, -70));
+                //drawingContext.PushTransform(transforms);
+                //                drawingContext.DrawDrawing(hitDrawings);
+                drawingContext.DrawDrawing(boundsDrawing);
+
+    //            drawingContext.Pop();
+                drawingContext.Pop();
+            }
+
+            drawingContext.Close();
+
+            svgViewer.HostVisual.Children.Add(_drawingVisual);
+            //svgViewer.HostVisual.Children.Insert(0, drawingVisual);
+        }
+
         public Task<bool> LoadDocumentAsync(string svgFilePath)
         {
             if (_isLoadingDrawing || string.IsNullOrWhiteSpace(svgFilePath))
@@ -928,9 +988,18 @@ private void OnZoomPanMouseUp(object sender, MouseButtonEventArgs e)
             {
                 if (_drawingDocument != null)
                 {
+                    if (_drawingVisual != null)
+                    {
+                        svgViewer.HostVisual.Children.Remove(_drawingVisual);
+                        _drawingVisual = null;
+                    }
+
                     Point point = e.GetPosition(svgViewer);
                     _drawingDocument.DisplayTransform = svgViewer.DisplayTransform;
                     var hitResult = _drawingDocument.HitTest(point);
+
+                    DrawDebugHitList(_drawingDocument.HitList, _drawingDocument.HitPaths); //TODO:Testing
+                    
                     if (hitResult != null && hitResult.IsHit)
                     {
                         var selecteElement = hitResult.Element;