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

增加部分鼠标事件回调

Browse Source
This commit is contained in:
monitor1394
2020-05-16 20:33:01 +08:00
parent e371e079f2
commit bc5bd1214e
10 changed files with 191 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Runtime/API/BaseChart_API.cs
View File

@@ -9,6 +9,7 @@ using UnityEngine;
using System.Collections.Generic;
using System;
using UnityEngine.UI;
using UnityEngine.EventSystems;
namespace XCharts
{
@@ -88,7 +89,6 @@ namespace XCharts
/// The position of chart.
/// 图表的左下角起始坐标。
/// </summary>
/// <returns></returns>
public Vector3 chartPosition { get { return m_ChartPosition; } }
public Rect chartRect { get { return m_ChartRect; } }
/// <summary>
@@ -97,13 +97,53 @@ namespace XCharts
/// </summary>
public Vector2 pointerPos { get; protected set; }
/// <summary>
/// 自定义绘制回调。
/// </summary>
public Action<VertexHelper> customDrawCallback { set { m_CustomDrawCallback = value; } }
/// <summary>
/// 警告信息。
/// </summary>
public string warningInfo { get; protected set; }
/// <summary>
/// 强制开启鼠标事件检测。
/// </summary>
public bool forceOpenRaycastTarget { get { return m_ForceOpenRaycastTarget; } set { m_ForceOpenRaycastTarget = value; } }
/// <summary>
/// 自定义绘制回调。
/// </summary>
public Action<VertexHelper> onCustomDraw { set { m_OnCustomDrawCallback = value; } }
/// <summary>
/// 鼠标点击回调。
/// </summary>
public Action<BaseChart, PointerEventData> onPointerClick { set { m_OnPointerClick = value; m_ForceOpenRaycastTarget = true; } }
/// <summary>
/// 鼠标按下回调。
/// </summary>
public Action<BaseChart, PointerEventData> onPointerDown { set { m_OnPointerDown = value; m_ForceOpenRaycastTarget = true; } }
/// <summary>
/// 鼠标弹起回调。
/// </summary>
public Action<BaseChart, PointerEventData> onPointerUp { set { m_OnPointerUp = value; m_ForceOpenRaycastTarget = true; } }
/// <summary>
/// 鼠标进入回调。
/// </summary>
public Action<BaseChart, PointerEventData> onPointerEnter { set { m_OnPointerEnter = value; m_ForceOpenRaycastTarget = true; } }
/// <summary>
/// 鼠标退出回调。
/// </summary>
public Action<BaseChart, PointerEventData> onPointerExit { set { m_OnPointerExit = value; m_ForceOpenRaycastTarget = true; } }
/// <summary>
/// 鼠标开始拖拽回调。
/// </summary>
public Action<BaseChart, PointerEventData> onBeginDrag { set { m_OnBeginDrag = value; m_ForceOpenRaycastTarget = true; } }
/// <summary>
/// 鼠标拖拽回调。
/// </summary>
public Action<BaseChart, PointerEventData> onDrag { set { m_OnDrag = value; m_ForceOpenRaycastTarget = true; } }
/// <summary>
/// 鼠标结束拖拽回调。
/// </summary>
public Action<BaseChart, PointerEventData> onEndDrag { set { m_OnEndDrag = value; m_ForceOpenRaycastTarget = true; } }
/// <summary>
/// 鼠标滚动回调。
/// </summary>
public Action<BaseChart, PointerEventData> onScroll { set { m_OnScroll = value; m_ForceOpenRaycastTarget = true; } }
/// <summary>
/// 设置图表的宽高（在非stretch pivot下才有效，其他情况需要自己调整RectTransform）
@@ -704,5 +744,8 @@ namespace XCharts
[Obsolete("Use BaseChart.AnimationFadeOut() instead.", true)]
public void MissAnimationStart() { }
[Obsolete("Use onCustomDraw instead.", false)]
public Action<VertexHelper> customDrawCallback { set { m_OnCustomDrawCallback = value; } }
}
}

9
Runtime/API/CoordinateChart_API.cs
View File

