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

增加Chart的onSerieClick，onSerieDown，onSerieEnter和onSerieExit回调

Browse Source
This commit is contained in:
monitor1394
2023-03-09 21:31:26 +08:00
parent bf152a3a71
commit 465af108aa
28 changed files with 408 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
Runtime/Serie/Pie/PieHandler.cs
View File

@@ -12,7 +12,6 @@ namespace XCharts.Runtime
public override void Update()
{
base.Update();
UpdateSerieContext();
}
public override void DrawBase(VertexHelper vh)
@@ -79,32 +78,28 @@ namespace XCharts.Runtime
public override void OnPointerDown(PointerEventData eventData)
{
if (!chart.HasSerie<Pie>()) return;
if (chart.pointerPos == Vector2.zero) return;
var dataIndex = GetPiePosIndex(serie, chart.pointerPos);
var refresh = false;
for (int i = 0; i < chart.series.Count; i++)
if (dataIndex >= 0)
{
var serie = chart.GetSerie(i);
if (!(serie is Pie)) continue;
var index = GetPiePosIndex(serie, chart.pointerPos);
if (index >= 0)
refresh = true;
for (int j = 0; j < serie.data.Count; j++)
{
refresh = true;
for (int j = 0; j < serie.data.Count; j++)
{
if (j == index) serie.data[j].context.selected = !serie.data[j].context.selected;
else serie.data[j].context.selected = false;
}
if (chart.onPointerClickPie != null)
{
chart.onPointerClickPie(eventData, i, index);
}
if (j == dataIndex) serie.data[j].context.selected = !serie.data[j].context.selected;
else serie.data[j].context.selected = false;
}
}
if (refresh) chart.RefreshChart();
base.OnPointerDown(eventData);
}
private void UpdateSerieContext()
public override int GetPointerItemDataIndex()
{
return GetPiePosIndex(serie, chart.pointerPos);
}
public override void UpdateSerieContext()
{
var needCheck = m_LegendEnter || (chart.isPointerInChart && PointerIsInPieSerie(serie, chart.pointerPos));
var needInteract = false;
@@ -123,14 +118,8 @@ namespace XCharts.Runtime
serieData.context.highlight = false;
serieData.interact.SetValueAndColor(ref needInteract, serieData.context.outsideRadius, color, toColor);
}
if (chart.onPointerEnterPie != null)
{
chart.onPointerEnterPie(serie.index, serie.context.pointerItemDataIndex);
}
if (needInteract)
{
chart.RefreshPainter(serie);
}
}
return;
}
@@ -138,6 +127,7 @@ namespace XCharts.Runtime
var lastPointerItemDataIndex = serie.context.pointerItemDataIndex;
var dataIndex = GetPiePosIndex(serie, chart.pointerPos);
serie.context.pointerItemDataIndex = -1;
serie.context.pointerEnter = dataIndex >= 0;
for (int i = 0; i < serie.dataCount; i++)
{
var serieData = serie.data[i];
@@ -162,10 +152,6 @@ namespace XCharts.Runtime
if (lastPointerItemDataIndex != serie.context.pointerItemDataIndex)
{
needInteract = true;
if (chart.onPointerEnterPie != null)
{
chart.onPointerEnterPie(serie.index, serie.context.pointerItemDataIndex);
}
}
if (needInteract)
{
@@ -220,21 +206,21 @@ namespace XCharts.Runtime
}
float degree = serie.pieRoseType == RoseType.Area ?
(totalDegree / showdataCount) :
(float) (totalDegree * value / dataTotalFilterMinAngle);
(float)(totalDegree * value / dataTotalFilterMinAngle);
if (serie.minAngle > 0 && degree < serie.minAngle) degree = serie.minAngle;
serieData.context.toAngle = startDegree + degree;
if (serieData.radius > 0)
serieData.context.outsideRadius = ChartHelper.GetActualValue(serieData.radius, Mathf.Min(chart.chartWidth, chart.chartHeight));
else
serieData.context.outsideRadius = serie.pieRoseType > 0 ?
serie.context.insideRadius + (float) ((serie.context.outsideRadius - serie.context.insideRadius) * value / serie.context.dataMax) :
serie.context.insideRadius + (float)((serie.context.outsideRadius - serie.context.insideRadius) * value / serie.context.dataMax) :
serie.context.outsideRadius;
if (serieData.context.highlight)
{
serieData.context.outsideRadius += chart.theme.serie.pieTooltipExtraRadius;
}
var offset = 0f;
if (serie.pieClickOffset && serieData.selected)
if (serie.pieClickOffset && (serieData.selected || serieData.context.selected))
{
offset += chart.theme.serie.pieSelectedOffset;
}
@@ -258,7 +244,7 @@ namespace XCharts.Runtime
serieData.context.offsetRadius = 0;
serieData.context.insideRadius -= serieData.context.offsetRadius;
serieData.context.outsideRadius -= serieData.context.offsetRadius;
if (serie.pieClickOffset && serieData.selected)
if (serie.pieClickOffset && (serieData.selected || serieData.context.selected))
{
serieData.context.offsetRadius += chart.theme.serie.pieSelectedOffset;
if (serieData.context.insideRadius > 0)
@@ -350,7 +336,7 @@ namespace XCharts.Runtime
serieData.interact.SetValueAndColor(ref interacting, outsideRadius, color, toColor);
}
if (serie.pieClickOffset && serieData.selected)
if (serie.pieClickOffset && (serieData.selected || serieData.context.selected))
{
var drawEndDegree = serieData.context.currentAngle;
var needRoundCap = serie.roundCap && insideRadius > 0;
@@ -493,7 +479,7 @@ namespace XCharts.Runtime
}
var diffAngle = (currAngle - startAngle) % 360;
var isLeft = diffAngle > 180 || (diffAngle == 0 && serieData.context.startAngle > 0);
var pos5X = isLeft?pos2.x - labelLine.lineLength2 : pos2.x + labelLine.lineLength2;
var pos5X = isLeft ? pos2.x - labelLine.lineLength2 : pos2.x + labelLine.lineLength2;
var pos5 = new Vector3(pos5X, pos2.y);
var angle = Vector3.Angle(pos1 - center, pos2 - pos1);
if (angle > 15)
@@ -538,7 +524,7 @@ namespace XCharts.Runtime
var serieData = serie.data[i];
if (angle >= serieData.context.startAngle && angle <= serieData.context.toAngle)
{
var ndist = serieData.selected ?
var ndist = (serieData.selected || serieData.context.selected) ?
Vector2.Distance(local, serieData.context.offsetCenter) :
dist;
if (ndist >= serieData.context.insideRadius && ndist <= serieData.context.outsideRadius)