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

修复当设置AxisLine的onZero时刻度显示异常的问题

Browse Source
This commit is contained in:
monitor1394
2020-01-08 19:33:30 +08:00
parent 43b9884fab
commit 7ccd378e7d
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,6 +1,7 @@
# 更新日志 # 更新日志
* (2020.01.08) 修复当设置`AxisLine`的`onZero`时刻度显示异常的问题
* (2020.01.08) 增加`Mask`遮罩遮挡支持 * (2020.01.08) 增加`Mask`遮罩遮挡支持
* (2019.12.21) 增加`Tooltip`的单个数据项和标题的字符串模版格式器 * (2019.12.21) 增加`Tooltip`的单个数据项和标题的字符串模版格式器
* (2019.12.21) 增加`DataZoom`的最小显示数据个数`minShowNum` * (2019.12.21) 增加`DataZoom`的最小显示数据个数`minShowNum`

36
Runtime/Internal/CoordinateChart.cs
View File

@@ -909,9 +909,17 @@ namespace XCharts
new Vector2(coordinateX, pY + scaleWidth), new Vector2(coordinateX, pY + scaleWidth),
yAxis.splitArea.getColor(i)); yAxis.splitArea.getColor(i));
} }
if (yAxis.showSplitLine)
{
if (!xAxis.axisLine.show || !xAxis.axisLine.onZero || zeroPos.y != pY)
{
DrawSplitLine(vh, yAxis, yAxis.splitLineType, new Vector3(coordinateX, pY),
new Vector3(coordinateX + coordinateWidth, pY), m_ThemeInfo.axisSplitLineColor);
}
}
if (yAxis.axisTick.show) if (yAxis.axisTick.show)
{ {
var startX = coordinateX + m_XAxises[yAxisIndex].runtimeZeroXOffset; var startX = coordinateX + (yAxis.axisLine.onZero ? m_XAxises[yAxisIndex].runtimeZeroXOffset : 0);
if (yAxis.IsValue() && yAxisIndex > 0) startX += coordinateWidth; if (yAxis.IsValue() && yAxisIndex > 0) startX += coordinateWidth;
bool inside = yAxis.axisTick.inside; bool inside = yAxis.axisTick.inside;
if ((inside && yAxisIndex == 0) || (!inside && yAxisIndex == 1)) if ((inside && yAxisIndex == 0) || (!inside && yAxisIndex == 1))
@@ -925,14 +933,6 @@ namespace XCharts
ChartDrawer.DrawLine(vh, new Vector3(startX, pY), new Vector3(pX, pY), ChartDrawer.DrawLine(vh, new Vector3(startX, pY), new Vector3(pX, pY),
yAxis.axisLine.width, m_ThemeInfo.axisLineColor); yAxis.axisLine.width, m_ThemeInfo.axisLineColor);
} }
if (yAxis.showSplitLine)
{
if (!xAxis.axisLine.show || zeroPos.y != pY)
{
DrawSplitLine(vh, yAxis, yAxis.splitLineType, new Vector3(coordinateX, pY),
new Vector3(coordinateX + coordinateWidth, pY), m_ThemeInfo.axisSplitLineColor);
}
}
totalWidth += scaleWidth; totalWidth += scaleWidth;
} }
} }
@@ -963,9 +963,17 @@ namespace XCharts
new Vector2(pX + scaleWidth, coordinateY), new Vector2(pX + scaleWidth, coordinateY),
xAxis.splitArea.getColor(i)); xAxis.splitArea.getColor(i));
} }
if (xAxis.showSplitLine)
{
if (!yAxis.axisLine.show || !yAxis.axisLine.onZero || zeroPos.x != pX)
{
DrawSplitLine(vh, xAxis, xAxis.splitLineType, new Vector3(pX, coordinateY),
new Vector3(pX, coordinateY + coordinateHeight), m_ThemeInfo.axisSplitLineColor);
}
}
if (xAxis.axisTick.show) if (xAxis.axisTick.show)
{ {
var startY = coordinateY + m_YAxises[xAxisIndex].runtimeZeroYOffset; var startY = coordinateY + (xAxis.axisLine.onZero ? m_YAxises[xAxisIndex].runtimeZeroYOffset : 0);
if (xAxis.IsValue() && xAxisIndex > 0) startY += coordinateHeight; if (xAxis.IsValue() && xAxisIndex > 0) startY += coordinateHeight;
bool inside = xAxis.axisTick.inside; bool inside = xAxis.axisTick.inside;
if ((inside && xAxisIndex == 0) || (!inside && xAxisIndex == 1)) if ((inside && xAxisIndex == 0) || (!inside && xAxisIndex == 1))
@@ -979,14 +987,6 @@ namespace XCharts
ChartDrawer.DrawLine(vh, new Vector3(pX, startY), new Vector3(pX, pY), ChartDrawer.DrawLine(vh, new Vector3(pX, startY), new Vector3(pX, pY),
xAxis.axisLine.width, m_ThemeInfo.axisLineColor); xAxis.axisLine.width, m_ThemeInfo.axisLineColor);
} }
if (xAxis.showSplitLine)
{
if (!yAxis.axisLine.show || zeroPos.x != pX)
{
DrawSplitLine(vh, xAxis, xAxis.splitLineType, new Vector3(pX, coordinateY),
new Vector3(pX, coordinateY + coordinateHeight), m_ThemeInfo.axisSplitLineColor);
}
}
totalWidth += scaleWidth; totalWidth += scaleWidth;
} }
} }