Feature/drawing renderer refactor

src/Directory.Packages.props

@@ -4,7 +4,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
-    <PackageVersion Include="EPPlus" Version="8.6.3" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageVersion Include="MSTest" Version="3.10.4" />

src/EPPlus.Compression/EPPlus.Compression.csproj

@@ -6,5 +6,6 @@
 		<RootNamespace>OfficeOpenXml.Packaging.Ionic</RootNamespace>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>EPPlus.Compression.snk</AssemblyOriginatorKeyFile>
+		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 </Project>

src/EPPlus.DrawingRenderer.Tests/Chart/BarChartTests.cs

@@ -51,7 +51,7 @@ public void DatalabelBarCharts()
             {
                 var ws = p.Workbook.Worksheets[0];
                 var drawings = ws.Drawings;
-                var ix = 1;
+                var ix = 0;
 
                 for (int i = ix; i < drawings.Count; i++)
                 {

src/EPPlus.DrawingRenderer.Tests/Chart/ColumnChartTests.cs

@@ -53,5 +53,48 @@ public void GenerateSvgForColumnCharts2()
                 }
             }
         }
+        [TestMethod]
+        public void GenerateColumnChartFromBlazorSample()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("BlazorSample1-Column.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[1];
+
+                //var ix = 2;
+                //var c = ws.Drawings[ix];
+                //var svg = renderer.RenderDrawingToSvg(c);
+                //SaveTextFileToWorkbook($"svg\\ChartForSvg_ind{ix++}.svg", svg);
+
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\BlazorSample_Column_sheet2_{ix++}.svg", svg);
+                }
+            }            
+        }
+        [TestMethod]
+        public void GenerateBarChartFromBlazorSample()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("BlazorSample1-BarChart.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[1];
+
+                //var ix = 2;
+                //var c = ws.Drawings[ix];
+                //var svg = renderer.RenderDrawingToSvg(c);
+                //SaveTextFileToWorkbook($"svg\\ChartForSvg_ind{ix++}.svg", svg);
+
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\BlazorSample_Bar_sheet2_{ix++}.svg", svg);
+                }
+            }
+        }
+
     }
 }

src/EPPlus.DrawingRenderer.Tests/Chart/LineChartToSvgTests.cs

@@ -1,7 +1,12 @@
 using OfficeOpenXml;
 using OfficeOpenXml.Drawing.Chart;
+using OfficeOpenXml.Drawing.Chart.Style;
+using OfficeOpenXml.Export.HtmlExport;
+using OfficeOpenXml.Style;
+using OfficeOpenXml.Table;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -322,6 +327,88 @@ public void GenerateLineChartWithDropLine()
                 }
             }
         }
