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

接口优化

Browse Source
This commit is contained in:
monitor1394
2019-10-16 06:34:26 +08:00
parent 466585d8ef
commit f29b52f544
3 changed files with 79 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
Assets/XCharts/Scripts/UI/API/BaseChart_API.cs
View File

@@ -132,11 +132,15 @@ namespace XCharts
/// <param name="data">the data to add</param> /// <param name="data">the data to add</param>
/// <param name="dataName">the name of data</param> /// <param name="dataName">the name of data</param>
/// <returns>Returns True on success</returns> /// <returns>Returns True on success</returns>
public virtual bool AddData(string serieName, float data, string dataName = null) public virtual SerieData AddData(string serieName, float data, string dataName = null)
{ {
var success = m_Series.AddData(serieName, data, dataName); var serieData = m_Series.AddData(serieName, data, dataName);
if (success) RefreshChart(); if (serieData != null)
return success; {
RefreshChart();
RefreshLabel();
}
return serieData;
} }
/// <summary> /// <summary>
@@ -147,15 +151,15 @@ namespace XCharts
/// <param name="data">the data to add</param> /// <param name="data">the data to add</param>
/// <param name="dataName">the name of data</param> /// <param name="dataName">the name of data</param>
/// <returns>Returns True on success</returns> /// <returns>Returns True on success</returns>
public virtual bool AddData(int serieIndex, float data, string dataName = null) public virtual SerieData AddData(int serieIndex, float data, string dataName = null)
{ {
var success = m_Series.AddData(serieIndex, data, dataName); var serieData = m_Series.AddData(serieIndex, data, dataName);
if (success) if (serieData != null)
{ {
RefreshChart(); RefreshChart();
ReinitChartLabel(); RefreshLabel();
} }
return success; return serieData;
} }
/// <summary> /// <summary>
@@ -166,15 +170,15 @@ namespace XCharts
/// <param name="multidimensionalData">the (x,y,z,...) data</param> /// <param name="multidimensionalData">the (x,y,z,...) data</param>
/// <param name="dataName">the name of data</param> /// <param name="dataName">the name of data</param>
/// <returns>Returns True on success</returns> /// <returns>Returns True on success</returns>
public virtual bool AddData(string serieName, List<float> multidimensionalData, string dataName = null) public virtual SerieData AddData(string serieName, List<float> multidimensionalData, string dataName = null)
{ {
var success = m_Series.AddData(serieName, multidimensionalData, dataName); var serieData = m_Series.AddData(serieName, multidimensionalData, dataName);
if (success) if (serieData != null)
{ {
RefreshChart(); RefreshChart();
ReinitChartLabel(); RefreshLabel();
} }
return success; return serieData;
} }
/// <summary> /// <summary>
@@ -185,15 +189,15 @@ namespace XCharts
/// <param name="multidimensionalData">the (x,y,z,...) data</param> /// <param name="multidimensionalData">the (x,y,z,...) data</param>
/// <param name="dataName">the name of data</param> /// <param name="dataName">the name of data</param>
/// <returns>Returns True on success</returns> /// <returns>Returns True on success</returns>
public virtual bool AddData(int serieIndex, List<float> multidimensionalData, string dataName = null) public virtual SerieData AddData(int serieIndex, List<float> multidimensionalData, string dataName = null)
{ {
var success = m_Series.AddData(serieIndex, multidimensionalData, dataName); var serieData = m_Series.AddData(serieIndex, multidimensionalData, dataName);
if (success) if (serieData != null)
{ {
RefreshChart(); RefreshChart();
ReinitChartLabel(); RefreshLabel();
} }
return success; return serieData;
} }
/// <summary> /// <summary>
@@ -205,15 +209,15 @@ namespace XCharts
/// <param name="yValue">y data</param> /// <param name="yValue">y data</param>
/// <param name="dataName">the name of data</param> /// <param name="dataName">the name of data</param>
/// <returns>Returns True on success</returns> /// <returns>Returns True on success</returns>
public virtual bool AddData(string serieName, float xValue, float yValue, string dataName) public virtual SerieData AddData(string serieName, float xValue, float yValue, string dataName)
{ {
var success = m_Series.AddXYData(serieName, xValue, yValue, dataName); var serieData = m_Series.AddXYData(serieName, xValue, yValue, dataName);
if (success) if (serieData != null)
{ {
RefreshChart(); RefreshChart();
ReinitChartLabel(); RefreshLabel();
} }
return true; return serieData;
} }
/// <summary> /// <summary>
@@ -225,15 +229,15 @@ namespace XCharts
/// <param name="yValue">y data</param> /// <param name="yValue">y data</param>
/// <param name="dataName">the name of data</param> /// <param name="dataName">the name of data</param>
/// <returns>Returns True on success</returns> /// <returns>Returns True on success</returns>
public virtual bool AddData(int serieIndex, float xValue, float yValue, string dataName = null) public virtual SerieData AddData(int serieIndex, float xValue, float yValue, string dataName = null)
{ {
var success = m_Series.AddXYData(serieIndex, xValue, yValue, dataName); var serieData = m_Series.AddXYData(serieIndex, xValue, yValue, dataName);
if (success) if (serieData != null)
{ {
RefreshChart(); RefreshChart();
ReinitChartLabel(); RefreshLabel();
} }
return success; return serieData;
} }
/// <summary> /// <summary>
@@ -379,10 +383,16 @@ namespace XCharts
m_RefreshChart = true; m_RefreshChart = true;
} }
/// <summary> [Obsolete("rename. use RefreshLabel() instead.", true)]
/// 重新初始化Label。
/// </summary>
public void ReinitChartLabel() public void ReinitChartLabel()
{
RefreshLabel();
}
/// <summary>
/// 刷新文本标签Label，重新初始化，当有改动Label参数时手动调用改接口
/// </summary>
public void RefreshLabel()
{ {
m_ReinitLabel = true; m_ReinitLabel = true;
} }

