From dbac61384fa4689e00f789246ff242a8b2a2eb84 Mon Sep 17 00:00:00 2001 From: monitor1394 Date: Mon, 16 Sep 2019 18:17:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89Serie=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=97=A7=E7=89=88=E6=9C=AC=E6=95=B0=E6=8D=AE=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E6=94=AF=E6=8C=81xData=E5=92=8CyDat?= =?UTF-8?q?a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/XCharts/Scripts/UI/Component/Serie.cs | 39 +------------------ .../XCharts/Scripts/UI/Internal/BaseChart.cs | 29 -------------- README.md | 1 + 3 files changed, 2 insertions(+), 67 deletions(-) diff --git a/Assets/XCharts/Scripts/UI/Component/Serie.cs b/Assets/XCharts/Scripts/UI/Component/Serie.cs index 82d31396..1986fb05 100644 --- a/Assets/XCharts/Scripts/UI/Component/Serie.cs +++ b/Assets/XCharts/Scripts/UI/Component/Serie.cs @@ -127,9 +127,6 @@ namespace XCharts [SerializeField] private Animation m_Animation = new Animation(); [SerializeField] [Range(1, 10)] private int m_ShowDataDimension; [SerializeField] private bool m_ShowDataName; - [FormerlySerializedAs("m_Data")] - [SerializeField] private List m_YData = new List(); - [SerializeField] private List m_XData = new List(); [SerializeField] private List m_Data = new List(); [NonSerialized] private int m_FilterStart; @@ -257,14 +254,6 @@ namespace XCharts public SerieLabel highlightLabel { get { return m_HighlightLabel; } set { m_HighlightLabel = value; } } public Animation animation { get { return m_Animation; } set { m_Animation = value; } } /// - /// 维度Y的数据列表。默认对应yAxis。 - /// - public List yData { get { return m_YData; } } - /// - /// 维度X的数据列表。默认对应xAxis。 - /// - public List xData { get { return m_XData; } } - /// /// 系列中的数据内容数组。SerieData可以设置1到n维数据。 /// public List data { get { return m_Data; } } @@ -442,8 +431,6 @@ namespace XCharts /// public void ClearData() { - m_XData.Clear(); - m_YData.Clear(); m_Data.Clear(); } @@ -453,8 +440,6 @@ namespace XCharts /// public void RemoveData(int index) { - m_XData.RemoveAt(index); - m_YData.RemoveAt(index); m_Data.RemoveAt(index); } @@ -468,13 +453,9 @@ namespace XCharts { if (maxDataNumber > 0) { - while (m_XData.Count > maxDataNumber) m_XData.RemoveAt(0); - while (m_YData.Count > maxDataNumber) m_YData.RemoveAt(0); while (m_Data.Count > maxDataNumber) m_Data.RemoveAt(0); } - int xValue = m_XData.Count; - m_XData.Add(xValue); - m_YData.Add(value); + int xValue = m_Data.Count; m_Data.Add(new SerieData() { data = new List() { xValue, value }, name = dataName }); } @@ -489,12 +470,8 @@ namespace XCharts { if (maxDataNumber > 0) { - while (m_XData.Count > maxDataNumber) m_XData.RemoveAt(0); - while (m_YData.Count > maxDataNumber) m_YData.RemoveAt(0); while (m_Data.Count > maxDataNumber) m_Data.RemoveAt(0); } - m_XData.Add(xValue); - m_YData.Add(yValue); m_Data.Add(new SerieData() { data = new List() { xValue, yValue }, name = dataName }); } @@ -520,16 +497,12 @@ namespace XCharts { if (maxDataNumber > 0) { - while (m_XData.Count > maxDataNumber) m_XData.RemoveAt(0); - while (m_YData.Count > maxDataNumber) m_YData.RemoveAt(0); while (m_Data.Count > maxDataNumber) m_Data.RemoveAt(0); } var serieData = new SerieData(); serieData.name = dataName; for (int i = 0; i < valueList.Count; i++) { - if (i == 0) m_XData.Add(valueList[i]); - else if (i == 1) m_YData.Add(valueList[i]); serieData.data.Add(valueList[i]); } m_Data.Add(serieData); @@ -721,14 +694,6 @@ namespace XCharts public void UpdateData(int index, int dimension, float value) { if (index < 0) return; - if (dimension == 0) - { - if (index < m_XData.Count) m_XData[index] = value; - } - else if (dimension == 1) - { - if (index < m_YData.Count) m_YData[index] = value; - } if (index < m_Data.Count && dimension < m_Data[index].data.Count) { m_Data[index].data[dimension] = value; @@ -888,8 +853,6 @@ namespace XCharts if (flag) { serieData.data.Add(value); - if (j == 0) m_XData.Add(value); - else if (j == 1) m_YData.Add(value); } else serieData.name = txt.Replace("\"", "").Trim(); } diff --git a/Assets/XCharts/Scripts/UI/Internal/BaseChart.cs b/Assets/XCharts/Scripts/UI/Internal/BaseChart.cs index dce2a955..b2ca7fab 100644 --- a/Assets/XCharts/Scripts/UI/Internal/BaseChart.cs +++ b/Assets/XCharts/Scripts/UI/Internal/BaseChart.cs @@ -79,7 +79,6 @@ namespace XCharts InitLegend(); InitSerieLabel(); InitTooltip(); - TransferOldVersionData(); m_Series.AnimationStop(); m_Series.AnimationStart(); } @@ -139,34 +138,6 @@ namespace XCharts } } - private void TransferOldVersionData() - { - foreach (var serie in m_Series.series) - { - if (serie.yData.Count <= 0) continue; - bool needTransfer = true; - foreach (var sd in serie.data) - { - foreach (var value in sd.data) - { - if (value != 0) needTransfer = false; - } - } - if (needTransfer) - { - serie.data.Clear(); - for (int i = 0; i < serie.yData.Count; i++) - { - float xvalue = i < serie.xData.Count ? serie.xData[i] : i; - float yvalue = serie.yData[i]; - var serieData = new SerieData(); - serieData.data = new List() { xvalue, yvalue }; - serie.data.Add(serieData); - } - } - } - } - private void InitTitle() { m_Title.OnChanged(); diff --git a/README.md b/README.md index 92de1f95..43388868 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ QQ交流群：XCharts交流群（202030963） ## 更新日志 +* （2019.09.16）去掉`Serie`中的旧版本数据兼容，不再支持`xData`和`yData` * （2019.09.06）增加`Animation`在重新初始化数据时自启动功能 * （2019.09.06）增加`SerieLabel`的`Border`边框相关配置支持 * （2019.09.05）增加`PieChart`的`Animation`初始化动画配置支持