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

增加GridLayout网格布局组件

Browse Source
This commit is contained in:
monitor1394
2023-08-29 18:30:11 +08:00
parent e0f6b8c2dc
commit e4fbe5670f
31 changed files with 399 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,8 +83,12 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_Height, value)) SetAllDirty(); }
}
public void UpdateRuntimeData(float chartX, float chartY, float chartWidth, float chartHeight)
public void UpdateRuntimeData(BaseChart chart)
{
var chartX = chart.chartX;
var chartY = chart.chartY;
var chartWidth = chart.chartWidth;
var chartHeight = chart.chartHeight;
context.left = left <= 1 ? left * chartWidth : left;
context.bottom = bottom <= 1 ? bottom * chartHeight : bottom;
context.top = top <= 1 ? top * chartHeight : top;

5
Runtime/Component/Axis/SingleAxis/SingleAxisHandler.cs
View File

@@ -33,10 +33,7 @@ namespace XCharts.Runtime
axis.painter = chart.painter;
axis.refreshComponent = delegate()
{
axis.UpdateRuntimeData(chart.chartX,
chart.chartY,
chart.chartWidth,
chart.chartHeight);
axis.UpdateRuntimeData(chart);
InitAxis(null,
axis.orient,

6
Runtime/Component/DataZoom/DataZoom.cs
View File

@@ -662,8 +662,12 @@ namespace XCharts.Runtime
if (m_EndLabel != null) m_EndLabel.SetPosition(pos);
}
public void UpdateRuntimeData(float chartX, float chartY, float chartWidth, float chartHeight)
public void UpdateRuntimeData(BaseChart chart)
{
var chartX = chart.chartX;
var chartY = chart.chartY;
var chartWidth = chart.chartWidth;
var chartHeight = chart.chartHeight;
var runtimeLeft = left <= 1 ? left * chartWidth : left;
var runtimeBottom = bottom <= 1 ? bottom * chartHeight : bottom;
var runtimeTop = top <= 1 ? top * chartHeight : top;

5
Runtime/Coord/Calendar/CalendarCoord.cs
View File

@@ -12,7 +12,8 @@ namespace XCharts.Runtime
return false;
}
public void UpdateRuntimeData(float chartX, float chartY, float chartWidth, float chartHeight)
{ }
public void UpdateRuntimeData(BaseChart chart)
{
}
}
}

22
Runtime/Coord/Grid/GridCoord.cs
View File

