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

[bug] fix tooltip draw error when axis data is empty (#204)

Browse Source
This commit is contained in:
monitor1394
2022-06-25 17:07:26 +08:00
parent 0dbcc4ab2b
commit 2a03e71312
2 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -54,6 +54,7 @@
## master ## master
* (2022.06.25) 修复`Toolip`在类目轴无数据时绘制异常的问题 (#204)
* (2022.06.25) 优化`Serie`设置`PlaceHolder`时的`Tooltip`表现 * (2022.06.25) 优化`Serie`设置`PlaceHolder`时的`Tooltip`表现
* (2022.06.25) 增加`Since`标识配置参数从哪个版本开始支持 * (2022.06.25) 增加`Since`标识配置参数从哪个版本开始支持
* (2022.06.24) 优化`Painter`绘制层，`Top`层细分为`Upper`和`Top`层 * (2022.06.24) 优化`Painter`绘制层，`Top`层细分为`Upper`和`Top`层

46
Runtime/Component/Tooltip/TooltipHandler.cs
View File

@@ -488,6 +488,7 @@ namespace XCharts.Runtime
private void DrawXAxisIndicator(VertexHelper vh, Tooltip tooltip, GridCoord grid) private void DrawXAxisIndicator(VertexHelper vh, Tooltip tooltip, GridCoord grid)
{ {
var xAxes = chart.GetChartComponents<XAxis>(); var xAxes = chart.GetChartComponents<XAxis>();
var lineType = tooltip.lineStyle.GetType(chart.theme.tooltip.lineType); var lineType = tooltip.lineStyle.GetType(chart.theme.tooltip.lineType);
var lineWidth = tooltip.lineStyle.GetWidth(chart.theme.tooltip.lineWidth); var lineWidth = tooltip.lineStyle.GetWidth(chart.theme.tooltip.lineWidth);
@@ -496,6 +497,8 @@ namespace XCharts.Runtime
var xAxis = component as XAxis; var xAxis = component as XAxis;
if (xAxis.gridIndex == grid.index) if (xAxis.gridIndex == grid.index)
{ {
if (double.IsInfinity(xAxis.context.pointerValue))
continue;
var dataZoom = chart.GetDataZoomOfAxis(xAxis); var dataZoom = chart.GetDataZoomOfAxis(xAxis);
int dataCount = chart.series.Count > 0 ? chart.series[0].GetDataList(dataZoom).Count : 0; int dataCount = chart.series.Count > 0 ? chart.series[0].GetDataList(dataZoom).Count : 0;
float splitWidth = AxisHelper.GetDataWidth(xAxis, grid.context.width, dataCount, dataZoom); float splitWidth = AxisHelper.GetDataWidth(xAxis, grid.context.width, dataCount, dataZoom);
@@ -510,22 +513,7 @@ namespace XCharts.Runtime
Vector2 sp = new Vector2(pX, grid.context.y); Vector2 sp = new Vector2(pX, grid.context.y);
Vector2 ep = new Vector2(pX, grid.context.y + grid.context.height); Vector2 ep = new Vector2(pX, grid.context.y + grid.context.height);
var lineColor = TooltipHelper.GetLineColor(tooltip, chart.theme); var lineColor = TooltipHelper.GetLineColor(tooltip, chart.theme);
// if (xAxis.IsCategory() && tooltip.type == Tooltip.Type.Corss) ChartDrawer.DrawLineStyle(vh, lineType, lineWidth, sp, ep, lineColor);
// {
// float tooltipSplitWid = splitWidth < 1 ? 1 : splitWidth;
// pX = (float)(grid.context.x + splitWidth * xAxis.context.pointerValue -
// (xAxis.boundaryGap ? 0 : splitWidth / 2));
// float pY = grid.context.y + grid.context.height;
// Vector3 p1 = new Vector3(pX, grid.context.y);
// Vector3 p2 = new Vector3(pX, pY);
// Vector3 p3 = new Vector3(pX + tooltipSplitWid, pY);
// Vector3 p4 = new Vector3(pX + tooltipSplitWid, grid.context.y);
// UGL.DrawQuadrilateral(vh, p1, p2, p3, p4, chart.theme.tooltip.areaColor);
// }
// else
{
ChartDrawer.DrawLineStyle(vh, lineType, lineWidth, sp, ep, lineColor);
}
if (tooltip.type == Tooltip.Type.Corss) if (tooltip.type == Tooltip.Type.Corss)
{ {
sp = new Vector2(grid.context.x, chart.pointerPos.y); sp = new Vector2(grid.context.x, chart.pointerPos.y);
@@ -534,7 +522,7 @@ namespace XCharts.Runtime
} }
break; break;
case Tooltip.Type.Shadow: case Tooltip.Type.Shadow:
if (xAxis.IsCategory()) if (xAxis.IsCategory() && !double.IsInfinity(xAxis.context.pointerValue))
{ {
float tooltipSplitWid = splitWidth < 1 ? 1 : splitWidth; float tooltipSplitWid = splitWidth < 1 ? 1 : splitWidth;
pX = (float) (grid.context.x + splitWidth * xAxis.context.pointerValue - pX = (float) (grid.context.x + splitWidth * xAxis.context.pointerValue -
@@ -544,6 +532,10 @@ namespace XCharts.Runtime
Vector3 p2 = new Vector3(pX, pY); Vector3 p2 = new Vector3(pX, pY);
Vector3 p3 = new Vector3(pX + tooltipSplitWid, pY); Vector3 p3 = new Vector3(pX + tooltipSplitWid, pY);
Vector3 p4 = new Vector3(pX + tooltipSplitWid, grid.context.y); Vector3 p4 = new Vector3(pX + tooltipSplitWid, grid.context.y);
Debug.LogError(p1 + "," + grid.context.x + "," + xAxis.context.pointerValue);
Debug.LogError(p2);
Debug.LogError(p3);
Debug.LogError(p4);
UGL.DrawQuadrilateral(vh, p1, p2, p3, p4, chart.theme.tooltip.areaColor); UGL.DrawQuadrilateral(vh, p1, p2, p3, p4, chart.theme.tooltip.areaColor);
} }
break; break;
@@ -565,12 +557,13 @@ namespace XCharts.Runtime
var yAxes = chart.GetChartComponents<YAxis>(); var yAxes = chart.GetChartComponents<YAxis>();
var lineType = tooltip.lineStyle.GetType(chart.theme.tooltip.lineType); var lineType = tooltip.lineStyle.GetType(chart.theme.tooltip.lineType);
var lineWidth = tooltip.lineStyle.GetWidth(chart.theme.tooltip.lineWidth); var lineWidth = tooltip.lineStyle.GetWidth(chart.theme.tooltip.lineWidth);
foreach (var component in yAxes) foreach (var component in yAxes)
{ {
var yAxis = component as YAxis; var yAxis = component as YAxis;
if (yAxis.gridIndex == grid.index) if (yAxis.gridIndex == grid.index)
{ {
if (double.IsInfinity(yAxis.context.pointerValue))
continue;
var dataZoom = chart.GetDataZoomOfAxis(yAxis); var dataZoom = chart.GetDataZoomOfAxis(yAxis);
int dataCount = chart.series.Count > 0 ? chart.series[0].GetDataList(dataZoom).Count : 0; int dataCount = chart.series.Count > 0 ? chart.series[0].GetDataList(dataZoom).Count : 0;
float splitWidth = AxisHelper.GetDataWidth(yAxis, grid.context.height, dataCount, dataZoom); float splitWidth = AxisHelper.GetDataWidth(yAxis, grid.context.height, dataCount, dataZoom);
@@ -583,22 +576,7 @@ namespace XCharts.Runtime
Vector2 sp = new Vector2(grid.context.x, pY); Vector2 sp = new Vector2(grid.context.x, pY);
Vector2 ep = new Vector2(grid.context.x + grid.context.width, pY); Vector2 ep = new Vector2(grid.context.x + grid.context.width, pY);
var lineColor = TooltipHelper.GetLineColor(tooltip, chart.theme); var lineColor = TooltipHelper.GetLineColor(tooltip, chart.theme);
// if (yAxis.IsCategory() && tooltip.type == Tooltip.Type.Corss) ChartDrawer.DrawLineStyle(vh, lineType, lineWidth, sp, ep, lineColor);
// {
// float tooltipSplitWid = splitWidth < 1 ? 1 : splitWidth;
// float pX = grid.context.x + grid.context.width;
// pY = (float)(grid.context.y + splitWidth * yAxis.context.pointerValue -
// (yAxis.boundaryGap ? 0 : splitWidth / 2));
// Vector3 p1 = new Vector3(grid.context.x, pY);
// Vector3 p2 = new Vector3(grid.context.x, pY + tooltipSplitWid);
// Vector3 p3 = new Vector3(pX, pY + tooltipSplitWid);
// Vector3 p4 = new Vector3(pX, pY);
// UGL.DrawQuadrilateral(vh, p1, p2, p3, p4, chart.theme.tooltip.areaColor);
// }
// else
{
ChartDrawer.DrawLineStyle(vh, lineType, lineWidth, sp, ep, lineColor);
}
if (tooltip.type == Tooltip.Type.Corss) if (tooltip.type == Tooltip.Type.Corss)
{ {
sp = new Vector2(chart.pointerPos.x, grid.context.y); sp = new Vector2(chart.pointerPos.x, grid.context.y);