VisualMelon · May 21, 2020 · Aug 10, 2020 · Aug 29, 2020 · Aug 29, 2020 · Aug 29, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,8 @@ All notable changes to this project will be documented in this file.
 - Expanded `IntervalBarSeries` and `TornadoBarSeries` to allow for varied label positions and angles (#2027)
 - VectorSeries (#107)
 - LogarithmicColorAxis (#92)
+- SvgExporter for OxyPlot.ImageSharp
+- Consistent support for DrawText's maxSize parameter (#1559)
 
 ### Changed
 - Make consistent BaseValue and BaseLine across BarSeries, LinearBarSeries, and HistogramSeries
@@ -26,10 +28,12 @@ All notable changes to this project will be documented in this file.
 - Add support for .NET 7.0 (#1937)
 - Update SkiaSharp to Version 2.88.6
 - AxisRendererBase is now generic
+- OxyPlot.Wpf to use common text arranging and trimming
 
 ### Removed
 - Support for .NET Framework 4.0 and 4.5 (#1839)
 - Unused LabelColor property from TornadoBarSeries, IntervalBarSeries, and RectangleBarSeries (#2030)
+- UseVerticalAlignmentWorkaround property of OxyPlot.SvgRenderContext
 
 ### Fixed
 - fixed issue with BarSeries, when the HitTest returns the wrong BarItem, when there are invalid items in the list. (#2038)
@@ -41,6 +45,9 @@ All notable changes to this project will be documented in this file.
 - Font weight not being applied in ImageSharp (#2006)
 - SkiaSharp - Fix use of obsolete functions (#1937)
 - Dashed lines are solid when exporting via SkiaSharp.SvgExporter (#1674)
+- Vertical text alignment in OxyPlot.SvgRenderContext (#1531)
+- Consistent horizontal text alignment for mutliline text (#1554)
+- Consistent implementation of MeasureText (#1551)
 
 ## [2.1.2] - 2022-12-03
 

diff --git a/Source/Examples/ExampleLibrary/Examples/PerformanceExamples.cs b/Source/Examples/ExampleLibrary/Examples/PerformanceExamples.cs
@@ -312,6 +312,18 @@ public static PlotModel IntOverflow100k()
             return IntOverflow(100000);
         }
 
+        [Example("Rotated Text")]
+        public static PlotModel RotatedText()
+        {
+            return RotatedText("Rotated Text", null);
+        }
+
+        [Example("Rotated Text (trimmed)")]
+        public static PlotModel RotatedTextTrimmed()
+        {
+            return RotatedText("Rotated Text (trimmed)", new OxySize(100, 50));
+        }
+
         private static PlotModel IntOverflow(int n)
         {
             var model = new PlotModel { Title = "int overflow", Subtitle = "n = " + n };
@@ -350,5 +362,28 @@ private static void AddPoints(ICollection<ScatterPoint> points, int n)
                 points.Add(new ScatterPoint(x * Math.Cos(x), x * Math.Sin(x)));
             }
         }
+
+        private static PlotModel RotatedText(string title, OxySize? maxSize)
+        {
+            var model = new PlotModel { Title = title };
+            var xaxis = new LinearAxis { Position = AxisPosition.Bottom, Minimum = 0, Maximum = 100 };
+            var yaxis = new LinearAxis { Position = AxisPosition.Left, Minimum = 0, Maximum = 100 };
+            model.Axes.Add(xaxis);
+            model.Axes.Add(yaxis);
+
+            model.Annotations.Add(new RenderingCapabilities.DelegateAnnotation(rc =>
+            {
+                for (int x = 0; x <= 100; x += 10)
+                {
+                    for (int y = 0; y <= 100; y += 10)
+                    {
+                        var p = xaxis.Transform(x, y, yaxis);
+                        rc.DrawText(p, $"({x}, {y}): A piece of multiline\ntext that can be trimmed.", OxyColors.Black, null, 16, 400, x + y, HorizontalAlignment.Center, VerticalAlignment.Middle, maxSize);
+                    }
+                }
+            }));
+
+            return model;
+        }
     }
 }
diff --git a/Source/Examples/ExampleLibrary/Examples/RenderingCapabilities.cs b/Source/Examples/ExampleLibrary/Examples/RenderingCapabilities.cs
@@ -288,6 +288,60 @@ public static PlotModel DrawMultilineTextAlignmentRotation()
             return model;
         }
 
+        /// <summary>
+        /// Shows max size capabilities for the DrawText method.
+        /// </summary>
+        /// <returns>A plot model.</returns>
+        [Example("DrawText - Bounded Multi-line Alignment/Rotation")]
+        public static PlotModel DrawBoundedMultilineTextAlignmentRotation()
+        {
+            var model = new PlotModel();
+            model.Annotations.Add(new DelegateAnnotation(rc =>
+            {
+                for (var ha = HorizontalAlignment.Left; ha <= HorizontalAlignment.Right; ha++)
+                {
+                    for (var va = VerticalAlignment.Top; va <= VerticalAlignment.Bottom; va++)
+                    {
+                        var origin = new ScreenPoint(((int)ha + 2) * 170, ((int)va + 2) * 170);
+                        rc.FillCircle(origin, 3, OxyColors.Blue, EdgeRenderingMode.Adaptive);
+                        for (var rotation = 0; rotation < 360; rotation += 90)
+                        {
+                            rc.DrawText(origin, $"R{rotation:000}\n{ha}\n{va}", OxyColors.Black, fontSize: 20d, rotation: rotation, horizontalAlignment: ha, verticalAlignment: va, maxSize: new OxySize(50, 70));
+                        }
+                    }
+                }
+            }));
+            return model;
+        }
+
+        /// <summary>
+        /// Shows max size capabilities for the DrawText method.
+        /// </summary>
+        /// <returns>A plot model.</returns>
+        [Example("DrawText - Horizontal Text Trimming")]
+        public static PlotModel DrawHorizontalTextTrimmed()
+        {
+            var text = "This is a long piece of text with many words that barely qualifies as a sentence.";
+            var multiLineText = "This is a long piece of multiline text\nwith many words that\nbarely qualifies as a sentence.";
+
+            var model = new PlotModel();
+            model.Annotations.Add(new DelegateAnnotation(rc =>
+            {
+                for (int i = 0; i < 20; i++)
+                {
+                    var p = new ScreenPoint(10, 10 + i * 20);
+                    rc.DrawText(p, text, OxyColors.Black, maxSize: new OxySize(i * 20, double.MaxValue));
+                }
+
+                for (int i = 0; i < 5; i++)
+                {
+                    var p = new ScreenPoint(10, 400 + i * 50);
+                    rc.DrawText(p, multiLineText, OxyColors.Black, maxSize: new OxySize(i * 25, double.MaxValue));
+                }
+            }));
+            return model;
+        }
+
         /// <summary>
         /// Shows color capabilities for the DrawText method.
         /// </summary>

diff --git a/Source/OxyPlot.ImageSharp.Tests/PngExporterTests.cs b/Source/OxyPlot.ImageSharp.Tests/PngExporterTests.cs
@@ -187,7 +187,17 @@ public void LargeImageTest(bool interpolate)
         public void TestMultilineAlignment()
         {
             var plotModel = ExampleLibrary.RenderingCapabilities.DrawMultilineTextAlignmentRotation();
-            var fileName = Path.Combine(this.outputDirectory, "Text.png");
+            var fileName = Path.Combine(this.outputDirectory, "Multiline-Alignment.png");
+            PngExporter.Export(plotModel, fileName, 700, 700);
+
+            Assert.IsTrue(File.Exists(fileName));
+        }
+
+        [Test]
+        public void TestBoundedMultilineAlignment()
+        {
+            var plotModel = ExampleLibrary.RenderingCapabilities.DrawBoundedMultilineTextAlignmentRotation();
+            var fileName = Path.Combine(this.outputDirectory, "Bounded-Multiline-Alignment.png");
             PngExporter.Export(plotModel, fileName, 700, 700);
 
             Assert.IsTrue(File.Exists(fileName));

diff --git a/Source/OxyPlot.ImageSharp.Tests/SvgExporterTests.cs b/Source/OxyPlot.ImageSharp.Tests/SvgExporterTests.cs
@@ -0,0 +1,210 @@
+// --------------------------------------------------------------------------------------------------------------------
+// <copyright file="SvgExporterTests.cs" company="OxyPlot">
+//   Copyright (c) 2020 OxyPlot contributors
+// </copyright>
+// --------------------------------------------------------------------------------------------------------------------
+
+namespace OxyPlot.ImageSharp.Tests
+{
+    using System;
+    using System.IO;
+    using NUnit.Framework;
+
+    using OxyPlot.Series;
+    using OxyPlot.ImageSharp;
+    using OxyPlot.Annotations;
+    using ExampleLibrary;
+
+    [TestFixture]
+    public class SvgExporterTests
+    {
+        private const string SVG_FOLDER = "SVG";
+        private string outputDirectory;
+
+        [OneTimeSetUp]
+        public void Setup()
+        {
+            this.outputDirectory = Path.Combine(TestContext.CurrentContext.WorkDirectory, SVG_FOLDER);
+            Directory.CreateDirectory(this.outputDirectory);
+        }
+
+        [Test]
+        public void Export_SomeExamplesInExampleLibrary_CheckThatAllFilesExist()
+        {
+            var exporter = new SvgExporter(1000, 750);
+            var directory = Path.Combine(this.outputDirectory, "ExampleLibrary");
+            ExportTest.ExportExamples_CheckThatAllFilesExist(Examples.GetFirstExampleOfEachCategoryForAutomatedTest(), exporter, directory, ".svg");
+        }
+
+        [Test]
+        public void ExportToStream()
+        {
+            var plotModel = CreateTestModel1();
+            var exporter = new SvgExporter(1000, 750);
+            var stream = new MemoryStream();
+            exporter.Export(plotModel, stream);
+
+            Assert.IsTrue(stream.Length > 0);
+        }
+
+        [Test]
+        public void ExportToFile()
+        {
+            var plotModel = CreateTestModel1();
+            var fileName = Path.Combine(this.outputDirectory, "Plot1.svg");
+            SvgExporter.Export(plotModel, fileName, 1000, 750);
+
+            Assert.IsTrue(File.Exists(fileName));
+        }
+
+        [Test]
+        public void ExportWithDifferentBackground()
+        {
+            var plotModel = CreateTestModel1();
+            plotModel.Background = OxyColors.Yellow;
+            var fileName = Path.Combine(this.outputDirectory, "Background_Yellow.svg");
+            var exporter = new SvgExporter(1000, 750);
+            using (var stream = File.OpenWrite(fileName))
+            {
+                exporter.Export(plotModel, stream);
+            }
+
+            Assert.IsTrue(File.Exists(fileName));
+        }
+
+        [Test]
+        [TestCase(0.75)]
+        [TestCase(1)]
+        [TestCase(1.2)]
+        [TestCase(2)]
+        [TestCase(3.1415)]
+        public void ExportWithResolution(double factor)
+        {
+            var resolution = (int)(96 * factor);
+            var plotModel = CreateTestModel1();
+            var directory = Path.Combine(this.outputDirectory, "Resolution");
+            Directory.CreateDirectory(directory);
+
+            var fileName = Path.Combine(directory, $"Resolution{resolution}.svg");
+            var exporter = new SvgExporter((int)(400 * factor), (int)(300 * factor), resolution);
+
+            using (var stream = File.OpenWrite(fileName))
+            {
+                exporter.Export(plotModel, stream);
+            }
+
+            Assert.IsTrue(File.Exists(fileName));
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void PlotBackgroundImageTest(bool interpolate)
+        {
+            // this is a test of the DrawImage function; don't add pointless backgrounds to your plots
+
+            var plotModel = CreateTestModel1();
+
+            var pixelData = new OxyColor[5, 5];
+            for (int i = 0; i < pixelData.GetLength(0); i++)
+            {
+                for (int j = 0; j < pixelData.GetLength(1); j++)
+                {
+                    pixelData[i, j] = OxyColor.FromArgb(255, 128, (byte)((i * 255) / pixelData.GetLength(0)), (byte)((j * 255) / pixelData.GetLength(1)));
+                }
+            }
+
+            var oxyImage = OxyImage.Create(pixelData, ImageFormat.Png);
+            var imageAnnotation = new ImageAnnotation()
+            {
+                ImageSource = oxyImage,
+                X = new PlotLength(-0.0, PlotLengthUnit.RelativeToPlotArea),
+                Y = new PlotLength(-0.0, PlotLengthUnit.RelativeToPlotArea),
+                Width = new PlotLength(1.0, PlotLengthUnit.RelativeToPlotArea),
+                Height = new PlotLength(1.0, PlotLengthUnit.RelativeToPlotArea),
+                HorizontalAlignment = HorizontalAlignment.Left,
+                VerticalAlignment = VerticalAlignment.Top,
+                Interpolate = interpolate
+            };
+            plotModel.Annotations.Add(imageAnnotation);
+
+            var fileName = Path.Combine(this.outputDirectory, $"PlotBackground{(interpolate ? "Interpolated" : "Pixelated")}.svg");
+            var exporter = new SvgExporter(1000, 750);
+            using (var stream = File.OpenWrite(fileName))
+            {
+                exporter.Export(plotModel, stream);
+            }
+
+            Assert.IsTrue(File.Exists(fileName));
+        }
+
+        [Test]
+        [TestCase(true)]
+        [TestCase(false)]
+        public void LargeImageTest(bool interpolate)
+        {
+            // this is a test of the DrawImage function; don't add pointless backgrounds to your plots
+
+            var plotModel = CreateTestModel1();
+
+            var pixelData = new OxyColor[5, 5];
+            for (int i = 0; i < pixelData.GetLength(0); i++)
+            {
+                for (int j = 0; j < pixelData.GetLength(1); j++)
+                {
+                    pixelData[i, j] = OxyColor.FromArgb(255, 128, (byte)((i * 255) / pixelData.GetLength(0)), (byte)((j * 255) / pixelData.GetLength(1)));
+                }
+            }
+
+            var oxyImage = OxyImage.Create(pixelData, ImageFormat.Png);
+            var imageAnnotation = new ImageAnnotation()
+            {
+                ImageSource = oxyImage,
+                X = new PlotLength(-1, PlotLengthUnit.RelativeToViewport),
+                Y = new PlotLength(-1, PlotLengthUnit.RelativeToViewport),
+                Width = new PlotLength(3, PlotLengthUnit.RelativeToViewport),
+                Height = new PlotLength(3, PlotLengthUnit.RelativeToViewport),
+                HorizontalAlignment = HorizontalAlignment.Left,
+                VerticalAlignment = VerticalAlignment.Top,
+                Interpolate = interpolate
+            };
+            plotModel.Annotations.Add(imageAnnotation);
+
+            var fileName = Path.Combine(this.outputDirectory, $"LargeImage{(interpolate ? "Interpolated" : "Pixelated")}.svg");
+            var exporter = new SvgExporter(1000, 750);
+            using (var stream = File.OpenWrite(fileName))
+            {
+                exporter.Export(plotModel, stream);
+            }
+
+            Assert.IsTrue(File.Exists(fileName));
+        }
+
+        [Test]
+        public void TestMultilineAlignment()
+        {
+            var plotModel = ExampleLibrary.RenderingCapabilities.DrawMultilineTextAlignmentRotation();
+            var fileName = Path.Combine(this.outputDirectory, "Multiline-Alignment.svg");
+            SvgExporter.Export(plotModel, fileName, 700, 700);
+
+            Assert.IsTrue(File.Exists(fileName));
+        }
+
+        [Test]
+        public void TestBoundedMultilineAlignment()
+        {
+            var plotModel = ExampleLibrary.RenderingCapabilities.DrawBoundedMultilineTextAlignmentRotation();
+            var fileName = Path.Combine(this.outputDirectory, "Bounded-Multiline-Alignment.svg");
+            SvgExporter.Export(plotModel, fileName, 700, 700);
+
+            Assert.IsTrue(File.Exists(fileName));
+        }
+
+        private static PlotModel CreateTestModel1()
+        {
+            var model = new PlotModel { Title = "Test 1" };
+            model.Series.Add(new FunctionSeries(Math.Sin, 0, Math.PI * 8, 200, "sin(x)"));
+            return model;
+        }
+    }
+}