@@ -16,6 +16,7 @@ namespace XCharts.Runtime
public class GridCoord : CoordSystem, IUpdateRuntimeData, ISerieContainer
{
[SerializeField] private bool m_Show = true;
[SerializeField][Since("v3.8.0")] private int m_LayoutIndex = -1;
[SerializeField] private float m_Left = 0.1f;
[SerializeField] private float m_Right = 0.08f;
[SerializeField] private float m_Top = 0.22f;
@@ -36,6 +37,11 @@ namespace XCharts.Runtime
get { return m_Show; }
set { if (PropertyUtil.SetStruct(ref m_Show, value)) SetVerticesDirty(); }
}
public int layoutIndex
{
get { return m_LayoutIndex; }
set { if (PropertyUtil.SetStruct(ref m_LayoutIndex, value)) SetVerticesDirty(); }
}
/// <summary>
/// Distance between grid component and the left side of the container.
/// |grid 组件离容器左侧的距离。
@@ -114,8 +120,22 @@ namespace XCharts.Runtime
return context.isPointerEnter;
}
public void UpdateRuntimeData(float chartX, float chartY, float chartWidth, float chartHeight)
public void UpdateRuntimeData(BaseChart chart)
{
if (layoutIndex >= 0)
{
var layout = chart.GetChartComponent<GridLayout>(layoutIndex);
if (layout != null)
{
layout.UpdateRuntimeData(chart);
layout.UpdateGridContext(index, ref context);
return;
}
}
var chartX = chart.chartX;
var chartY = chart.chartY;
var chartWidth = chart.chartWidth;
var chartHeight = chart.chartHeight;
context.left = left <= 1 ? left * chartWidth : left;
context.bottom = bottom <= 1 ? bottom * chartHeight : bottom;
context.top = top <= 1 ? top * chartHeight : top;

3
Runtime/Coord/Grid/GridCoordHandler.cs
View File

@@ -1,4 +1,3 @@
using System;
using System.Text;
using UnityEngine;
using UnityEngine.UI;
@@ -15,7 +14,7 @@ namespace XCharts.Runtime
grid.painter = chart.painter;
grid.refreshComponent = delegate()
{
grid.UpdateRuntimeData(chart.chartX, chart.chartY, chart.chartWidth, chart.chartHeight);
grid.UpdateRuntimeData(chart);
chart.OnCoordinateChanged();
};
grid.refreshComponent();

130
Runtime/Coord/Grid/GridLayout.cs Normal file
View File

@@ -0,0 +1,130 @@
using System;
using UnityEngine;
namespace XCharts.Runtime
{
/// <summary>
/// Grid layout component. Used to manage the layout of multiple `GridCoord`, and the number of rows and columns of the grid can be controlled by `row` and `column`.
/// |网格布局组件。用于管理多个`GridCoord`的布局，可以通过`row`和`column`来控制网格的行列数。
/// </summary>
[Since("v3.8.0")]
[Serializable]
[ComponentHandler(typeof(GridLayoutHandler), true)]
public class GridLayout : MainComponent, IUpdateRuntimeData
{
[SerializeField] private bool m_Show = true;
[SerializeField] private float m_Left = 0.1f;
[SerializeField] private float m_Right = 0.08f;
[SerializeField] private float m_Top = 0.22f;
[SerializeField] private float m_Bottom = 0.12f;
[SerializeField] private int m_Row = 2;
[SerializeField] private int m_Column = 2;
[SerializeField] private Vector2 m_Spacing = Vector2.zero;
public GridLayoutContext context = new GridLayoutContext();
/// <summary>
/// Whether to show the grid in rectangular coordinate.
/// |是否显示直角坐标系网格。
/// </summary>
public bool show
{
get { return m_Show; }
set { if (PropertyUtil.SetStruct(ref m_Show, value)) SetVerticesDirty(); }
}
/// <summary>
/// Distance between grid component and the left side of the container.
/// |grid 组件离容器左侧的距离。
/// </summary>
public float left
{
get { return m_Left; }
set { if (PropertyUtil.SetStruct(ref m_Left, value)) SetAllDirty(); }
}
/// <summary>
/// Distance between grid component and the right side of the container.
/// |grid 组件离容器右侧的距离。
/// </summary>
public float right
{
get { return m_Right; }
set { if (PropertyUtil.SetStruct(ref m_Right, value)) SetAllDirty(); }
}
/// <summary>
/// Distance between grid component and the top side of the container.
/// |grid 组件离容器上侧的距离。
/// </summary>
public float top
{
get { return m_Top; }
set { if (PropertyUtil.SetStruct(ref m_Top, value)) SetAllDirty(); }
}
/// <summary>
/// Distance between grid component and the bottom side of the container.
/// |grid 组件离容器下侧的距离。
/// </summary>
public float bottom
{
get { return m_Bottom; }
set { if (PropertyUtil.SetStruct(ref m_Bottom, value)) SetAllDirty(); }
}
/// <summary>
/// the row count of grid layout.
/// |网格布局的行数。
/// </summary>
public int row
{
get { return m_Row; }
set { if (PropertyUtil.SetStruct(ref m_Row, value)) SetAllDirty(); }
}
/// <summary>
/// the column count of grid layout.
/// |网格布局的列数。
/// </summary>
public int column
{
get { return m_Column; }
set { if (PropertyUtil.SetStruct(ref m_Column, value)) SetAllDirty(); }
}
/// <summary>
/// the spacing of grid layout.
/// |网格布局的间距。
/// </summary>
public Vector2 spacing
{
get { return m_Spacing; }
set { if (PropertyUtil.SetStruct(ref m_Spacing, value)) SetAllDirty(); }
}
public void UpdateRuntimeData(BaseChart chart)
{
var chartX = chart.chartX;
var chartY = chart.chartY;
var chartWidth = chart.chartWidth;
var chartHeight = chart.chartHeight;
context.left = left <= 1 ? left * chartWidth : left;
context.bottom = bottom <= 1 ? bottom * chartHeight : bottom;
context.top = top <= 1 ? top * chartHeight : top;
context.right = right <= 1 ? right * chartWidth : right;
context.x = chartX + context.left;
context.y = chartY + context.bottom;
context.width = chartWidth - context.left - context.right;
context.height = chartHeight - context.top - context.bottom;
context.eachWidth = (context.width - spacing.x * (column - 1)) / column;
context.eachHeight = (context.height - spacing.y * (row - 1)) / row;
}
internal void UpdateGridContext(int index, ref GridCoordContext gridContext)
{
var row = index / m_Column;
var column = index % m_Column;
gridContext.x = context.x + column * (context.eachWidth + spacing.x);
gridContext.y = context.y + row * (context.eachHeight + spacing.y);
gridContext.width = context.eachWidth;
gridContext.height = context.eachHeight;
gridContext.position = new Vector3(gridContext.x, gridContext.y);
gridContext.center = new Vector3(gridContext.x + gridContext.width / 2, gridContext.y + gridContext.height / 2);
}
}
}

11
Runtime/Coord/Grid/GridLayout.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 9abc8e277fa0f41c1a0b13133bb736c4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

16
Runtime/Coord/Grid/GridLayoutContext.cs Normal file
View File

@@ -0,0 +1,16 @@
namespace XCharts.Runtime
{
public class GridLayoutContext : MainComponentContext
{
public float x;
public float y;
public float width;
public float height;
public float left;
public float right;
public float bottom;
public float top;
public float eachWidth;
public float eachHeight;
}
}

11
Runtime/Coord/Grid/GridLayoutContext.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 7265c042ebd33458eb12c112d46d9a60
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

7
Runtime/Coord/Grid/GridLayoutHandler.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace XCharts.Runtime
{
[UnityEngine.Scripting.Preserve]
internal sealed class GridLayoutHandler : MainComponentHandler<GridLayout>
{
}
}

11
Runtime/Coord/Grid/GridLayoutHandler.cs.meta Normal file
View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 3b1c1f0fa475b484286b0b2c688dc3c1
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

6
Runtime/Coord/Parallel/ParallelCoord.cs
View File

@@ -92,8 +92,12 @@ namespace XCharts.Runtime
return context.runtimeIsPointerEnter;
}
public void UpdateRuntimeData(float chartX, float chartY, float chartWidth, float chartHeight)
public void UpdateRuntimeData(BaseChart chart)
{
var chartX = chart.chartX;
var chartY = chart.chartY;
var chartWidth = chart.chartWidth;
var chartHeight = chart.chartHeight;
context.left = left <= 1 ? left * chartWidth : left;
context.bottom = bottom <= 1 ? bottom * chartHeight : bottom;
context.top = top <= 1 ? top * chartHeight : top;

2
Runtime/Coord/Parallel/ParallelCoordHandler.cs
View File

@@ -20,7 +20,7 @@ namespace XCharts.Runtime
grid.painter = chart.painter;
grid.refreshComponent = delegate()
{
grid.UpdateRuntimeData(chart.chartX, chart.chartY, chart.chartWidth, chart.chartHeight);
grid.UpdateRuntimeData(chart);
chart.OnCoordinateChanged();
};
grid.refreshComponent();

2
Runtime/Internal/BaseChart.Component.cs
View File

@@ -66,7 +66,7 @@ namespace XCharts.Runtime
}
component.SetDefaultValue();
if (component is IUpdateRuntimeData)
(component as IUpdateRuntimeData).UpdateRuntimeData(chartX, chartY, chartWidth, chartHeight);
(component as IUpdateRuntimeData).UpdateRuntimeData(this);
AddComponent(component);
m_Components.Sort();
CreateComponentHandler(component);

