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

修复CoordinateChart的tooltip报错

Browse Source
This commit is contained in:
monitor1394
2021-05-18 08:34:11 +08:00
parent f93b30d239
commit ccb010fee3
6 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/Component/Main/Series.cs
View File

@@ -214,6 +214,15 @@ namespace XCharts
return false; return false;
} }
public bool Contains(SerieType type)
{
foreach (var serie in m_Series)
{
if (serie.type == type) return true;
}
return false;
}
/// <summary> /// <summary>
/// Remove serie from series. /// Remove serie from series.
/// 移除指定名字的系列。 /// 移除指定名字的系列。
@@ -327,7 +336,7 @@ namespace XCharts
return null; return null;
} }
public SerieData AddData(string serieName, float open, float close, float lowest, float heighest, string dataName = null) public SerieData AddData(string serieName, float open, float close, float lowest, float heighest, string dataName = null)
{ {
var serie = GetSerie(serieName); var serie = GetSerie(serieName);
if (serie != null) if (serie != null)

5
Runtime/Component/Main/Tooltip.cs
View File

@@ -481,9 +481,8 @@ namespace XCharts
/// </summary> /// </summary>
internal void UpdateLastDataIndex() internal void UpdateLastDataIndex()
{ {
lastDataIndex[0] = runtimeDataIndex[0]; if (lastDataIndex.Count > 0 && runtimeDataIndex.Count > 0) lastDataIndex[0] = runtimeDataIndex[0];
if (runtimeDataIndex.Count > 1) if (lastDataIndex.Count > 0 && runtimeDataIndex.Count > 1) lastDataIndex[1] = runtimeDataIndex[1];
lastDataIndex[1] = runtimeDataIndex[1];
} }
/// <summary> /// <summary>

1
Runtime/Internal/DrawSerieGauge.cs
View File

@@ -79,6 +79,7 @@ namespace XCharts
public bool CheckTootipArea(Vector2 local) public bool CheckTootipArea(Vector2 local)
{ {
if (chart.series.Contains(SerieType.Gauge)) return false;
var serie = GetPointerInSerieIndex(chart.series, local); var serie = GetPointerInSerieIndex(chart.series, local);
if (serie != null) if (serie != null)
{ {

3
Runtime/Internal/DrawSeriePie.cs
View File

@@ -75,6 +75,7 @@ namespace XCharts
public bool CheckTootipArea(Vector2 local) public bool CheckTootipArea(Vector2 local)
{ {
if (chart.series.Contains(SerieType.Pie)) return false;
bool selected = false; bool selected = false;
chart.tooltip.runtimeDataIndex.Clear(); chart.tooltip.runtimeDataIndex.Clear();
foreach (var serie in chart.series.list) foreach (var serie in chart.series.list)
@@ -102,7 +103,7 @@ namespace XCharts
chart.tooltip.SetActive(false); chart.tooltip.SetActive(false);
chart.RefreshChart(); chart.RefreshChart();
} }
return true; return selected;
} }
public bool OnLegendButtonClick(int index, string legendName, bool show) public bool OnLegendButtonClick(int index, string legendName, bool show)

1
Runtime/Internal/DrawSerieRadar.cs
View File

@@ -119,6 +119,7 @@ namespace XCharts
public bool CheckTootipArea(Vector2 local) public bool CheckTootipArea(Vector2 local)
{ {
if (chart.series.Contains(SerieType.Radar)) return false;
if (m_IsEnterLegendButtom) return false; if (m_IsEnterLegendButtom) return false;
if (!IsInRadar(local)) return false; if (!IsInRadar(local)) return false;
bool highlight = false; bool highlight = false;

1
Runtime/Internal/DrawSerieRing.cs
View File

@@ -127,6 +127,7 @@ namespace XCharts
public bool CheckTootipArea(Vector2 local) public bool CheckTootipArea(Vector2 local)
{ {
if (chart.series.Contains(SerieType.Ring)) return false;
if (!PointerIsInRingSerie(chart.series, local)) return false; if (!PointerIsInRingSerie(chart.series, local)) return false;
if (m_IsEnterLegendButtom) return false; if (m_IsEnterLegendButtom) return false;
bool selected = false; bool selected = false;