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

重构代码，废弃Series.series接口，用Series.list代替

Browse Source
This commit is contained in:
monitor1394
2019-10-01 13:52:02 +08:00
parent a220017d3d
commit 2560170921
15 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Scripts/UI/Internal/BaseChart.cs
View File

@@ -254,7 +254,6 @@ namespace XCharts
{
for (int n = 0; n < datas.Count; n++)
{
var legendName = m_Legend.GetFormatterContent(datas[n]);
OnLegendButtonClick(n, datas[n], n == 0 ? true : false);
}
}
@@ -268,7 +267,7 @@ namespace XCharts
int count = 0;
for (int i = 0; i < m_Series.Count; i++)
{
var serie = m_Series.series[i];
var serie = m_Series.list[i];
if (serie.type != SerieType.Pie && !serie.label.show) continue;
for (int j = 0; j < serie.data.Count; j++)
{
@@ -533,7 +532,7 @@ namespace XCharts
protected bool CheckDataShow(string legendName, bool show)
{
bool needShow = false;
foreach (var serie in m_Series.series)
foreach (var serie in m_Series.list)
{
if (legendName.Equals(serie.name))
{
@@ -560,7 +559,7 @@ namespace XCharts
protected bool CheckDataHighlighted(string legendName, bool heighlight)
{
bool show = false;
foreach (var serie in m_Series.series)
foreach (var serie in m_Series.list)
{
if (legendName.Equals(serie.name))
{

2
Scripts/UI/Internal/BaseChart_API.cs
View File

@@ -346,7 +346,7 @@ namespace XCharts
/// <returns></returns>
public virtual bool IsActiveByLegend(string legendName)
{
foreach (var serie in m_Series.series)
foreach (var serie in m_Series.list)
{
if (serie.show && legendName.Equals(serie.name))
{

5
Scripts/UI/Internal/CoordinateChart.cs
View File

@@ -914,7 +914,7 @@ namespace XCharts
ChartDrawer.DrawLine(vh, p4, p1, xAxis.axisLine.width, m_ThemeInfo.dataZoomLineColor);
if (m_DataZoom.showDataShadow && m_Series.Count > 0)
{
Serie serie = m_Series.series[0];
Serie serie = m_Series.list[0];
Axis axis = yAxises[0];
float scaleWid = coordinateWid / (serie.data.Count - 1);
Vector3 lp = Vector3.zero;
@@ -963,7 +963,6 @@ namespace XCharts
protected void DrawSplitLine(VertexHelper vh, Axis axis, Axis.SplitLineType type,
Vector3 startPos, Vector3 endPos, Color color)
{
bool isYAxis = axis is YAxis;
switch (type)
{
case Axis.SplitLineType.Dashed:
@@ -1165,8 +1164,6 @@ namespace XCharts
protected override void OnRefreshLabel()
{
var isYAxis = m_YAxises[0].type == Axis.AxisType.Category
|| m_YAxises[1].type == Axis.AxisType.Category;
for (int i = 0; i < m_Series.Count; i++)
{
var serie = m_Series.GetSerie(i);

6
Scripts/UI/Internal/CoordinateChart_DrawBar.cs
View File

@@ -165,7 +165,7 @@ namespace XCharts
float gap = 0.3f;
for (int i = 0; i < m_Series.Count; i++)
{
var serie = m_Series.series[i];
var serie = m_Series.list[i];
if (serie.type == SerieType.Bar)
{
if (serie.barGap != 0)
@@ -186,7 +186,7 @@ namespace XCharts
barStackSet.Clear();
for (int i = 0; i < m_Series.Count; i++)
{
var serie = m_Series.series[i];
var serie = m_Series.list[i];
if (serie.type == SerieType.Bar && serie.show)
{
if (!string.IsNullOrEmpty(serie.stack))
@@ -217,7 +217,7 @@ namespace XCharts
float barWidth = 0;
for (int i = 0; i < m_Series.Count; i++)
{
var serie = m_Series.series[i];
var serie = m_Series.list[i];
if (serie.type == SerieType.Bar && serie.show && now.stack.Equals(serie.stack))
{
if (serie.barWidth > barWidth) barWidth = serie.barWidth;

6
Scripts/UI/Internal/CoordinateChart_DrawLine.cs
View File

@@ -79,7 +79,6 @@ namespace XCharts
var yAxis = m_YAxises[serie.axisIndex];
var xAxis = m_XAxises[serie.axisIndex];
var zeroPos = new Vector3(coordinateX, coordinateY + yAxis.zeroYOffset);
var lastSerie = m_Series.GetSerie(serie.index - 1);
var isStack = m_Series.IsStack(serie.stack, SerieType.Line);
if (!xAxis.show) xAxis = m_XAxises[(serie.axisIndex + 1) % m_XAxises.Count];
float scaleWid = xAxis.GetDataWidth(coordinateWid, m_DataZoom);
@@ -357,7 +356,6 @@ namespace XCharts
var xAxis = m_XAxises[serie.axisIndex];
var yAxis = m_YAxises[serie.axisIndex];
var zeroPos = new Vector3(coordinateX + xAxis.zeroXOffset, coordinateY);
var lastSerie = m_Series.GetSerie(serieIndex - 1);
var isStack = m_Series.IsStack(serie.stack, SerieType.Line);
if (!yAxis.show) yAxis = m_YAxises[(serie.axisIndex + 1) % m_YAxises.Count];
float scaleWid = yAxis.GetDataWidth(coordinateHig, m_DataZoom);
@@ -373,8 +371,6 @@ namespace XCharts
seriesHig.Add(0);
}
}
var fine = isStack && m_Series.IsAnyGradientSerie(serie.stack);
int rate = 1;
var sampleDist = serie.sampleDist;
if (sampleDist > 0) rate = (int)((maxCount - serie.minShow) / (coordinateWid / sampleDist));
@@ -493,7 +489,6 @@ namespace XCharts
bool isDown;
var dir1 = (np - lp).normalized;
dir1v = Vector3.Cross(dir1, Vector3.forward).normalized * (isYAxis ? -1 : 1);
float cut = 0;
if (np != nnp)
{
var dir2 = (nnp - np).normalized;
@@ -502,7 +497,6 @@ namespace XCharts
isDown = isYAxis ? normal.z >= 0 : normal.z <= 0;
var angle = (180 - Vector3.Angle(dir1, dir2)) * Mathf.Deg2Rad / 2;
var diff = serie.lineStyle.width / Mathf.Sin(angle);
cut = serie.lineStyle.width / Mathf.Tan(angle);
var dirDp = Vector3.Cross(dir3, Vector3.forward).normalized * (isYAxis ? -1 : 1);
dir2v = Vector3.Cross(dir2, Vector3.forward).normalized * (isYAxis ? -1 : 1);
dnPos = np + (isDown ? dirDp : -dirDp) * diff;