Feature/drawing renderer refactor

Readme.md

@@ -6,7 +6,7 @@
 # EPPlus 8
 
 ## License
-EPPlus 8 has a dual license model with a community license for noncommercial use: [Polyform Noncommercial 1.0.0](https://polyformproject.org/licenses/noncommercial/1.0.0/).
+EPPlus 8 has a dual license model with a community license for noncommercial use: [Polyform Noncommercial 1.0.0](https://polyformproject.org/licenses/noncommercial/1.0.0).
 
 With this license EPPlus is free to use for personal/noncommercial use, but will require a commercial license to be used in a commercial business.
 

appveyor8.yml

@@ -1,4 +1,4 @@
-version: 8.5.4.{build}
+version: 8.6.1.{build}
 branches:
   only:
   - develop8
@@ -10,15 +10,15 @@ install:
     & $env:temp\dotnet-install.ps1 -Architecture x64 -Version '10.0.100' -InstallDir "$env:ProgramFiles\dotnet"
 init:
 - ps: >-
-    Update-AppveyorBuild -Version "8.5.4.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
+    Update-AppveyorBuild -Version "8.6.1.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
 
-    Write-Host "8.5.4.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
+    Write-Host "8.6.1.$env:appveyor_build_number-$(Get-Date -format yyyyMMdd)-$env:appveyor_repo_branch"
 dotnet_csproj:
   patch: true
   file: '**\*.csproj'
   version: '{version}'
-  assembly_version: 8.5.4.{build}
-  file_version: 8.5.4.{build}
+  assembly_version: 8.6.1.{build}
+  file_version: 8.6.1.{build}
 nuget:
   project_feed: true
 before_build:

docs/articles/breakingchanges.md

@@ -230,4 +230,5 @@ The misspelled enum eCompundLineStyle has been renamed eCompoundLineStyle.
 
 ### 9.0.0
 The misspelled enum eCompundLineStyle has been renamed eCompoundLineStyle.
+The misspelled property on drawingFill `Transparancy`  has been renamed to `Transparency`
 The `Richtext.Baseline` property now always return that value in whole percent.

docs/articles/fixedissues.md

@@ -2,12 +2,52 @@
 ## Version 9.0.0
 * Added 'Layout' property to 'ExcelChartTrendlineLabel' class.
 
-## Version 8.5.5
-### Minor Features
-* Ranges can now convert their values to richText via ´ConvertToRichText()´ e.g. ´ws.Cells["A1"].ConvertToRichText()´
-### Fixed issues
-* Several issues related to RichText in ranges. Simply looking at the .RichText attribute no longer changes the cell value. Setting a propert e.g. ´range.RichText.Text = "Hi"´ or using ConvertToRichText() actually changes the value.
-
+## Version 8.6 1
+### Features
+* 3 new functions:
+  * ´REGEXEXTRACT´
+  * ´REGEXREPLACE´
+  * ´REGEXTEST´
+### Fixed issues	
+* Fixed mismatch in conditional formatting when loading a workbook.
+* Fixed several issues in the HTML export
+  * Text rotated vertically in cells now adjusts column widths more appropriately.
+  * Borders sometimes disappeared when having rotate the text.
+  * Fixed bug where the positions/visuals of images would sometimes not appear.
+  * Pattern fills with empty colors did not pick the correct theme color.
+  * Merged cells did not render border correctly on the right and bottom edges.
+* Workbooks with group shapes in charts sometimes failed to load. 
+* Images in charts sometimes got stretched.
+* ´ExcelRangeBase.ClearDataValidation´ threw an ´InvalidOperationException´ if when there were no data validations.
+* Fixed case-sensitivity parsing on ´ExcelChartAxisStandard´ enums, ´MajorTickMark´ and ´MinorTickMark´ (Fix by Lieven De Foor).
+* ´ExcelWorksheets.Delete´ threw ´NotSupportedException´ on chart worksheets. (Fix by Lieven De Foor).
+* Using full row/column addresses in formulas referencing external workbooks caused bad performance.
+* The ´VLOOKUP´ and ´HLOOKUP´ function sometimes returned the wrong value on unsorted data.
+
+## Version 8.6 0
+### Features
+* 9 new functions:
+  * ´GROUPBY´
+  * ´PIVOTBY´
+  * ´TRIMRANGE´
+  * ´WRAPROWS´
+  * ´WRAPCOLS´
+  * ´USDOLLAR´
+  * ´CODE´
+  * ´ENCODEURL´
+  * ´ISFORMULA´
+* Support for the [trim reference operators](https://github.com/EPPlusSoftware/EPPlus/wiki/Trim-reference-operator).
+* Ranges can now convert their values to rich text via ´ConvertToRichText()´ e.g. ´ws.Cells["A1"].ConvertToRichText()´
+* Calculation of dynamic array formulas now support dirty cell recalculation inside other dirty cell calculations.
+### Fixed issues	
+* Fixed a cache issue with the ´IF´ function when recalculation dynamic array formulas with dirty cells.
+* ´ExcelPackage.LoadAsync´ failed with an unhandled exception, if a package had a package part larger than 2GB.
+* Fixed copy of absolute positioned drawings and group shapes.
+* Fixed a performance issue related to copying using full row/column addresses.
+* Fixed stale values when using newer worksheet functions (e.g. ARRAYTOTEXT) by adding required features to the workbook XML.
+* CompareOptions.Culture in RangeSortOptions was not honored when sorting ranges(thanks to lievendf).
+* Copied "Text length data validations" no longer become "Int data validations" in the output workbook.
+* Several issues related to RichText in ranges. Accessing the ´ExcelRangeBase.RichText´ property no longer casts the cell value to string.
 ## Version 8.5.4
 ### Minor Features
 * Added ´IncludeInHtmlOnly´ option to the ´ePictureInclude´ enum. This allows the HTML Exporter to include pictures directly in the HTML output rather than in the CSS.

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

@@ -22,7 +22,7 @@ public void GenerateSvgForBarCharts1()
                 var ix = 0;
                 foreach (ExcelChart c in ws.Drawings)
                 {
-                    var svg = c.ToSvg();
+                    var svg = c.ToSvg(x => { x.Size.Width = 100; x.Size.Height = 100; });
                     SaveTextFileToWorkbook($"svg\\BarChartForSvg_sheet1_{ix++}.svg", svg);
                 }
             }
@@ -42,5 +42,42 @@ public void GenerateSvgForBarCharts2()
                 }
             }
         }
