Chart Legend Entries issue with text settings (#1492)

JanKallman · OssianEPPlus · web-flow · commit 3002b34cc6b0 · 2024-06-18T09:29:25.000+02:00
* Added fix for Chart Legend Entries issue with text settings

* Added fix for datalabel

* Added datalabel formatting issues fix

* Fixed test to avoid validation error on colors

---------

Co-authored-by: Ossian Edström &lt;ossian.edstrom@epplussoftware.com&gt;
diff --git a/src/EPPlus/Drawing/Chart/ExcelChartDataLabelCollection.cs b/src/EPPlus/Drawing/Chart/ExcelChartDataLabelCollection.cs
@@ -78,7 +78,7 @@ private XmlElement CreateElement(int idx)
             XmlElement pointNode;
             if (idx < _list.Count)
             {
-                pointNode = TopNode.OwnerDocument.CreateElement("c", "dLbl", ExcelPackage.schemaMain);
+                pointNode = TopNode.OwnerDocument.CreateElement("c", "dLbl", @"http://schemas.openxmlformats.org/drawingml/2006/chart");
                 TopNode.InsertBefore(pointNode, _list[idx].TopNode);
             }
             else
diff --git a/src/EPPlus/Drawing/Chart/ExcelChartDataLabelStandard.cs b/src/EPPlus/Drawing/Chart/ExcelChartDataLabelStandard.cs
@@ -27,13 +27,10 @@ public class ExcelChartDataLabelStandard : ExcelChartDataLabel
         internal ExcelChartDataLabelStandard(ExcelChart chart, XmlNamespaceManager ns, XmlNode node, string nodeName, string[] schemaNodeOrder)
            : base(chart, ns, node, nodeName, "c")
         {
-            AddSchemaNodeOrder([""], LabelNodeHolder.DataLabels.NodeOrder);
-            var order = SchemaNodeOrder;
-
             if (nodeName == "dLbl" || nodeName == "")
             {
-                AddSchemaNodeOrder([""], LabelNodeHolder.DataLabel.NodeOrder);
-                
+                SchemaNodeOrder = LabelNodeHolder.DataLabel.NodeOrder;
+
                 TopNode = node;
                 
                 var extPath = "c:extLst/c:ext";
@@ -57,6 +54,8 @@ internal ExcelChartDataLabelStandard(ExcelChart chart, XmlNamespaceManager ns, X
             }
             else
             {
+                SchemaNodeOrder = schemaNodeOrder;
+
                 var fullNodeName = "c:" + nodeName;
                 var topNode = GetNode(fullNodeName);
                 if (topNode == null)
@@ -65,6 +64,7 @@ internal ExcelChartDataLabelStandard(ExcelChart chart, XmlNamespaceManager ns, X
                     topNode.InnerXml = "<c:showLegendKey val=\"0\" /><c:showVal val=\"0\" /><c:showCatName val=\"0\" /><c:showSerName val=\"0\" /><c:showPercent val=\"0\" /><c:showBubbleSize val=\"0\" /> <c:separator>\r\n</c:separator><c:showLeaderLines val=\"0\" />";
                 }
                 TopNode = topNode;
+                SchemaNodeOrder = LabelNodeHolder.DataLabels.NodeOrder;
             }
         }
 
@@ -161,11 +161,22 @@ public override bool ShowLeaderLines
         {
             get
             {
+                if(TopNode.LocalName == "dLbl")
+                {
+                    return GetXmlNodeBool(showLeaderLinesPath, TopNode.ParentNode);
+                }
                 return GetXmlNodeBool(showLeaderLinesPath);
             }
             set
             {
-                SetXmlNodeString(showLeaderLinesPath, value ? "1" : "0");
+                if (TopNode.LocalName == "dLbl")
+                {
+                    SetXmlNodeString(TopNode.ParentNode, showBubbleSizePath, value ? "1" : "0");
+                }
+                else
+                {
+                    SetXmlNodeString(showLeaderLinesPath, value ? "1" : "0");
+                }
             }
         }
         const string showBubbleSizePath = "c:showBubbleSize/@val";
diff --git a/src/EPPlus/Drawing/Chart/ExcelChartSerieDataLabel.cs b/src/EPPlus/Drawing/Chart/ExcelChartSerieDataLabel.cs
@@ -27,7 +27,7 @@ public sealed class ExcelChartSerieDataLabel : ExcelChartDataLabelStandard
     {
        internal ExcelChartSerieDataLabel(ExcelChart chart, XmlNamespaceManager ns, XmlNode node, string[] schemaNodeOrder)
            : base(chart, ns,node,"dLbls", schemaNodeOrder)
-       {
+        {
             Position = eLabelPosition.Center;
         }
         ExcelChartDataLabelCollection _dataLabels = null;
diff --git a/src/EPPlus/Style/ExcelTextFont.cs b/src/EPPlus/Style/ExcelTextFont.cs
@@ -101,10 +101,13 @@ protected internal void CreateTopNode()
             if (_path!="" && TopNode==_rootNode)
             {
                 _initXml?.Invoke();
-                CreateNode(_path);
-                TopNode = _rootNode.SelectSingleNode(_path, NameSpaceManager);
-                CreateNode("../../../a:bodyPr") ;
-                CreateNode("../../../a:lstStyle");
+                if (TopNode == _rootNode && string.IsNullOrEmpty(_path)==false)
+                {
+                    CreateNode(_path);
+                    TopNode = _rootNode.SelectSingleNode(_path, NameSpaceManager);
+                    CreateNode("../../../a:bodyPr");
+                    CreateNode("../../../a:lstStyle");
+                }
             }
             else if (TopNode.ParentNode?.ParentNode?.ParentNode?.LocalName == "rich")
             {
diff --git a/src/EPPlus/XmlHelper.cs b/src/EPPlus/XmlHelper.cs
@@ -989,6 +989,20 @@ internal bool GetXmlNodeBool(string path)
         {
             return GetXmlNodeBool(path, false);
         }
+        /// <summary>
+        /// Get xmlNodeBool from parent node
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="parentNode"></param>
+        /// <returns></returns>
+        internal bool GetXmlNodeBool(string path, XmlNode parentNode)
+        {
+            var tempNode = TopNode;
+            TopNode = parentNode;
+            var retVal = GetXmlNodeBool(path, TopNode);
+            TopNode = tempNode;
+            return retVal;
+        }
         internal bool GetXmlNodeBool(string path, bool blankValue)
         {
             string value = GetXmlNodeString(path);
diff --git a/src/EPPlusTest/Drawing/Chart/DatalabelTest.cs b/src/EPPlusTest/Drawing/Chart/DatalabelTest.cs
@@ -296,9 +296,9 @@ void AdjustDataLabelItem(ref ExcelChartDataLabelItem label)
         }
 
         [TestMethod]
-        public void TwoLabelsOnSameSeries()
+        public void DataLabelsMultipleOneSeries()
         {
-            using (var pck = OpenPackage("ColumnChartStuffEasy.xlsx", true))
+            using (var pck = OpenPackage("DataLabelsMultipleOneSeries.xlsx", true))
             {
                 var cSheet = pck.Workbook.Worksheets.Add("ColumnChartSheet");
 
diff --git a/src/EPPlusTest/FormulaParsing/Excel/Functions/RefAndLookup/GetPivotData/GetPivotDataTests_Grouping.cs b/src/EPPlusTest/FormulaParsing/Excel/Functions/RefAndLookup/GetPivotData/GetPivotDataTests_Grouping.cs
@@ -2,13 +2,6 @@
 using OfficeOpenXml;
 using OfficeOpenXml.Table.PivotTable;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OfficeOpenXml.Table.PivotTable.Calculation.Functions;
-using OfficeOpenXml.Table.PivotTable.Calculation;
-using FakeItEasy;
 namespace EPPlusTest.FormulaParsing.Excel.Functions.RefAndLookup
 {
 	[TestClass]
@@ -156,6 +149,7 @@ public void GetPivotData_Grouping_YearMonth()
 		[TestMethod]
 		public void GetPivotData_Grouping_YearMonthDay()
 		{
+			SwitchToCulture();
 			var ws = _package.Workbook.Worksheets.Add("DateGroup_YearMonthDay");
 			var pt = ws.PivotTables.Add(ws.Cells["A1"], _dateWs1.Cells["K1:O11"], "PivotTable3");
 			var rf = pt.RowFields.Add(pt.Fields[4]);
@@ -180,6 +174,7 @@ public void GetPivotData_Grouping_YearMonthDay()
 			Assert.AreEqual(1D, (double)ws.Cells["G9"].Value);
 			Assert.AreEqual(ErrorValues.RefError, ws.Cells["G10"].Value);
 			Assert.AreEqual(2881D, (double)ws.Cells["G11"].Value);
+			SwitchBackToCurrentCulture();
 		}
 		[TestMethod]
 		public void GetPivotData_Grouping_Hour()
diff --git a/src/EPPlusTest/LoadFunctions/LoadFromCollectionTests.cs b/src/EPPlusTest/LoadFunctions/LoadFromCollectionTests.cs
@@ -582,7 +582,7 @@ public void ShouldSetHyperlinkForURIs()
                 var ns = package.Workbook.Styles.CreateNamedStyle("Hyperlink");
                 ns.BuildInId = 8;
                 ns.Style.Font.UnderLine = true;
-                ns.Style.Font.Color.SetColor(System.Drawing.Color.FromArgb(0x0563C1));
+                ns.Style.Font.Color.SetColor(System.Drawing.Color.FromArgb(0xFF,0x05 ,0x63, 0xC1));
 
                 var r = sheet.Cells["A1"].LoadFromCollection(items, true, TableStyles.Medium1);
                 sheet.Cells["E2:E5"].StyleName = "Hyperlink";

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ private XmlElement CreateElement(int idx)`
`78`	`78`	`XmlElement pointNode;`
`79`	`79`	`if (idx < _list.Count)`
`80`	`80`	`{`
`81`		`- pointNode = TopNode.OwnerDocument.CreateElement("c", "dLbl", ExcelPackage.schemaMain);`
	`81`	`+ pointNode = TopNode.OwnerDocument.CreateElement("c", "dLbl", @"http://schemas.openxmlformats.org/drawingml/2006/chart");`
`82`	`82`	`TopNode.InsertBefore(pointNode, _list[idx].TopNode);`
`83`	`83`	`}`
`84`	`84`	`else`
Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,10 @@ public class ExcelChartDataLabelStandard : ExcelChartDataLabel`
`27`	`27`	`internal ExcelChartDataLabelStandard(ExcelChart chart, XmlNamespaceManager ns, XmlNode node, string nodeName, string[] schemaNodeOrder)`
`28`	`28`	`: base(chart, ns, node, nodeName, "c")`
`29`	`29`	`{`
`30`		`- AddSchemaNodeOrder([""], LabelNodeHolder.DataLabels.NodeOrder);`
`31`		`- var order = SchemaNodeOrder;`
`32`		`-`
`33`	`30`	`if (nodeName == "dLbl" \|\| nodeName == "")`
`34`	`31`	`{`
`35`		`- AddSchemaNodeOrder([""], LabelNodeHolder.DataLabel.NodeOrder);`
`36`		`-`
	`32`	`+ SchemaNodeOrder = LabelNodeHolder.DataLabel.NodeOrder;`
	`33`	`+`
`37`	`34`	`TopNode = node;`
`38`	`35`
`39`	`36`	`var extPath = "c:extLst/c:ext";`
`@@ -57,6 +54,8 @@ internal ExcelChartDataLabelStandard(ExcelChart chart, XmlNamespaceManager ns, X`
`57`	`54`	`}`
`58`	`55`	`else`
`59`	`56`	`{`
	`57`	`+ SchemaNodeOrder = schemaNodeOrder;`
	`58`	`+`
`60`	`59`	`var fullNodeName = "c:" + nodeName;`
`61`	`60`	`var topNode = GetNode(fullNodeName);`
`62`	`61`	`if (topNode == null)`
`@@ -65,6 +64,7 @@ internal ExcelChartDataLabelStandard(ExcelChart chart, XmlNamespaceManager ns, X`
`65`	`64`	`topNode.InnerXml = "<c:showLegendKey val=\"0\" /><c:showVal val=\"0\" /><c:showCatName val=\"0\" /><c:showSerName val=\"0\" /><c:showPercent val=\"0\" /><c:showBubbleSize val=\"0\" /> <c:separator>\r\n</c:separator><c:showLeaderLines val=\"0\" />";`
`66`	`65`	`}`
`67`	`66`	`TopNode = topNode;`
	`67`	`+ SchemaNodeOrder = LabelNodeHolder.DataLabels.NodeOrder;`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`
`@@ -161,11 +161,22 @@ public override bool ShowLeaderLines`
`161`	`161`	`{`
`162`	`162`	`get`
`163`	`163`	`{`
	`164`	`+ if(TopNode.LocalName == "dLbl")`
	`165`	`+ {`
	`166`	`+ return GetXmlNodeBool(showLeaderLinesPath, TopNode.ParentNode);`
	`167`	`+ }`
`164`	`168`	`return GetXmlNodeBool(showLeaderLinesPath);`
`165`	`169`	`}`
`166`	`170`	`set`
`167`	`171`	`{`
`168`		`- SetXmlNodeString(showLeaderLinesPath, value ? "1" : "0");`
	`172`	`+ if (TopNode.LocalName == "dLbl")`
	`173`	`+ {`
	`174`	`+ SetXmlNodeString(TopNode.ParentNode, showBubbleSizePath, value ? "1" : "0");`
	`175`	`+ }`
	`176`	`+ else`
	`177`	`+ {`
	`178`	`+ SetXmlNodeString(showLeaderLinesPath, value ? "1" : "0");`
	`179`	`+ }`
`169`	`180`	`}`
`170`	`181`	`}`
`171`	`182`	`const string showBubbleSizePath = "c:showBubbleSize/@val";`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public sealed class ExcelChartSerieDataLabel : ExcelChartDataLabelStandard`
`27`	`27`	`{`
`28`	`28`	`internal ExcelChartSerieDataLabel(ExcelChart chart, XmlNamespaceManager ns, XmlNode node, string[] schemaNodeOrder)`
`29`	`29`	`: base(chart, ns,node,"dLbls", schemaNodeOrder)`
`30`		`- {`
	`30`	`+ {`
`31`	`31`	`Position = eLabelPosition.Center;`
`32`	`32`	`}`
`33`	`33`	`ExcelChartDataLabelCollection _dataLabels = null;`
Original file line number	Diff line number	Diff line change
`@@ -101,10 +101,13 @@ protected internal void CreateTopNode()`
`101`	`101`	`if (_path!="" && TopNode==_rootNode)`
`102`	`102`	`{`
`103`	`103`	`_initXml?.Invoke();`
`104`		`- CreateNode(_path);`
`105`		`- TopNode = _rootNode.SelectSingleNode(_path, NameSpaceManager);`
`106`		`- CreateNode("../../../a:bodyPr") ;`
`107`		`- CreateNode("../../../a:lstStyle");`
	`104`	`+ if (TopNode == _rootNode && string.IsNullOrEmpty(_path)==false)`
	`105`	`+ {`
	`106`	`+ CreateNode(_path);`
	`107`	`+ TopNode = _rootNode.SelectSingleNode(_path, NameSpaceManager);`
	`108`	`+ CreateNode("../../../a:bodyPr");`
	`109`	`+ CreateNode("../../../a:lstStyle");`
	`110`	`+ }`
`108`	`111`	`}`
`109`	`112`	`else if (TopNode.ParentNode?.ParentNode?.ParentNode?.LocalName == "rich")`
`110`	`113`	`{`
Original file line number	Diff line number	Diff line change
`@@ -296,9 +296,9 @@ void AdjustDataLabelItem(ref ExcelChartDataLabelItem label)`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`[TestMethod]`
`299`		`- public void TwoLabelsOnSameSeries()`
	`299`	`+ public void DataLabelsMultipleOneSeries()`
`300`	`300`	`{`
`301`		`- using (var pck = OpenPackage("ColumnChartStuffEasy.xlsx", true))`
	`301`	`+ using (var pck = OpenPackage("DataLabelsMultipleOneSeries.xlsx", true))`
`302`	`302`	`{`
`303`	`303`	`var cSheet = pck.Workbook.Worksheets.Add("ColumnChartSheet");`
`304`	`304`