foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-28 12:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

重构接口

Browse Source
This commit is contained in:
monitor1394
2019-09-29 09:16:15 +08:00
parent 35cababb2c
commit ddf73c7f21
10 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/XCharts/Demo/Scripts/Demo10_LineSimple.cs
View File

@@ -30,7 +30,7 @@ public class Demo10_LineSimple : MonoBehaviour
chart.xAxises[0].boundaryGap = true; chart.xAxises[0].boundaryGap = true;
chart.RemoveData(); chart.RemoveData();
chart.AddSerie("test", SerieType.Line); chart.AddSerie(SerieType.Line);
for (int i = 0; i < dataCount; i++) for (int i = 0; i < dataCount; i++)
{ {
chart.AddXAxisData("x" + i); chart.AddXAxisData("x" + i);

2
Assets/XCharts/Demo/Scripts/Demo11_AddSinCurve.cs
View File

@@ -37,7 +37,7 @@ public class Demo11_AddSinCurve : MonoBehaviour
chart.RemoveData(); chart.RemoveData();
var serie = chart.AddSerie("test", SerieType.Line); var serie = chart.AddSerie(SerieType.Line);
serie.symbol.type = SerieSymbolType.None; serie.symbol.type = SerieSymbolType.None;
serie.lineType = LineType.Normal; serie.lineType = LineType.Normal;
for (angle = 0; angle < 1080; angle++) for (angle = 0; angle < 1080; angle++)

2
Assets/XCharts/Demo/Scripts/Demo_Dynamic.cs
View File

@@ -22,7 +22,7 @@ public class Demo_Dynamic : MonoBehaviour
{ {
chart = gameObject.GetComponentInChildren<CoordinateChart>(); chart = gameObject.GetComponentInChildren<CoordinateChart>();
//chart.RemoveData(); //chart.RemoveData();
var serie = chart.AddSerie("data", SerieType.Line); var serie = chart.AddSerie(SerieType.Line);
serie.symbol.type = SerieSymbolType.None; serie.symbol.type = SerieSymbolType.None;
serie.maxCache = maxCacheDataNumber; serie.maxCache = maxCacheDataNumber;
chart.xAxises[0].maxCache = maxCacheDataNumber; chart.xAxises[0].maxCache = maxCacheDataNumber;

2
Assets/XCharts/Scripts/UI/BarChart.cs
View File

@@ -18,7 +18,7 @@ namespace XCharts
m_Title.text = "BarChart"; m_Title.text = "BarChart";
m_Tooltip.type = Tooltip.Type.Shadow; m_Tooltip.type = Tooltip.Type.Shadow;
RemoveData(); RemoveData();
AddSerie("serie1", SerieType.Bar); AddSerie(SerieType.Bar, "serie1");
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
AddXAxisData("x" + (i + 1)); AddXAxisData("x" + (i + 1));

54
Assets/XCharts/Scripts/UI/Component/Series.cs
View File

@@ -212,7 +212,7 @@ namespace XCharts
/// <param name="type"></param> /// <param name="type"></param>
/// <param name="show"></param> /// <param name="show"></param>
/// <returns></returns> /// <returns></returns>
public Serie AddSerie(string serieName, SerieType type, bool show = true) public Serie AddSerie(SerieType type, string serieName, bool show = true)
{ {
var serie = GetSerie(serieName); var serie = GetSerie(serieName);
if (serie == null) if (serie == null)
@@ -254,7 +254,6 @@ namespace XCharts
/// <param name="serieName"></param> /// <param name="serieName"></param>
/// <param name="value"></param> /// <param name="value"></param>
/// <param name="dataName"></param> /// <param name="dataName"></param>
/// <param name="maxDataNumber"></param>
/// <returns></returns> /// <returns></returns>
public bool AddData(string serieName, float value, string dataName = null) public bool AddData(string serieName, float value, string dataName = null)
{ {
@@ -273,7 +272,6 @@ namespace XCharts
/// <param name="index"></param> /// <param name="index"></param>
/// <param name="value"></param> /// <param name="value"></param>
/// <param name="dataName"></param> /// <param name="dataName"></param>
/// <param name="maxDataNumber"></param>
/// <returns></returns> /// <returns></returns>
public bool AddData(int index, float value, string dataName = null) public bool AddData(int index, float value, string dataName = null)
{ {
@@ -292,7 +290,6 @@ namespace XCharts
/// <param name="serieName"></param> /// <param name="serieName"></param>
/// <param name="multidimensionalData"></param> /// <param name="multidimensionalData"></param>
/// <param name="dataName"></param> /// <param name="dataName"></param>
/// <param name="maxDataNumber"></param>
/// <returns></returns> /// <returns></returns>
public bool AddData(string serieName, List<float> multidimensionalData, string dataName = null) public bool AddData(string serieName, List<float> multidimensionalData, string dataName = null)
{ {
@@ -311,7 +308,6 @@ namespace XCharts
/// <param name="serieIndex"></param> /// <param name="serieIndex"></param>
/// <param name="multidimensionalData"></param> /// <param name="multidimensionalData"></param>
/// <param name="dataName"></param> /// <param name="dataName"></param>
/// <param name="maxDataNumber"></param>
/// <returns></returns> /// <returns></returns>
public bool AddData(int serieIndex, List<float> multidimensionalData, string dataName = null) public bool AddData(int serieIndex, List<float> multidimensionalData, string dataName = null)
{ {
@@ -331,7 +327,6 @@ namespace XCharts
/// <param name="xValue"></param> /// <param name="xValue"></param>
/// <param name="yValue"></param> /// <param name="yValue"></param>
/// <param name="dataName"></param> /// <param name="dataName"></param>
/// <param name="maxDataNumber"></param>
/// <returns></returns> /// <returns></returns>
public bool AddXYData(string serieName, float xValue, float yValue, string dataName = null) public bool AddXYData(string serieName, float xValue, float yValue, string dataName = null)
{ {
@@ -351,7 +346,6 @@ namespace XCharts
/// <param name="xValue"></param> /// <param name="xValue"></param>
/// <param name="yValue"></param> /// <param name="yValue"></param>
/// <param name="dataName"></param> /// <param name="dataName"></param>
/// <param name="maxDataNumber"></param>
/// <returns></returns> /// <returns></returns>
public bool AddXYData(int index, float xValue, float yValue, string dataName = null) public bool AddXYData(int index, float xValue, float yValue, string dataName = null)
{ {
@@ -370,16 +364,22 @@ namespace XCharts
/// <param name="name"></param> /// <param name="name"></param>
/// <param name="value"></param> /// <param name="value"></param>
/// <param name="dataIndex"></param> /// <param name="dataIndex"></param>
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) if (serie != null)
{ {
serie.UpdateYData(dataIndex, value); serie.UpdateYData(dataIndex, value);
} }
} }
public void UpdateDataName(string serieName, string dataName, int dataIndex = 0) /// <summary>
/// 更新指定系列的数据项名称
/// </summary>
/// <param name="serieName"></param>
/// <param name="dataIndex"></param>
/// <param name="dataName"></param>
public void UpdateDataName(string serieName, int dataIndex, string dataName)
{ {
var serie = GetSerie(serieName); var serie = GetSerie(serieName);
if (serie != null) if (serie != null)
@@ -388,7 +388,13 @@ namespace XCharts
} }
} }
public void UpdateDataName(int serieIndex, string dataName, int dataIndex = 0) /// <summary>
/// 更新指定系列的数据项名称
/// </summary>
/// <param name="serieIndex"></param>
/// <param name="dataIndex"></param>
/// <param name="dataName"></param>
public void UpdateDataName(int serieIndex, int dataIndex, string dataName)
{ {
var serie = GetSerie(serieIndex); var serie = GetSerie(serieIndex);
if (serie != null) if (serie != null)
@@ -398,14 +404,14 @@ namespace XCharts
} }
/// <summary> /// <summary>
/// 更新指定系列的维度Y数据 /// 更新指定系列的维度Y数据项的值
/// </summary> /// </summary>
/// <param name="index"></param> /// <param name="serieIndex"></param>
/// <param name="value"></param>
/// <param name="dataIndex"></param> /// <param name="dataIndex"></param>
public void UpdateData(int index, float value, int dataIndex = 0) /// <param name="value"></param>
public void UpdateData(int serieIndex, int dataIndex, float value)
{ {
var serie = GetSerie(index); var serie = GetSerie(serieIndex);
if (serie != null) if (serie != null)
{ {
serie.UpdateYData(dataIndex, value); serie.UpdateYData(dataIndex, value);
@@ -416,13 +422,13 @@ namespace XCharts
/// <summary> /// <summary>
/// 更新指定系列的维度X和维度Y数据 /// 更新指定系列的维度X和维度Y数据
/// </summary> /// </summary>
/// <param name="name"></param> /// <param name="serieName"></param>
/// <param name="dataIndex"></param>
/// <param name="xValue"></param> /// <param name="xValue"></param>
/// <param name="yValue"></param> /// <param name="yValue"></param>
/// <param name="dataIndex"></param> public void UpdateXYData(string serieName,int dataIndex, float xValue, float yValue)
public void UpdateXYData(string name, float xValue, float yValue, int dataIndex = 0)
{ {
var serie = GetSerie(name); var serie = GetSerie(serieName);
if (serie != null) if (serie != null)
{ {
serie.UpdateXYData(dataIndex, xValue, yValue); serie.UpdateXYData(dataIndex, xValue, yValue);
@@ -432,13 +438,13 @@ namespace XCharts
/// <summary> /// <summary>
/// 更新指定系列的维度X和维度Y数据 /// 更新指定系列的维度X和维度Y数据
/// </summary> /// </summary>
/// <param name="index"></param> /// <param name="serieIndex"></param>
/// <param name="dataIndex"></param>
/// <param name="xValue"></param> /// <param name="xValue"></param>
/// <param name="yValue"></param> /// <param name="yValue"></param>
/// <param name="dataIndex"></param> public void UpdateXYData(int serieIndex, int dataIndex,float xValue, float yValue)
public void UpdateXYData(int index, float xValue, float yValue, int dataIndex = 0)
{ {
var serie = GetSerie(index); var serie = GetSerie(serieIndex);
if (serie != null) if (serie != null)
{ {
serie.UpdateXYData(dataIndex, xValue, yValue); serie.UpdateXYData(dataIndex, xValue, yValue);

26
Assets/XCharts/Scripts/UI/Internal/BaseChart_API.cs
View File

@@ -111,9 +111,9 @@ namespace XCharts
/// <param name="type">the type of serie</param> /// <param name="type">the type of serie</param>
/// <param name="show">whether to show this serie</param> /// <param name="show">whether to show this serie</param>
/// <returns>the added serie</returns> /// <returns>the added serie</returns>
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);
} }
/// <summary> /// <summary>
@@ -234,11 +234,11 @@ namespace XCharts
/// 更新指定系列中的指定索引数据。 /// 更新指定系列中的指定索引数据。
/// </summary> /// </summary>
/// <param name="serieName">the name of serie</param> /// <param name="serieName">the name of serie</param>
/// <param name="value">the data will be update</param>
/// <param name="dataIndex">the index of data</param> /// <param name="dataIndex">the index of data</param>
public virtual void UpdateData(string serieName, float value, int dataIndex = 0) /// <param name="value">the data will be update</param>
public virtual void UpdateData(string serieName,int dataIndex, float value)
{ {
m_Series.UpdateData(serieName, value, dataIndex); m_Series.UpdateData(serieName,dataIndex, value);
RefreshChart(); RefreshChart();
} }
@@ -247,11 +247,11 @@ namespace XCharts
/// 更新指定系列中的指定索引数据。 /// 更新指定系列中的指定索引数据。
/// </summary> /// </summary>
/// <param name="serieIndex">the index of serie</param> /// <param name="serieIndex">the index of serie</param>
/// <param name="value">the data will be update</param>
/// <param name="dataIndex">the index of data</param> /// <param name="dataIndex">the index of data</param>
public virtual void UpdateData(int serieIndex, float value, int dataIndex = 0) /// <param name="value">the data will be update</param>
public virtual void UpdateData(int serieIndex,int dataIndex, float value)
{ {
m_Series.UpdateData(serieIndex, value, dataIndex); m_Series.UpdateData(serieIndex, dataIndex,value);
RefreshChart(); RefreshChart();
} }
@@ -260,11 +260,11 @@ namespace XCharts
/// 更新指定系列中的指定索引数据名称。 /// 更新指定系列中的指定索引数据名称。
/// </summary> /// </summary>
/// <param name="serieName"></param> /// <param name="serieName"></param>
/// <param name="dataName"></param>
/// <param name="dataIndex"></param> /// <param name="dataIndex"></param>
public virtual void UpdateDataName(string serieName, string dataName, int dataIndex = 0) /// <param name="dataName"></param>
public virtual void UpdateDataName(string serieName,int dataIndex, string dataName)
{ {
m_Series.UpdateDataName(serieName, dataName, dataIndex); m_Series.UpdateDataName(serieName,dataIndex, dataName);
} }
/// <summary> /// <summary>
@@ -274,9 +274,9 @@ namespace XCharts
/// <param name="serieIndex"></param> /// <param name="serieIndex"></param>
/// <param name="dataName"></param> /// <param name="dataName"></param>
/// <param name="dataIndex"></param> /// <param name="dataIndex"></param>
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);
} }
/// <summary> /// <summary>

2
Assets/XCharts/Scripts/UI/LineChart.cs
View File

@@ -19,7 +19,7 @@ namespace XCharts
m_Title.text = "LineChart"; m_Title.text = "LineChart";
m_Tooltip.type = Tooltip.Type.Line; m_Tooltip.type = Tooltip.Type.Line;
RemoveData(); RemoveData();
AddSerie("serie1", SerieType.Line); AddSerie(SerieType.Line, "serie1");
for (int i = 0; i < 5; i++) for (int i = 0; i < 5; i++)
{ {
AddXAxisData("x" + (i + 1)); AddXAxisData("x" + (i + 1));

2
Assets/XCharts/Scripts/UI/PieChart.cs
View File

@@ -44,7 +44,7 @@ namespace XCharts
m_Pie = Pie.defaultPie; m_Pie = Pie.defaultPie;
m_Title.text = "PieChart"; m_Title.text = "PieChart";
RemoveData(); RemoveData();
AddSerie("serie1", SerieType.Pie); AddSerie(SerieType.Pie,"serie1");
AddData(0, 70, "pie1"); AddData(0, 70, "pie1");
AddData(0, 20, "pie2"); AddData(0, 20, "pie2");
AddData(0, 10, "pie3"); AddData(0, 10, "pie3");

2
Assets/XCharts/Scripts/UI/RadarChart.cs
View File

@@ -75,7 +75,7 @@ namespace XCharts
RemoveData(); RemoveData();
m_Radars.Add(Radar.defaultRadar); m_Radars.Add(Radar.defaultRadar);
m_Title.text = "RadarChart"; m_Title.text = "RadarChart";
var serie = AddSerie("serie1", SerieType.Radar); var serie = AddSerie(SerieType.Radar, "serie1");
serie.symbol.type = SerieSymbolType.EmptyCircle; serie.symbol.type = SerieSymbolType.EmptyCircle;
serie.symbol.size = 4; serie.symbol.size = 4;
serie.symbol.selectedSize = 6; serie.symbol.selectedSize = 6;

2
Assets/XCharts/Scripts/UI/ScatterChart.cs
View File

@@ -25,7 +25,7 @@ namespace XCharts
m_YAxises[1].type = Axis.AxisType.Value; m_YAxises[1].type = Axis.AxisType.Value;
m_XAxises[1].boundaryGap = false; m_XAxises[1].boundaryGap = false;
RemoveData(); RemoveData();
AddSerie("serie1", SerieType.Scatter); AddSerie(SerieType.Scatter, "serie1");
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
{ {
AddData(0, Random.Range(10, 100), Random.Range(10, 100)); AddData(0, Random.Range(10, 100), Random.Range(10, 100));