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

优化堆叠平滑曲线图的绘制

Browse Source
This commit is contained in:
monitor1394
2019-10-03 11:07:26 +08:00
parent c148c8ccd4
commit 0a39463bac
3 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/XCharts/Scripts/UI/Internal/CoordinateChart.cs
View File

@@ -93,12 +93,12 @@ namespace XCharts
switch (serie.type) switch (serie.type)
{ {
case SerieType.Line: case SerieType.Line:
if (yCategory) DrawYLineSerie(vh, j, serie, colorIndex, ref m_SeriesCurrHig); if (yCategory) DrawYLineSerie(vh,serie, colorIndex, ref m_SeriesCurrHig);
else DrawXLineSerie(vh, j, serie, colorIndex, ref m_SeriesCurrHig); else DrawXLineSerie(vh,serie, colorIndex, ref m_SeriesCurrHig);
break; break;
case SerieType.Bar: case SerieType.Bar:
if (yCategory) DrawYBarSerie(vh, j, serie, colorIndex, ref m_SeriesCurrHig); if (yCategory) DrawYBarSerie(vh, serie, colorIndex, ref m_SeriesCurrHig);
else DrawXBarSerie(vh, j, serie, colorIndex, ref m_SeriesCurrHig); else DrawXBarSerie(vh, serie, colorIndex, ref m_SeriesCurrHig);
break; break;
case SerieType.Scatter: case SerieType.Scatter:
case SerieType.EffectScatter: case SerieType.EffectScatter:

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

@@ -9,8 +9,7 @@ namespace XCharts
{ {
protected float m_BarLastOffset = 0; protected float m_BarLastOffset = 0;
protected void DrawYBarSerie(VertexHelper vh, int serieIndex, Serie serie, int colorIndex, protected void DrawYBarSerie(VertexHelper vh, Serie serie, int colorIndex, ref List<float> seriesHig)
ref List<float> seriesHig)
{ {
if (!IsActive(serie.name)) return; if (!IsActive(serie.name)) return;
var xAxis = m_XAxises[serie.axisIndex]; var xAxis = m_XAxises[serie.axisIndex];
@@ -95,8 +94,7 @@ namespace XCharts
return currHig; return currHig;
} }
protected void DrawXBarSerie(VertexHelper vh, int serieIndex, Serie serie, int colorIndex, protected void DrawXBarSerie(VertexHelper vh, Serie serie, int colorIndex, ref List<float> seriesHig)
ref List<float> seriesHig)
{ {
if (!IsActive(serie.name)) return; if (!IsActive(serie.name)) return;
var showData = serie.GetDataList(m_DataZoom); var showData = serie.GetDataList(m_DataZoom);

41
Assets/XCharts/Scripts/UI/Internal/CoordinateChart_DrawLine.cs
View File

@@ -67,7 +67,7 @@ namespace XCharts
} }
} }
protected void DrawXLineSerie(VertexHelper vh, int serieIndex, Serie serie, int colorIndex, ref List<float> seriesHig) protected void DrawXLineSerie(VertexHelper vh, Serie serie, int colorIndex, ref List<float> seriesHig)
{ {
if (!IsActive(serie.index)) return; if (!IsActive(serie.index)) return;
var showData = serie.GetDataList(m_DataZoom); var showData = serie.GetDataList(m_DataZoom);
@@ -162,21 +162,21 @@ namespace XCharts
{ {
case LineType.Normal: case LineType.Normal:
nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : np; nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : np;
isFinish = DrawNormalLine(vh, serieIndex, serie, xAxis, lp, np, nnp, i, lineColor, isFinish = DrawNormalLine(vh, serie, xAxis, lp, np, nnp, i, lineColor,
areaColor, areaToColor, zeroPos); areaColor, areaToColor, zeroPos);
break; break;
case LineType.Smooth: case LineType.Smooth:
case LineType.SmoothDash: case LineType.SmoothDash:
llp = i > 1 ? serie.dataPoints[i - 2] : firstLastPos; llp = i > 1 ? serie.dataPoints[i - 2] : firstLastPos;
nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : lastNextPos; nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : lastNextPos;
isFinish = DrawSmoothLine(vh, serieIndex, serie, xAxis, lp, np, llp, nnp, i, isFinish = DrawSmoothLine(vh, serie, xAxis, lp, np, llp, nnp, i,
lineColor, areaColor, areaToColor, isStack, zeroPos); lineColor, areaColor, areaToColor, isStack, zeroPos);
break; break;
case LineType.StepStart: case LineType.StepStart:
case LineType.StepMiddle: case LineType.StepMiddle:
case LineType.StepEnd: case LineType.StepEnd:
nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : np; nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : np;
isFinish = DrawStepLine(vh, serieIndex, serie, xAxis, lp, np, nnp, i, lineColor, isFinish = DrawStepLine(vh, serie, xAxis, lp, np, nnp, i, lineColor,
areaColor, areaToColor, zeroPos); areaColor, areaToColor, zeroPos);
break; break;
case LineType.Dash: case LineType.Dash:
@@ -342,7 +342,7 @@ namespace XCharts
return yDataHig; return yDataHig;
} }
protected void DrawYLineSerie(VertexHelper vh, int serieIndex, Serie serie, int colorIndex, ref List<float> seriesHig) protected void DrawYLineSerie(VertexHelper vh, Serie serie, int colorIndex, ref List<float> seriesHig)
{ {
if (!IsActive(serie.index)) return; if (!IsActive(serie.index)) return;
var showData = serie.GetDataList(m_DataZoom); var showData = serie.GetDataList(m_DataZoom);
@@ -416,21 +416,21 @@ namespace XCharts
{ {
case LineType.Normal: case LineType.Normal:
nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : np; nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : np;
isFinish = DrawNormalLine(vh, serieIndex, serie, yAxis, lp, np, nnp, i, lineColor, isFinish = DrawNormalLine(vh, serie, yAxis, lp, np, nnp, i, lineColor,
areaColor, areaToColor, zeroPos); areaColor, areaToColor, zeroPos);
break; break;
case LineType.Smooth: case LineType.Smooth:
case LineType.SmoothDash: case LineType.SmoothDash:
llp = i > 1 ? serie.dataPoints[i - 2] : lp; llp = i > 1 ? serie.dataPoints[i - 2] : lp;
nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : np; nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : np;
isFinish = DrawSmoothLine(vh, serieIndex, serie, yAxis, lp, np, llp, nnp, i, isFinish = DrawSmoothLine(vh, serie, yAxis, lp, np, llp, nnp, i,
lineColor, areaColor, areaToColor, isStack, zeroPos); lineColor, areaColor, areaToColor, isStack, zeroPos);
break; break;
case LineType.StepStart: case LineType.StepStart:
case LineType.StepMiddle: case LineType.StepMiddle:
case LineType.StepEnd: case LineType.StepEnd:
nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : np; nnp = i < serie.dataPoints.Count - 1 ? serie.dataPoints[i + 1] : np;
isFinish = DrawStepLine(vh, serieIndex, serie, yAxis, lp, np, nnp, i, lineColor, isFinish = DrawStepLine(vh, serie, yAxis, lp, np, nnp, i, lineColor,
areaColor, areaToColor, zeroPos); areaColor, areaToColor, zeroPos);
break; break;
case LineType.Dash: case LineType.Dash:
@@ -465,7 +465,7 @@ namespace XCharts
} }
private Vector3 stPos1, stPos2, lastDir, lastDnPos; private Vector3 stPos1, stPos2, lastDir, lastDnPos;
private bool DrawNormalLine(VertexHelper vh, int serieIndex, Serie serie, Axis axis, Vector3 lp, private bool DrawNormalLine(VertexHelper vh, Serie serie, Axis axis, Vector3 lp,
Vector3 np, Vector3 nnp, int dataIndex, Color lineColor, Color areaColor, Color areaToColor, Vector3 np, Vector3 nnp, int dataIndex, Color lineColor, Color areaColor, Color areaToColor,
Vector3 zeroPos) Vector3 zeroPos)
{ {
@@ -848,7 +848,7 @@ namespace XCharts
private List<Vector3> bezierPoints = new List<Vector3>(); private List<Vector3> bezierPoints = new List<Vector3>();
private Vector3 smoothStartPosUp, smoothStartPosDn; private Vector3 smoothStartPosUp, smoothStartPosDn;
private bool DrawSmoothLine(VertexHelper vh, int serieIndex, Serie serie, Axis xAxis, Vector3 lp, private bool DrawSmoothLine(VertexHelper vh, Serie serie, Axis xAxis, Vector3 lp,
Vector3 np, Vector3 llp, Vector3 nnp, int dataIndex, Color lineColor, Color areaColor, Vector3 np, Vector3 llp, Vector3 nnp, int dataIndex, Color lineColor, Color areaColor,
Color areaToColor, bool isStack, Vector3 zeroPos) Color areaToColor, bool isStack, Vector3 zeroPos)
{ {
@@ -857,7 +857,6 @@ namespace XCharts
var smoothPoints = serie.GetUpSmoothList(dataIndex); var smoothPoints = serie.GetUpSmoothList(dataIndex);
var smoothDownPoints = serie.GetDownSmoothList(dataIndex); var smoothDownPoints = serie.GetDownSmoothList(dataIndex);
var fine = isStack && m_Series.IsAnyGradientSerie(serie.stack); var fine = isStack && m_Series.IsAnyGradientSerie(serie.stack);
if (isYAxis) ChartHelper.GetBezierListVertical(ref bezierPoints, lp, np, fine, lineSmoothStyle); if (isYAxis) ChartHelper.GetBezierListVertical(ref bezierPoints, lp, np, fine, lineSmoothStyle);
else ChartHelper.GetBezierList(ref bezierPoints, vh, lp, np, llp, nnp, fine, lineSmoothStyle); else ChartHelper.GetBezierList(ref bezierPoints, vh, lp, np, llp, nnp, fine, lineSmoothStyle);
@@ -880,13 +879,19 @@ namespace XCharts
var startUp = start - diff; var startUp = start - diff;
var startDn = start + diff; var startDn = start + diff;
Vector3 toUp, toDn, tnp, tlp; Vector3 toUp, toDn, tnp, tlp;
smoothPoints.Add(startUp);
smoothDownPoints.Add(startDn);
bool isFinish = true; bool isFinish = true;
if (dataIndex > 1) if (dataIndex > 1)
{ {
ChartDrawer.DrawTriangle(vh, smoothStartPosUp, startUp, lp, lineColor); ChartDrawer.DrawTriangle(vh, smoothStartPosUp, startUp, lp, lineColor);
ChartDrawer.DrawTriangle(vh, smoothStartPosDn, startDn, lp, lineColor); ChartDrawer.DrawTriangle(vh, smoothStartPosDn, startDn, lp, lineColor);
smoothPoints.Add(smoothStartPosUp);
smoothDownPoints.Add(smoothStartPosDn);
}
else
{
smoothPoints.Add(startUp);
smoothDownPoints.Add(startDn);
} }
for (int k = 1; k < bezierPoints.Count; k++) for (int k = 1; k < bezierPoints.Count; k++)
{ {
@@ -910,8 +915,12 @@ namespace XCharts
smoothStartPosUp = toUp; smoothStartPosUp = toUp;
smoothStartPosDn = toDn; smoothStartPosDn = toDn;
} }
if (serie.areaStyle.show && (serieIndex == 0 || !isStack)) if (serie.areaStyle.show && (serie.index == 0 || !isStack))
{ {
if (k == 1 && dataIndex > 1)
{
startDn = smoothStartPosDn;
}
if (isYAxis) if (isYAxis)
{ {
if (start.x > zeroPos.x && to.x > zeroPos.x) if (start.x > zeroPos.x && to.x > zeroPos.x)
@@ -1046,8 +1055,8 @@ namespace XCharts
} }
private List<Vector3> linePointList = new List<Vector3>(); private List<Vector3> linePointList = new List<Vector3>();
private bool DrawStepLine(VertexHelper vh, int serieIndex, Serie serie, Axis axis, Vector3 lp, private bool DrawStepLine(VertexHelper vh, Serie serie, Axis axis, Vector3 lp, Vector3 np,
Vector3 np, Vector3 nnp, int dataIndex, Color lineColor, Color areaColor, Color areaToColor, Vector3 zeroPos) Vector3 nnp, int dataIndex, Color lineColor, Color areaColor, Color areaToColor, Vector3 zeroPos)
{ {
bool isYAxis = axis is YAxis; bool isYAxis = axis is YAxis;
float lineWidth = serie.lineStyle.width; float lineWidth = serie.lineStyle.width;