+
+        [TestMethod]
+        public void DatalabelBarCharts()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("BarChartForSvgDatalabelsBasic.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+                var drawings = ws.Drawings;
+                var ix = 1;
+
+                for (int i = ix; i < drawings.Count; i++)
+                {
+                    var svg = drawings[i].ToSvg();
+                    SaveTextFileToWorkbook($"svg\\BarChartDataLabels{ix++}.svg", svg);
+                }
+            }
+        }
+
+
+        [TestMethod]
+        public void NegativeDatalabelBarCharts()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("negativeDatalabels.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+                var drawings = ws.Drawings;
+                var ix = 0;
+
+                for (int i = ix; i < drawings.Count; i++)
+                {
+                    var svg = drawings[i].ToSvg();
+                    SaveTextFileToWorkbook($"svg\\NegativeLabels{ix++}.svg", svg);
+                }
+            }
+        }
     }
 }

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

@@ -21,7 +21,7 @@ public void GenerateSvgForColumnCharts1()
 
                 //var ix = 1;
                 //var c = ws.Drawings[ix];
-                //var svg = renderer.RenderDrawingToSvg(c);
+                //var svg = c.ToSvg();
                 //SaveTextFileToWorkbook($"svg\\ChartForSvg_ind{ix++}.svg", svg);
 
                 var ix = 0;

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

@@ -0,0 +1,70 @@
+using OfficeOpenXml;
+using OfficeOpenXml.Drawing.Chart;
+
+namespace EPPlus.Export.ImageRenderer.Tests.Chart
+{
+    [TestClass]
+    public class ErrorbarsTests : TestBase
+    {
+        [TestMethod]
+        public void GenerateSvgForErrorbars_Line_Sheet1()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("Errorbars.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+                //var ix = 4;
+                //var c = ws.Drawings[ix];
+                //var svg = c.ToSvg();
+                //SaveTextFileToWorkbook($"svg\\Error_sheet1_ind{ix++}.svg", svg);
+
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\Errorbar_sheet1_{ix++}.svg", svg);
+                }
+            }
+        }
+        [TestMethod]
+        public void GenerateSvgForErrorbars_Column_Sheet2()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("Errorbars.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[1];
+                //var ix = 4;
+                //var c = ws.Drawings[ix];
+                //var svg = c.ToSvg();
+                //SaveTextFileToWorkbook($"svg\\Error_sheet1_ind{ix++}.svg", svg);
+
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\Errorbar_sheet2_{ix++}.svg", svg);
+                }
+            }
+        }
+        [TestMethod]
+        public void GenerateSvgForErrorbars_Bar_Sheet3()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("Errorbars.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[2];
+                //var ix = 4;
+                //var c = ws.Drawings[ix];
+                //var svg = c.ToSvg();
+                //SaveTextFileToWorkbook($"svg\\Error_sheet1_ind{ix++}.svg", svg);
+
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\Errorbar_sheet3_{ix++}.svg", svg);
+                }
+            }
+        }
+    }
+}

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

@@ -19,17 +19,17 @@ public void GenerateSvgForLineCharts_sheet1()
             {
                 var ws = p.Workbook.Worksheets[0];
 
-                //var ix = 6;
-                //var c = ws.Drawings[ix];
-                //var svg = c.ToSvg();
-                //SaveTextFileToWorkbook($"svg\\ChartForSvg_ind{ix++}.svg", svg);
+                var ix = 6;
+                var c = ws.Drawings[ix];
+                var svg = c.ToSvg();
+                SaveTextFileToWorkbook($"svg\\ChartForSvg_ind{ix++}.svg", svg);
 
-                var ix = 0;
-                foreach (ExcelChart c in ws.Drawings)
-                {
-                    var svg = c.ToSvg();
-                    SaveTextFileToWorkbook($"svg\\ChartForSvg{ix++}.svg", svg);
-                }
+                //for (int i = 0; i < ws.Drawings.Count; i++)
+                //{
+                //    var c = ws.Drawings[i];
+                //    var svg = c.ToSvg();
+                //    SaveTextFileToWorkbook($"svg\\ChartForSvg{i}.svg", svg);
+                //}
             }
         }
 
