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

[improve][CandlestickChart] improve large data rendering

Browse Source
This commit is contained in:
monitor1394
2022-08-29 21:09:27 +08:00
parent 6ae4468aa2
commit b01c2e4338
5 changed files with 94 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -58,6 +58,7 @@
## master ## master
* (2022.08.29) 优化`CandlestickChart`大量数据绘制
* (2022.08.28) 修复`LineChart`在堆叠和自定义Y轴范围的情况下显示不正常的问题 * (2022.08.28) 修复`LineChart`在堆叠和自定义Y轴范围的情况下显示不正常的问题
* (2022.08.26) 增加`Legend`新图标类型`Candlestick` * (2022.08.26) 增加`Legend`新图标类型`Candlestick`
* (2022.08.26) 优化`CandlestickChart`表现，调整相关的`AddData()`接口参数 * (2022.08.26) 优化`CandlestickChart`表现，调整相关的`AddData()`接口参数

58
Runtime/Serie/Candlestick/CandlestickHandler.cs
View File

@@ -105,6 +105,7 @@ namespace XCharts.Runtime
var isYAxis = false; var isYAxis = false;
serie.containerIndex = grid.index; serie.containerIndex = grid.index;
serie.containterInstanceId = grid.instanceId; serie.containterInstanceId = grid.instanceId;
var intensive = grid.context.width / (maxCount - serie.minShow) < 0.6f;
for (int i = serie.minShow; i < maxCount; i++) for (int i = serie.minShow; i < maxCount; i++)
{ {
var serieData = showData[i]; var serieData = showData[i];
@@ -170,37 +171,44 @@ namespace XCharts.Runtime
var heighPos = new Vector3(center.x, zeroY + (float) ((heighest - minCut) / valueTotal * grid.context.height)); var heighPos = new Vector3(center.x, zeroY + (float) ((heighest - minCut) / valueTotal * grid.context.height));
var openCenterPos = new Vector3(center.x, prb.y); var openCenterPos = new Vector3(center.x, prb.y);
var closeCenterPos = new Vector3(center.x, prt.y); var closeCenterPos = new Vector3(center.x, prt.y);
if (barWidth > 2f * borderWidth) if (intensive)
{ {
if (itemWidth > 0 && itemHeight > 0) UGL.DrawLine(vh, lowPos, heighPos, borderWidth, borderColor);
}
else
{
if (barWidth > 2f * borderWidth)
{ {
if (itemStyle.IsNeedCorner()) if (itemWidth > 0 && itemHeight > 0)
{ {
UGL.DrawRoundRectangle(vh, center, itemWidth, itemHeight, areaColor, areaColor, 0, if (itemStyle.IsNeedCorner())
{
UGL.DrawRoundRectangle(vh, center, itemWidth, itemHeight, areaColor, areaColor, 0,
itemStyle.cornerRadius, isYAxis, 0.5f);
}
else
{
chart.DrawClipPolygon(vh, ref prb, ref plb, ref plt, ref prt, areaColor, areaColor,
serie.clip, grid);
}
UGL.DrawBorder(vh, center, itemWidth, itemHeight, 2 * borderWidth, borderColor, 0,
itemStyle.cornerRadius, isYAxis, 0.5f); itemStyle.cornerRadius, isYAxis, 0.5f);
} }
else
{
chart.DrawClipPolygon(vh, ref prb, ref plb, ref plt, ref prt, areaColor, areaColor,
serie.clip, grid);
}
UGL.DrawBorder(vh, center, itemWidth, itemHeight, 2 * borderWidth, borderColor, 0,
itemStyle.cornerRadius, isYAxis, 0.5f);
} }
} else
else {
{ UGL.DrawLine(vh, openCenterPos, closeCenterPos, Mathf.Max(borderWidth, barWidth / 2), borderColor);
UGL.DrawLine(vh, openCenterPos, closeCenterPos, Mathf.Max(borderWidth, barWidth / 2), borderColor); }
} if (isRise)
if (isRise) {
{ UGL.DrawLine(vh, openCenterPos, lowPos, borderWidth, borderColor);
UGL.DrawLine(vh, openCenterPos, lowPos, borderWidth, borderColor); UGL.DrawLine(vh, closeCenterPos, heighPos, borderWidth, borderColor);
UGL.DrawLine(vh, closeCenterPos, heighPos, borderWidth, borderColor); }
} else
else {
{ UGL.DrawLine(vh, closeCenterPos, lowPos, borderWidth, borderColor);
UGL.DrawLine(vh, closeCenterPos, lowPos, borderWidth, borderColor); UGL.DrawLine(vh, openCenterPos, heighPos, borderWidth, borderColor);
UGL.DrawLine(vh, openCenterPos, heighPos, borderWidth, borderColor); }
} }
} }
if (!serie.animation.IsFinish()) if (!serie.animation.IsFinish())

64
Runtime/Serie/Candlestick/SimplifiedCandlestickHandler.cs
View File

