Add per-workbook RenderContext on ExcelWorkbook

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

@@ -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,50 @@
+using OfficeOpenXml;
+using OfficeOpenXml.Drawing.Chart;
+
+namespace EPPlus.Export.ImageRenderer.Tests.Chart
+{
+    [TestClass]
+    public class ErrorbarsTests : TestBase
+    {
+        [TestMethod]
+        public void GenerateSvgForErrorbars_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);
+                }
+            }
+        }
+    }
+}

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

@@ -24,11 +24,11 @@ public void GenerateSvgForLineCharts_sheet1()
                 //var svg = c.ToSvg();
                 //SaveTextFileToWorkbook($"svg\\ChartForSvg_ind{ix++}.svg", svg);
 
-                var ix = 0;
-                foreach (ExcelChart c in ws.Drawings)
+                for(int i = 0; i< ws.Drawings.Count; i++)
                 {
+                    var c = ws.Drawings[i];
                     var svg = c.ToSvg();
-                    SaveTextFileToWorkbook($"svg\\ChartForSvg{ix++}.svg", svg);
+                    SaveTextFileToWorkbook($"svg\\ChartForSvg{i}.svg", svg);
                 }
             }
         }
@@ -128,64 +128,65 @@ public void GenerateSvgForLineCharts()
                 }
             }
         }
+
         [TestMethod]
         public void GenerateSuperScript()
         {
             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);
+                }
+            }
+        }
+
     }
 }

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

@@ -12,98 +12,20 @@ public class PieChartTests : TestBase
     {
 
         [TestMethod]
-        public void ReadAndGenerateExcelPieChartSvgs()
+        public void ReadAndCreateSvgsAll()
         {
             ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
             using (var p = OpenTemplatePackage("PieChartSvgALL.xlsx"))
             {
                 var ws = p.Workbook.Worksheets[0];
 
-                for(int i = 0; i < p.Workbook.Worksheets.Count; i++)
-                {
-                    ws = p.Workbook.Worksheets[i];
-                    foreach (ExcelChart c in ws.Drawings)
-                    {
-                        var svg = c.ToSvg();
-                        SaveTextFileToWorkbook($"svg\\PieChartSvgALL\\s{i}_{ws.Name}_{c.Name}.svg", svg);
-                    }
-                }
-            }
-        }
-
-
-        [TestMethod]
-        public void ReadAndGenerateExcelPieChartPointExplosion()
-        {
-            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
-            using (var p = OpenTemplatePackage("PointExplosionStandAlone.xlsx"))
-            {
-                var ws = p.Workbook.Worksheets[0];
-
-                for (int i = 0; i < p.Workbook.Worksheets.Count; i++)
-                {
-                    ws = p.Workbook.Worksheets[i];
-                    foreach (ExcelChart c in ws.Drawings)
-                    {
-                        var svg = c.ToSvg();
-                        SaveTextFileToWorkbook($"svg\\PointExplosionStandAlone\\s{i}_{ws.Name}_{c.Name}.svg", svg);
-                    }
-                }
-            }
-        }
-
-        [TestMethod]
-        public void BasicPieChart()
-        {
-            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
-            using (var p = OpenTemplatePackage("BasicPieChart.xlsx"))
-            {
-                var ws = p.Workbook.Worksheets[0];
-
-                var ix = 0;
-                foreach (ExcelChart c in ws.Drawings)
-                {
-                    var svg = c.ToSvg();
-                    SaveTextFileToWorkbook($"svg\\BasicPieChart{ix++}.svg", svg);
-                }
-            }
-        }
-
-        [TestMethod]
-        public void Datalabels()
-        {
-            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
-            using (var p = OpenTemplatePackage("PieChartDlblsOrig.xlsx"))
-            {
-                var ws = p.Workbook.Worksheets[0];
-
-                for (int i = 0; i < p.Workbook.Worksheets.Count; i++)
-                {
-                    ws = p.Workbook.Worksheets[i];
-                    foreach (ExcelChart c in ws.Drawings)
-                    {
-                        var svg = c.ToSvg();
-                        SaveTextFileToWorkbook($"svg\\PieChartDlbls\\s{i}_{ws.Name}_{c.Name}.svg", svg);
-                    }
-                }
-            }
-        }
-
-        [TestMethod]
-        public void Datalabels2()
-        {
-            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
-            using (var p = OpenTemplatePackage("PieChartDlblsInsideEndOnly.xlsx"))
-            {
-                var ws = p.Workbook.Worksheets[0];
-
                 for (int i = 0; i < p.Workbook.Worksheets.Count; i++)
                 {
                     ws = p.Workbook.Worksheets[i];
                     foreach (ExcelChart c in ws.Drawings)
                     {
                         var svg = c.ToSvg();
-                        SaveTextFileToWorkbook($"svg\\PieChartDlbls\\s{i}_{ws.Name}_{c.Name}.svg", svg);
+                        SaveTextFileToWorkbook($"svg\\PieChartSvgALL\\s{i}_{ws.Name}_{c.Name}.svg", svg);
                     }
                 }
             }

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

@@ -13,9 +13,9 @@ public void GenerateSvgForTrendlines_Sheet1()
             using (var p = OpenTemplatePackage("Trendlines.xlsx"))
             {
                 var ws = p.Workbook.Worksheets[0];
-                //var ix = 2;
+                //var ix = 4;
                 //var c = ws.Drawings[ix];
-                //var svg = renderer.RenderDrawingToSvg(c);
+                //var svg = c.ToSvg();
                 //SaveTextFileToWorkbook($"svg\\Trendline_sheet1_ind{ix++}.svg", svg);
 
                 var ix = 0;
@@ -26,6 +26,28 @@ public void GenerateSvgForTrendlines_Sheet1()
                 }
             }
         }
+
+        [TestMethod]
+        public void TrendlineAlt()
+        {
+            ExcelPackage.License.SetNonCommercialOrganization("EPPlus Project");
+            using (var p = OpenTemplatePackage("TrendlineAlt.xlsx"))
+            {
+                var ws = p.Workbook.Worksheets[0];
+                //var ix = 4;
+                //var c = ws.Drawings[ix];
+                //var svg = c.ToSvg();
+                //SaveTextFileToWorkbook($"svg\\Trendline_sheet1_ind{ix++}.svg", svg);
+
+                var ix = 0;
+                foreach (ExcelChart c in ws.Drawings)
+                {
+                    var svg = c.ToSvg();
+                    SaveTextFileToWorkbook($"svg\\TrendlineAlt_sheet1_{ix++}.svg", svg);
+                }
+            }
+        }
+
         [TestMethod]
         public void GenerateSvgForTrendlines_Sheet2()
         {
@@ -36,7 +58,7 @@ public void GenerateSvgForTrendlines_Sheet2()
 
                 //var ix = 3;
                 //var c = ws.Drawings[ix];
-                //var svg = renderer.RenderDrawingToSvg(c);
+                //var svg = c.ToSvg();
                 //SaveTextFileToWorkbook($"svg\\Trendline_sheet1_ind{ix++}.svg", svg);
 
                 var ix = 0;