@@ -128,64 +128,65 @@ public void GenerateSvgForLineCharts()
                 }
             }
         }
+
         [TestMethod]
-        public void GenerateSuperScript()
+        public void GenerateSvgForCharts_SecondaryAxis()
         {
             ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
-            using (var p = OpenTemplatePackage("Superscript.xlsx"))
+            using (var p = OpenTemplatePackage("ChartForSvg_SecondaryAxis.xlsx"))
             {
                 var ws = p.Workbook.Worksheets[0];
                 //var ix = 1;
                 //var c = ws.Drawings[ix];
-                //var svg = renderer.RenderDrawingToSvg(c);
-                //SaveTextFileToWorkbook($"svg\\LineChartForSvg_Single{ix++}.svg", svg);
+                //var svg = c.ToSvg();
+                //SaveTextFileToWorkbook($"svg\\ChartForSvg_sheet2_{ix++}.svg", svg);
                 var ix = 1;
-                foreach (var c in ws.Drawings)
+                foreach (ExcelChart c in ws.Drawings)
                 {
                     var svg = c.ToSvg();
-                    SaveTextFileToWorkbook($"svg\\ss{ix++}.svg", svg);
+                    SaveTextFileToWorkbook($"svg\\ChartForSvg_SecAxis{ix++}.svg", svg);
                 }
             }
         }
-
         [TestMethod]
-        public void GenerateSvgForCharts_SecondaryAxis()
+        public void GenerateSvgForCharts_SecondaryAxis_sheet2()
         {
             ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
             using (var p = OpenTemplatePackage("ChartForSvg_SecondaryAxis.xlsx"))
             {
-                var ws = p.Workbook.Worksheets[0];
-                //var ix = 3;
+                var ws = p.Workbook.Worksheets[1];
+                //var ix = 2;
                 //var c = ws.Drawings[ix];
                 //var svg = renderer.RenderDrawingToSvg(c);
-                //SaveTextFileToWorkbook($"svg\\ChartForSvg_sheet2_{ix++}.svg", svg);
+                //SaveTextFileToWorkbook($"svg\\ChartForSvg_Sheet2_SecAxis{ix++}.svg", svg);
                 var ix = 1;
                 foreach (ExcelChart c in ws.Drawings)
                 {
                     var svg = c.ToSvg();
-                    SaveTextFileToWorkbook($"svg\\ChartForSvg_SecAxis{ix++}.svg", svg);
+                    SaveTextFileToWorkbook($"svg\\ChartForSvg_Sheet2_SecAxis{ix++}.svg", svg);
                 }
             }
         }
         [TestMethod]
-        public void GenerateSvgForCharts_SecondaryAxis_sheet2()
+        public void GenerateSvgForCharts_SecondaryAxis_sheet3()
         {
             ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
             using (var p = OpenTemplatePackage("ChartForSvg_SecondaryAxis.xlsx"))
             {
-                var ws = p.Workbook.Worksheets[1];
-                //var ix = 2;
+                var ws = p.Workbook.Worksheets[2];
+                //var ix = 1;
                 //var c = ws.Drawings[ix];
-                //var svg = renderer.RenderDrawingToSvg(c);
-                //SaveTextFileToWorkbook($"svg\\ChartForSvg_Sheet2_SecAxis{ix++}.svg", svg);
+                //var svg = c.ToSvg();
+                //SaveTextFileToWorkbook($"svg\\ChartForSvg_sheet3_{ix++}.svg", svg);
                 var ix = 1;
                 foreach (ExcelChart c in ws.Drawings)
                 {
                     var svg = c.ToSvg();
-                    SaveTextFileToWorkbook($"svg\\ChartForSvg_Sheet2_SecAxis{ix++}.svg", svg);
+                    SaveTextFileToWorkbook($"svg\\ChartForSvg_Sheet3_SecAxis{ix++}.svg", svg);
                 }
             }
         }
+
         [TestMethod]
         public void GenerateSimplestChart()
         {
@@ -280,5 +281,27 @@ public void GenerateSimpleLineChart()
                 SaveTextFileToWorkbook($"svg\\defChartLine3Points.svg", svg);
             }
         }
+        [TestMethod]
+        public void GenerateSvgForLineCharts_AxisAlign_sheet1()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("HorizontalAxisAlign.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+
+                //var ix = 3;
+                //var c = ws.Drawings[ix];
+                //var svg = c.ToSvg();
+                //SaveTextFileToWorkbook($"svg\\HorizontalAxisChartForSvg{ix++}.svg", svg);
+
+                for (int i = 0; i < ws.Drawings.Count; i++)
+                {
+                    var c = ws.Drawings[i];
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\HorizontalAxisChartForSvg{i}.svg", svg);
+                }
+            }
+        }
+
     }
 }