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

修复区域平滑折线图显示异常的问题

Browse Source
This commit is contained in:
monitor1394
2019-08-07 07:59:00 +08:00
parent 6424a2c440
commit 4684affac6
5 changed files with 250 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
Scripts/UI/Component/Serie.cs
View File

@@ -93,6 +93,12 @@ namespace XCharts
[SerializeField] private List<float> m_XData = new List<float>();
[SerializeField] private List<SerieData> m_Data = new List<SerieData>();
[NonSerialized] private int m_FilterStart;
[NonSerialized] private int m_FilterEnd;
[NonSerialized] private List<SerieData> m_FilterData;
[NonSerialized] private Dictionary<int, List<Vector3>> m_SmoothPoints = new Dictionary<int, List<Vector3>>();
[NonSerialized] private List<Vector3> m_DataPoints = new List<Vector3>();
/// <summary>
/// Whether to show serie in chart.
/// 系列是否显示在图表上。
@@ -203,10 +209,27 @@ namespace XCharts
/// 数据项个数。
/// </summary>
public int dataCount { get { return m_Data.Count; } }
/// <summary>
/// 整个系列的每段曲线的点列表
/// </summary>
/// <value></value>
public Dictionary<int, List<Vector3>> smoothPoints { get { return m_SmoothPoints; } }
private int filterStart { get; set; }
private int filterEnd { get; set; }
private List<SerieData> filterData { get; set; }
public List<Vector3> dataPoints { get { return m_DataPoints; } }
public List<Vector3> GetSmoothList(int dataIndex, int size = 100)
{
if (m_SmoothPoints.ContainsKey(dataIndex))
{
return m_SmoothPoints[dataIndex];
}
else
{
var list = new List<Vector3>(size);
m_SmoothPoints[dataIndex] = list;
return list;
}
}
/// <summary>
/// 维度Y对应数据中最大值。
@@ -503,11 +526,11 @@ namespace XCharts
var startIndex = (int)((m_Data.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((m_Data.Count - 1) * dataZoom.end / 100);
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
if (filterData == null || filterData.Count != count)
if (m_FilterData == null || m_FilterData.Count != count)
{
UpdateFilterData(dataZoom);
}
return filterData;
return m_FilterData;
}
else
{
@@ -550,23 +573,23 @@ namespace XCharts
{
var startIndex = (int)((data.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((data.Count - 1) * dataZoom.end / 100);
if (startIndex != filterStart || endIndex != filterEnd)
if (startIndex != m_FilterStart || endIndex != m_FilterEnd)
{
filterStart = startIndex;
filterEnd = endIndex;
m_FilterStart = startIndex;
m_FilterEnd = endIndex;
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
if (m_Data.Count > 0)
{
filterData = m_Data.GetRange(startIndex, count);
m_FilterData = m_Data.GetRange(startIndex, count);
}
else
{
filterData = m_Data;
m_FilterData = m_Data;
}
}
else if (endIndex == 0)
{
filterData = new List<SerieData>();
m_FilterData = new List<SerieData>();
}
}
}

18
Scripts/UI/Component/Series.cs
View File

@@ -587,6 +587,24 @@ namespace XCharts
return false;
}
public bool IsStack(string stackName)
{
_setForStack.Clear();
foreach (var serie in m_Series)
{
if (string.IsNullOrEmpty(serie.stack)) continue;
if (_setForStack.Contains(serie.stack))
{
if (serie.stack.Equals(stackName)) return true;
}
else
{
_setForStack.Add(serie.stack);
}
}
return false;
}
/// <summary>
/// 获得堆叠系列列表
/// </summary>

20
Scripts/UI/Component/Theme.cs
View File

@@ -244,18 +244,18 @@ namespace XCharts
public Color32 GetColor(int index)
{
if (index < 0) index = 0;
var customIndex = index < m_CustomColorPalette.Count ? index : index % m_CustomColorPalette.Count;
if (customIndex < m_CustomColorPalette.Count && m_CustomColorPalette[customIndex] != Color.clear)
if (m_CustomColorPalette.Count > 0)
{
return m_CustomColorPalette[customIndex];
}
else
{
var newIndex = index < m_ColorPalette.Length ? index : index % m_ColorPalette.Length;
if (newIndex < m_ColorPalette.Length)
return m_ColorPalette[newIndex];
else return Color.clear;
var customIndex = index < m_CustomColorPalette.Count ? index : index % m_CustomColorPalette.Count;
if (customIndex < m_CustomColorPalette.Count && m_CustomColorPalette[customIndex] != Color.clear)
{
return m_CustomColorPalette[customIndex];
}
}
var newIndex = index < m_ColorPalette.Length ? index : index % m_ColorPalette.Length;
if (newIndex < m_ColorPalette.Length)
return m_ColorPalette[newIndex];
else return Color.clear;
}
Dictionary<int, string> _colorDic = new Dictionary<int, string>();