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

增加二维数据支持，XY轴都可以设置为数值轴

Browse Source
This commit is contained in:
monitor1394
2019-07-14 14:34:18 +08:00
parent e0ca33d7cb
commit 9ec5e80d22
15 changed files with 11930 additions and 13223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -303,16 +303,14 @@ namespace XCharts
}
}
public void AdjustMinMaxValue(int minValue, int maxValue, out int tempMinValue, out int tempMaxValue)
public void AdjustMinMaxValue(ref int minValue, ref int maxValue)
{
tempMinValue = minValue;
tempMaxValue = maxValue;
if (minMaxType == Axis.AxisMinMaxType.Custom)
{
if (min != 0 || max != 0)
{
tempMinValue = min;
tempMaxValue = max;
minValue = min;
maxValue = max;
}
}
else
@@ -322,23 +320,23 @@ namespace XCharts
case Axis.AxisMinMaxType.Default:
if (minValue > 0 && maxValue > 0)
{
tempMinValue = 0;
tempMaxValue = ChartHelper.GetMaxDivisibleValue(maxValue);
minValue = 0;
maxValue = ChartHelper.GetMaxDivisibleValue(maxValue);
}
else if (minValue < 0 && maxValue < 0)
{
tempMinValue = ChartHelper.GetMinDivisibleValue(minValue);
tempMaxValue = 0;
minValue = ChartHelper.GetMinDivisibleValue(minValue);
maxValue = 0;
}
else
{
tempMinValue = ChartHelper.GetMinDivisibleValue(minValue);
tempMaxValue = ChartHelper.GetMaxDivisibleValue(maxValue);
minValue = ChartHelper.GetMinDivisibleValue(minValue);
maxValue = ChartHelper.GetMaxDivisibleValue(maxValue);
}
break;
case Axis.AxisMinMaxType.MinMax:
tempMinValue = ChartHelper.GetMinDivisibleValue(minValue);
tempMaxValue = ChartHelper.GetMaxDivisibleValue(maxValue);
minValue = ChartHelper.GetMinDivisibleValue(minValue);
maxValue = ChartHelper.GetMaxDivisibleValue(maxValue);
break;
}
}

3
Scripts/UI/Internal/AxisLine.cs
View File

