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][datazoom] 增加DataZoom的MarqueeStyle支持框选区域

Browse Source
This commit is contained in:
monitor1394
2022-11-12 21:27:52 +08:00
parent 26ef85ce6f
commit 5e234dc408
10 changed files with 289 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,6 +90,7 @@ namespace XCharts.Runtime
[SerializeField] private LabelStyle m_LabelStyle = new LabelStyle();
[SerializeField] private LineStyle m_LineStyle = new LineStyle(LineStyle.Type.Solid);
[SerializeField] private AreaStyle m_AreaStyle = new AreaStyle();
[SerializeField][Since("v3.5.0")] private MarqueeStyle m_MarqueeStyle = new MarqueeStyle();
public DataZoomContext context = new DataZoomContext();
@@ -141,7 +142,8 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_SupportInside, value)) SetVerticesDirty(); }
}
/// <summary>
/// 是否支持坐标系内滚动
/// Whether inside scrolling is supported.
/// |是否支持坐标系内滚动
/// </summary>
public bool supportInsideScroll
{
@@ -149,7 +151,8 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_SupportInsideScroll, value)) SetVerticesDirty(); }
}
/// <summary>
/// 是否支持坐标系内拖拽
/// Whether insde drag is supported.
/// |是否支持坐标系内拖拽
/// </summary>
public bool supportInsideDrag
{
@@ -363,6 +366,14 @@ namespace XCharts.Runtime
get { return m_AreaStyle; }
set { if (PropertyUtil.SetClass(ref m_AreaStyle, value)) SetComponentDirty(); }
}
/// <summary>
/// 选取框样式。
/// </summary>
public MarqueeStyle marqueeStyle
{
get { return m_MarqueeStyle; }
set { if (PropertyUtil.SetClass(ref m_MarqueeStyle, value)) SetAllDirty(); }
}
class AxisIndexValueInfo
{
@@ -414,6 +425,7 @@ namespace XCharts.Runtime
show = true,
opacity = 0.3f
};
m_MarqueeStyle = new MarqueeStyle();
}
/// <summary>
@@ -515,6 +527,17 @@ namespace XCharts.Runtime
}
}
public bool IsInMarqueeArea(SerieData serieData)
{
return IsInMarqueeArea(serieData.context.position);
}
public bool IsInMarqueeArea(Vector2 pos)
{
if (!supportSelect) return false;
return context.marqueeRect.Contains(pos);
}
public bool IsContainsAxis(Axis axis)
{
if (axis == null)