diff --git a/Runtime/Component/Main/Serie.cs b/Runtime/Component/Main/Serie.cs index 09df5899..f9e59649 100644 --- a/Runtime/Component/Main/Serie.cs +++ b/Runtime/Component/Main/Serie.cs @@ -359,6 +359,7 @@ namespace XCharts [NonSerialized] internal int m_FilterMinShow; [NonSerialized] internal bool m_NeedUpdateFilterData; [NonSerialized] internal List m_FilterData = new List(); + [NonSerialized] internal List m_SortedData = new List(); [NonSerialized] private Dictionary> m_UpSmoothPoints = new Dictionary>(); [NonSerialized] private Dictionary> m_DownSmoothPoints = new Dictionary>(); [NonSerialized] private List m_DataPoints = new List(); @@ -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 runtimeFilterData { get { return m_FilterData; } } + public List 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; } } diff --git a/Runtime/Helper/SerieHelper.cs b/Runtime/Helper/SerieHelper.cs index 6a2d60c4..025f9571 100644 --- a/Runtime/Helper/SerieHelper.cs +++ b/Runtime/Helper/SerieHelper.cs @@ -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);