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

[improve][Parallel] improve ParallelChart

Browse Source
This commit is contained in:
monitor1394
2022-09-23 08:38:56 +08:00
parent bd9a0df52b
commit 4c89bda4b9
7 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -58,6 +58,7 @@
## master
* (2022.09.23) 优化`ParallelChart`
* (2022.09.22) 增加`SaveAsImage()`接口保存图表到图片
* (2022.09.21) 修复`InsertSerie()`接口不刷新图表的问题
* (2022.09.21) 优化`PolarChart`对`Line`热力图的支持

1
Editor/Series/ParallelEditor.cs
View File

@@ -7,6 +7,7 @@ namespace XCharts.Editor
{
public override void OnCustomInspectorGUI()
{
PropertyField("m_ColorBy");
PropertyField("m_ParallelIndex");
PropertyField("m_LineType");
PropertyField("m_LineStyle");

1
Runtime/Component/Axis/ParallelAxis/ParallelAxis.cs
View File

@@ -23,6 +23,7 @@ namespace XCharts.Runtime
splitLine.show = false;
splitLine.lineStyle.type = LineStyle.Type.None;
axisLabel.textLimit.enable = true;
axisName.labelStyle.offset = new Vector3(0, 25, 0);
}
}

2
Runtime/Component/Axis/ParallelAxis/ParallelAxisHander.cs
View File

@@ -160,7 +160,7 @@ namespace XCharts.Runtime
internal override float GetAxisLineXOrY()
{
return component.context.y;
return component.context.x;
}
}
}

3
Runtime/Serie/Parallel/Parallel.cs
View File

@@ -6,7 +6,8 @@ namespace XCharts.Runtime
[System.Serializable]
[SerieHandler(typeof(ParallelHandler), true)]
[RequireChartComponent(typeof(ParallelCoord))]
[SerieDataExtraComponent(typeof(ItemStyle), typeof(LabelStyle), typeof(EmphasisStyle), typeof(BlurStyle), typeof(SelectStyle))]
[SerieExtraComponent(typeof(EmphasisStyle), typeof(BlurStyle), typeof(SelectStyle))]
[SerieDataExtraComponent(typeof(EmphasisStyle), typeof(BlurStyle), typeof(SelectStyle))]
[SerieDataExtraField()]
public class Parallel : Serie, INeedSerieContainer
{

28
Runtime/Serie/Parallel/ParallelHandler.cs
View File

@@ -8,8 +8,6 @@ namespace XCharts.Runtime
[UnityEngine.Scripting.Preserve]
internal sealed class ParallelHandler : SerieHandler<Parallel>
{
private List<Vector3> m_Points = new List<Vector3>();
public override void Update()
{
base.Update();
@@ -38,7 +36,7 @@ namespace XCharts.Runtime
var animationIndex = serie.animation.GetCurrIndex();
var isHorizonal = parallel.orient == Orient.Horizonal;
var lineColor = SerieHelper.GetLineColor(serie, null, chart.theme, serie.context.colorIndex);
var lineWidth = serie.lineStyle.GetWidth(chart.theme.serie.lineWidth);
float currDetailProgress = !isHorizonal ?
@@ -58,9 +56,11 @@ namespace XCharts.Runtime
var isSmooth = serie.lineType == LineType.Smooth;
foreach (var serieData in serie.data)
{
m_Points.Clear();
var count = Mathf.Min(axisCount, serieData.data.Count);
var lp = Vector3.zero;
var colorIndex = serie.colorByData?serieData.index : serie.context.colorIndex;
var lineColor = SerieHelper.GetLineColor(serie, serieData, chart.theme, colorIndex);
serieData.context.dataPoints.Clear();
for (int i = 0; i < count; i++)
{
if (animationIndex >= 0 && i > animationIndex) continue;
@@ -69,11 +69,11 @@ namespace XCharts.Runtime
{
if (isSmooth)
{
m_Points.Add(pos);
serieData.context.dataPoints.Add(pos);
}
else if (pos.x <= currProgress)
{
m_Points.Add(pos);
serieData.context.dataPoints.Add(pos);
}
else
{
@@ -82,9 +82,9 @@ namespace XCharts.Runtime
var intersectionPos = Vector3.zero;
if (UGLHelper.GetIntersection(lp, pos, currProgressStart, currProgressEnd, ref intersectionPos))
m_Points.Add(intersectionPos);
serieData.context.dataPoints.Add(intersectionPos);
else
m_Points.Add(pos);
serieData.context.dataPoints.Add(pos);
break;
}
}
@@ -92,11 +92,11 @@ namespace XCharts.Runtime
{
if (isSmooth)
{
m_Points.Add(pos);
serieData.context.dataPoints.Add(pos);
}
else if (pos.y <= currProgress)
{
m_Points.Add(pos);
serieData.context.dataPoints.Add(pos);
}
else
{
@@ -105,21 +105,21 @@ namespace XCharts.Runtime
var intersectionPos = Vector3.zero;
if (UGLHelper.GetIntersection(lp, pos, currProgressStart, currProgressEnd, ref intersectionPos))
m_Points.Add(intersectionPos);
serieData.context.dataPoints.Add(intersectionPos);
else
m_Points.Add(pos);
serieData.context.dataPoints.Add(pos);
break;
}
}
lp = pos;
}
if (isSmooth)
UGL.DrawCurves(vh, m_Points, lineWidth, lineColor,
UGL.DrawCurves(vh, serieData.context.dataPoints, lineWidth, lineColor,
chart.settings.lineSmoothStyle,
chart.settings.lineSmoothness,
UGL.Direction.XAxis, currProgress, isHorizonal);
else
UGL.DrawLine(vh, m_Points, lineWidth, lineColor, isSmooth);
UGL.DrawLine(vh, serieData.context.dataPoints, lineWidth, lineColor, isSmooth);
}
if (!serie.animation.IsFinish())
{

2
Runtime/Serie/SerieHandler.cs
View File

@@ -448,7 +448,7 @@ namespace XCharts.Runtime
var endLabelStyle = serie.endLabel;
if (endLabelStyle == null)
return;
var dataCount = serie.context.drawPoints.Count;
var dataCount = serie.context.dataPoints.Count;
var active = endLabelStyle.show && dataCount > 0;
m_EndLabel.SetActive(active);
if (active)