4
Runtime/Internal/BaseChart.cs
View File

@@ -25,6 +25,8 @@ namespace XCharts.Runtime
[SerializeField][ListForComponent(typeof(Background))] private List<Background> m_Backgrounds = new List<Background>();
[SerializeField][ListForComponent(typeof(DataZoom))] private List<DataZoom> m_DataZooms = new List<DataZoom>();
[SerializeField][ListForComponent(typeof(GridCoord))] private List<GridCoord> m_Grids = new List<GridCoord>();
[SerializeField][ListForComponent(typeof(GridLayout))] private List<GridLayout> m_GridsLayout = new List<GridLayout>();
[SerializeField][ListForComponent(typeof(Legend))] private List<Legend> m_Legends = new List<Legend>();
[SerializeField][ListForComponent(typeof(MarkLine))] private List<MarkLine> m_MarkLines = new List<MarkLine>();
[SerializeField][ListForComponent(typeof(MarkArea))] private List<MarkArea> m_MarkAreas = new List<MarkArea>();
@@ -460,7 +462,7 @@ namespace XCharts.Runtime
if (component is Axis)
component.SetAllDirty();
if (component is IUpdateRuntimeData)
(component as IUpdateRuntimeData).UpdateRuntimeData(m_ChartX, m_ChartY, m_ChartWidth, m_ChartHeight);
(component as IUpdateRuntimeData).UpdateRuntimeData(this);
}
}

2
Runtime/Internal/Misc/IUpdateRuntimeData.cs
View File

@@ -6,6 +6,6 @@ namespace XCharts.Runtime
{
public interface IUpdateRuntimeData
{
void UpdateRuntimeData(float chartX, float chartY, float chartWidth, float chartHeight);
void UpdateRuntimeData(BaseChart chart);
}
}

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

