foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-25 02:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化柱状图绘制

Browse Source
This commit is contained in:
monitor1394
2020-04-18 23:38:42 +08:00
parent 20886dd1d5
commit b689a18a01
2 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/XCharts/Runtime/API/CoordinateChart_API.cs
View File

@@ -221,9 +221,19 @@ namespace XCharts
{ {
if (index >= 0 && index <= 1) if (index >= 0 && index <= 1)
{ {
var xAxis = m_XAxises[index];
var yAxis = m_YAxises[index];
var tempX = m_XAxises[index].Clone(); var tempX = m_XAxises[index].Clone();
m_XAxises[index].Copy(m_YAxises[index]); xAxis.Copy(m_YAxises[index]);
m_YAxises[index].Copy(tempX); yAxis.Copy(tempX);
xAxis.runtimeZeroXOffset = 0;
xAxis.runtimeZeroYOffset = 0;
yAxis.runtimeZeroXOffset = 0;
yAxis.runtimeZeroYOffset = 0;
xAxis.runtimeMinValue = 0;
xAxis.runtimeMaxValue = 0;
yAxis.runtimeMinValue = 0;
yAxis.runtimeMaxValue = 0;
} }
} }
} }

56
Assets/XCharts/Runtime/Internal/CoordinateChart_DrawBar.cs
View File