+        [TestMethod]
+        public void GenerateBlazorSample1()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("BlazorSample1.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[1];
+
+                //var ix = 1;
+                //var c = ws.Drawings[ix];
+                //var svg = c.ToSvg();
+                //SaveTextFileToWorkbook($"svg\\5.3-SampleLines{ix}.svg", svg);
+
+                for (int i = 0; i < ws.Drawings.Count; i++)
+                {
+                    var c = ws.Drawings[i];
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\BlazorSample1{i}.svg", svg);
+                }
+            }   
+        }
+        [TestMethod]
+        public async Task HtmlExportWithLineChart()
+        {
+            using (var package = new ExcelPackage())
+            {
+                var style = TableStyles.Dark3;
+                var sheet = package.Workbook.Worksheets.Add("Html export sample 8");
+                var csvFileInfo = new FileInfo(Path.Combine(_dataPath, $"currencies2011weekly.csv"));
+                if (csvFileInfo.Exists == false) return;
+                var format = new ExcelTextFormat
+                {
+                    Delimiter = ';',
+                    Culture = CultureInfo.InvariantCulture,
+                    DataTypes = new eDataTypes[] { eDataTypes.DateTime, eDataTypes.Number, eDataTypes.Number, eDataTypes.Number, eDataTypes.Number }
+                };
+                var tableRange = sheet.Cells["A15"].LoadFromText(csvFileInfo, format, style, true);
+
+                sheet.Cells["B1:E1"].Style.HorizontalAlignment = ExcelHorizontalAlignment.Right;
+                sheet.Cells[tableRange.Start.Row, 1, tableRange.End.Row, 1].Style.Numberformat.Format = "yyyy-MM-dd";
+                sheet.Cells[tableRange.Start.Row, 2, tableRange.End.Row, 5].Style.Numberformat.Format = "#,##0.0000";
+                tableRange.AutoFitColumns();
+
+                var table = sheet.Tables.GetFromRange(tableRange);
+                table.ShowFirstColumn = true;
+                var chart = sheet.Drawings.AddLineChart("LineChart1", eLineChartType.Line);
+
+                var serie1 = chart.Series.Add(tableRange.TakeColumnsBetween(1,1).SkipRows(1), tableRange.TakeColumns(1).SkipRows(1));
+                serie1.HeaderAddress = sheet.Cells["B15"];
+
+                var serie2 = chart.Series.Add(tableRange.TakeColumnsBetween(2, 1).SkipRows(1), tableRange.TakeColumns(1).SkipRows(1));
+                serie2.HeaderAddress = sheet.Cells["C15"];
+
+                var serie3 = chart.Series.Add(tableRange.TakeColumnsBetween(3, 1).SkipRows(1), tableRange.TakeColumns(1).SkipRows(1));
+                serie3.HeaderAddress = sheet.Cells["D15"];
+
+                chart.SetPosition(0, 0);
+                chart.To.Row = 14;
+                chart.To.Column = 10;
+                chart.StyleManager.SetChartStyle(ePresetChartStyle.LineChartStyle5);
+
+                var exporter = sheet.Cells.CreateHtmlExporter();
+                var settings = exporter.Settings;
+                settings.Drawings.Include = eDrawingInclude.Include;
+                settings.Culture = CultureInfo.InvariantCulture;
+                settings.SetRowHeight = true;
+                settings.SetColumnWidth = true;
+                settings.TableId = "currency-table";
+                settings.AdditionalTableClassNames.Add("table");
+                settings.AdditionalTableClassNames.Add("table-sm");
+                settings.AdditionalTableClassNames.Add("table-borderless");
+                settings.Drawings.Position = eDrawingPosition.Absolute;
+                SaveWorkbook("HtmlExportWithLineChart.xlsx", package);
+                // export css and html
+                //var css = exporter.GetCssString();
+                //var html = exporter.GetHtmlString();
+                var html = await exporter.GetSinglePageAsync();
+
+                SaveSvg("HtmlExportWithLineChart.html", html);
+            }
+
+        }
         //2.4-CreateAFileSystemReport.xlsx
         //3.3-FxReportFromDatabase.xlsx
     }

src/EPPlus.DrawingRenderer.Tests/Shape/ShapeWrappingTests.cs

@@ -0,0 +1,75 @@
+using OfficeOpenXml;
+using OfficeOpenXml.Drawing;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EPPlus.DrawingRenderer.Tests.Shape
+{
+    [TestClass]
+    public class ShapeWrappingTests : TestBase
+    {
+        [TestMethod]
+        public void WrapEveryLetter()
+        {
+            using(var p = OpenPackage("WrapEveryLetterSvg.xlsx",true))
+            {
+                var ws = p.Workbook.Worksheets.Add("wrapShapes");
+
+                var txtBox = ws.Drawings.AddTextbox("txtBox1", "MY WORLD");
+                txtBox.As.Shape.SetSize(30, 150);
+
+                var svg = txtBox.ToSvg();
+                File.WriteAllText(GetOutputFile("svg\\", "WrapEveryLetter.svg").FullName, svg);
+                SaveAndCleanup(p);
+            }
+        }
+
+        [TestMethod]
+        public void WrapAndColor()
+        {
+            using (var p = OpenPackage("WrapInRect.xlsx", true))
+            {
+                var ws = p.Workbook.Worksheets.Add("wrap");
+
+                var _currentShape = ws.Drawings.AddShape("MyShape", OfficeOpenXml.Drawing.eShapeStyle.Rect);
+                _currentShape.SetSize(36, 200);
+
+                _currentShape.Font.Color = System.Drawing.Color.Goldenrod;
+                _currentShape.TextBody.LeftInsert = 0;
+                _currentShape.TextBody.RightInsert = 0;
+                _currentShape.TextBody.TopInsert = 0;
+                _currentShape.TextBody.BottomInsert = 0;
+
+                var rt1 = _currentShape.RichText.Add("M", true);
+                var rt2 = _currentShape.RichText.Add("Y ", false);
+                var rt3 = _currentShape.RichText.Add("W", false);
+                var rt4 = _currentShape.RichText.Add("O", false);
+                var rt5 = _currentShape.RichText.Add("R", false);
+                var rt6 = _currentShape.RichText.Add("L", false);
+                var rt7 = _currentShape.RichText.Add("D", false);
+                _currentShape.RichText.Add("MY WORLD", true);
+
+                var startColor = KnownColor.Plum;
+
+                _currentShape.RichText.Add("Default world", true);
+
+                foreach (var item in _currentShape.RichText)
+                {
+                    item.Color = System.Drawing.Color.FromKnownColor(startColor);
+                    startColor += 1;
+                }
+
+                _currentShape.TextBody.Anchor = eTextAnchoringType.Top;
+
+                var svg = _currentShape.ToSvg();
+                File.WriteAllText(GetOutputFile("svg\\", "WrapAndColor.svg").FullName, svg);
+
+                SaveAndCleanup(p);
+            }
+        }
+    }
+}