@@ -189,8 +189,7 @@ namespace XCharts.Runtime
serie.context.dataMax = serie.yMax;
serie.context.startAngle = GetStartAngle(serie);
var runtimePieDataTotal = serie.yTotal;
SerieHelper.UpdateCenter(serie, chart.chartPosition, chart.chartWidth, chart.chartHeight);
SerieHelper.UpdateCenter(serie, chart);
float startDegree = serie.context.startAngle;
float totalDegree = 0;
float zeroReplaceValue = 0;

2
Runtime/Serie/Ring/RingHandler.cs
View File

@@ -193,7 +193,7 @@ namespace XCharts.Runtime
private void UpdateRuntimeData()
{
var data = serie.data;
SerieHelper.UpdateCenter(serie, chart.chartPosition, chart.chartWidth, chart.chartHeight);
SerieHelper.UpdateCenter(serie, chart);
var ringWidth = serie.context.outsideRadius - serie.context.insideRadius;
for (int j = 0; j < data.Count; j++)
{

10
Runtime/Serie/Serie.cs
View File

@@ -246,6 +246,7 @@ namespace XCharts.Runtime
[SerializeField] private int m_PolarIndex = 0;
[SerializeField] private int m_SingleAxisIndex = 0;
[SerializeField] private int m_ParallelIndex = 0;
[SerializeField][Since("v3.8.0")] private int m_GridIndex = -1;
[SerializeField] protected int m_MinShow;
[SerializeField] protected int m_MaxShow;
[SerializeField] protected int m_MaxCache;
@@ -477,6 +478,15 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_ParallelIndex, value)) SetAllDirty(); }
}
/// <summary>
/// Index of layout component that serie uses.
/// |所使用的 layout 组件的 index。 默认为-1不指定index, 当为大于或等于0时, 为第一个layout组件的第index个格子。
/// </summary>
public int gridIndex
{
get { return m_GridIndex; }
set { if (PropertyUtil.SetStruct(ref m_GridIndex, value)) SetAllDirty(); }
}
/// <summary>
/// The min number of data to show in chart.
/// |系列所显示数据的最小索引
/// </summary>

4
Runtime/Serie/SerieHandler.cs
View File

@@ -310,7 +310,7 @@ namespace XCharts.Runtime
m_SerieLabelRoot.hideFlags = chart.chartHideFlags;
SerieLabelPool.ReleaseAll(m_SerieLabelRoot.transform);
int count = 0;
SerieHelper.UpdateCenter(serie, chart.chartPosition, chart.chartWidth, chart.chartHeight);
SerieHelper.UpdateCenter(serie, chart);
for (int j = 0; j < serie.data.Count; j++)
{
var serieData = serie.data[j];
@@ -402,7 +402,7 @@ namespace XCharts.Runtime
SerieLabelPool.ReleaseAll(serieTitleRoot.transform);
ChartHelper.RemoveComponent<Text>(serieTitleRoot);
SerieHelper.UpdateCenter(serie, chart.chartPosition, chart.chartWidth, chart.chartHeight);
SerieHelper.UpdateCenter(serie, chart);
if (serie.titleJustForSerie)
{

17
Runtime/Serie/SerieHelper.cs
View File

@@ -213,9 +213,22 @@ namespace XCharts.Runtime
/// </summary>
/// <param name="chartWidth"></param>
/// <param name="chartHeight"></param>
public static void UpdateCenter(Serie serie, Vector3 chartPosition, float chartWidth, float chartHeight)
public static void UpdateCenter(Serie serie, BaseChart chart)
{
if (serie.center.Length < 2) return;
var chartPosition = chart.chartPosition;
var chartWidth = chart.chartWidth;
var chartHeight = chart.chartHeight;
if (serie.gridIndex >= 0)
{
var grid = chart.GetChartComponent<GridCoord>(serie.gridIndex);
if (grid != null)
{
chartPosition = grid.context.position;
chartWidth = grid.context.width;
chartHeight = grid.context.height;
}
}
var centerX = serie.center[0] <= 1 ? chartWidth * serie.center[0] : serie.center[0];
var centerY = serie.center[1] <= 1 ? chartHeight * serie.center[1] : serie.center[1];
serie.context.center = chartPosition + new Vector3(centerX, centerY);
@@ -820,7 +833,7 @@ namespace XCharts.Runtime
serie.m_FilterMinShow = dataZoom.minShowNum;
serie.m_NeedUpdateFilterData = false;
if(ReferenceEquals(serie.m_FilterData,data))
if (ReferenceEquals(serie.m_FilterData, data))
{
serie.m_FilterData = new List<SerieData>();
}