diff --git a/Scripts/UI/API/BaseChart_API.cs b/Scripts/UI/API/BaseChart_API.cs
index 29677271..3ca8b70c 100644
--- a/Scripts/UI/API/BaseChart_API.cs
+++ b/Scripts/UI/API/BaseChart_API.cs
@@ -132,11 +132,15 @@ namespace XCharts
/// the data to add
/// the name of data
/// Returns True on success
- 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);
- if (success) RefreshChart();
- return success;
+ var serieData = m_Series.AddData(serieName, data, dataName);
+ if (serieData != null)
+ {
+ RefreshChart();
+ RefreshLabel();
+ }
+ return serieData;
}
///
@@ -147,15 +151,15 @@ namespace XCharts
/// the data to add
/// the name of data
/// Returns True on success
- 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);
- if (success)
+ var serieData = m_Series.AddData(serieIndex, data, dataName);
+ if (serieData != null)
{
RefreshChart();
- ReinitChartLabel();
+ RefreshLabel();
}
- return success;
+ return serieData;
}
///
@@ -166,15 +170,15 @@ namespace XCharts
/// the (x,y,z,...) data
/// the name of data
/// Returns True on success
- public virtual bool AddData(string serieName, List multidimensionalData, string dataName = null)
+ public virtual SerieData AddData(string serieName, List multidimensionalData, string dataName = null)
{
- var success = m_Series.AddData(serieName, multidimensionalData, dataName);
- if (success)
+ var serieData = m_Series.AddData(serieName, multidimensionalData, dataName);
+ if (serieData != null)
{
RefreshChart();
- ReinitChartLabel();
+ RefreshLabel();
}
- return success;
+ return serieData;
}
///
@@ -185,15 +189,15 @@ namespace XCharts
/// the (x,y,z,...) data
/// the name of data
/// Returns True on success
- public virtual bool AddData(int serieIndex, List multidimensionalData, string dataName = null)
+ public virtual SerieData AddData(int serieIndex, List multidimensionalData, string dataName = null)
{
- var success = m_Series.AddData(serieIndex, multidimensionalData, dataName);
- if (success)
+ var serieData = m_Series.AddData(serieIndex, multidimensionalData, dataName);
+ if (serieData != null)
{
RefreshChart();
- ReinitChartLabel();
+ RefreshLabel();
}
- return success;
+ return serieData;
}
///
@@ -205,15 +209,15 @@ namespace XCharts
/// y data
/// the name of data
/// Returns True on success
- 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);
- if (success)
+ var serieData = m_Series.AddXYData(serieName, xValue, yValue, dataName);
+ if (serieData != null)
{
RefreshChart();
- ReinitChartLabel();
+ RefreshLabel();
}
- return true;
+ return serieData;
}
///
@@ -225,15 +229,15 @@ namespace XCharts
/// y data
/// the name of data
/// Returns True on success
- 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);
- if (success)
+ var serieData = m_Series.AddXYData(serieIndex, xValue, yValue, dataName);
+ if (serieData != null)
{
RefreshChart();
- ReinitChartLabel();
+ RefreshLabel();
}
- return success;
+ return serieData;
}
///
@@ -379,10 +383,16 @@ namespace XCharts
m_RefreshChart = true;
}
- ///
- /// 重新初始化Label。
- ///
+ [Obsolete("rename. use RefreshLabel() instead.", true)]
public void ReinitChartLabel()
+ {
+ RefreshLabel();
+ }
+
+ ///
+ /// 刷新文本标签Label,重新初始化,当有改动Label参数时手动调用改接口
+ ///
+ public void RefreshLabel()
{
m_ReinitLabel = true;
}
diff --git a/Scripts/UI/Component/Main/Serie.cs b/Scripts/UI/Component/Main/Serie.cs
index df8c5059..7856e0d4 100644
--- a/Scripts/UI/Component/Main/Serie.cs
+++ b/Scripts/UI/Component/Main/Serie.cs
@@ -597,7 +597,7 @@ namespace XCharts
///
///
///
- public void AddYData(float value, string dataName = null)
+ public SerieData AddYData(float value, string dataName = null)
{
if (m_MaxCache > 0)
{
@@ -608,7 +608,9 @@ namespace XCharts
}
}
int xValue = m_Data.Count;
- m_Data.Add(new SerieData() { data = new List() { xValue, value }, name = dataName });
+ var serieData = new SerieData() { data = new List() { xValue, value }, name = dataName };
+ m_Data.Add(serieData);
+ return serieData;
}
///
@@ -618,7 +620,7 @@ namespace XCharts
///
///
///
- public void AddXYData(float xValue, float yValue, string dataName = null)
+ public SerieData AddXYData(float xValue, float yValue, string dataName = null)
{
if (m_MaxCache > 0)
{
@@ -628,7 +630,9 @@ namespace XCharts
m_Data.RemoveAt(0);
}
}
- m_Data.Add(new SerieData() { data = new List() { xValue, yValue }, name = dataName });
+ var serieData = new SerieData() { data = new List() { xValue, yValue }, name = dataName };
+ m_Data.Add(serieData);
+ return serieData;
}
///
@@ -638,16 +642,16 @@ namespace XCharts
///
///
///
- public void AddData(List valueList, string dataName = null)
+ public SerieData AddData(List valueList, string dataName = null)
{
- if (valueList == null || valueList.Count == 0) return;
+ if (valueList == null || valueList.Count == 0) return null;
if (valueList.Count == 1)
{
- AddYData(valueList[0], dataName);
+ return AddYData(valueList[0], dataName);
}
else if (valueList.Count == 2)
{
- AddXYData(valueList[0], valueList[1], dataName);
+ return AddXYData(valueList[0], valueList[1], dataName);
}
else
{
@@ -666,6 +670,7 @@ namespace XCharts
serieData.data.Add(valueList[i]);
}
m_Data.Add(serieData);
+ return serieData;
}
}
diff --git a/Scripts/UI/Component/Main/Series.cs b/Scripts/UI/Component/Main/Series.cs
index 2bef42b5..baaff888 100644
--- a/Scripts/UI/Component/Main/Series.cs
+++ b/Scripts/UI/Component/Main/Series.cs
@@ -266,16 +266,15 @@ namespace XCharts
///
///
///
- ///
- public bool AddData(string serieName, float value, string dataName = null)
+ /// 添加成功返回SerieData,否则返回null
+ public SerieData AddData(string serieName, float value, string dataName = null)
{
var serie = GetSerie(serieName);
if (serie != null)
{
- serie.AddYData(value, dataName);
- return true;
+ return serie.AddYData(value, dataName);
}
- return false;
+ return null;
}
///
@@ -284,16 +283,15 @@ namespace XCharts
///
///
///
- ///
- public bool AddData(int index, float value, string dataName = null)
+ /// 添加成功返回SerieData,否则返回null
+ public SerieData AddData(int index, float value, string dataName = null)
{
var serie = GetSerie(index);
if (serie != null)
{
- serie.AddYData(value, dataName);
- return true;
+ return serie.AddYData(value, dataName);
}
- return false;
+ return null;
}
///
@@ -302,16 +300,15 @@ namespace XCharts
///
///
///
- ///
- public bool AddData(string serieName, List multidimensionalData, string dataName = null)
+ /// 添加成功返回SerieData,否则返回null
+ public SerieData AddData(string serieName, List multidimensionalData, string dataName = null)
{
var serie = GetSerie(serieName);
if (serie != null)
{
- serie.AddData(multidimensionalData, dataName);
- return true;
+ return serie.AddData(multidimensionalData, dataName);
}
- return false;
+ return null;
}
///
@@ -320,16 +317,15 @@ namespace XCharts
///
///
///
- ///
- public bool AddData(int serieIndex, List multidimensionalData, string dataName = null)
+ /// 添加成功返回SerieData,否则返回null
+ public SerieData AddData(int serieIndex, List multidimensionalData, string dataName = null)
{
var serie = GetSerie(serieIndex);
if (serie != null)
{
- serie.AddData(multidimensionalData, dataName);
- return true;
+ return serie.AddData(multidimensionalData, dataName);
}
- return false;
+ return null;
}
///
@@ -339,16 +335,15 @@ namespace XCharts
///
///
///
- ///
- public bool AddXYData(string serieName, float xValue, float yValue, string dataName = null)
+ /// 添加成功返回SerieData,否则返回null
+ public SerieData AddXYData(string serieName, float xValue, float yValue, string dataName = null)
{
var serie = GetSerie(serieName);
if (serie != null)
{
- serie.AddXYData(xValue, yValue, dataName);
- return true;
+ return serie.AddXYData(xValue, yValue, dataName);
}
- return false;
+ return null;
}
///
@@ -358,16 +353,15 @@ namespace XCharts
///
///
///
- ///
- public bool AddXYData(int index, float xValue, float yValue, string dataName = null)
+ /// 添加成功返回SerieData,否则返回null
+ public SerieData AddXYData(int index, float xValue, float yValue, string dataName = null)
{
var serie = GetSerie(index);
if (serie != null)
{
- serie.AddXYData(xValue, yValue, dataName);
- return true;
+ return serie.AddXYData(xValue, yValue, dataName);
}
- return false;
+ return null;
}
///