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

增加Pie和Radar的gridIndex支持设置指定网格

Browse Source
This commit is contained in:
monitor1394
2023-08-29 22:20:29 +08:00
parent e4fbe5670f
commit 8df1dbe0fb
17 changed files with 164 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Component/Axis/AxisHelper.cs
View File

@@ -621,7 +621,8 @@ namespace XCharts.Runtime
var startY = grid.context.y + xAxis.offset;
if (xAxis.IsTop())
startY += grid.context.height;
else if (xAxis.axisLine.onZero && relativedAxis.IsValue() && relativedAxis.gridIndex == xAxis.gridIndex)
else if (xAxis.axisLine.onZero && relativedAxis != null && relativedAxis.IsValue()
&& relativedAxis.gridIndex == xAxis.gridIndex)
startY += relativedAxis.context.offset;
return startY;
}
@@ -631,7 +632,8 @@ namespace XCharts.Runtime
var startX = grid.context.x + yAxis.offset;
if (yAxis.IsRight())
startX += grid.context.width;
else if (yAxis.axisLine.onZero && relativedAxis.IsValue() && relativedAxis.gridIndex == yAxis.gridIndex)
else if (yAxis.axisLine.onZero && relativedAxis != null && relativedAxis.IsValue()
&& relativedAxis.gridIndex == yAxis.gridIndex)
startX += relativedAxis.context.offset;
return startX;
}

25
Runtime/Component/Radar/RadarCoord.cs
View File

@@ -109,6 +109,7 @@ namespace XCharts.Runtime
[SerializeField] private bool m_ConnectCenter = false;
[SerializeField] private bool m_LineGradient = true;
[SerializeField][Since("v3.4.0")] private float m_StartAngle;
[SerializeField][Since("v3.8.0")] private int m_GridIndex = -1;
[SerializeField] private List<Indicator> m_IndicatorList = new List<Indicator>();
public RadarCoordContext context = new RadarCoordContext();
@@ -120,6 +121,15 @@ namespace XCharts.Runtime
/// </summary>
public bool show { get { return m_Show; } set { if (PropertyUtil.SetStruct(ref m_Show, value)) SetComponentDirty(); } }
/// <summary>
/// Index of layout component that serie uses. Default is -1 means not use layout, otherwise use the first layout component.
/// |所使用的 layout 组件的 index。 默认为-1不指定index, 当为大于或等于0时, 为第一个layout组件的第index个格子。
/// </summary>
public int gridIndex
{
get { return m_GridIndex; }
set { if (PropertyUtil.SetStruct(ref m_GridIndex, value)) SetVerticesDirty(); }
}
/// <summary>
/// Radar render type, in which 'Polygon' and 'Circle' are supported.
/// |雷达图绘制类型，支持 'Polygon' 和 'Circle'。
/// </summary>
@@ -286,6 +296,7 @@ namespace XCharts.Runtime
public override void SetDefaultValue()
{
m_Show = true;
m_GridIndex = -1;
m_Shape = Shape.Polygon;
m_Radius = 0.35f;
m_SplitNumber = 5;
@@ -341,9 +352,21 @@ namespace XCharts.Runtime
return 0;
}
internal void UpdateRadarCenter(Vector3 chartPosition, float chartWidth, float chartHeight)
internal void UpdateRadarCenter(BaseChart chart)
{
if (center.Length < 2) return;
var chartPosition = chart.chartPosition;
var chartWidth = chart.chartWidth;
var chartHeight = chart.chartWidth;
if (gridIndex >= 0)
{
var layout = chart.GetChartComponent<GridLayout>(0);
if (layout != null)
{
layout.UpdateRuntimeData(chart);
layout.UpdateGridContext(gridIndex, ref chartPosition, ref chartWidth, ref chartHeight);
}
}
var centerX = center[0] <= 1 ? chartWidth * center[0] : center[0];
var centerY = center[1] <= 1 ? chartHeight * center[1] : center[1];
context.center = chartPosition + new Vector3(centerX, centerY);

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

@@ -39,7 +39,7 @@ namespace XCharts.Runtime
radar.painter = chart.GetPainter(radar.index);
radar.refreshComponent = delegate()
{
radar.UpdateRadarCenter(chart.chartPosition, chart.chartWidth, chart.chartHeight);
radar.UpdateRadarCenter(chart);
var radarObject = ChartHelper.AddObject("Radar" + radar.index, chart.transform, chart.chartMinAnchor,
chart.chartMaxAnchor, chart.chartPivot, chart.chartSizeDelta);
radar.gameObject = radarObject;
@@ -64,7 +64,7 @@ namespace XCharts.Runtime
private void DrawRadarCoord(VertexHelper vh, RadarCoord radar)
{
if (!radar.show) return;
radar.UpdateRadarCenter(chart.chartPosition, chart.chartWidth, chart.chartHeight);
radar.UpdateRadarCenter(chart);
if (radar.shape == RadarCoord.Shape.Circle)
{
DrawCricleRadar(vh, radar);