src/EPPlus.DrawingRenderer.Tests/TestBase.cs

@@ -83,6 +83,7 @@ private class GeoData
     protected static string _testInputPathOptional = @"c:\epplusTest\workbooks\";           //Team shared workbooks for tests
     protected static string _testInputLocalPathOptional = @"c:\epplusTest\workbooks\";      //Local workboks for tests
     protected static string _imagePath = @"c:\epplusTest\images\";
+    protected static string _dataPath = @"c:\epplusTest\data\";
     /// <summary>
     ///Gets or sets the test context which provides
     ///information about and functionality for the current test run.

src/EPPlus.DrawingRenderer.Tests/TextRenderTests.cs

@@ -39,7 +39,7 @@
 //                    var c = System.Drawing.Color.FromName(color);
 //                    if (c.IsEmpty)
 //                    {
-//                        var sc = Enum.Parse<eSchemeColor>(color);
+//                        var sc = (eSchemeColor)Enum.Parse(typeof(eSchemeColor), color);
 //                        fill.SolidFill.Color.SetSchemeColor(sc);
 //                    }
 //                    else
@@ -49,7 +49,7 @@
 //                }
 //                catch
 //                {
-//                    var sc = Enum.Parse<eSchemeColor>(color);
+//                    var sc = (eSchemeColor)Enum.Parse(typeof(eSchemeColor), color);
 //                    fill.SolidFill.Color.SetSchemeColor(sc);
 //                }
 //            }
@@ -76,13 +76,13 @@
 //        //        fontSizes.Add(runFont.Size);
 //        //    }
 
-           
+
 //        //    return new TextFragmentCollectionSimple(fonts, runContents);
 //        //}
 
 //        //List<TextLineSimple> GetWrappedText(ExcelDrawingTextRunCollection runs, TextFragmentCollectionSimple fragments)
 //        //{
-            
+
 //        //    List<MeasurementFont> fonts = new List<MeasurementFont>();
 
 //        //    for (int i = 0; i < runs.Count(); i++)
@@ -146,7 +146,7 @@
 //                Style = MeasurementFontStyles.Regular
 //            };
 
-//            List<MeasurementFont> fonts = new() { /*font1,*/ font2, font3, font4, font5, font6};
+//            List<MeasurementFont> fonts = new() { /*font1,*/ font2, font3, font4, font5, font6 };
 
 //            var maxSizePoints = Math.Round(300d, 0, MidpointRounding.AwayFromZero).PixelToPoint();
 //            var ttMeasurer = OpenTypeFonts.GetTextLayoutEngineForFont(font2);
@@ -224,14 +224,14 @@
 
 //                var txtRuns2 = tbItem.Paragraphs[1].Runs;
 
-//                Assert.AreEqual(53.20963541666667d, txtRuns2[0].Bounds.Width.PointToPixel(),0.2);
+//                Assert.AreEqual(53.20963541666667d, txtRuns2[0].Bounds.Width.PointToPixel(), 0.2);
 //                var currentLineWidth = txtRuns2[0].Bounds.Width.PointToPixel();
 
-//                Assert.AreEqual(currentLineWidth, txtRuns2[1].Bounds.Left.PointToPixel(),0.2);
-//                Assert.AreEqual(69.55924479166667d, txtRuns2[1].Bounds.Width.PointToPixel(),0.2);
+//                Assert.AreEqual(currentLineWidth, txtRuns2[1].Bounds.Left.PointToPixel(), 0.2);
+//                Assert.AreEqual(69.55924479166667d, txtRuns2[1].Bounds.Width.PointToPixel(), 0.2);
 //                currentLineWidth += txtRuns2[1].Bounds.Width.PointToPixel();
 
