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

增加BarChart的Label配置支持

Browse Source
This commit is contained in:
monitor1394
2019-08-20 18:52:15 +08:00
parent 49957515c4
commit ceecf12d3a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Scripts/UI/BarChart.cs
View File

@@ -75,6 +75,7 @@ namespace XCharts
Vector3 p2 = new Vector3(pX + barHig, pY + space + barWidth); Vector3 p2 = new Vector3(pX + barHig, pY + space + barWidth);
Vector3 p3 = new Vector3(pX + barHig, pY + space); Vector3 p3 = new Vector3(pX + barHig, pY + space);
Vector3 p4 = new Vector3(pX, pY + space); Vector3 p4 = new Vector3(pX, pY + space);
serie.dataPoints.Add(new Vector3(pX + barHig, pY + space + barWidth / 2));
var highlight = (m_Tooltip.show && m_Tooltip.IsSelected(i)) var highlight = (m_Tooltip.show && m_Tooltip.IsSelected(i))
|| serie.data[i].highlighted || serie.data[i].highlighted
|| serie.highlighted; || serie.highlighted;
@@ -259,15 +260,15 @@ namespace XCharts
protected override void OnRefreshLabel() protected override void OnRefreshLabel()
{ {
var isYAxis = m_YAxises[0].type == Axis.AxisType.Category var isYAxis = (m_YAxises[0].show && m_YAxises[0].type == Axis.AxisType.Category)
|| m_YAxises[1].type == Axis.AxisType.Category; || (m_YAxises[1].show && m_YAxises[1].type == Axis.AxisType.Category);
for (int i = 0; i < m_Series.Count; i++) for (int i = 0; i < m_Series.Count; i++)
{ {
var serie = m_Series.GetSerie(i); var serie = m_Series.GetSerie(i);
if (serie.type == SerieType.Bar && serie.show) if (serie.type == SerieType.Bar && serie.show)
{ {
var zeroPos = Vector3.zero; var zeroPos = Vector3.zero;
if (serie.label.position == SerieLabel.Position.Bottom) if (serie.label.position == SerieLabel.Position.Bottom || serie.label.position == SerieLabel.Position.Center)
{ {
if (isYAxis) if (isYAxis)
{ {
@@ -289,10 +290,11 @@ namespace XCharts
switch (serie.label.position) switch (serie.label.position)
{ {
case SerieLabel.Position.Center: case SerieLabel.Position.Center:
pos = new Vector3(pos.x, pos.y / 2); pos = isYAxis ? new Vector3(zeroPos.x + (pos.x - zeroPos.x) / 2, pos.y) :
new Vector3(pos.x, zeroPos.y + (pos.y - zeroPos.y) / 2);
break; break;
case SerieLabel.Position.Bottom: case SerieLabel.Position.Bottom:
pos = new Vector3(pos.x, zeroPos.y); pos = isYAxis ? new Vector3(zeroPos.x, pos.y) : new Vector3(pos.x, zeroPos.y);
break; break;
} }
var value = serieData.data[1]; var value = serieData.data[1];