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

优化清空并重新添加数据后的自动刷新问题

Browse Source
This commit is contained in:
monitor1394
2020-03-11 08:41:42 +08:00
parent cb86799e44
commit 4606d65a5c
7 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Internal/CoordinateChart.cs
View File

@@ -421,7 +421,7 @@ namespace XCharts
string key = serie.name;
float xValue, yValue;
serie.GetXYData(index, m_DataZoom, out xValue, out yValue);
var isIngore = ChartHelper.IsIngore(serie.dataPoints[index]);
var isIngore = serie.IsIngorePoint(index);
if (isCartesian)
{
var serieData = serie.GetSerieData(index, m_DataZoom);
@@ -1521,7 +1521,7 @@ namespace XCharts
{
content = serie.label.GetFormatterContent(serie.name, serieData.name, value, total);
}
serieData.SetLabelActive(value != 0);
serieData.SetLabelActive(value != 0 && serieData.labelPosition != Vector3.zero);
serieData.SetLabelPosition(serie.label.offset);
if (serieData.SetLabelText(content)) RefreshChart();
}

11
Runtime/Internal/SerieLabelPool.cs
View File

@@ -14,6 +14,7 @@ namespace XCharts
internal static class SerieLabelPool
{
private static readonly Stack<GameObject> m_Stack = new Stack<GameObject>(200);
private static Dictionary<int, bool> m_ReleaseDic = new Dictionary<int, bool>(1000);
public static GameObject Get(string name, Transform parent, SerieLabel label, Font font, Color color,
float iconWidth, float iconHeight)
@@ -29,6 +30,7 @@ namespace XCharts
else
{
element = m_Stack.Pop();
m_ReleaseDic.Remove(element.GetInstanceID());
element.name = name;
element.transform.SetParent(parent);
element.transform.localEulerAngles = new Vector3(0, 0, label.rotate);
@@ -45,10 +47,12 @@ namespace XCharts
public static void Release(GameObject element)
{
ChartHelper.SetActive(element, false);
//if (m_Stack.Count > 0 && ReferenceEquals(m_Stack.Peek(), element))
// Debug.LogError("Internal error. Trying to destroy object that is already released to pool." + element.name);
if (Application.isPlaying)
if (!Application.isPlaying) return;
if (!m_ReleaseDic.ContainsKey(element.GetInstanceID()))
{
m_Stack.Push(element);
m_ReleaseDic.Add(element.GetInstanceID(), true);
}
}
public static void ReleaseAll(Transform parent)
@@ -63,6 +67,7 @@ namespace XCharts
public static void ClearAll()
{
m_Stack.Clear();
m_ReleaseDic.Clear();
}
}
}