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

优化DataZoom组件，增加双指缩放

Browse Source
This commit is contained in:
monitor1394
2019-10-09 02:37:05 +08:00
parent 46462ca05f
commit bbee082dd4
8 changed files with 336 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Scripts/UI/Component/Axis.cs
View File

@@ -105,6 +105,7 @@ namespace XCharts
[SerializeField] protected AxisSplitArea m_SplitArea = AxisSplitArea.defaultSplitArea;
[NonSerialized] private float m_ValueRange;
[NonSerialized] private bool m_NeedUpdateFilterData;
/// <summary>
/// Set this to false to prevent the axis from showing.
@@ -279,7 +280,11 @@ namespace XCharts
{
if (maxCache > 0)
{
while (m_Data.Count > maxCache) m_Data.RemoveAt(0);
while (m_Data.Count > maxCache)
{
m_NeedUpdateFilterData = true;
m_Data.RemoveAt(0);
}
}
m_Data.Add(category);
}
@@ -306,15 +311,12 @@ namespace XCharts
/// <returns></returns>
public List<string> GetDataList(DataZoom dataZoom)
{
if (dataZoom != null && dataZoom.show)
if (dataZoom != null && dataZoom.enable)
{
var startIndex = (int)((data.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((data.Count - 1) * dataZoom.end / 100);
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
if (filterData == null || filterData.Count != count)
{
UpdateFilterData(dataZoom);
}
UpdateFilterData(dataZoom);
return filterData;
}
else
@@ -323,20 +325,22 @@ namespace XCharts
}
}
private List<string> emptyFliter = new List<string>();
/// <summary>
/// 更新dataZoom对应的类目数据列表
/// </summary>
/// <param name="dataZoom"></param>
public void UpdateFilterData(DataZoom dataZoom)
{
if (dataZoom != null && dataZoom.show)
if (dataZoom != null && dataZoom.enable)
{
var startIndex = (int)((data.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((data.Count - 1) * dataZoom.end / 100);
if (startIndex != filterStart || endIndex != filterEnd)
if (startIndex != filterStart || endIndex != filterEnd || m_NeedUpdateFilterData)
{
filterStart = startIndex;
filterEnd = endIndex;
m_NeedUpdateFilterData = false;
if (m_Data.Count > 0)
{
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
@@ -349,7 +353,7 @@ namespace XCharts
}
else if (endIndex == 0)
{
filterData = new List<string>();
filterData = emptyFliter;
}
}
}

100
Scripts/UI/Component/DataZoom.cs
View File

@@ -12,22 +12,6 @@ namespace XCharts
[System.Serializable]
public class DataZoom
{
public enum DataZoomType
{
/// <summary>
/// DataZoom functionalities is embeded inside coordinate systems, enable user to
/// zoom or roam coordinate system by mouse dragging, mouse move or finger touch (in touch screen).
/// 内置于坐标系中，使用户可以在坐标系上通过鼠标拖拽、鼠标滚轮、手指滑动（触屏上）来缩放或漫游坐标系。
/// </summary>
Inside,
/// <summary>
/// A special slider bar is provided, on which coordinate systems can be zoomed or
/// roamed by mouse dragging or finger touch (in touch screen).
/// 有单独的滑动条，用户在滑动条上进行缩放或漫游。
/// </summary>
Slider
}
/// <summary>
/// Generally dataZoom component zoom or roam coordinate system through data filtering
/// and set the windows of axes internally.
@@ -70,12 +54,13 @@ namespace XCharts
/// </summary>
Percent
}
[SerializeField] private bool m_Show;
[SerializeField] private DataZoomType m_Type;
[SerializeField] private bool m_Enable;
[SerializeField] private FilterMode m_FilterMode;
[SerializeField] private Orient m_Orient;
[SerializeField] private int m_XAxisIndex;
[SerializeField] private int m_YAxisIndex;
[SerializeField] private bool m_SupportInside;
[SerializeField] private bool m_SupportSlider;
[SerializeField] private bool m_SupportSelect;
[SerializeField] private bool m_ShowDataShadow;
[SerializeField] private bool m_ShowDetail;
[SerializeField] private bool m_ZoomLock;
@@ -89,29 +74,21 @@ namespace XCharts
[SerializeField] private float m_StartValue;
[SerializeField] private float m_EndValue;
[Range(1f, 20f)]
[SerializeField] private float m_ScrollSensitivity;
[SerializeField] private float m_ScrollSensitivity = 1.1f;
[SerializeField] private int m_FontSize = 18;
[SerializeField] private FontStyle m_FontStyle;
/// <summary>
/// Whether to show dataZoom.
/// 是否显示缩放区域。
/// </summary>
public bool show { get { return m_Show; } set { m_Show = value; } }
/// <summary>
/// The type of dataZoom.
/// 区域缩放类型。
/// </summary>
public DataZoomType type { get { return m_Type; } set { m_Type = value; } }
public bool enable { get { return m_Enable; } set { m_Enable = value; } }
/// <summary>
/// The mode of data filter.
/// 数据过滤类型。
/// </summary>
public FilterMode filterMode { get { return m_FilterMode; } set { m_FilterMode = value; } }
/// <summary>
/// Specify whether the layout of dataZoom component is horizontal or vertical.
/// 水平还是垂直显示。
/// </summary>
public Orient orient { get { return m_Orient; } set { m_Orient = value; } }
/// <summary>
/// Specify which xAxis is controlled by the dataZoom.
/// 控制哪一个 x 轴。
/// </summary>
@@ -122,6 +99,18 @@ namespace XCharts
/// </summary>
public int yAxisIndex { get { return m_YAxisIndex; } set { m_YAxisIndex = value; } }
/// <summary>
/// 是否支持内置。内置于坐标系中，使用户可以在坐标系上通过鼠标拖拽、鼠标滚轮、手指滑动（触屏上）来缩放或漫游坐标系。
/// </summary>
public bool supportInside { get { return m_SupportInside; } set { m_SupportInside = value; } }
/// <summary>
/// 是否支持滑动条。有单独的滑动条，用户在滑动条上进行缩放或漫游。
/// </summary>
public bool supportSlider { get { return m_SupportSlider; } set { m_SupportSlider = value; } }
/// <summary>
/// 是否支持框选。提供一个选框进行数据区域缩放。
/// </summary>
private bool supportSelect { get { return m_SupportSelect; } set { m_SupportSelect = value; } }
/// <summary>
/// Whether to show data shadow, to indicate the data tendency in brief.
/// default:true
/// 是否显示数据阴影。数据阴影可以简单地反应数据走势。
@@ -142,14 +131,14 @@ namespace XCharts
/// <summary>
/// Whether to show data shadow in dataZoom-silder component, to indicate the data tendency in brief.
/// default:true
/// 拖动时，是否实时更新系列的视图。如果设置为 false，则只在拖拽结束的时候更新。
/// 拖动时，是否实时更新系列的视图。如果设置为 false，则只在拖拽结束的时候更新。默认为true，暂不支持修改。
/// </summary>
public bool realtime { get { return m_Realtime; } set { m_Realtime = value; } }
public bool realtime { get { return true; } }
/// <summary>
/// The background color of the component.
/// 组件的背景颜色。
/// </summary>
public Color backgroundColor { get { return m_BackgroundColor; } set { m_BackgroundColor = value; } }
private Color backgroundColor { get { return m_BackgroundColor; } set { m_BackgroundColor = value; } }
/// <summary>
/// Distance between dataZoom component and the bottom side of the container.
/// bottom value is a instant pixel value like 10.
@@ -175,13 +164,21 @@ namespace XCharts
/// default:30
/// 数据窗口范围的起始百分比。范围是：0 ~ 100。
/// </summary>
public float start { get { return m_Start; } set { m_Start = value; } }
public float start
{
get { return m_Start; }
set { m_Start = value; if (m_Start < 0) m_Start = 0; if (m_Start > 100) m_Start = 100; }
}
/// <summary>
/// The end percentage of the window out of the data extent, in the range of 0 ~ 100.
/// default:70
/// 数据窗口范围的结束百分比。范围是：0 ~ 100。
/// </summary>
public float end { get { return m_End; } set { m_End = value; } }
public float end
{
get { return m_End; }
set { m_End = value; if (m_End < 0) m_End = 0; if (m_End > 100) m_End = 100; }
}
/// <summary>
/// The sensitivity of dataZoom scroll.
/// The larger the number, the more sensitive it is.
@@ -189,6 +186,16 @@ namespace XCharts
/// 缩放区域组件的敏感度。值越高每次缩放所代表的数据越多。
/// </summary>
public float scrollSensitivity { get { return m_ScrollSensitivity; } set { m_ScrollSensitivity = value; } }
/// <summary>
/// font size.
/// 文字的字体大小。
/// </summary>
public int fontSize { get { return m_FontSize; } set { m_FontSize = value; } }
/// <summary>
/// font style.
/// 文字字体的风格。
/// </summary>
public FontStyle fontStyle { get { return m_FontStyle; } set { m_FontStyle = value; } }
/// <summary>
/// DataZoom is in draging.
@@ -212,16 +219,13 @@ namespace XCharts
{
return new DataZoom()
{
m_Type = DataZoomType.Slider,
filterMode = FilterMode.None,
orient = Orient.Horizonal,
xAxisIndex = 0,
yAxisIndex = 0,
showDataShadow = true,
showDetail = false,
zoomLock = false,
realtime = true,
m_Height = 50,
m_Height = 0,
m_Bottom = 10,
rangeMode = RangeMode.Percent,
start = 30,
@@ -320,5 +324,21 @@ namespace XCharts
{
if (endLabel) endLabel.text = text;
}
/// <summary>
/// 获取DataZoom的高，当height设置为0时，自动计算合适的偏移。
/// </summary>
/// <param name="gridBottom"></param>
/// <returns></returns>
public float GetHeight(float gridBottom)
{
if (height <= 0)
{
var hig = gridBottom - bottom - 30;
if (hig < 10) hig = 10;
return hig;
}
else return height;
}
}
}

37
Scripts/UI/Component/Serie.cs
View File

@@ -192,6 +192,7 @@ namespace XCharts
[NonSerialized] private Dictionary<int, List<Vector3>> m_UpSmoothPoints = new Dictionary<int, List<Vector3>>();
[NonSerialized] private Dictionary<int, List<Vector3>> m_DownSmoothPoints = new Dictionary<int, List<Vector3>>();
[NonSerialized] private List<Vector3> m_DataPoints = new List<Vector3>();
[NonSerialized] private bool m_NeedUpdateFilterData;
/// <summary>
/// Whether to show serie in chart.
@@ -590,7 +591,11 @@ namespace XCharts
{
if (m_MaxCache > 0)
{
while (m_Data.Count > m_MaxCache) m_Data.RemoveAt(0);
while (m_Data.Count > m_MaxCache)
{
m_NeedUpdateFilterData = true;
m_Data.RemoveAt(0);
}
}
int xValue = m_Data.Count;
m_Data.Add(new SerieData() { data = new List<float>() { xValue, value }, name = dataName });
@@ -607,7 +612,11 @@ namespace XCharts
{
if (m_MaxCache > 0)
{
while (m_Data.Count > m_MaxCache) m_Data.RemoveAt(0);
while (m_Data.Count > m_MaxCache)
{
m_NeedUpdateFilterData = true;
m_Data.RemoveAt(0);
}
}
m_Data.Add(new SerieData() { data = new List<float>() { xValue, yValue }, name = dataName });
}
@@ -634,7 +643,11 @@ namespace XCharts
{
if (m_MaxCache > 0)
{
while (m_Data.Count > m_MaxCache) m_Data.RemoveAt(0);
while (m_Data.Count > m_MaxCache)
{
m_NeedUpdateFilterData = true;
m_Data.RemoveAt(0);
}
}
var serieData = new SerieData();
serieData.name = dataName;
@@ -727,15 +740,9 @@ namespace XCharts
/// <returns></returns>
public List<SerieData> GetDataList(DataZoom dataZoom)
{
if (dataZoom != null && dataZoom.show)
if (dataZoom != null && dataZoom.enable)
{
var startIndex = (int)((m_Data.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((m_Data.Count - 1) * dataZoom.end / 100);
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
if (m_FilterData == null || m_FilterData.Count != count)
{
UpdateFilterData(dataZoom);
}
UpdateFilterData(dataZoom);
return m_FilterData;
}
else
@@ -769,20 +776,22 @@ namespace XCharts
minValue = min;
}
private List<SerieData> emptyFilter = new List<SerieData>();
/// <summary>
/// 根据dataZoom更新数据列表缓存
/// </summary>
/// <param name="dataZoom"></param>
public void UpdateFilterData(DataZoom dataZoom)
{
if (dataZoom != null && dataZoom.show)
if (dataZoom != null && dataZoom.enable)
{
var startIndex = (int)((data.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((data.Count - 1) * dataZoom.end / 100);
if (startIndex != m_FilterStart || endIndex != m_FilterEnd)
if (startIndex != m_FilterStart || endIndex != m_FilterEnd || m_NeedUpdateFilterData)
{
m_FilterStart = startIndex;
m_FilterEnd = endIndex;
m_NeedUpdateFilterData = false;
var count = endIndex == startIndex ? 1 : endIndex - startIndex + 1;
if (m_Data.Count > 0)
{
@@ -795,7 +804,7 @@ namespace XCharts
}
else if (endIndex == 0)
{
m_FilterData = new List<SerieData>();
m_FilterData = emptyFilter;
}
}
}

2
Scripts/UI/Component/Series.cs
View File

@@ -476,7 +476,7 @@ namespace XCharts
/// <param name="dataZoom"></param>
public void UpdateFilterData(DataZoom dataZoom)
{
if (dataZoom != null && dataZoom.show)
if (dataZoom != null && dataZoom.enable)
{
for (int i = 0; i < m_Series.Count; i++)
{