21
Assets/XCharts/Scripts/UI/Component/Main/Serie.cs
View File

@@ -597,7 +597,7 @@ namespace XCharts
/// </summary> /// </summary>
/// <param name="value"></param> /// <param name="value"></param>
/// <param name="dataName"></param> /// <param name="dataName"></param>
public void AddYData(float value, string dataName = null) public SerieData AddYData(float value, string dataName = null)
{ {
if (m_MaxCache > 0) if (m_MaxCache > 0)
{ {
@@ -608,7 +608,9 @@ namespace XCharts
} }
} }
int xValue = m_Data.Count; int xValue = m_Data.Count;
m_Data.Add(new SerieData() { data = new List<float>() { xValue, value }, name = dataName }); var serieData = new SerieData() { data = new List<float>() { xValue, value }, name = dataName };
m_Data.Add(serieData);
return serieData;
} }
/// <summary> /// <summary>
@@ -618,7 +620,7 @@ namespace XCharts
/// <param name="yValue"></param> /// <param name="yValue"></param>
/// <param name="dataName"></param> /// <param name="dataName"></param>
/// <param name="maxDataNumber"></param> /// <param name="maxDataNumber"></param>
public void AddXYData(float xValue, float yValue, string dataName = null) public SerieData AddXYData(float xValue, float yValue, string dataName = null)
{ {
if (m_MaxCache > 0) if (m_MaxCache > 0)
{ {
@@ -628,7 +630,9 @@ namespace XCharts
m_Data.RemoveAt(0); m_Data.RemoveAt(0);
} }
} }
m_Data.Add(new SerieData() { data = new List<float>() { xValue, yValue }, name = dataName }); var serieData = new SerieData() { data = new List<float>() { xValue, yValue }, name = dataName };
m_Data.Add(serieData);
return serieData;
} }
/// <summary> /// <summary>
@@ -638,16 +642,16 @@ namespace XCharts
/// <param name="valueList"></param> /// <param name="valueList"></param>
/// <param name="dataName"></param> /// <param name="dataName"></param>
/// <param name="maxDataNumber"></param> /// <param name="maxDataNumber"></param>
public void AddData(List<float> valueList, string dataName = null) public SerieData AddData(List<float> valueList, string dataName = null)
{ {
if (valueList == null || valueList.Count == 0) return; if (valueList == null || valueList.Count == 0) return null;
if (valueList.Count == 1) if (valueList.Count == 1)
{ {
AddYData(valueList[0], dataName); return AddYData(valueList[0], dataName);
} }
else if (valueList.Count == 2) else if (valueList.Count == 2)
{ {
AddXYData(valueList[0], valueList[1], dataName); return AddXYData(valueList[0], valueList[1], dataName);
} }
else else
{ {
@@ -666,6 +670,7 @@ namespace XCharts
serieData.data.Add(valueList[i]); serieData.data.Add(valueList[i]);
} }
m_Data.Add(serieData); m_Data.Add(serieData);
return serieData;
} }
} }

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

