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

增加SymbolStyle的size2参数支持长方形标记

Browse Source
This commit is contained in:
monitor1394
2024-12-28 21:03:17 +08:00
parent 21cd72b995
commit 43de03951c
9 changed files with 42 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Serie/Heatmap/HeatmapHandler.cs
View File

@@ -303,7 +303,7 @@ namespace XCharts.Runtime
var emptyColor = SerieHelper.GetItemBackgroundColor(serie, serieData, chart.theme, serie.context.colorIndex, state);
serieData.context.rect = new Rect(pos.x - symbolSize / 2, pos.y - symbolSize / 2, symbolSize, symbolSize);
chart.DrawSymbol(vh, symbol.type, symbolSize, symbolBorder, pos,
color, color, emptyColor, borderColor, symbol.gap, cornerRadius);
color, color, emptyColor, borderColor, symbol.gap, cornerRadius, symbol.size2);
}
if (visualMap.hoverLink && highlight && emphasisStyle != null &&
@@ -461,7 +461,7 @@ namespace XCharts.Runtime
else
{
chart.DrawSymbol(vh, symbol.type, symbolSize, symbolBorder, pos,
color, color, emptyColor, borderColor, symbol.gap, cornerRadius);
color, color, emptyColor, borderColor, symbol.gap, cornerRadius, symbol.size2);
}
if (visualMap.hoverLink && highlight && emphasisStyle != null &&

2
Runtime/Serie/Line/LineHandler.PolarCoord.cs
View File

@@ -275,7 +275,7 @@ namespace XCharts.Runtime
symbolSize = serie.animation.GetSysmbolSize(symbolSize);
chart.DrawSymbol(vh, symbol.type, symbolSize, symbolBorder, serieData.context.position,
symbolColor, symbolToColor, symbolEmptyColor, borderColor, symbol.gap, cornerRadius);
symbolColor, symbolToColor, symbolEmptyColor, borderColor, symbol.gap, cornerRadius, symbol.size2);
}
}
}

4
Runtime/Serie/Radar/RadarHandler.cs
View File

@@ -345,7 +345,7 @@ namespace XCharts.Runtime
SerieHelper.GetItemColor(out symbolColor, out symbolToColor, out symbolEmptyColor, serie, serieData, chart.theme, colorIndex, serieState);
SerieHelper.GetSymbolInfo(out borderColor, out symbolBorder, out cornerRadius, serie, serieData, chart.theme, serieState);
chart.DrawSymbol(vh, symbol.type, symbolSize, symbolBorder, point, symbolColor,
symbolToColor, symbolEmptyColor, borderColor, symbol.gap, cornerRadius);
symbolToColor, symbolEmptyColor, borderColor, symbol.gap, cornerRadius, symbol.size2);
}
}
}
@@ -495,7 +495,7 @@ namespace XCharts.Runtime
symbolToColor = m_RadarCoord.outRangeColor;
}
chart.DrawSymbol(vh, serie.symbol.type, symbolSize, symbolBorder, serieData.context.labelPosition, symbolColor,
symbolToColor, symbolEmptyColor, borderColor, serie.symbol.gap, cornerRadius);
symbolToColor, symbolEmptyColor, borderColor, serie.symbol.gap, cornerRadius, serie.symbol.size2);
}
}
if (!serie.animation.IsFinish())

2
Runtime/Serie/SerieHandler.cs
View File

@@ -762,7 +762,7 @@ namespace XCharts.Runtime
{
var color = symbol.GetColor(defaultColor);
chart.DrawSymbol(vh, symbol.type, symbol.size, 1, pos,
color, color, ColorUtil.clearColor32, color, symbol.gap, null);
color, color, ColorUtil.clearColor32, color, symbol.gap, null, symbol.size2);
}
public override void OnPointerDown(PointerEventData eventData)