foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-28 03:58:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

修复饼图当数据名称默认为空时颜色显示异常的问题

Browse Source
This commit is contained in:
monitor1394
2019-10-16 19:05:24 +08:00
parent 6b66b5a129
commit f88a44bd48
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Scripts/UI/Component/Main/Serie.cs
View File

@@ -609,6 +609,7 @@ namespace XCharts
} }
int xValue = m_Data.Count; int xValue = m_Data.Count;
var serieData = new SerieData() { data = new List<float>() { xValue, value }, name = dataName }; var serieData = new SerieData() { data = new List<float>() { xValue, value }, name = dataName };
serieData.index = xValue;
m_Data.Add(serieData); m_Data.Add(serieData);
return serieData; return serieData;
} }
@@ -631,6 +632,7 @@ namespace XCharts
} }
} }
var serieData = new SerieData() { data = new List<float>() { xValue, yValue }, name = dataName }; var serieData = new SerieData() { data = new List<float>() { xValue, yValue }, name = dataName };
serieData.index = m_Data.Count;
m_Data.Add(serieData); m_Data.Add(serieData);
return serieData; return serieData;
} }
@@ -665,6 +667,7 @@ namespace XCharts
} }
var serieData = new SerieData(); var serieData = new SerieData();
serieData.name = dataName; serieData.name = dataName;
serieData.index = m_Data.Count;
for (int i = 0; i < valueList.Count; i++) for (int i = 0; i < valueList.Count; i++)
{ {
serieData.data.Add(valueList[i]); serieData.data.Add(valueList[i]);

2
Scripts/UI/Component/Main/Series.cs
View File

@@ -872,7 +872,7 @@ namespace XCharts
int numName = -1; int numName = -1;
if (int.TryParse(name, out numName)) if (int.TryParse(name, out numName))
{ {
if (numName >= 0 && numName < list.Count) return false; if (numName >= 0 && numName < 100) return false;
} }
return true; return true;
} }

3
Scripts/UI/PieChart.cs
View File

@@ -80,8 +80,9 @@ namespace XCharts
for (int n = 0; n < data.Count; n++) for (int n = 0; n < data.Count; n++)
{ {
var serieData = data[n]; var serieData = data[n];
serieData.index = n;
float value = serieData.data[1]; float value = serieData.data[1];
serieNameCount = m_LegendRealShowName.IndexOf(serieData.name); serieNameCount = m_LegendRealShowName.IndexOf(serieData.legendName);
Color color = m_ThemeInfo.GetColor(serieNameCount); Color color = m_ThemeInfo.GetColor(serieNameCount);
serieData.pieStartAngle = startDegree; serieData.pieStartAngle = startDegree;
serieData.pieToAngle = startDegree; serieData.pieToAngle = startDegree;