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

修复BarChart在 0 数值时显示异常的问题

Browse Source
This commit is contained in:
monitor1394
2021-03-18 19:25:36 +08:00
parent 457db21751
commit 09c32f171d
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/XCharts/CHANGELOG.md
View File

@@ -32,6 +32,7 @@
## Latest ## Latest
* (2021.03.18) 修复`BarChart`在 `0` 数值时显示异常的问题
* (2021.03.14) 修复`Tooltip`的指示器在某些情况下指示位置不准的问题 * (2021.03.14) 修复`Tooltip`的指示器在某些情况下指示位置不准的问题
* (2021.03.13) 优化`MultiComponentMode`开启后的编辑体验和组件刷新 #128 * (2021.03.13) 优化`MultiComponentMode`开启后的编辑体验和组件刷新 #128
* (2021.03.10) 增加`CandlestickChart`K线图 #124 * (2021.03.10) 增加`CandlestickChart`K线图 #124

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

@@ -63,7 +63,8 @@ namespace XCharts
float value = showData[i].GetCurrData(1, dataChangeDuration, xAxis.inverse, xMinValue, xMaxValue); float value = showData[i].GetCurrData(1, dataChangeDuration, xAxis.inverse, xMinValue, xMaxValue);
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 axisLineWidth = (value < 0 ? -1 : 1) * yAxis.axisLine.GetWidth(m_Theme.axis.lineWidth); float axisLineWidth = value == 0 ? 0
: ((value < 0 ? -1 : 1) * yAxis.axisLine.GetWidth(m_Theme.axis.lineWidth));
float pY = grid.runtimeY + i * categoryWidth; float pY = grid.runtimeY + i * categoryWidth;
if (!yAxis.boundaryGap) pY -= categoryWidth / 2; if (!yAxis.boundaryGap) pY -= categoryWidth / 2;
@@ -98,15 +99,15 @@ namespace XCharts
if (value < 0) if (value < 0)
{ {
plt = new Vector3(pX - borderWidth, pY + space + barWidth - borderWidth); plt = new Vector3(pX - borderWidth, pY + space + barWidth - borderWidth);
prt = new Vector3(pX + currHig + borderWidth - axisLineWidth, pY + space + barWidth - borderWidth); prt = new Vector3(pX + currHig + borderWidth, pY + space + barWidth - borderWidth);
prb = new Vector3(pX + currHig + borderWidth - axisLineWidth, pY + space + borderWidth); prb = new Vector3(pX + currHig + borderWidth, pY + space + borderWidth);
plb = new Vector3(pX - borderWidth, pY + space + borderWidth); plb = new Vector3(pX - borderWidth, pY + space + borderWidth);
} }
else else
{ {
plt = new Vector3(pX + borderWidth, pY + space + barWidth - borderWidth); plt = new Vector3(pX + borderWidth, pY + space + barWidth - borderWidth);
prt = new Vector3(pX + currHig - borderWidth - axisLineWidth, pY + space + barWidth - borderWidth); prt = new Vector3(pX + currHig - borderWidth , pY + space + barWidth - borderWidth);
prb = new Vector3(pX + currHig - borderWidth - axisLineWidth, pY + space + borderWidth); prb = new Vector3(pX + currHig - borderWidth , pY + space + borderWidth);
plb = new Vector3(pX + borderWidth, pY + space + borderWidth); plb = new Vector3(pX + borderWidth, pY + space + borderWidth);
} }
top = new Vector3(pX + currHig - borderWidth, pY + space + barWidth / 2); top = new Vector3(pX + currHig - borderWidth, pY + space + barWidth / 2);
@@ -199,7 +200,8 @@ namespace XCharts
float pX = grid.runtimeX + i * categoryWidth; float pX = grid.runtimeX + i * categoryWidth;
float zeroY = grid.runtimeY + yAxis.runtimeZeroYOffset; float zeroY = grid.runtimeY + yAxis.runtimeZeroYOffset;
if (!xAxis.boundaryGap) pX -= categoryWidth / 2; if (!xAxis.boundaryGap) pX -= categoryWidth / 2;
float axisLineWidth = (value < 0 ? -1 : 1) * xAxis.axisLine.GetWidth(m_Theme.axis.lineWidth); float axisLineWidth = value == 0 ? 0 :
((value < 0 ? -1 : 1) * xAxis.axisLine.GetWidth(m_Theme.axis.lineWidth));
float pY = zeroY + axisLineWidth; float pY = zeroY + axisLineWidth;
if (isStack) if (isStack)
{ {
@@ -232,15 +234,15 @@ namespace XCharts
if (value < 0) if (value < 0)
{ {
plb = new Vector3(pX + space + borderWidth, pY - borderWidth); plb = new Vector3(pX + space + borderWidth, pY - borderWidth);
plt = new Vector3(pX + space + borderWidth, pY + currHig + borderWidth - axisLineWidth); plt = new Vector3(pX + space + borderWidth, pY + currHig + borderWidth);
prt = new Vector3(pX + space + barWidth - borderWidth, pY + currHig + borderWidth - axisLineWidth); prt = new Vector3(pX + space + barWidth - borderWidth, pY + currHig + borderWidth);
prb = new Vector3(pX + space + barWidth - borderWidth, pY - borderWidth); prb = new Vector3(pX + space + barWidth - borderWidth, pY - borderWidth);
} }
else else
{ {
plb = new Vector3(pX + space + borderWidth, pY + borderWidth); plb = new Vector3(pX + space + borderWidth, pY + borderWidth);
plt = new Vector3(pX + space + borderWidth, pY + currHig - borderWidth - axisLineWidth); plt = new Vector3(pX + space + borderWidth, pY + currHig - borderWidth);
prt = new Vector3(pX + space + barWidth - borderWidth, pY + currHig - borderWidth - axisLineWidth); prt = new Vector3(pX + space + barWidth - borderWidth, pY + currHig - borderWidth);
prb = new Vector3(pX + space + barWidth - borderWidth, pY + borderWidth); prb = new Vector3(pX + space + barWidth - borderWidth, pY + borderWidth);
} }
top = new Vector3(pX + space + barWidth / 2, pY + currHig - borderWidth); top = new Vector3(pX + space + barWidth / 2, pY + currHig - borderWidth);