-//                Assert.AreEqual(currentLineWidth, txtRuns2[2].Bounds.Left.PointToPixel(),0.0001);
+//                Assert.AreEqual(currentLineWidth, txtRuns2[2].Bounds.Left.PointToPixel(), 0.0001);
 //                Assert.AreEqual(49.89388020833334, txtRuns2[2].Bounds.Width.PointToPixel(), 0.0001);
 //                currentLineWidth += txtRuns2[2].Bounds.Width.PointToPixel();
 
@@ -328,7 +328,7 @@
 
 
 //            //Appears off by 1-2 px bc of border width
-//            Assert.AreEqual(190d, tbItem.Bounds.GlobalTop.PointToPixel() , 1.0);
+//            Assert.AreEqual(190d, tbItem.Bounds.GlobalTop.PointToPixel(), 1.0);
 //        }
 
 
@@ -379,7 +379,7 @@
 
 //            //var trItem = new SvgTextRunItem(svgShape, lastpara.Bounds, font, "MyText");
 //            //lastpara.Runs.Add(trItem);
-//            lastpara.AddOwnText(new TextFragment() {Text = "my new text", Font = font });
+//            lastpara.AddOwnText(new TextFragment() { Text = "my new text", Font = font });
 //            svgShape.Render(sb);
 
 //            var str = sb.ToString();

src/EPPlus.DrawingRenderer/EPPlus.DrawingRenderer.csproj

@@ -11,6 +11,7 @@
 		<LangVersion>latest</LangVersion>
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>EPPlus.DrawingRenderer.snk</AssemblyOriginatorKeyFile>
+		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 	<ItemGroup>
 	  <Compile Remove="RenderItems\Shared\GroupItem.cs" />

src/EPPlus.DrawingRenderer/Svg/Core/SvgShapeRenderer.cs

@@ -622,8 +622,46 @@ private string GetXy(RenderItem item, UserSpaceSettings userSpace, double? angle
                 double x1 = cx - halfX, y1 = cy - halfY;
                 double x2 = cx + halfX, y2 = cy + halfY;
 
+                if(item.DefId == "xGridLine")
+                {
+                    //If global, has to stretch the whole length.
+                    //This case is special because it stretches in the same direction as the attempted gradient
+                    x1 = item.Bounds.Left;
+                    x2 = w - x1;
+                }
+
                 return $" x1=\"{(x1).PointToPixelString("0.00")}\" x2=\"{(x2).PointToPixelString("0.00")}\" y1=\"{y1.PointToPixelString("0.00")}\" y2=\"{y2.PointToPixelString("0.00")}\"";
             }
+            else if (angle.HasValue && angle != 0)
+            {
+                    var x1 = 0D;
+                    var x2 = 0D;
+                    var y1 = 0D;
+                    var y2 = 0D;
+                    angle %= 360;
+                    if (angle <= 90)
+                    {
+                        x2 = 1D - Math.Sin(MathHelper.Radians(angle.Value));
+                        y2 = Math.Sin(MathHelper.Radians(angle.Value));
+                    }
+                    else if (angle <= 180)
+                    {
+                        y2 = Math.Sin(MathHelper.Radians(angle.Value));
+                        x1 = 1D - Math.Sin(MathHelper.Radians(angle.Value));
+                    }
+                    else if (angle <= 270)
+                    {
+                        y1 = Math.Sin(MathHelper.Radians(angle.Value - 180));
+                        x1 = 1D - Math.Sin(MathHelper.Radians(angle.Value - 180));
+                    }
+                    else
+                    {
+                        y1 = Math.Sin(MathHelper.Radians(angle.Value - 180));
+                        x2 = 1D - Math.Sin(MathHelper.Radians(angle.Value - 180));
+                    }
+
+                    return $" x1=\"{(x1).ToString("0.00%", CultureInfo.InvariantCulture)}\" x2=\"{(x2).ToString("0.00%", CultureInfo.InvariantCulture)}\" y1=\"{y1.ToString("0.00%", CultureInfo.InvariantCulture)}\" y2=\"{y2.ToString("0.00%", CultureInfo.InvariantCulture)}\"";
+            }
             return "";
         }