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

增加runtimeSortedData用于排序数据

Browse Source
This commit is contained in:
monitor1394
2021-06-09 07:26:03 +08:00
parent d1f36a5d00
commit ae6bd4bdde
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,6 +359,7 @@ namespace XCharts
[NonSerialized] internal int m_FilterMinShow;
[NonSerialized] internal bool m_NeedUpdateFilterData;
[NonSerialized] internal List<SerieData> m_FilterData = new List<SerieData>();
[NonSerialized] internal List<SerieData> m_SortedData = new List<SerieData>();
[NonSerialized] private Dictionary<int, List<Vector3>> m_UpSmoothPoints = new Dictionary<int, List<Vector3>>();
[NonSerialized] private Dictionary<int, List<Vector3>> m_DownSmoothPoints = new Dictionary<int, List<Vector3>>();
[NonSerialized] private List<Vector3> m_DataPoints = new List<Vector3>();
@@ -1153,7 +1154,7 @@ namespace XCharts
public float runtimeY { get; internal set; }
public float runtimeWidth { get; internal set; }
public float runtimeHeight { get; internal set; }
public List<SerieData> runtimeFilterData { get { return m_FilterData; } }
public List<SerieData> runtimeSortedData { get { return m_SortedData; } }
public bool nameDirty { get { return m_NameDirty; } }
private void SetNameDirty()
@@ -1660,7 +1661,7 @@ namespace XCharts
}
else
{
return runtimeFilterData.Count > 0 ? runtimeFilterData : m_Data;
return runtimeSortedData.Count > 0 ? runtimeSortedData : m_Data;
}
}

8
Runtime/Helper/SerieHelper.cs
View File

@@ -543,16 +543,16 @@ namespace XCharts
public static void UpdateSerieRuntimeFilterData(Serie serie, bool filterInvisible = true)
{
serie.runtimeFilterData.Clear();
serie.runtimeSortedData.Clear();
foreach (var serieData in serie.data)
{
if (!filterInvisible || (filterInvisible && serieData.show))
serie.runtimeFilterData.Add(serieData);
serie.runtimeSortedData.Add(serieData);
}
switch (serie.dataSortType)
{
case SerieDataSortType.Ascending:
serie.runtimeFilterData.Sort(delegate (SerieData data1, SerieData data2)
serie.runtimeSortedData.Sort(delegate (SerieData data1, SerieData data2)
{
var value1 = data1.GetData(1);
var value2 = data2.GetData(1);
@@ -562,7 +562,7 @@ namespace XCharts
});
break;
case SerieDataSortType.Descending:
serie.runtimeFilterData.Sort(delegate (SerieData data1, SerieData data2)
serie.runtimeSortedData.Sort(delegate (SerieData data1, SerieData data2)
{
var value1 = data1.GetData(1);
var value2 = data2.GetData(1);