@@ -70,7 +70,7 @@ namespace XCharts
float value = showData[i].GetCurrData(1, dataChangeDuration, xAxis.inverse); float value = showData[i].GetCurrData(1, dataChangeDuration, xAxis.inverse);
float borderWidth = value == 0 ? 0 : itemStyle.runtimeBorderWidth; float borderWidth = value == 0 ? 0 : itemStyle.runtimeBorderWidth;
if (showData[i].IsDataChanged()) dataChanging = true; if (showData[i].IsDataChanged()) dataChanging = true;
float pX = seriesHig[i] + coordinateX + xAxis.runtimeZeroXOffset + yAxis.axisLine.width; float pX = seriesHig[i] + coordinateX + xAxis.runtimeZeroXOffset + (value < 0 ? -1 : 1) * yAxis.axisLine.width;
float pY = coordinateY + +i * categoryWidth; float pY = coordinateY + +i * categoryWidth;
if (!yAxis.boundaryGap) pY -= categoryWidth / 2; if (!yAxis.boundaryGap) pY -= categoryWidth / 2;
@@ -91,13 +91,24 @@ namespace XCharts
seriesHig[i] += barHig; seriesHig[i] += barHig;
} }
float currHig = CheckAnimation(serie, i, barHig);
Vector3 plt = new Vector3(pX + borderWidth, pY + space + barWidth - borderWidth); float currHig = CheckAnimation(serie, i, barHig);
Vector3 prt = new Vector3(pX + currHig - borderWidth, pY + space + barWidth - borderWidth); Vector3 plt, prt, prb, plb, top;
Vector3 prb = new Vector3(pX + currHig - borderWidth, pY + space + borderWidth); if (value < 0)
Vector3 plb = new Vector3(pX + borderWidth, pY + space + borderWidth); {
Vector3 top = new Vector3(pX + currHig - borderWidth, pY + space + barWidth / 2); plt = new Vector3(pX - borderWidth, pY + space + barWidth - borderWidth);
prt = new Vector3(pX + currHig + borderWidth, pY + space + barWidth - borderWidth);
prb = new Vector3(pX + currHig + borderWidth, pY + space + borderWidth);
plb = new Vector3(pX - borderWidth, pY + space + borderWidth);
}
else
{
plt = new Vector3(pX + borderWidth, pY + space + barWidth - borderWidth);
prt = new Vector3(pX + currHig - borderWidth, pY + space + barWidth - borderWidth);
prb = new Vector3(pX + currHig - borderWidth, pY + space + borderWidth);
plb = new Vector3(pX + borderWidth, pY + space + borderWidth);
}
top = new Vector3(pX + currHig - borderWidth, pY + space + barWidth / 2);
plt = ClampInCoordinate(plt); plt = ClampInCoordinate(plt);
prt = ClampInCoordinate(prt); prt = ClampInCoordinate(prt);
prb = ClampInCoordinate(prb); prb = ClampInCoordinate(prb);
@@ -199,7 +210,7 @@ namespace XCharts
float pX = coordinateX + i * categoryWidth; float pX = coordinateX + i * categoryWidth;
float zeroY = coordinateY + yAxis.runtimeZeroYOffset; float zeroY = coordinateY + yAxis.runtimeZeroYOffset;
if (!xAxis.boundaryGap) pX -= categoryWidth / 2; if (!xAxis.boundaryGap) pX -= categoryWidth / 2;
float pY = seriesHig[i] + zeroY + xAxis.axisLine.width; float pY = seriesHig[i] + zeroY + (value < 0 ? -1 : 1) * xAxis.axisLine.width;
var barHig = 0f; var barHig = 0f;
var valueTotal = 0f; var valueTotal = 0f;
@@ -218,11 +229,22 @@ namespace XCharts
seriesHig[i] += barHig; seriesHig[i] += barHig;
} }
float currHig = CheckAnimation(serie, i, barHig); float currHig = CheckAnimation(serie, i, barHig);
Vector3 plb = new Vector3(pX + space + borderWidth, pY + borderWidth); Vector3 plb, plt, prt, prb, top;
Vector3 plt = new Vector3(pX + space + borderWidth, pY + currHig - borderWidth); if (value < 0)
Vector3 prt = new Vector3(pX + space + barWidth - borderWidth, pY + currHig - borderWidth); {
Vector3 prb = new Vector3(pX + space + barWidth - borderWidth, pY + borderWidth); plb = new Vector3(pX + space + borderWidth, pY - borderWidth);
Vector3 top = new Vector3(pX + space + barWidth / 2, pY + currHig - borderWidth); plt = new Vector3(pX + space + borderWidth, pY + currHig + borderWidth);
prt = new Vector3(pX + space + barWidth - borderWidth, pY + currHig + borderWidth);
prb = new Vector3(pX + space + barWidth - borderWidth, pY - borderWidth);
}
else
{
plb = new Vector3(pX + space + borderWidth, pY + borderWidth);
plt = new Vector3(pX + space + borderWidth, pY + currHig - borderWidth);
prt = new Vector3(pX + space + barWidth - borderWidth, pY + currHig - borderWidth);
prb = new Vector3(pX + space + barWidth - borderWidth, pY + borderWidth);
}
top = new Vector3(pX + space + barWidth / 2, pY + currHig - borderWidth);
plb = ClampInCoordinate(plb); plb = ClampInCoordinate(plb);
plt = ClampInCoordinate(plt); plt = ClampInCoordinate(plt);
prt = ClampInCoordinate(prt); prt = ClampInCoordinate(prt);
@@ -440,8 +462,8 @@ namespace XCharts
var p4 = prt - diff - Vector3.up * borderWidth / 2; var p4 = prt - diff - Vector3.up * borderWidth / 2;
ChartDrawer.DrawLine(vh, p1, p2, borderWidth / 2, borderColor); ChartDrawer.DrawLine(vh, p1, p2, borderWidth / 2, borderColor);
ChartDrawer.DrawLine(vh, p3, p4, borderWidth / 2, borderColor); ChartDrawer.DrawLine(vh, p3, p4, borderWidth / 2, borderColor);
ChartDrawer.DrawDoughnut(vh, pcl, inRadius, outRadius, borderColor, Color.clear, smoothness, 180, 360); ChartDrawer.DrawDoughnut(vh, pcl, inRadius, outRadius, borderColor, Color.clear, 180, 360, smoothness);
ChartDrawer.DrawDoughnut(vh, pcr, inRadius, outRadius, borderColor, Color.clear, smoothness, 0, 180); ChartDrawer.DrawDoughnut(vh, pcr, inRadius, outRadius, borderColor, Color.clear, 0, 180, smoothness);
} }
} }
else else
@@ -479,8 +501,8 @@ namespace XCharts
var p4 = prt - diff - Vector3.right * borderWidth / 2; var p4 = prt - diff - Vector3.right * borderWidth / 2;
ChartDrawer.DrawLine(vh, p1, p2, borderWidth / 2, borderColor); ChartDrawer.DrawLine(vh, p1, p2, borderWidth / 2, borderColor);
ChartDrawer.DrawLine(vh, p3, p4, borderWidth / 2, borderColor); ChartDrawer.DrawLine(vh, p3, p4, borderWidth / 2, borderColor);
ChartDrawer.DrawDoughnut(vh, pct, inRadius, outRadius, borderColor, Color.clear, smoothness, 270, 450); ChartDrawer.DrawDoughnut(vh, pct, inRadius, outRadius, borderColor, Color.clear, 270, 450, smoothness);
ChartDrawer.DrawDoughnut(vh, pcb, inRadius, outRadius, borderColor, Color.clear, smoothness, 90, 270); ChartDrawer.DrawDoughnut(vh, pcb, inRadius, outRadius, borderColor, Color.clear, 90, 270, smoothness);
} }
} }
else else