diff --git a/Demo/Scripts/Demo10_LineSimple.cs b/Demo/Scripts/Demo10_LineSimple.cs index a3171cf2..81c8ecf0 100644 --- a/Demo/Scripts/Demo10_LineSimple.cs +++ b/Demo/Scripts/Demo10_LineSimple.cs @@ -30,7 +30,7 @@ public class Demo10_LineSimple : MonoBehaviour chart.xAxises[0].boundaryGap = true; chart.RemoveData(); - chart.AddSerie("test", SerieType.Line); + chart.AddSerie(SerieType.Line); for (int i = 0; i < dataCount; i++) { chart.AddXAxisData("x" + i); diff --git a/Demo/Scripts/Demo11_AddSinCurve.cs b/Demo/Scripts/Demo11_AddSinCurve.cs index 8b81ced3..bdc9511a 100644 --- a/Demo/Scripts/Demo11_AddSinCurve.cs +++ b/Demo/Scripts/Demo11_AddSinCurve.cs @@ -37,7 +37,7 @@ public class Demo11_AddSinCurve : MonoBehaviour chart.RemoveData(); - var serie = chart.AddSerie("test", SerieType.Line); + var serie = chart.AddSerie(SerieType.Line); serie.symbol.type = SerieSymbolType.None; serie.lineType = LineType.Normal; for (angle = 0; angle < 1080; angle++) diff --git a/Demo/Scripts/Demo_Dynamic.cs b/Demo/Scripts/Demo_Dynamic.cs index 9831628f..5e1b2ef9 100644 --- a/Demo/Scripts/Demo_Dynamic.cs +++ b/Demo/Scripts/Demo_Dynamic.cs @@ -22,7 +22,7 @@ public class Demo_Dynamic : MonoBehaviour { chart = gameObject.GetComponentInChildren(); //chart.RemoveData(); - var serie = chart.AddSerie("data", SerieType.Line); + var serie = chart.AddSerie(SerieType.Line); serie.symbol.type = SerieSymbolType.None; serie.maxCache = maxCacheDataNumber; chart.xAxises[0].maxCache = maxCacheDataNumber; diff --git a/Scripts/UI/BarChart.cs b/Scripts/UI/BarChart.cs index b88c1b38..021ee454 100644 --- a/Scripts/UI/BarChart.cs +++ b/Scripts/UI/BarChart.cs @@ -18,7 +18,7 @@ namespace XCharts m_Title.text = "BarChart"; m_Tooltip.type = Tooltip.Type.Shadow; RemoveData(); - AddSerie("serie1", SerieType.Bar); + AddSerie(SerieType.Bar, "serie1"); for (int i = 0; i < 5; i++) { AddXAxisData("x" + (i + 1)); diff --git a/Scripts/UI/Component/Series.cs b/Scripts/UI/Component/Series.cs index 02cafda6..93f96903 100644 --- a/Scripts/UI/Component/Series.cs +++ b/Scripts/UI/Component/Series.cs @@ -212,7 +212,7 @@ namespace XCharts /// /// /// - public Serie AddSerie(string serieName, SerieType type, bool show = true) + public Serie AddSerie(SerieType type, string serieName, bool show = true) { var serie = GetSerie(serieName); if (serie == null) @@ -254,7 +254,6 @@ namespace XCharts /// /// /// - /// /// public bool AddData(string serieName, float value, string dataName = null) { @@ -273,7 +272,6 @@ namespace XCharts /// /// /// - /// /// public bool AddData(int index, float value, string dataName = null) { @@ -292,7 +290,6 @@ namespace XCharts /// /// /// - /// /// public bool AddData(string serieName, List multidimensionalData, string dataName = null) { @@ -311,7 +308,6 @@ namespace XCharts /// /// /// - /// /// public bool AddData(int serieIndex, List multidimensionalData, string dataName = null) { @@ -331,7 +327,6 @@ namespace XCharts /// /// /// - /// /// public bool AddXYData(string serieName, float xValue, float yValue, string dataName = null) { @@ -351,7 +346,6 @@ namespace XCharts /// /// /// - /// /// public bool AddXYData(int index, float xValue, float yValue, string dataName = null) { @@ -370,16 +364,22 @@ namespace XCharts /// /// /// - public void UpdateData(string name, float value, int dataIndex = 0) + public void UpdateData(string serieName, int dataIndex, float value) { - var serie = GetSerie(name); + var serie = GetSerie(serieName); if (serie != null) { serie.UpdateYData(dataIndex, value); } } - public void UpdateDataName(string serieName, string dataName, int dataIndex = 0) + /// + /// 更新指定系列的数据项名称 + /// + /// + /// + /// + public void UpdateDataName(string serieName, int dataIndex, string dataName) { var serie = GetSerie(serieName); if (serie != null) @@ -388,7 +388,13 @@ namespace XCharts } } - public void UpdateDataName(int serieIndex, string dataName, int dataIndex = 0) + /// + /// 更新指定系列的数据项名称 + /// + /// + /// + /// + public void UpdateDataName(int serieIndex, int dataIndex, string dataName) { var serie = GetSerie(serieIndex); if (serie != null) @@ -398,14 +404,14 @@ namespace XCharts } /// - /// 更新指定系列的维度Y数据 + /// 更新指定系列的维度Y数据项的值 /// - /// - /// + /// /// - public void UpdateData(int index, float value, int dataIndex = 0) + /// + public void UpdateData(int serieIndex, int dataIndex, float value) { - var serie = GetSerie(index); + var serie = GetSerie(serieIndex); if (serie != null) { serie.UpdateYData(dataIndex, value); @@ -416,13 +422,13 @@ namespace XCharts /// /// 更新指定系列的维度X和维度Y数据 /// - /// + /// + /// /// /// - /// - public void UpdateXYData(string name, float xValue, float yValue, int dataIndex = 0) + public void UpdateXYData(string serieName,int dataIndex, float xValue, float yValue) { - var serie = GetSerie(name); + var serie = GetSerie(serieName); if (serie != null) { serie.UpdateXYData(dataIndex, xValue, yValue); @@ -432,13 +438,13 @@ namespace XCharts /// /// 更新指定系列的维度X和维度Y数据 /// - /// + /// + /// /// /// - /// - public void UpdateXYData(int index, float xValue, float yValue, int dataIndex = 0) + public void UpdateXYData(int serieIndex, int dataIndex,float xValue, float yValue) { - var serie = GetSerie(index); + var serie = GetSerie(serieIndex); if (serie != null) { serie.UpdateXYData(dataIndex, xValue, yValue); diff --git a/Scripts/UI/Internal/BaseChart_API.cs b/Scripts/UI/Internal/BaseChart_API.cs index 9c3e433b..6a7291af 100644 --- a/Scripts/UI/Internal/BaseChart_API.cs +++ b/Scripts/UI/Internal/BaseChart_API.cs @@ -111,9 +111,9 @@ namespace XCharts /// the type of serie /// whether to show this serie /// the added serie - public virtual Serie AddSerie(string serieName, SerieType type, bool show = true) + public virtual Serie AddSerie(SerieType type, string serieName = null, bool show = true) { - return m_Series.AddSerie(serieName, type); + return m_Series.AddSerie(type, serieName); } /// @@ -234,11 +234,11 @@ namespace XCharts /// 更新指定系列中的指定索引数据。 /// /// the name of serie - /// the data will be update /// the index of data - public virtual void UpdateData(string serieName, float value, int dataIndex = 0) + /// the data will be update + public virtual void UpdateData(string serieName,int dataIndex, float value) { - m_Series.UpdateData(serieName, value, dataIndex); + m_Series.UpdateData(serieName,dataIndex, value); RefreshChart(); } @@ -247,11 +247,11 @@ namespace XCharts /// 更新指定系列中的指定索引数据。 /// /// the index of serie - /// the data will be update /// the index of data - public virtual void UpdateData(int serieIndex, float value, int dataIndex = 0) + /// the data will be update + public virtual void UpdateData(int serieIndex,int dataIndex, float value) { - m_Series.UpdateData(serieIndex, value, dataIndex); + m_Series.UpdateData(serieIndex, dataIndex,value); RefreshChart(); } @@ -260,11 +260,11 @@ namespace XCharts /// 更新指定系列中的指定索引数据名称。 /// /// - /// /// - public virtual void UpdateDataName(string serieName, string dataName, int dataIndex = 0) + /// + public virtual void UpdateDataName(string serieName,int dataIndex, string dataName) { - m_Series.UpdateDataName(serieName, dataName, dataIndex); + m_Series.UpdateDataName(serieName,dataIndex, dataName); } /// @@ -274,9 +274,9 @@ namespace XCharts /// /// /// - public virtual void UpdateDataName(int serieIndex, string dataName, int dataIndex) + public virtual void UpdateDataName(int serieIndex, int dataIndex, string dataName) { - m_Series.UpdateDataName(serieIndex, dataName, dataIndex); + m_Series.UpdateDataName(serieIndex, dataIndex,dataName); } /// diff --git a/Scripts/UI/LineChart.cs b/Scripts/UI/LineChart.cs index ee39a986..576cce45 100644 --- a/Scripts/UI/LineChart.cs +++ b/Scripts/UI/LineChart.cs @@ -19,7 +19,7 @@ namespace XCharts m_Title.text = "LineChart"; m_Tooltip.type = Tooltip.Type.Line; RemoveData(); - AddSerie("serie1", SerieType.Line); + AddSerie(SerieType.Line, "serie1"); for (int i = 0; i < 5; i++) { AddXAxisData("x" + (i + 1)); diff --git a/Scripts/UI/PieChart.cs b/Scripts/UI/PieChart.cs index cd1822bc..90b2af2d 100644 --- a/Scripts/UI/PieChart.cs +++ b/Scripts/UI/PieChart.cs @@ -44,7 +44,7 @@ namespace XCharts m_Pie = Pie.defaultPie; m_Title.text = "PieChart"; RemoveData(); - AddSerie("serie1", SerieType.Pie); + AddSerie(SerieType.Pie,"serie1"); AddData(0, 70, "pie1"); AddData(0, 20, "pie2"); AddData(0, 10, "pie3"); diff --git a/Scripts/UI/RadarChart.cs b/Scripts/UI/RadarChart.cs index 5c89c311..3e497b49 100644 --- a/Scripts/UI/RadarChart.cs +++ b/Scripts/UI/RadarChart.cs @@ -75,7 +75,7 @@ namespace XCharts RemoveData(); m_Radars.Add(Radar.defaultRadar); m_Title.text = "RadarChart"; - var serie = AddSerie("serie1", SerieType.Radar); + var serie = AddSerie(SerieType.Radar, "serie1"); serie.symbol.type = SerieSymbolType.EmptyCircle; serie.symbol.size = 4; serie.symbol.selectedSize = 6; diff --git a/Scripts/UI/ScatterChart.cs b/Scripts/UI/ScatterChart.cs index 6d5e35b7..038be1fc 100644 --- a/Scripts/UI/ScatterChart.cs +++ b/Scripts/UI/ScatterChart.cs @@ -25,7 +25,7 @@ namespace XCharts m_YAxises[1].type = Axis.AxisType.Value; m_XAxises[1].boundaryGap = false; RemoveData(); - AddSerie("serie1", SerieType.Scatter); + AddSerie(SerieType.Scatter, "serie1"); for (int i = 0; i < 10; i++) { AddData(0, Random.Range(10, 100), Random.Range(10, 100));