@@ -140,7 +140,6 @@ namespace XCharts
/// reutrn true when all the show axis is `Value` type.
/// 纯数值坐标轴（数值轴或对数轴）。
/// </summary>
/// <returns></returns>
public bool IsValue()
{
foreach (var axis in m_XAxises)
@@ -154,6 +153,9 @@ namespace XCharts
return true;
}
/// <summary>
/// 纯类目轴。
/// </summary>
public bool IsCategory()
{
foreach (var axis in m_XAxises)
@@ -167,6 +169,9 @@ namespace XCharts
return true;
}
/// <summary>
/// 坐标是否在坐标轴内。
/// </summary>
public bool IsInCooridate(Vector2 local)
{
return IsInCooridate(local.x, local.y);
@@ -253,7 +258,7 @@ namespace XCharts
}
/// <summary>
/// 设置可缓存的最大数据量。
/// 设置可缓存的最大数据量。当数据量超过该值时，会自动删除第一个值再加入最新值。
/// </summary>
public void SetMaxCache(int maxCache)
{

34
Runtime/Internal/BaseChart.cs
View File

@@ -31,7 +31,7 @@ namespace XCharts
}
public partial class BaseChart : MaskableGraphic, IPointerDownHandler, IPointerUpHandler,
IPointerEnterHandler, IPointerExitHandler, IBeginDragHandler,
IPointerEnterHandler, IPointerExitHandler, IBeginDragHandler, IPointerClickHandler,
IDragHandler, IEndDragHandler, IScrollHandler
{
protected static readonly string s_TitleObjectName = "title";
@@ -53,9 +53,20 @@ namespace XCharts
[SerializeField] protected Series m_Series = Series.defaultSeries;
[SerializeField] protected Settings m_Settings = new Settings();
[SerializeField] protected float m_Large = 1;
[SerializeField] protected Action<VertexHelper> m_CustomDrawCallback;
[SerializeField] protected string m_DebugInfo = "";
[SerializeField] protected Action<VertexHelper> m_OnCustomDrawCallback;
[SerializeField] protected Action<BaseChart, PointerEventData> m_OnPointerClick;
[SerializeField] protected Action<BaseChart, PointerEventData> m_OnPointerDown;
[SerializeField] protected Action<BaseChart, PointerEventData> m_OnPointerUp;
[SerializeField] protected Action<BaseChart, PointerEventData> m_OnPointerEnter;
[SerializeField] protected Action<BaseChart, PointerEventData> m_OnPointerExit;
[SerializeField] protected Action<BaseChart, PointerEventData> m_OnBeginDrag;
[SerializeField] protected Action<BaseChart, PointerEventData> m_OnDrag;
[SerializeField] protected Action<BaseChart, PointerEventData> m_OnEndDrag;
[SerializeField] protected Action<BaseChart, PointerEventData> m_OnScroll;
[NonSerialized] private Theme m_CheckTheme = 0;
[NonSerialized] protected Vector3 m_ChartPosition = Vector3.zero;
[NonSerialized] protected Vector2 m_ChartMinAnchor;
@@ -72,6 +83,7 @@ namespace XCharts
[NonSerialized] protected bool m_IsPlayingAnimation = false;
[NonSerialized] protected List<string> m_LegendRealShowName = new List<string>();
[NonSerialized] protected GameObject m_SerieLabelRoot;
[NonSerialized] protected bool m_ForceOpenRaycastTarget;
protected Vector2 chartAnchorMax { get { return m_ChartMinAnchor; } }
protected Vector2 chartAnchorMin { get { return m_ChartMaxAnchor; } }
@@ -528,6 +540,7 @@ namespace XCharts
private void CheckPointerPos()
{
if (m_ForceOpenRaycastTarget) raycastTarget = true;
var needCheck = (m_Tooltip.show && m_Tooltip.runtimeInited)
|| raycastTarget;
if (needCheck)
@@ -737,9 +750,9 @@ namespace XCharts
vh.Clear();
DrawBackground(vh);
DrawChart(vh);
if (m_CustomDrawCallback != null)
if (m_OnCustomDrawCallback != null)
{
m_CustomDrawCallback(vh);
m_OnCustomDrawCallback(vh);
}
DrawTooltip(vh);
m_RefreshLabel = true;
@@ -886,36 +899,49 @@ namespace XCharts
}
}
public virtual void OnPointerClick(PointerEventData eventData)
{
if (m_OnPointerClick != null) m_OnPointerClick(this, eventData);
}
public virtual void OnPointerDown(PointerEventData eventData)
{
if (m_OnPointerDown != null) m_OnPointerDown(this, eventData);
}
public virtual void OnPointerUp(PointerEventData eventData)
{
if (m_OnPointerUp != null) m_OnPointerUp(this, eventData);
}
public virtual void OnPointerEnter(PointerEventData eventData)
{
if (m_OnPointerEnter != null) m_OnPointerEnter(this, eventData);
}
public virtual void OnPointerExit(PointerEventData eventData)
{
if (m_OnPointerExit != null) m_OnPointerExit(this, eventData);
}
public virtual void OnBeginDrag(PointerEventData eventData)
{
if (m_OnBeginDrag != null) m_OnBeginDrag(this, eventData);
}
public virtual void OnEndDrag(PointerEventData eventData)
{
if (m_OnEndDrag != null) m_OnEndDrag(this, eventData);
}
public virtual void OnDrag(PointerEventData eventData)
{
if (m_OnDrag != null) m_OnDrag(this, eventData);
}
public virtual void OnScroll(PointerEventData eventData)
{
if (m_OnScroll != null) m_OnScroll(this, eventData);
}
}
}

5
Runtime/Internal/CoordinateChart.cs
View File

@@ -1505,6 +1505,7 @@ namespace XCharts
public override void OnBeginDrag(PointerEventData eventData)
{
base.OnBeginDrag(eventData);
if (Input.touchCount > 1) return;
Vector2 pos;
if (!RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform,
@@ -1539,6 +1540,7 @@ namespace XCharts
public override void OnDrag(PointerEventData eventData)
{
base.OnDrag(eventData);
if (Input.touchCount > 1) return;
float deltaX = eventData.delta.x;
float deltaPercent = deltaX / m_CoordinateWidth * 100;
@@ -1634,6 +1636,7 @@ namespace XCharts
public override void OnEndDrag(PointerEventData eventData)
{
base.OnEndDrag(eventData);
if (m_DataZoomDrag || m_DataZoomStartDrag || m_DataZoomEndDrag || m_DataZoomCoordinateDrag)
{
RefreshChart();
@@ -1647,6 +1650,7 @@ namespace XCharts
public override void OnPointerDown(PointerEventData eventData)
{
base.OnPointerDown(eventData);
if (Input.touchCount > 1) return;
Vector2 localPos;
if (!RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform,
@@ -1686,6 +1690,7 @@ namespace XCharts
public override void OnScroll(PointerEventData eventData)
{
base.OnScroll(eventData);
if (Input.touchCount > 1) return;
if (!m_DataZoom.enable || m_DataZoom.zoomLock) return;
Vector2 pos;

2
Runtime/PieChart.cs
View File

@@ -573,6 +573,8 @@ namespace XCharts
public override void OnPointerDown(PointerEventData eventData)
{
base.OnPointerDown(eventData);
Vector2 local;
if (!RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform,
eventData.position, canvas.worldCamera, out local))