@@ -266,16 +266,15 @@ 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>
/// <returns></returns> /// <returns>添加成功返回SerieData，否则返回null</returns>
public bool AddData(string serieName, float value, string dataName = null) public SerieData AddData(string serieName, float value, string dataName = null)
{ {
var serie = GetSerie(serieName); var serie = GetSerie(serieName);
if (serie != null) if (serie != null)
{ {
serie.AddYData(value, dataName); return serie.AddYData(value, dataName);
return true;
} }
return false; return null;
} }
/// <summary> /// <summary>
@@ -284,16 +283,15 @@ 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>
/// <returns></returns> /// <returns>添加成功返回SerieData，否则返回null</returns>
public bool AddData(int index, float value, string dataName = null) public SerieData AddData(int index, float value, string dataName = null)
{ {
var serie = GetSerie(index); var serie = GetSerie(index);
if (serie != null) if (serie != null)
{ {
serie.AddYData(value, dataName); return serie.AddYData(value, dataName);
return true;
} }
return false; return null;
} }
/// <summary> /// <summary>
@@ -302,16 +300,15 @@ 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>
/// <returns></returns> /// <returns>添加成功返回SerieData，否则返回null</returns>
public bool AddData(string serieName, List<float> multidimensionalData, string dataName = null) public SerieData AddData(string serieName, List<float> multidimensionalData, string dataName = null)
{ {
var serie = GetSerie(serieName); var serie = GetSerie(serieName);
if (serie != null) if (serie != null)
{ {
serie.AddData(multidimensionalData, dataName); return serie.AddData(multidimensionalData, dataName);
return true;
} }
return false; return null;
} }
/// <summary> /// <summary>
@@ -320,16 +317,15 @@ 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>
/// <returns></returns> /// <returns>添加成功返回SerieData，否则返回null</returns>
public bool AddData(int serieIndex, List<float> multidimensionalData, string dataName = null) public SerieData AddData(int serieIndex, List<float> multidimensionalData, string dataName = null)
{ {
var serie = GetSerie(serieIndex); var serie = GetSerie(serieIndex);
if (serie != null) if (serie != null)
{ {
serie.AddData(multidimensionalData, dataName); return serie.AddData(multidimensionalData, dataName);
return true;
} }
return false; return null;
} }
/// <summary> /// <summary>
@@ -339,16 +335,15 @@ 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>
/// <returns></returns> /// <returns>添加成功返回SerieData，否则返回null</returns>
public bool AddXYData(string serieName, float xValue, float yValue, string dataName = null) public SerieData AddXYData(string serieName, float xValue, float yValue, string dataName = null)
{ {
var serie = GetSerie(serieName); var serie = GetSerie(serieName);
if (serie != null) if (serie != null)
{ {
serie.AddXYData(xValue, yValue, dataName); return serie.AddXYData(xValue, yValue, dataName);
return true;
} }
return false; return null;
} }
/// <summary> /// <summary>
@@ -358,16 +353,15 @@ 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>
/// <returns></returns> /// <returns>添加成功返回SerieData，否则返回null</returns>
public bool AddXYData(int index, float xValue, float yValue, string dataName = null) public SerieData AddXYData(int index, float xValue, float yValue, string dataName = null)
{ {
var serie = GetSerie(index); var serie = GetSerie(index);
if (serie != null) if (serie != null)
{ {
serie.AddXYData(xValue, yValue, dataName); return serie.AddXYData(xValue, yValue, dataName);
return true;
} }
return false; return null;
} }
/// <summary> /// <summary>