@@ -106,7 +106,7 @@ namespace XCharts.Runtime
var itemStyle = serie.itemStyle; var itemStyle = serie.itemStyle;
serie.containerIndex = grid.index; serie.containerIndex = grid.index;
serie.containterInstanceId = grid.instanceId; serie.containterInstanceId = grid.instanceId;
var intensive = grid.context.width / (maxCount - serie.minShow) < 0.6f;
for (int i = serie.minShow; i < maxCount; i++) for (int i = serie.minShow; i < maxCount; i++)
{ {
var serieData = showData[i]; var serieData = showData[i];
@@ -170,39 +170,45 @@ namespace XCharts.Runtime
var heighPos = new Vector3(center.x, zeroY + (float) ((heighest - minCut) / valueTotal * grid.context.height)); var heighPos = new Vector3(center.x, zeroY + (float) ((heighest - minCut) / valueTotal * grid.context.height));
var openCenterPos = new Vector3(center.x, prb.y); var openCenterPos = new Vector3(center.x, prb.y);
var closeCenterPos = new Vector3(center.x, prt.y); var closeCenterPos = new Vector3(center.x, prt.y);
if (barWidth > 2f * borderWidth) if (intensive)
{ {
if (itemWidth > 0 && itemHeight > 0) UGL.DrawLine(vh, lowPos, heighPos, borderWidth, borderColor);
{
if (itemStyle.IsNeedCorner())
{
UGL.DrawRoundRectangle(vh, center, itemWidth, itemHeight, areaColor, areaColor, 0,
itemStyle.cornerRadius, isYAxis, 0.5f);
}
else
{
chart.DrawClipPolygon(vh, ref prb, ref plb, ref plt, ref prt, areaColor, areaColor,
serie.clip, grid);
}
UGL.DrawBorder(vh, center, itemWidth, itemHeight, 2 * borderWidth, borderColor, 0,
itemStyle.cornerRadius, isYAxis, 0.5f);
}
if (isRise)
{
UGL.DrawLine(vh, openCenterPos, lowPos, borderWidth, borderColor);
UGL.DrawLine(vh, closeCenterPos, heighPos, borderWidth, borderColor);
}
else
{
UGL.DrawLine(vh, closeCenterPos, lowPos, borderWidth, borderColor);
UGL.DrawLine(vh, openCenterPos, heighPos, borderWidth, borderColor);
}
} }
else else
{ {
UGL.DrawLine(vh, openCenterPos, closeCenterPos, Mathf.Max(borderWidth, barWidth / 2), borderColor); if (barWidth > 2f * borderWidth)
{
if (itemWidth > 0 && itemHeight > 0)
{
if (itemStyle.IsNeedCorner())
{
UGL.DrawRoundRectangle(vh, center, itemWidth, itemHeight, areaColor, areaColor, 0,
itemStyle.cornerRadius, isYAxis, 0.5f);
}
else
{
chart.DrawClipPolygon(vh, ref prb, ref plb, ref plt, ref prt, areaColor, areaColor,
serie.clip, grid);
}
UGL.DrawBorder(vh, center, itemWidth, itemHeight, 2 * borderWidth, borderColor, 0,
itemStyle.cornerRadius, isYAxis, 0.5f);
}
if (isRise)
{
UGL.DrawLine(vh, openCenterPos, lowPos, borderWidth, borderColor);
UGL.DrawLine(vh, closeCenterPos, heighPos, borderWidth, borderColor);
}
else
{
UGL.DrawLine(vh, closeCenterPos, lowPos, borderWidth, borderColor);
UGL.DrawLine(vh, openCenterPos, heighPos, borderWidth, borderColor);
}
}
else
{
UGL.DrawLine(vh, openCenterPos, closeCenterPos, Mathf.Max(borderWidth, barWidth / 2), borderColor);
}
} }
} }
if (!serie.animation.IsFinish()) if (!serie.animation.IsFinish())
{ {

17
Runtime/Serie/SerieData.cs
View File

@@ -478,6 +478,23 @@ namespace XCharts.Runtime
return temp; return temp;
} }
public void GetMinMaxData(int startDimensionIndex, bool inverse, out double min, out double max)
{
if (m_Data.Count == 0)
{
min = 0;
max = 0;
}
min = double.MaxValue;
max = double.MinValue;
for (int i = startDimensionIndex; i < m_Data.Count; i++)
{
var value = GetData(i, inverse);
if (value < min) min = value;
if (value > max) max = value;
}
}
public double GetTotalData() public double GetTotalData()
{ {
var total = 0d; var total = 0d;

15
Runtime/Serie/SeriesHelper.cs
View File

@@ -344,19 +344,20 @@ namespace XCharts.Runtime
else else
{ {
var showData = serie.GetDataList(dataZoom); var showData = serie.GetDataList(dataZoom);
foreach (var data in showData) if (serie is Candlestick || serie is SimplifiedCandlestick)
{ {
foreach (var data in showData)
if (serie is Candlestick)
{ {
var dataMin = data.GetMinData(inverse); double dataMin, dataMax;
var dataMax = data.GetMaxData(inverse); data.GetMinMaxData(1, inverse, out dataMin, out dataMax);
if (dataMax > max) max = dataMax; if (dataMax > max) max = dataMax;
if (dataMin < min) min = dataMin; if (dataMin < min) min = dataMin;
} }
else }
else
{
foreach (var data in showData)
{ {
//var currData = data.GetData(yValue ? 1 : 0, inverse);
var currData = data.GetCurrData(yValue ? 1 : 0, updateDuration, inverse); var currData = data.GetCurrData(yValue ? 1 : 0, updateDuration, inverse);
if (!serie.IsIgnoreValue(currData)) if (!serie.IsIgnoreValue(currData))
{ {