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

[feature][polar] support circular polar

Browse Source
This commit is contained in:
monitor1394
2022-09-14 07:13:45 +08:00
parent ac7628ce68
commit afbfa20fd9
11 changed files with 50 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Component/Axis/AngleAxis/AngleAxisHandler.cs
View File

@@ -61,7 +61,7 @@ namespace XCharts.Runtime
var polar = chart.GetChartComponent<PolarCoord>(axis.polarIndex);
if (polar == null) return;
PolarHelper.UpdatePolarCenter(polar, chart.chartPosition, chart.chartWidth, chart.chartHeight);
var radius = polar.context.radius;
var radius = polar.context.outsideRadius;
axis.context.labelObjectList.Clear();
axis.context.startAngle = 90 - axis.startAngle;
@@ -103,7 +103,7 @@ namespace XCharts.Runtime
private void DrawAngleAxis(VertexHelper vh, AngleAxis angleAxis)
{
var polar = chart.GetChartComponent<PolarCoord>(angleAxis.polarIndex);
var radius = polar.context.radius;
var radius = polar.context.outsideRadius;
var cenPos = polar.context.center;
var total = 360;
var size = AxisHelper.GetScaleNumber(angleAxis, total, null);
@@ -158,7 +158,7 @@ namespace XCharts.Runtime
var dir = (chart.pointerPos - new Vector2(polar.context.center.x, polar.context.center.y)).normalized;
var angle = ChartHelper.GetAngle360(Vector2.up, dir);
axis.context.pointerValue = (angle - component.context.startAngle + 360) % 360;
axis.context.pointerLabelPosition = polar.context.center + new Vector3(dir.x, dir.y) * (polar.context.radius + 25);
axis.context.pointerLabelPosition = polar.context.center + new Vector3(dir.x, dir.y) * (polar.context.outsideRadius + 25);
}
}
}

12
Runtime/Component/Axis/RadiusAxis/RadiusAxisHandler.cs
View File

@@ -74,7 +74,9 @@ namespace XCharts.Runtime
if (axis.context.labelObjectList.Count <= 0)
InitRadiusAxis(axis);
else
{
axis.UpdateLabelText(polar.context.radius, null, false);
}
}
private void InitRadiusAxis(RadiusAxis axis)
@@ -89,7 +91,7 @@ namespace XCharts.Runtime
PolarHelper.UpdatePolarCenter(polar, chart.chartPosition, chart.chartWidth, chart.chartHeight);
axis.context.labelObjectList.Clear();
var radius = polar.context.radius;
var radius = polar.context.outsideRadius - polar.context.insideRadius;
var objName = component.GetType().Name + axis.index;
var axisObj = ChartHelper.AddObject(objName, chart.transform, chart.chartMinAnchor,
chart.chartMaxAnchor, chart.chartPivot, chart.chartSizeDelta);
@@ -99,7 +101,7 @@ namespace XCharts.Runtime
ChartHelper.HideAllObject(axisObj);
var textStyle = axis.axisLabel.textStyle;
var splitNumber = AxisHelper.GetScaleNumber(axis, radius, null);
var totalWidth = 0f;
var totalWidth = polar.context.insideRadius;
var txtHig = textStyle.GetFontSize(chart.theme.axis) + 2;
for (int i = 0; i < splitNumber; i++)
{
@@ -150,7 +152,7 @@ namespace XCharts.Runtime
var radius = polar.context.radius;
var cenPos = polar.context.center;
var size = AxisHelper.GetScaleNumber(radiusAxis, radius, null);
var totalWidth = 0f;
var totalWidth = polar.context.insideRadius;
var dire = ChartHelper.GetDire(startAngle, true).normalized;
var tickWidth = radiusAxis.axisTick.GetWidth(chart.theme.axis.tickWidth);
var tickLength = radiusAxis.axisTick.GetLength(chart.theme.axis.tickLength);
@@ -178,8 +180,8 @@ namespace XCharts.Runtime
}
if (radiusAxis.show && radiusAxis.axisLine.show)
{
var lineStartPos = polar.context.center - dire * tickWidth;
var lineEndPos = polar.context.center + dire * (radius + tickWidth);
var lineStartPos = polar.context.center + dire * polar.context.insideRadius;
var lineEndPos = polar.context.center + dire * (polar.context.outsideRadius + 2 * tickWidth);
var lineWidth = radiusAxis.axisLine.GetWidth(chart.theme.axis.lineWidth);
UGL.DrawLine(vh, lineStartPos, lineEndPos, lineWidth, chart.theme.axis.lineColor);
}

1
Runtime/Component/Radar/RadarCoordHandler.cs
View File

@@ -17,6 +17,7 @@ namespace XCharts.Runtime
public override void Update()
{
base.Update();
if (!chart.isPointerInChart)
{
component.context.isPointerEnter = false;

2
Runtime/Component/Tooltip/TooltipHandler.cs
View File

@@ -646,7 +646,7 @@ namespace XCharts.Runtime
var lineType = tooltip.lineStyle.GetType(theme.tooltip.lineType);
var lineWidth = tooltip.lineStyle.GetWidth(theme.tooltip.lineWidth);
var cenPos = m_Polar.context.center;
var radius = m_Polar.context.radius;
var radius = m_Polar.context.outsideRadius;
var sp = m_Polar.context.center;
var tooltipAngle = m_AngleAxis.GetValueAngle(tooltip.context.angle);