@@ -6,6 +6,7 @@ namespace XCharts
public class AxisLine
{
[SerializeField] private bool m_Show;
[SerializeField] private bool m_OnZero;
[SerializeField] private bool m_Symbol;
[SerializeField] private float m_SymbolWidth;
[SerializeField] private float m_SymbolHeight;
@@ -13,6 +14,7 @@ namespace XCharts
[SerializeField] private float m_SymbolDent;
public bool show { get { return m_Show; } set { m_Show = value; } }
public bool onZero { get { return m_OnZero; } set { m_OnZero = value; } }
public bool symbol { get { return m_Symbol; } set { m_Symbol = value; } }
public float symbolWidth { get { return m_SymbolWidth; } set { m_SymbolWidth = value; } }
public float symbolHeight { get { return m_SymbolHeight; } set { m_SymbolHeight = value; } }
@@ -26,6 +28,7 @@ namespace XCharts
var axisLine = new AxisLine
{
m_Show = true,
m_OnZero = true,
m_Symbol = false,
m_SymbolWidth = 10,
m_SymbolHeight = 15,

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

@@ -13,9 +13,7 @@ namespace XCharts
private static readonly string s_DefaultDataZoom = "datazoom";
[SerializeField] protected Coordinate m_Coordinate = Coordinate.defaultCoordinate;
[SerializeField] protected XAxis m_XAxis = XAxis.defaultXAxis;
[SerializeField] protected List<XAxis> m_XAxises = new List<XAxis>();
[SerializeField] protected YAxis m_YAxis = YAxis.defaultYAxis;
[SerializeField] protected List<YAxis> m_YAxises = new List<YAxis>();
[SerializeField] protected DataZoom m_DataZoom = DataZoom.defaultDataZoom;
@@ -188,7 +186,7 @@ namespace XCharts
string strColor = ColorUtility.ToHtmlStringRGBA(m_ThemeInfo.GetColor(i));
string key = m_Series.series[i].name;
if (string.IsNullOrEmpty(key)) key = m_Legend.GetData(i);
float value = m_Series.series[i].GetData(index, m_DataZoom);
float value = m_Series.series[i].GetYData(index, m_DataZoom);
sb.Append("\n");
sb.AppendFormat("<color=#{0}>● </color>", strColor);
sb.AppendFormat("{0}: {1}", key, value);
@@ -272,7 +270,8 @@ namespace XCharts
InitAxisY();
}
public void ClearAxisData(){
public void ClearAxisData()
{
foreach (var item in m_XAxises) item.data.Clear();
foreach (var item in m_YAxises) item.data.Clear();
}
@@ -293,7 +292,7 @@ namespace XCharts
if (m_XAxises.Count <= 0)
{
var axis1 = new XAxis();
axis1.Copy(m_XAxis);
axis1.Copy(axis1);
var axis2 = XAxis.defaultXAxis;
axis2.show = false;
m_XAxises.Add(axis1);
@@ -302,7 +301,7 @@ namespace XCharts
if (m_YAxises.Count <= 0)
{
var axis1 = new YAxis();
axis1.Copy(m_YAxis);
axis1.Copy(axis1);
var axis2 = YAxis.defaultYAxis;
axis2.show = false;
m_YAxises.Add(axis1);
@@ -611,8 +610,22 @@ namespace XCharts
int tempMinValue = 0;
int tempMaxValue = 100;
m_Series.GetMinMaxValue(m_DataZoom, axisIndex, out tempMinValue, out tempMaxValue);
axis.AdjustMinMaxValue(tempMinValue, tempMaxValue, out tempMinValue, out tempMaxValue);
if (m_XAxises[axisIndex].IsValue() && m_YAxises[axisIndex].IsValue())
{
if (axis is XAxis)
{
m_Series.GetXMinMaxValue(m_DataZoom, axisIndex, out tempMinValue, out tempMaxValue);
}
else
{
m_Series.GetYMinMaxValue(m_DataZoom, axisIndex, out tempMinValue, out tempMaxValue);
}
}
else
{
m_Series.GetYMinMaxValue(m_DataZoom, axisIndex, out tempMinValue, out tempMaxValue);
}
axis.AdjustMinMaxValue(ref tempMinValue, ref tempMaxValue);
if (tempMinValue != axis.minValue || tempMaxValue != axis.maxValue)
{
axis.minValue = tempMinValue;
@@ -625,7 +638,7 @@ namespace XCharts
axis.maxValue < 0 ? coordinateWid :
Mathf.Abs(axis.minValue) * (coordinateWid / (Mathf.Abs(axis.minValue) + Mathf.Abs(axis.maxValue)));
}
else if (axis is YAxis && axis.IsValue())
if (axis is YAxis && axis.IsValue())
{
axis.zeroYOffset = axis.minValue > 0 ? 0 :
axis.maxValue < 0 ? coordinateHig :
@@ -777,7 +790,7 @@ namespace XCharts
{
if (xAxis.show && xAxis.axisLine.show)
{
var lineY = coordinateY + m_YAxises[xAxisIndex].zeroYOffset;
var lineY = coordinateY + (xAxis.axisLine.onZero ? m_YAxises[xAxisIndex].zeroYOffset : 0);
if (xAxis.IsValue() && xAxisIndex > 0) lineY += coordinateHig;
var top = new Vector3(coordinateX + coordinateWid + m_Coordinate.tickness, lineY);
ChartHelper.DrawLine(vh, new Vector3(coordinateX - m_Coordinate.tickness, lineY),
@@ -799,7 +812,7 @@ namespace XCharts
{
if (yAxis.show && yAxis.axisLine.show)
{
var lineX = coordinateX + m_XAxises[yAxisIndex].zeroXOffset;
var lineX = coordinateX + (yAxis.axisLine.onZero ? m_XAxises[yAxisIndex].zeroXOffset : 0);
if (yAxis.IsValue() && yAxisIndex > 0) lineX += coordinateWid;
var top = new Vector3(lineX, coordinateY + coordinateHig + m_Coordinate.tickness);
ChartHelper.DrawLine(vh, new Vector3(lineX, coordinateY - m_Coordinate.tickness),
@@ -832,17 +845,17 @@ namespace XCharts
{
Serie serie = m_Series.series[0];
Axis axis = yAxises[0];
float scaleWid = coordinateWid / (serie.data.Count - 1);
float scaleWid = coordinateWid / (serie.yData.Count - 1);
Vector3 lp = Vector3.zero;
Vector3 np = Vector3.zero;
int minValue = 0;
int maxValue = 100;
m_Series.GetMinMaxValue(null, 0, out minValue, out maxValue);
axis.AdjustMinMaxValue(minValue, maxValue, out minValue, out maxValue);
m_Series.GetYMinMaxValue(null, 0, out minValue, out maxValue);
axis.AdjustMinMaxValue(ref minValue, ref maxValue);
if (minValue > 0 && maxValue > 0) minValue = 0;
for (int i = 0; i < serie.data.Count; i++)
for (int i = 0; i < serie.yData.Count; i++)
{
float value = serie.data[i];
float value = serie.yData[i];
float pX = coordinateX + i * scaleWid;
float dataHig = value / (maxValue - minValue) * m_DataZoom.height;
np = new Vector3(pX, m_DataZoom.bottom + dataHig);

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

@@ -1,43 +1,51 @@
using System.Collections.Generic;
using System.ComponentModel;
using UnityEngine;
using UnityEngine.Serialization;
namespace XCharts
{
public enum SerieType
{
Line,
Bar,
Pie,
Radar
}
[System.Serializable]
public class Serie : JsonDataSupport
{
public enum SerieType
{
Line,
Bar
}
[SerializeField][DefaultValue("true")] private bool m_Show;
[SerializeField] [DefaultValue("true")] private bool m_Show;
[SerializeField] private SerieType m_Type;
[SerializeField] private string m_Name;
[SerializeField] private string m_Stack;
[SerializeField] private int m_AxisIndex;
[SerializeField] private List<float> m_Data = new List<float>();
[SerializeField] private bool m_Flodout;
[SerializeField] private bool m_TwoDimensionData;
[FormerlySerializedAs("m_Data")]
[SerializeField] private List<float> m_YData = new List<float>();
[SerializeField] private List<float> m_XData = new List<float>();
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 int axisIndex { get { return m_AxisIndex; } set { m_AxisIndex = value; } }
public List<float> data { get { return m_Data; } set { m_Data = value; } }
public List<float> yData { get { return m_YData; } set { m_YData = value; } }
public List<float> xData { get { return m_XData; } set { m_XData = value; } }
public int filterStart { get; set; }
public int filterEnd { get; set; }
public List<float> filterData { get; set; }
public float Max
private List<float> yFilterData { get; set; }
private List<float> xFilterData { get; set; }
public float yMax
{
get
{
float max = int.MinValue;
foreach (var data in data)
foreach (var data in yData)
{
if (data > max)
{
@@ -48,12 +56,28 @@ namespace XCharts
}
}
public float Min
public float xMax
{
get
{
float max = int.MinValue;
foreach (var data in xData)
{
if (data > max)
{
max = data;
}
}
return max;
}
}
public float yMin
{
get
{
float min = int.MaxValue;
foreach (var data in data)
foreach (var data in yData)
{
if (data < min)
{
@@ -64,12 +88,41 @@ namespace XCharts
}
}
public float Total
public float xMin
{
get
{
float min = int.MaxValue;
foreach (var data in xData)
{
if (data < min)
{
min = data;
}
}
return min;
}
}
public float yTotal
{
get
{
float total = 0;
foreach (var data in data)
foreach (var data in yData)
{
total += data;
}
return total;
}
}
public float xTotal
{
get
{
float total = 0;
foreach (var data in xData)
{
total += data;
}
@@ -79,26 +132,30 @@ namespace XCharts
public void ClearData()
{
m_Data.Clear();
m_XData.Clear();
m_YData.Clear();
}
public void RemoveData(int index)
{
m_Data.RemoveAt(index);
m_XData.RemoveAt(index);
m_YData.RemoveAt(index);
}
public void AddData(float value, int maxDataNumber = 0)
public void AddYData(float value, int maxDataNumber = 0)
{
if (maxDataNumber > 0)
{
while (m_Data.Count > maxDataNumber) m_Data.RemoveAt(0);
while (m_XData.Count > maxDataNumber) m_XData.RemoveAt(0);
while (m_YData.Count > maxDataNumber) m_YData.RemoveAt(0);
}
m_Data.Add(value);
m_YData.Add(value);
m_XData.Add(m_XData.Count);
}
public float GetData(int index, DataZoom dataZoom = null)
public float GetYData(int index, DataZoom dataZoom = null)
{
var showData = GetData(dataZoom);
var showData = GetYData(dataZoom);
if (index >= 0 && index <= showData.Count - 1)
{
return showData[index];
@@ -106,22 +163,41 @@ namespace XCharts
return 0;
}
public List<float> GetData(DataZoom dataZoom)
public List<float> GetYData(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 startIndex = (int)((yData.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((yData.Count - 1) * dataZoom.end / 100);
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
if (filterData == null || filterData.Count != count)
if (yFilterData == null || yFilterData.Count != count)
{
UpdateFilterData(dataZoom);
}
return filterData;
return yFilterData;
}
else
{
return m_Data;
return m_YData;
}
}
public List<float> GetXData(DataZoom dataZoom)
{
if (dataZoom != null && dataZoom.show)
{
var startIndex = (int)((xData.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((xData.Count - 1) * dataZoom.end / 100);
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
if (xFilterData == null || xFilterData.Count != count)
{
UpdateFilterData(dataZoom);
}
return xFilterData;
}
else
{
return m_XData;
}
}
@@ -129,41 +205,51 @@ namespace XCharts
{
if (dataZoom != null && dataZoom.show)
{
var startIndex = (int)((data.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((data.Count - 1) * dataZoom.end / 100);
var startIndex = (int)((yData.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((yData.Count - 1) * dataZoom.end / 100);
if (startIndex != filterStart || endIndex != filterEnd)
{
filterStart = startIndex;
filterEnd = endIndex;
if (m_Data.Count > 0)
if (m_YData.Count > 0)
{
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
filterData = m_Data.GetRange(startIndex, count);
yFilterData = m_YData.GetRange(startIndex, count);
}
else
{
filterData = m_Data;
yFilterData = m_YData;
}
if (m_XData.Count > 0)
{
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
xFilterData = m_XData.GetRange(startIndex, count);
}
else
{
xFilterData = m_XData;
}
}
else if (endIndex == 0)
{
filterData = new List<float>();
yFilterData = new List<float>();
xFilterData = new List<float>();
}
}
}
public void UpdateData(int index, float value)
public void UpdateYData(int index, float value)
{
if (index >= 0 && index <= m_Data.Count - 1)
if (index >= 0 && index <= m_YData.Count - 1)
{
m_Data[index] = value;
m_YData[index] = value;
}
}
public override void ParseJsonData(string jsonData)
{
if (string.IsNullOrEmpty(jsonData) || !m_DataFromJson) return;
m_Data = ChartHelper.ParseFloatFromString(jsonData);
m_YData = ChartHelper.ParseFloatFromString(jsonData);
}
}
}

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

@@ -38,7 +38,7 @@ namespace XCharts
{
if (serieIndex >= 0 && serieIndex < Count)
{
return m_Series[serieIndex].GetData(dataIndex);
return m_Series[serieIndex].GetYData(dataIndex);
}
else
{
@@ -99,10 +99,10 @@ namespace XCharts
{
serie = new Serie();
serie.name = name;
serie.data = new List<float>();
serie.yData = new List<float>();
m_Series.Add(serie);
}
serie.AddData(value, maxDataNumber);
serie.AddYData(value, maxDataNumber);
return serie;
}
@@ -111,7 +111,7 @@ namespace XCharts
var serie = GetSerie(index);
if (serie != null)
{
serie.AddData(value, maxDataNumber);
serie.AddYData(value, maxDataNumber);
}
return serie;
}
@@ -121,7 +121,7 @@ namespace XCharts
var serie = GetSerie(name);
if (serie != null)
{
serie.UpdateData(dataIndex, value);
serie.UpdateYData(dataIndex, value);
}
}
@@ -130,7 +130,7 @@ namespace XCharts
var serie = GetSerie(index);
if (serie != null)
{
serie.UpdateData(dataIndex, value);
serie.UpdateYData(dataIndex, value);
}
}
@@ -184,7 +184,17 @@ namespace XCharts
return false;
}
public void GetMinMaxValue(DataZoom dataZoom, int axisIndex, out int minVaule, out int maxValue)
public void GetXMinMaxValue(DataZoom dataZoom, int axisIndex, out int minVaule, out int maxValue)
{
GetMinMaxValue(dataZoom,axisIndex,false,out minVaule,out maxValue);
}
public void GetYMinMaxValue(DataZoom dataZoom, int axisIndex, out int minVaule, out int maxValue)
{
GetMinMaxValue(dataZoom,axisIndex,true,out minVaule,out maxValue);
}
public void GetMinMaxValue(DataZoom dataZoom, int axisIndex, bool yValue, out int minVaule, out int maxValue)
{
float min = int.MaxValue;
float max = int.MinValue;
@@ -198,7 +208,7 @@ namespace XCharts
{
var serie = ss.Value[i];
if (serie.axisIndex != axisIndex) continue;
var showData = serie.GetData(dataZoom);
var showData = yValue ? serie.GetYData(dataZoom) : serie.GetXData(dataZoom);
for (int j = 0; j < showData.Count; j++)
{
if (!seriesTotalValue.ContainsKey(j))
@@ -224,7 +234,7 @@ namespace XCharts
if (m_Series[i].axisIndex != axisIndex) continue;
if (IsActive(i))
{
var showData = m_Series[i].GetData(dataZoom);
var showData = yValue ? m_Series[i].GetYData(dataZoom) : m_Series[i].GetXData(dataZoom);
foreach (var data in showData)
{
if (data > max) max = data;
@@ -251,7 +261,7 @@ namespace XCharts
float min = int.MaxValue;
for (int i = 0; i < m_Series.Count; i++)
{
var showData = m_Series[i].data;
var showData = m_Series[i].yData;
if (showData[index] > max)
{
max = Mathf.Ceil(showData[index]);
@@ -272,7 +282,7 @@ namespace XCharts
float min = int.MaxValue;
for (int i = 0; i < m_Series.Count; i++)
{
var showData = m_Series[i].data;
var showData = m_Series[i].yData;
if (showData[index] > max)
{
max = Mathf.Ceil(showData[index]);