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

增加DataZoom实现区域缩放

Browse Source
This commit is contained in:
monitor1394
2019-06-13 09:53:03 +08:00
parent 949f6d02aa
commit dfb0b33fe3
19 changed files with 101235 additions and 2155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Scripts/UI/BarChart.cs
View File

@@ -43,7 +43,7 @@ namespace XCharts
{
var stackSeries = m_Series.GetStackSeries();
int seriesCount = stackSeries.Count;
float scaleWid = m_YAxis.GetDataWidth(coordinateHig);
float scaleWid = m_YAxis.GetDataWidth(coordinateHig,m_DataZoom);
float barWid = m_Bar.barWidth > 1 ? m_Bar.barWidth : scaleWid * m_Bar.barWidth;
float offset = m_Bar.inSameBar ?
(scaleWid - barWid - m_Bar.space * (seriesCount - 1)) / 2 :
@@ -97,7 +97,7 @@ namespace XCharts
Vector3 sp = new Vector2(m_Tooltip.pointerPos.x, zeroY);
Vector3 ep = new Vector2(m_Tooltip.pointerPos.x, zeroY + coordinateHig);
DrawSplitLine(vh, false, Axis.SplitLineType.Dashed, sp, ep, m_ThemeInfo.tooltipLineColor);
float splitWidth = m_YAxis.GetSplitWidth(coordinateHig);
float splitWidth = m_YAxis.GetSplitWidth(coordinateHig, m_DataZoom);
float pY = zeroY + (m_Tooltip.dataIndex - 1) * splitWidth +
(m_YAxis.boundaryGap ? splitWidth / 2 : 0);
sp = new Vector2(coordinateX, pY);
@@ -122,7 +122,7 @@ namespace XCharts
{
var stackSeries = m_Series.GetStackSeries();
int seriesCount = stackSeries.Count;
float scaleWid = m_XAxis.GetDataWidth(coordinateWid);
float scaleWid = m_XAxis.GetDataWidth(coordinateWid, m_DataZoom);
float barWid = m_Bar.barWidth > 1 ? m_Bar.barWidth : scaleWid * m_Bar.barWidth;
float offset = m_Bar.inSameBar ?
(scaleWid - barWid - m_Bar.space * (seriesCount - 1)) / 2 :
@@ -137,16 +137,17 @@ namespace XCharts
Serie serie = serieList[n];
if (!m_Legend.IsActive(serie.name)) continue;
Color color = m_ThemeInfo.GetColor(serieCount);
List<float> showData = serie.GetData(m_DataZoom);
int maxCount = maxShowDataNumber > 0 ?
(maxShowDataNumber > serie.data.Count ? serie.data.Count : maxShowDataNumber)
: serie.data.Count;
(maxShowDataNumber > showData.Count ? showData.Count : maxShowDataNumber)
: showData.Count;
for (int i = minShowDataNumber; i < maxCount; i++)
{
if (!seriesCurrHig.ContainsKey(i))
{
seriesCurrHig[i] = 0;
}
float value = serie.data[i];
float value = showData[i];
float pX = zeroX + i * scaleWid;
if (!m_XAxis.boundaryGap) pX -= scaleWid / 2;
float pY = seriesCurrHig[i] + zeroY + m_Coordinate.tickness;
@@ -177,7 +178,7 @@ namespace XCharts
Vector3 ep = new Vector2(zeroX + coordinateWid, m_Tooltip.pointerPos.y);
DrawSplitLine(vh, true, Axis.SplitLineType.Dashed, sp, ep, m_ThemeInfo.tooltipLineColor);
float splitWidth = m_XAxis.GetSplitWidth(coordinateWid);
float splitWidth = m_XAxis.GetSplitWidth(coordinateWid, m_DataZoom);
float px = zeroX + (m_Tooltip.dataIndex - 1) * splitWidth
+ (m_XAxis.boundaryGap ? splitWidth / 2 : 0);
sp = new Vector2(px, coordinateY);

130
Scripts/UI/Internal/Axis.cs
View File

@@ -5,7 +5,7 @@ using UnityEngine;
namespace XCharts
{
[System.Serializable]
public class Axis : JsonDataSupport,IEquatable<Axis>
public class Axis : JsonDataSupport, IEquatable<Axis>
{
public enum AxisType
{
@@ -38,10 +38,10 @@ namespace XCharts
[SerializeField] private bool m_Inside;
[SerializeField] private float m_Length;
public bool show { get { return m_Show; }set { m_Show = value; } }
public bool show { get { return m_Show; } set { m_Show = value; } }
public bool alignWithLabel { get { return m_AlignWithLabel; } set { m_AlignWithLabel = value; } }
public bool inside { get { return m_Inside; }set { m_Inside = value; } }
public float length { get { return m_Length; }set { m_Length = value; } }
public bool inside { get { return m_Inside; } set { m_Inside = value; } }
public float length { get { return m_Length; } set { m_Length = value; } }
public static AxisTick defaultTick
{
@@ -72,7 +72,7 @@ namespace XCharts
[SerializeField] protected List<string> m_Data = new List<string>();
[SerializeField] protected AxisTick m_AxisTick = AxisTick.defaultTick;
public bool show { get { return m_Show; }set { m_Show = value; } }
public bool show { get { return m_Show; } set { m_Show = value; } }
public AxisType type { get { return m_Type; } set { m_Type = value; } }
public AxisMinMaxType minMaxType { get { return m_MinMaxType; } set { m_MinMaxType = value; } }
public int min { get { return m_Min; } set { m_Min = value; } }
@@ -83,7 +83,11 @@ namespace XCharts
public SplitLineType splitLineType { get { return m_SplitLineType; } set { m_SplitLineType = value; } }
public bool boundaryGap { get { return m_BoundaryGap; } set { m_BoundaryGap = value; } }
public List<string> data { get { return m_Data; } }
public AxisTick axisTick { get { return m_AxisTick; }set { m_AxisTick = value; } }
public AxisTick axisTick { get { return m_AxisTick; } set { m_AxisTick = value; } }
public int filterStart { get; set; }
public int filterEnd { get; set; }
public List<string> filterData { get; set; }
public void Copy(Axis other)
{
@@ -105,7 +109,7 @@ namespace XCharts
m_Data.Clear();
}
public void AddData(string category,int maxDataNumber)
public void AddData(string category, int maxDataNumber)
{
if (maxDataNumber > 0)
{
@@ -114,80 +118,136 @@ namespace XCharts
m_Data.Add(category);
}
public string GetData(int index)
public string GetData(int index,DataZoom dataZoom)
{
if (index >= 0 && index < data.Count)
return data[index];
var showData = GetData(dataZoom);
if (index >= 0 && index < showData.Count)
return showData[index];
else
return "";
}
public int GetSplitNumber()
public List<string> GetData(DataZoom dataZoom)
{
if (dataZoom != null && dataZoom.show)
{
var startIndex = (int)((data.Count-1) * dataZoom.start / 100);
var endIndex = (int)((data.Count - 1) * dataZoom.end / 100);
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
if(filterData == null || filterData.Count != count)
{
UpdateFilterData(dataZoom);
}
return filterData;
}
else
{
return m_Data;
}
}
public void UpdateFilterData(DataZoom dataZoom)
{
if (dataZoom != null && dataZoom.show)
{
var startIndex = (int)((data.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((data.Count - 1) * dataZoom.end / 100);
if(startIndex != filterStart || endIndex != filterEnd)
{
filterStart = startIndex;
filterEnd = endIndex;
if (m_Data.Count > 0)
{
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
filterData = m_Data.GetRange(startIndex, count);
}
else
{
filterData = m_Data;
}
}
else if(endIndex == 0)
{
filterData = new List<string>();
}
}
}
public int GetSplitNumber(DataZoom dataZoom)
{
if (type == AxisType.Value) return m_SplitNumber;
if (data.Count > 2 * m_SplitNumber || data.Count <= 0)
int dataCount = GetData(dataZoom).Count;
if (dataCount > 2 * m_SplitNumber || dataCount <= 0)
return m_SplitNumber;
else
return data.Count;
return dataCount;
}
public float GetSplitWidth(float coordinateWidth)
public float GetSplitWidth(float coordinateWidth,DataZoom dataZoom)
{
return coordinateWidth / (m_BoundaryGap ? GetSplitNumber() : GetSplitNumber() - 1);
return coordinateWidth / (m_BoundaryGap ? GetSplitNumber(dataZoom) : GetSplitNumber(dataZoom) - 1);
}
public int GetDataNumber()
public int GetDataNumber(DataZoom dataZoom)
{
return data.Count;
return GetData(dataZoom).Count;
}
public float GetDataWidth(float coordinateWidth)
public float GetDataWidth(float coordinateWidth, DataZoom dataZoom)
{
return coordinateWidth / (m_BoundaryGap ? data.Count : data.Count - 1);
var dataCount = GetDataNumber(dataZoom);
return coordinateWidth / (m_BoundaryGap ? dataCount : dataCount - 1);
}
public string GetScaleName(int index, float minValue = 0, float maxValue = 0)
public string GetScaleName(int index, float minValue, float maxValue, DataZoom dataZoom)
{
if (m_Type == AxisType.Value)
{
float value = (minValue + (maxValue - minValue) * index / (GetSplitNumber() - 1));
float value = (minValue + (maxValue - minValue) * index / (GetSplitNumber(dataZoom) - 1));
if (value - (int)value == 0)
return (value).ToString();
else
return (value).ToString("f1");
}
int dataCount = data.Count;
var showData = GetData(dataZoom);
int dataCount = showData.Count;
if (dataCount <= 0) return "";
if(index == GetSplitNumber() - 1 && !m_BoundaryGap)
if (index == GetSplitNumber(dataZoom) - 1 && !m_BoundaryGap)
{
return data[data.Count-1];
return showData[dataCount - 1];
}
else
{
float rate = dataCount / GetSplitNumber();
float rate = dataCount / GetSplitNumber(dataZoom);
if (rate < 1) rate = 1;
int offset = m_BoundaryGap ? (int)(rate / 2) : 0;
int newIndex = (int)(index * rate >= dataCount - 1 ? dataCount - 1 : offset + index * rate);
return data[newIndex];
int newIndex = (int)(index * rate >= dataCount - 1 ?
dataCount - 1 : offset + index * rate);
return showData[newIndex];
}
}
public int GetScaleNumber()
public int GetScaleNumber(DataZoom dataZoom)
{
if(type == AxisType.Value)
if (type == AxisType.Value)
{
return m_BoundaryGap ? m_SplitNumber + 1 : m_SplitNumber;
}
if (data.Count > 2 * splitNumber || data.Count <= 0)
return m_BoundaryGap ? m_SplitNumber + 1 : m_SplitNumber;
else
return m_BoundaryGap ? data.Count + 1 : data.Count;
{
var showData = GetData(dataZoom);
int dataCount = showData.Count;
if (dataCount > 2 * splitNumber || dataCount <= 0)
return m_BoundaryGap ? m_SplitNumber + 1 : m_SplitNumber;
else
return m_BoundaryGap ? dataCount + 1 : dataCount;
}
}
public float GetScaleWidth(float coordinateWidth)
public float GetScaleWidth(float coordinateWidth,DataZoom dataZoom)
{
int num = GetScaleNumber() - 1;
int num = GetScaleNumber(dataZoom) - 1;
if (num <= 0) num = 1;
return coordinateWidth / num;
}

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

@@ -12,7 +12,9 @@ namespace XCharts
Vertical
}
public class BaseChart : MaskableGraphic
public class BaseChart : MaskableGraphic, IPointerDownHandler, IPointerUpHandler,
IPointerEnterHandler, IPointerExitHandler, IBeginDragHandler,
IDragHandler, IEndDragHandler, IScrollHandler
{
private static readonly string s_TitleObjectName = "title";
private static readonly string s_LegendObjectName = "legend";
@@ -34,6 +36,7 @@ namespace XCharts
[NonSerialized] private Legend m_CheckLegend = Legend.defaultLegend;
[NonSerialized] private float m_CheckWidth = 0;
[NonSerialized] private float m_CheckHeight = 0;
[NonSerialized] private bool m_RefreshChart = false;
[NonSerialized] protected List<Text> m_LegendTextList = new List<Text>();
protected float chartWidth { get { return rectTransform.sizeDelta.x; } }
@@ -66,6 +69,7 @@ namespace XCharts
protected override void Awake()
{
raycastTarget = false;
m_ThemeInfo = ThemeInfo.Default;
rectTransform.anchorMax = Vector2.zero;
rectTransform.anchorMin = Vector2.zero;
@@ -85,6 +89,7 @@ namespace XCharts
CheckTile();
CheckLegend();
CheckTooltip();
CheckRefreshChart();
}
#if UNITY_EDITOR
@@ -355,6 +360,17 @@ namespace XCharts
{
}
protected void CheckRefreshChart()
{
if (m_RefreshChart)
{
int tempWid = (int)chartWidth;
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, tempWid - 1);
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, tempWid);
m_RefreshChart = false;
}
}
protected virtual void OnSizeChanged()
{
InitTitle();
@@ -400,9 +416,7 @@ namespace XCharts
public void RefreshChart()
{
int tempWid = (int)chartWidth;
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, tempWid - 1);
rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, tempWid);
m_RefreshChart = true;
}
protected virtual void RefreshTooltip()
@@ -434,5 +448,38 @@ namespace XCharts
Vector3 p4 = new Vector3(0, 0);
ChartHelper.DrawPolygon(vh, p1, p2, p3, p4, m_ThemeInfo.backgroundColor);
}
public virtual void OnPointerDown(PointerEventData eventData)
{
}
public virtual void OnPointerUp(PointerEventData eventData)
{
}
public virtual void OnPointerEnter(PointerEventData eventData)
{
}
public virtual void OnPointerExit(PointerEventData eventData)
{
}
public virtual void OnBeginDrag(PointerEventData eventData)
{
}
public virtual void OnEndDrag(PointerEventData eventData)
{
}
public virtual void OnDrag(PointerEventData eventData)
{
}
public virtual void OnScroll(PointerEventData eventData)
{
}
}
}

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

@@ -3,6 +3,7 @@ using UnityEngine.UI;
using System.Collections.Generic;
using System.Text;
using System;
using UnityEngine.EventSystems;
namespace XCharts
{
@@ -10,13 +11,20 @@ namespace XCharts
{
private static readonly string s_DefaultSplitNameY = "split_y";
private static readonly string s_DefaultSplitNameX = "split_x";
private static readonly string s_DefaultDataZoom = "datazoom";
[SerializeField] protected Coordinate m_Coordinate = Coordinate.defaultCoordinate;
[SerializeField] protected XAxis m_XAxis = XAxis.defaultXAxis;
[SerializeField] protected YAxis m_YAxis = YAxis.defaultYAxis;
[SerializeField] protected DataZoom m_DataZoom = DataZoom.defaultDataZoom;
private float m_ZeroXOffset;
private float m_ZeroYOffset;
private bool m_DataZoomDrag;
private bool m_DataZoomStartDrag;
private bool m_DataZoomEndDrag;
private float m_DataZoomLastStartIndex;
private float m_DataZoomLastEndIndex;
private XAxis m_CheckXAxis = XAxis.defaultXAxis;
private YAxis m_CheckYAxis = YAxis.defaultYAxis;
@@ -38,6 +46,7 @@ namespace XCharts
protected override void Awake()
{
CheckMinMaxValue();
InitDataZoom();
InitSplitX();
InitSplitY();
base.Awake();
@@ -50,8 +59,10 @@ namespace XCharts
CheckXAxis();
CheckMinMaxValue();
CheckCoordinate();
CheckDataZoom();
}
#if UNITY_EDITOR
protected override void Reset()
{
base.Reset();
@@ -61,11 +72,13 @@ namespace XCharts
InitSplitX();
InitSplitY();
}
#endif
protected override void DrawChart(VertexHelper vh)
{
base.DrawChart(vh);
DrawCoordinate(vh);
DrawDataZoom(vh);
}
protected override void CheckTootipArea(Vector2 local)
@@ -80,8 +93,8 @@ namespace XCharts
{
if (m_XAxis.type == Axis.AxisType.Value)
{
float splitWid = m_YAxis.GetDataWidth(coordinateHig);
for (int i = 0; i < m_YAxis.GetDataNumber(); i++)
float splitWid = m_YAxis.GetDataWidth(coordinateHig, m_DataZoom);
for (int i = 0; i < m_YAxis.GetDataNumber(m_DataZoom); i++)
{
float pY = zeroY + i * splitWid;
if (m_YAxis.boundaryGap)
@@ -104,8 +117,8 @@ namespace XCharts
}
else
{
float splitWid = m_XAxis.GetDataWidth(coordinateWid);
for (int i = 0; i < m_XAxis.GetDataNumber(); i++)
float splitWid = m_XAxis.GetDataWidth(coordinateWid, m_DataZoom);
for (int i = 0; i < m_XAxis.GetDataNumber(m_DataZoom); i++)
{
float pX = zeroX + i * splitWid;
if (m_XAxis.boundaryGap)
@@ -153,19 +166,19 @@ namespace XCharts
if (m_Series.Count == 1)
{
float value = m_Series.GetData(0, index);
string txt = tempAxis.GetData(index) + ": " + value;
string txt = tempAxis.GetData(index, m_DataZoom) + ": " + value;
m_Tooltip.UpdateContentText(txt);
}
else
{
StringBuilder sb = new StringBuilder(tempAxis.GetData(index));
StringBuilder sb = new StringBuilder(tempAxis.GetData(index, m_DataZoom));
for (int i = 0; i < m_Series.Count; i++)
{
if (m_Series.series[i].show)
{
string strColor = ColorUtility.ToHtmlStringRGBA(m_ThemeInfo.GetColor(i));
string key = m_Series.series[i].name;
float value = m_Series.series[i].data[index];
float value = m_Series.series[i].GetData(index, m_DataZoom);
sb.Append("\n");
sb.AppendFormat("<color=#{0}>● </color>", strColor);
sb.AppendFormat("{0}: {1}", key, value);
@@ -177,8 +190,8 @@ namespace XCharts
if (m_XAxis.type == Axis.AxisType.Value)
{
float hig = (maxValue - minValue) * (m_Tooltip.pointerPos.x - zeroX) / coordinateWid;
m_Tooltip.UpdateLabelText(hig.ToString("f2"), tempAxis.GetData(index));
float splitWidth = m_YAxis.GetSplitWidth(coordinateHig);
m_Tooltip.UpdateLabelText(hig.ToString("f2"), tempAxis.GetData(index, m_DataZoom));
float splitWidth = m_YAxis.GetSplitWidth(coordinateHig, m_DataZoom);
float py = zeroY + (m_Tooltip.dataIndex - 1) * splitWidth
+ (m_YAxis.boundaryGap ? splitWidth / 2 : 0);
Vector2 xLabelPos = new Vector2(m_Tooltip.pointerPos.x, coordinateY - 4 * m_Coordinate.tickness);
@@ -188,8 +201,8 @@ namespace XCharts
else
{
float hig = (maxValue - minValue) * (m_Tooltip.pointerPos.y - zeroY) / coordinateHig;
m_Tooltip.UpdateLabelText(tempAxis.GetData(index), hig.ToString("f2"));
float splitWidth = m_XAxis.GetSplitWidth(coordinateWid);
m_Tooltip.UpdateLabelText(tempAxis.GetData(index, m_DataZoom), hig.ToString("f2"));
float splitWidth = m_XAxis.GetSplitWidth(coordinateWid, m_DataZoom);
float px = zeroX + (m_Tooltip.dataIndex - 1) * splitWidth
+ (m_XAxis.boundaryGap ? splitWidth / 2 : 0);
Vector2 xLabelPos = new Vector2(px, coordinateY - 6 * m_Coordinate.tickness);
@@ -256,21 +269,21 @@ namespace XCharts
private void InitSplitY()
{
m_SplitYTextList.Clear();
float splitWidth = m_YAxis.GetScaleWidth(coordinateHig);
float splitWidth = m_YAxis.GetScaleWidth(coordinateHig, m_DataZoom);
var titleObject = ChartHelper.AddObject(s_DefaultSplitNameY, transform, chartAnchorMin,
chartAnchorMax, chartPivot, new Vector2(chartWidth, chartHeight));
titleObject.transform.localPosition = Vector3.zero;
ChartHelper.HideAllObject(titleObject, s_DefaultSplitNameY);
for (int i = 0; i < m_YAxis.GetSplitNumber(); i++)
for (int i = 0; i < m_YAxis.GetSplitNumber(m_DataZoom); i++)
{
Text txt = ChartHelper.AddTextObject(s_DefaultSplitNameY + i, titleObject.transform,
m_ThemeInfo.font, m_ThemeInfo.textColor, TextAnchor.MiddleRight, Vector2.zero,
Vector2.zero, new Vector2(1, 0.5f), new Vector2(m_Coordinate.left, 20),
m_Coordinate.fontSize, m_XAxis.textRotation);
txt.transform.localPosition = GetSplitYPosition(splitWidth, i);
txt.text = m_YAxis.GetScaleName(i, minValue, maxValue);
txt.text = m_YAxis.GetScaleName(i, minValue, maxValue, m_DataZoom);
txt.gameObject.SetActive(m_YAxis.show);
m_SplitYTextList.Add(txt);
}
@@ -279,14 +292,13 @@ namespace XCharts
public void InitSplitX()
{
m_SplitXTextList.Clear();
float splitWidth = m_XAxis.GetScaleWidth(coordinateWid);
float splitWidth = m_XAxis.GetScaleWidth(coordinateWid, m_DataZoom);
var titleObject = ChartHelper.AddObject(s_DefaultSplitNameX, transform, chartAnchorMin,
chartAnchorMax, chartPivot, new Vector2(chartWidth, chartHeight));
titleObject.transform.localPosition = Vector3.zero;
ChartHelper.HideAllObject(titleObject, s_DefaultSplitNameX);
for (int i = 0; i < m_XAxis.GetSplitNumber(); i++)
for (int i = 0; i < m_XAxis.GetSplitNumber(m_DataZoom); i++)
{
Text txt = ChartHelper.AddTextObject(s_DefaultSplitNameX + i, titleObject.transform,
m_ThemeInfo.font, m_ThemeInfo.textColor, TextAnchor.MiddleCenter, Vector2.zero,
@@ -294,12 +306,30 @@ namespace XCharts
m_Coordinate.fontSize, m_XAxis.textRotation);
txt.transform.localPosition = GetSplitXPosition(splitWidth, i);
txt.text = m_XAxis.GetScaleName(i, minValue, maxValue);
txt.text = m_XAxis.GetScaleName(i, minValue, maxValue, m_DataZoom);
txt.gameObject.SetActive(m_XAxis.show);
m_SplitXTextList.Add(txt);
}
}
private void InitDataZoom()
{
var dataZoomObject = ChartHelper.AddObject(s_DefaultDataZoom, transform, chartAnchorMin,
chartAnchorMax, chartPivot, new Vector2(chartWidth, chartHeight));
dataZoomObject.transform.localPosition = Vector3.zero;
ChartHelper.HideAllObject(dataZoomObject, s_DefaultDataZoom);
m_DataZoom.startLabel = ChartHelper.AddTextObject(s_DefaultDataZoom + "start",
dataZoomObject.transform, m_ThemeInfo.font, m_ThemeInfo.textColor, TextAnchor.MiddleRight,
Vector2.zero, Vector2.zero, new Vector2(1, 0.5f), new Vector2(200, 20));
m_DataZoom.endLabel = ChartHelper.AddTextObject(s_DefaultDataZoom + "end",
dataZoomObject.transform, m_ThemeInfo.font, m_ThemeInfo.textColor, TextAnchor.MiddleLeft,
Vector2.zero, Vector2.zero, new Vector2(0, 0.5f), new Vector2(200, 20));
m_DataZoom.SetLabelActive(false);
m_XAxis.UpdateFilterData(m_DataZoom);
m_Series.UpdateFilterData(m_DataZoom);
raycastTarget = m_DataZoom.show;
}
private Vector3 GetSplitYPosition(float scaleWid, int i)
{
if (m_YAxis.boundaryGap)
@@ -361,7 +391,7 @@ namespace XCharts
int tempMaxValue = 100;
if (m_Series != null)
{
m_Series.GetMinMaxValue(out tempMinValue, out tempMaxValue);
m_Series.GetMinMaxValue(m_DataZoom, out tempMinValue, out tempMaxValue);
}
if (m_XAxis.type == Axis.AxisType.Value)
{
@@ -463,7 +493,7 @@ namespace XCharts
{
for (int i = 0; i < m_SplitYTextList.Count; i++)
{
m_SplitYTextList[i].text = m_YAxis.GetScaleName(i, minValue, maxValue);
m_SplitYTextList[i].text = m_YAxis.GetScaleName(i, minValue, maxValue, m_DataZoom);
}
}
@@ -471,7 +501,7 @@ namespace XCharts
{
for (int i = 0; i < m_SplitXTextList.Count; i++)
{
m_SplitXTextList[i].text = m_XAxis.GetScaleName(i, minValue, maxValue);
m_SplitXTextList[i].text = m_XAxis.GetScaleName(i, minValue, maxValue, m_DataZoom);
}
}
@@ -480,13 +510,13 @@ namespace XCharts
#region draw tick and splitline
if (m_YAxis.show)
{
for (int i = 0; i < m_YAxis.GetScaleNumber(); i++)
for (int i = 0; i < m_YAxis.GetScaleNumber(m_DataZoom); i++)
{
float pX = 0;
float pY = coordinateY + i * m_YAxis.GetScaleWidth(coordinateHig);
float pY = coordinateY + i * m_YAxis.GetScaleWidth(coordinateHig, m_DataZoom);
if (m_YAxis.boundaryGap && m_YAxis.axisTick.alignWithLabel)
{
pY -= m_YAxis.GetScaleWidth(coordinateHig) / 2;
pY -= m_YAxis.GetScaleWidth(coordinateHig, m_DataZoom) / 2;
}
if (m_YAxis.axisTick.show)
@@ -504,13 +534,13 @@ namespace XCharts
}
if (m_XAxis.show)
{
for (int i = 0; i < m_XAxis.GetScaleNumber(); i++)
for (int i = 0; i < m_XAxis.GetScaleNumber(m_DataZoom); i++)
{
float pX = coordinateX + i * m_XAxis.GetScaleWidth(coordinateWid);
float pX = coordinateX + i * m_XAxis.GetScaleWidth(coordinateWid, m_DataZoom);
float pY = 0;
if (m_XAxis.boundaryGap && m_XAxis.axisTick.alignWithLabel)
{
pX -= m_XAxis.GetScaleWidth(coordinateWid) / 2;
pX -= m_XAxis.GetScaleWidth(coordinateWid, m_DataZoom) / 2;
}
if (m_XAxis.axisTick.show)
{
@@ -562,6 +592,59 @@ namespace XCharts
#endregion
}
private void DrawDataZoom(VertexHelper vh)
{
if (!m_DataZoom.show) return;
var p1 = new Vector2(coordinateX, m_DataZoom.bottom);
var p2 = new Vector2(coordinateX, m_DataZoom.bottom + m_DataZoom.height);
var p3 = new Vector2(coordinateX + coordinateWid, m_DataZoom.bottom + m_DataZoom.height);
var p4 = new Vector2(coordinateX + coordinateWid, m_DataZoom.bottom);
ChartHelper.DrawLine(vh, p1, p2, m_Coordinate.tickness, m_ThemeInfo.axisSplitLineColor);
ChartHelper.DrawLine(vh, p2, p3, m_Coordinate.tickness, m_ThemeInfo.axisSplitLineColor);
ChartHelper.DrawLine(vh, p3, p4, m_Coordinate.tickness, m_ThemeInfo.axisSplitLineColor);
ChartHelper.DrawLine(vh, p4, p1, m_Coordinate.tickness, m_ThemeInfo.axisSplitLineColor);
if (m_DataZoom.showDataShadow && m_Series.Count > 0)
{
Serie serie = m_Series.series[0];
float scaleWid = coordinateWid / (serie.data.Count - 1);
Vector3 lp = Vector3.zero;
Vector3 np = Vector3.zero;
for (int i = 0; i < serie.data.Count; i++)
{
float value = serie.data[i];
float pX = zeroX + i * scaleWid;
float dataHig = value / (maxValue - minValue) * m_DataZoom.height;
np = new Vector3(pX, m_DataZoom.bottom + dataHig);
if (i > 0)
{
Color color = m_ThemeInfo.axisSplitLineColor;
ChartHelper.DrawLine(vh, lp, np, m_Coordinate.tickness, color);
Vector3 alp = new Vector3(lp.x, lp.y - m_Coordinate.tickness);
Vector3 anp = new Vector3(np.x, np.y - m_Coordinate.tickness);
Color areaColor = new Color(color.r, color.g, color.b, color.a * 0.75f);
Vector3 tnp = new Vector3(np.x, m_DataZoom.bottom + m_Coordinate.tickness);
Vector3 tlp = new Vector3(lp.x, m_DataZoom.bottom + m_Coordinate.tickness);
ChartHelper.DrawPolygon(vh, alp, anp, tnp, tlp, areaColor);
}
lp = np;
}
}
switch (m_DataZoom.rangeMode)
{
case DataZoom.RangeMode.Percent:
var start = coordinateX + coordinateWid * m_DataZoom.start / 100;
var end = coordinateX + coordinateWid * m_DataZoom.end / 100;
p1 = new Vector2(start, m_DataZoom.bottom);
p2 = new Vector2(start, m_DataZoom.bottom + m_DataZoom.height);
p3 = new Vector2(end, m_DataZoom.bottom + m_DataZoom.height);
p4 = new Vector2(end, m_DataZoom.bottom);
ChartHelper.DrawPolygon(vh, p1, p2, p3, p4, m_ThemeInfo.axisSplitLineColor);
ChartHelper.DrawLine(vh, p1, p2, m_Coordinate.tickness, m_ThemeInfo.axisSplitLineColor);
ChartHelper.DrawLine(vh, p3, p4, m_Coordinate.tickness, m_ThemeInfo.axisSplitLineColor);
break;
}
}
protected void DrawSplitLine(VertexHelper vh, bool isYAxis, Axis.SplitLineType type,
Vector3 startPos, Vector3 endPos, Color color)
{
@@ -598,6 +681,210 @@ namespace XCharts
break;
}
}
private void CheckDataZoom()
{
if(raycastTarget != m_DataZoom.show)
{
raycastTarget = m_DataZoom.show;
}
if (!m_DataZoom.show) return;
if (m_DataZoom.showDetail)
{
Vector2 local;
if (!RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform,
Input.mousePosition, null, out local))
{
m_DataZoom.SetLabelActive(false);
return;
}
if (m_DataZoom.IsInSelectedZoom(local, coordinateX, coordinateWid)
|| m_DataZoom.IsInStartZoom(local, coordinateX, coordinateWid)
|| m_DataZoom.IsInEndZoom(local, coordinateX, coordinateWid))
{
m_DataZoom.SetLabelActive(true);
RefreshDataZoomLabel();
}
else
{
m_DataZoom.SetLabelActive(false);
}
}
}
public override void OnBeginDrag(PointerEventData eventData)
{
var pos = transform.InverseTransformPoint(eventData.position);
if (m_DataZoom.IsInStartZoom(pos, coordinateX, coordinateWid))
{
m_DataZoom.isDraging = true;
m_DataZoomStartDrag = true;
}
else if (m_DataZoom.IsInEndZoom(pos, coordinateX, coordinateWid))
{
m_DataZoom.isDraging = true;
m_DataZoomEndDrag = true;
}
else if (m_DataZoom.IsInSelectedZoom(pos, coordinateX, coordinateWid))
{
m_DataZoom.isDraging = true;
m_DataZoomDrag = true;
}
}
public override void OnDrag(PointerEventData eventData)
{
//Debug.LogError("drag");
float deltaX = eventData.delta.x;
float deltaPercent = deltaX / coordinateWid * 100;
if (m_DataZoomStartDrag)
{
m_DataZoom.start += deltaPercent;
if (m_DataZoom.start < 0)
{
m_DataZoom.start = 0;
}
else if (m_DataZoom.start > m_DataZoom.end)
{
m_DataZoom.start = m_DataZoom.end;
m_DataZoomEndDrag = true;
m_DataZoomStartDrag = false;
}
RefreshDataZoomLabel();
RefreshChart();
}
else if (m_DataZoomEndDrag)
{
m_DataZoom.end += deltaPercent;
if (m_DataZoom.end > 100)
{
m_DataZoom.end = 100;
}
else if (m_DataZoom.end < m_DataZoom.start)
{
m_DataZoom.end = m_DataZoom.start;
m_DataZoomStartDrag = true;
m_DataZoomEndDrag = false;
}
RefreshDataZoomLabel();
RefreshChart();
}
else if (m_DataZoomDrag)
{
if (deltaPercent > 0)
{
if (m_DataZoom.end + deltaPercent > 100)
{
deltaPercent = 100 - m_DataZoom.end;
}
}
else
{
if (m_DataZoom.start + deltaPercent < 0)
{
deltaPercent = -m_DataZoom.start;
}
}
m_DataZoom.start += deltaPercent;
m_DataZoom.end += deltaPercent;
RefreshDataZoomLabel();
RefreshChart();
}
}
private void RefreshDataZoomLabel()
{
var startIndex = (int)((xAxis.data.Count - 1) * m_DataZoom.start / 100);
var endIndex = (int)((xAxis.data.Count - 1) * m_DataZoom.end / 100);
if (m_DataZoomLastStartIndex != startIndex || m_DataZoomLastEndIndex != endIndex)
{
m_DataZoomLastStartIndex = startIndex;
m_DataZoomLastEndIndex = endIndex;
if (xAxis.data.Count > 0)
{
m_DataZoom.SetStartLabelText(xAxis.data[startIndex]);
m_DataZoom.SetEndLabelText(xAxis.data[endIndex]);
}
InitSplitX();
}
var start = coordinateX + coordinateWid * m_DataZoom.start / 100;
var end = coordinateX + coordinateWid * m_DataZoom.end / 100;
m_DataZoom.startLabel.transform.localPosition =
new Vector3(start - 10, m_DataZoom.bottom + m_DataZoom.height / 2);
m_DataZoom.endLabel.transform.localPosition =
new Vector3(end + 10, m_DataZoom.bottom + m_DataZoom.height / 2);
}
public override void OnEndDrag(PointerEventData eventData)
{
if(m_DataZoomDrag || m_DataZoomStartDrag || m_DataZoomEndDrag)
{
RefreshChart();
}
m_DataZoomDrag = false;
m_DataZoomStartDrag = false;
m_DataZoomEndDrag = false;
m_DataZoom.isDraging = false;
}
public override void OnPointerDown(PointerEventData eventData)
{
var localPos = transform.InverseTransformPoint(eventData.position);
if (m_DataZoom.IsInStartZoom(localPos, coordinateX, coordinateWid) ||
m_DataZoom.IsInEndZoom(localPos, coordinateX, coordinateWid))
{
return;
}
if (m_DataZoom.IsInZoom(localPos, coordinateX, coordinateWid)
&& !m_DataZoom.IsInSelectedZoom(localPos, coordinateX, coordinateWid))
{
var pointerX = localPos.x;
var selectWidth = coordinateWid * (m_DataZoom.end - m_DataZoom.start) / 100;
var startX = pointerX - selectWidth / 2;
var endX = pointerX + selectWidth / 2;
if (startX < coordinateX)
{
startX = coordinateX;
endX = coordinateX + selectWidth;
}
else if (endX > coordinateX + coordinateWid)
{
endX = coordinateX + coordinateWid;
startX = coordinateX + coordinateWid - selectWidth;
}
m_DataZoom.start = (startX - coordinateX) / coordinateWid * 100;
m_DataZoom.end = (endX - coordinateX) / coordinateWid * 100;
RefreshDataZoomLabel();
RefreshChart();
}
}
public override void OnScroll(PointerEventData eventData)
{
if (!m_DataZoom.show || m_DataZoom.zoomLock) return;
float deltaPercent = Mathf.Abs(eventData.scrollDelta.y *
m_DataZoom.scrollSensitivity / coordinateWid * 100);
if (eventData.scrollDelta.y > 0)
{
if (m_DataZoom.end <= m_DataZoom.start) return;
m_DataZoom.end -= deltaPercent;
m_DataZoom.start += deltaPercent;
if (m_DataZoom.end <= m_DataZoom.start)
{
m_DataZoom.end = m_DataZoom.start;
}
}
else
{
m_DataZoom.end += deltaPercent;
m_DataZoom.start -= deltaPercent;
if (m_DataZoom.end > 100) m_DataZoom.end = 100;
if (m_DataZoom.start < 0) m_DataZoom.start = 0;
}
RefreshDataZoomLabel();
RefreshChart();
}
}
}

142
Scripts/UI/Internal/DataZoom.cs Normal file
View File

@@ -0,0 +1,142 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
namespace XCharts
{
[System.Serializable]
public class DataZoom
{
public enum DataZoomType
{
Inside,
Slider
}
public enum FilterMode
{
Filter,
WeakFilter,
Empty,
None
}
public enum RangeMode
{
//Value,
Percent
}
[SerializeField] private bool m_Show;
[SerializeField] private DataZoomType m_Type;
[SerializeField] private FilterMode m_FilterMode;
[SerializeField] private Orient m_Orient;
[SerializeField] private bool m_ShowDataShadow;
[SerializeField] private bool m_ShowDetail;
[SerializeField] private bool m_ZoomLock;
[SerializeField] private bool m_Realtime;
[SerializeField] private Color m_BackgroundColor;
[SerializeField] private float m_Height;
[SerializeField] private float m_Bottom;
[SerializeField] private RangeMode m_RangeMode;
[SerializeField] private float m_Start;
[SerializeField] private float m_End;
[SerializeField] private float m_StartValue;
[SerializeField] private float m_EndValue;
[Range(1f, 20f)]
[SerializeField] private float m_ScrollSensitivity;
public bool show { get { return m_Show; } set { m_Show = value; } }
public DataZoomType type { get { return m_Type; } set { m_Type = value; } }
public FilterMode filterMode { get { return m_FilterMode; } set { m_FilterMode = value; } }
public Orient orient { get { return m_Orient; } set { m_Orient = value; } }
public bool showDataShadow { get { return m_ShowDataShadow; } set { m_ShowDataShadow = value; } }
public bool showDetail { get { return m_ShowDetail; } set { m_ShowDetail = value; } }
public bool zoomLock { get { return m_ZoomLock; } set { m_ZoomLock = value; } }
public bool realtime { get { return m_Realtime; } set { m_Realtime = value; } }
public Color backgroundColor { get { return m_BackgroundColor; } set { m_BackgroundColor = value; } }
public float bottom { get { return m_Bottom; } set { m_Bottom = value; } }
public float height { get { return m_Height; } set { m_Height = value; } }
public RangeMode rangeMode { get { return m_RangeMode; } set { m_RangeMode = value; } }
public float start { get { return m_Start; } set { m_Start = value; } }
public float end { get { return m_End; } set { m_End = value; } }
public float startValue { get { return m_StartValue; } set { m_StartValue = value; } }
public float endValue { get { return m_EndValue; } set { m_EndValue = value; } }
public float scrollSensitivity { get { return m_ScrollSensitivity; } set { m_ScrollSensitivity = value; } }
public bool isDraging { get; set; }
public Text startLabel { get; set; }
public Text endLabel { get; set; }
public static DataZoom defaultDataZoom
{
get
{
return new DataZoom()
{
m_Type = DataZoomType.Slider,
filterMode = FilterMode.None,
orient = Orient.Horizonal,
showDataShadow = true,
showDetail = false,
zoomLock = false,
realtime = true,
m_Height = 50,
m_Bottom = 10,
rangeMode = RangeMode.Percent,
start = 30,
end = 70,
m_ScrollSensitivity=10,
};
}
}
public bool IsInZoom(Vector2 pos, float startX, float width)
{
Rect rect = Rect.MinMaxRect(startX, m_Bottom, startX + width, m_Bottom + m_Height);
return rect.Contains(pos);
}
public bool IsInSelectedZoom(Vector2 pos, float startX, float width)
{
var start = startX + width * m_Start / 100;
var end = startX + width * m_End / 100;
Rect rect = Rect.MinMaxRect(start, m_Bottom, end, m_Bottom + m_Height);
return rect.Contains(pos);
}
public bool IsInStartZoom(Vector2 pos, float startX, float width)
{
var start = startX + width * m_Start / 100;
Rect rect = Rect.MinMaxRect(start - 10, m_Bottom, start + 10, m_Bottom + m_Height);
return rect.Contains(pos);
}
public bool IsInEndZoom(Vector2 pos, float startX, float width)
{
var end = startX + width * m_End / 100;
Rect rect = Rect.MinMaxRect(end - 10, m_Bottom, end + 10, m_Bottom + m_Height);
return rect.Contains(pos);
}
public void SetLabelActive(bool flag)
{
if(startLabel && startLabel.gameObject.activeInHierarchy!=flag)
{
startLabel.gameObject.SetActive(flag);
}
if (endLabel && endLabel.gameObject.activeInHierarchy != flag)
{
endLabel.gameObject.SetActive(flag);
}
}
public void SetStartLabelText(string text)
{
if (startLabel) startLabel.text = text;
}
public void SetEndLabelText(string text)
{
if (endLabel) endLabel.text = text;
}
}
}

13
Scripts/UI/Internal/DataZoom.cs.meta Normal file
View File

@@ -0,0 +1,13 @@
fileFormatVersion: 2
guid: 55000eccffd85064ea6a4d1d39ff63bb
timeCreated: 1559526210
licenseType: Free
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

1
Scripts/UI/Internal/JsonDataSupport.cs
View File

@@ -1,5 +1,4 @@
using UnityEngine;
using UnityEditor;
using System;
namespace XCharts

1
Scripts/UI/Internal/Radar.cs
View File

@@ -1,5 +1,4 @@
using UnityEngine;
using UnityEditor;
using System.Collections.Generic;
using System;
using System.Text.RegularExpressions;

61
Scripts/UI/Internal/Serie.cs
View File

@@ -20,11 +20,15 @@ namespace XCharts
[SerializeField] private List<float> m_Data = new List<float>();
[SerializeField] private bool m_Flodout;
public bool show { get { return m_Show; }set { m_Show = value; } }
public bool show { get { return m_Show; } set { m_Show = value; } }
public SerieType type { get { return m_Type; } set { m_Type = value; } }
public string name { get { return m_Name; } set { m_Name = value; } }
public string stack { get { return m_Stack; } set { m_Stack = value; } }
public List<float> data { get { return m_Data; }set { m_Data = value; } }
public List<float> data { get { return m_Data; } set { m_Data = value; } }
public int filterStart { get; set; }
public int filterEnd { get; set; }
public List<float> filterData { get; set; }
public float Max
{
@@ -90,15 +94,62 @@ namespace XCharts
m_Data.Add(value);
}
public float GetData(int index)
public float GetData(int index,DataZoom dataZoom = null)
{
if (index >= 0 && index <= data.Count - 1)
var showData = GetData(dataZoom);
if (index >= 0 && index <= showData.Count - 1)
{
return data[index];
return showData[index];
}
return 0;
}
public List<float> GetData(DataZoom dataZoom)
{
if (dataZoom != null && dataZoom.show)
{
var startIndex = (int)((data.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((data.Count - 1) * dataZoom.end / 100);
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
if (filterData == null || filterData.Count != count)
{
UpdateFilterData(dataZoom);
}
return filterData;
}
else
{
return m_Data;
}
}
public void UpdateFilterData(DataZoom dataZoom)
{
if (dataZoom != null && dataZoom.show)
{
var startIndex = (int)((data.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((data.Count - 1) * dataZoom.end / 100);
if (startIndex != filterStart || endIndex != filterEnd)
{
filterStart = startIndex;
filterEnd = endIndex;
if(m_Data.Count > 0)
{
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
filterData = m_Data.GetRange(startIndex, count);
}
else
{
filterData = m_Data;
}
}
else if (endIndex == 0)
{
filterData = new List<float>();
}
}
}
public void UpdateData(int index, float value)
{
if (index >= 0 && index <= m_Data.Count - 1)

62
Scripts/UI/Internal/Series.cs
View File

@@ -1,7 +1,5 @@
using UnityEngine;
using UnityEditor;
using System.Collections.Generic;
using System;
namespace XCharts
{
@@ -134,6 +132,17 @@ namespace XCharts
}
}
public void UpdateFilterData(DataZoom dataZoom)
{
if (dataZoom != null && dataZoom.show)
{
for (int i = 0; i < m_Series.Count; i++)
{
m_Series[i].UpdateFilterData(dataZoom);
}
}
}
public bool IsActive(string name)
{
var serie = GetSerie(name);
@@ -164,7 +173,7 @@ namespace XCharts
}
}
public void GetMinMaxValue(out int minVaule, out int maxValue)
public void GetMinMaxValue(DataZoom dataZoom, out int minVaule, out int maxValue)
{
float min = int.MaxValue;
float max = int.MinValue;
@@ -177,11 +186,12 @@ namespace XCharts
for (int i = 0; i < ss.Value.Count; i++)
{
var serie = ss.Value[i];
for (int j = 0; j < serie.data.Count; j++)
var showData = serie.GetData(dataZoom);
for (int j = 0; j < showData.Count; j++)
{
if (!seriesTotalValue.ContainsKey(j))
seriesTotalValue[j] = 0;
seriesTotalValue[j] = seriesTotalValue[j] + serie.data[j];
seriesTotalValue[j] = seriesTotalValue[j] + showData[j];
}
}
float tmax = int.MinValue;
@@ -201,8 +211,20 @@ namespace XCharts
{
if (IsActive(i))
{
if (m_Series[i].Max > max) max = m_Series[i].Max;
if (m_Series[i].Min < min) min = m_Series[i].Min;
if(dataZoom != null && dataZoom.show)
{
var showData = m_Series[i].GetData(dataZoom);
foreach(var data in showData)
{
if (data > max) max = data;
if (data < min) min = data;
}
}
else
{
if (m_Series[i].Max > max) max = m_Series[i].Max;
if (m_Series[i].Min < min) min = m_Series[i].Min;
}
}
}
}
@@ -216,36 +238,22 @@ namespace XCharts
minVaule = (int)min;
maxValue = (int)max;
}
//else if (max > 0 && min > 0)
//{
// minVaule = 0;
// maxValue = ChartHelper.GetMaxDivisibleValue(max);
//}
//else if (min < 0 && max < 0)
//{
// minVaule = ChartHelper.GetMaxDivisibleValue(min);
// maxValue = 0;
//}
//else
//{
// minVaule = ChartHelper.GetMaxDivisibleValue(min);
// maxValue = ChartHelper.GetMaxDivisibleValue(max);
//}
}
public float GetMaxValue(int index, int splitNumber = 0)
public float GetMaxValue(int index)
{
float max = int.MinValue;
float min = int.MaxValue;
for (int i = 0; i < m_Series.Count; i++)
{
if (m_Series[i].data[index] > max)
var showData = m_Series[i].data;
if (showData[index] > max)
{
max = Mathf.Ceil(m_Series[i].data[index]);
max = Mathf.Ceil(showData[index]);
}
if (m_Series[i].data[index] < min)
if (showData[index] < min)
{
min = Mathf.Ceil(m_Series[i].data[index]);
min = Mathf.Ceil(showData[index]);
}
}
if (max < 1 && max > -1) return max;

17
Scripts/UI/LineChart.cs
View File

@@ -20,11 +20,13 @@ namespace XCharts
base.Update();
}
#if UNITY_EDITOR
protected override void Reset()
{
base.Reset();
m_Line = Line.defaultLine;
}
#endif
protected override void DrawChart(VertexHelper vh)
{
@@ -44,7 +46,7 @@ namespace XCharts
{
var stackSeries = m_Series.GetStackSeries();
int seriesCount = stackSeries.Count;
float scaleWid = m_XAxis.GetDataWidth(coordinateWid);
float scaleWid = m_XAxis.GetDataWidth(coordinateWid, m_DataZoom);
int serieCount = 0;
List<Vector3> points = new List<Vector3>();
List<Vector3> smoothPoints = new List<Vector3>();
@@ -61,14 +63,15 @@ namespace XCharts
if (!IsActive(serie.name)) continue;
List<Vector3> lastPoints = new List<Vector3>();
List<Vector3> lastSmoothPoints = new List<Vector3>();
List<float> serieData = serie.GetData(m_DataZoom);
Color color = m_ThemeInfo.GetColor(serieCount);
Vector3 lp = Vector3.zero;
Vector3 np = Vector3.zero;
float startX = zeroX + (m_XAxis.boundaryGap ? scaleWid / 2 : 0);
int maxCount = maxShowDataNumber > 0 ?
(maxShowDataNumber > serie.data.Count ? serie.data.Count : maxShowDataNumber)
: serie.data.Count;
(maxShowDataNumber > serieData.Count ? serieData.Count : maxShowDataNumber)
: serieData.Count;
dataCount = (maxCount - minShowDataNumber);
if (m_Line.area && points.Count > 0)
{
@@ -95,7 +98,7 @@ namespace XCharts
{
seriesCurrHig[i] = 0;
}
float value = serie.data[i];
float value = serieData[i];
float pX = startX + i * scaleWid;
float pY = seriesCurrHig[i] + zeroY + m_Coordinate.tickness;
float dataHig = value / (maxValue - minValue) * coordinateHig;
@@ -264,7 +267,7 @@ namespace XCharts
//draw tooltip line
if (m_Tooltip.show && m_Tooltip.dataIndex > 0)
{
float splitWidth = m_XAxis.GetSplitWidth(coordinateWid);
float splitWidth = m_XAxis.GetSplitWidth(coordinateWid, m_DataZoom);
float px = zeroX + (m_Tooltip.dataIndex - 1) * splitWidth
+ (m_XAxis.boundaryGap ? splitWidth / 2 : 0);
Vector2 sp = new Vector2(px, coordinateY);
@@ -283,7 +286,7 @@ namespace XCharts
{
var stackSeries = m_Series.GetStackSeries();
int seriesCount = stackSeries.Count;
float scaleWid = m_YAxis.GetDataWidth(coordinateHig);
float scaleWid = m_YAxis.GetDataWidth(coordinateHig, m_DataZoom);
int serieCount = 0;
List<Vector3> points = new List<Vector3>();
List<Vector3> smoothPoints = new List<Vector3>();
@@ -501,7 +504,7 @@ namespace XCharts
//draw tooltip line
if (m_Tooltip.show && m_Tooltip.dataIndex > 0)
{
float splitWidth = m_YAxis.GetSplitWidth(coordinateHig);
float splitWidth = m_YAxis.GetSplitWidth(coordinateHig, m_DataZoom);
float pY = zeroY + (m_Tooltip.dataIndex - 1) * splitWidth + (m_YAxis.boundaryGap ? splitWidth / 2 : 0);
Vector2 sp = new Vector2(coordinateX, pY);
Vector2 ep = new Vector2(coordinateX + coordinateWid, pY);

8
Scripts/UI/PieChart.cs
View File

@@ -65,7 +65,13 @@ namespace XCharts
m_AngleList.Add(0);
continue;
}
float value = m_Series.series[i].data[0];
var data = m_Series.series[i].data;
if(data.Count <= 0)
{
m_AngleList.Add(0);
continue;
}
float value = data[0];
float degree = totalDegree * value / dataTotal;
float toDegree = startDegree + degree;