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

优化DataZoom

Browse Source
This commit is contained in:
monitor1394
2021-05-22 15:29:55 +08:00
parent 1b72bdf0ab
commit 355d3639b1
8 changed files with 98 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Component/Main/Axis.cs
View File

@@ -587,7 +587,7 @@ namespace XCharts
/// <returns></returns>
internal List<string> GetDataList(DataZoom dataZoom)
{
if (dataZoom != null && dataZoom.enable && dataZoom.IsContainsAxisIndex(index))
if (dataZoom != null && dataZoom.enable && dataZoom.IsContainsAxis(this))
{
UpdateFilterData(dataZoom);
return filterData;
@@ -610,7 +610,7 @@ namespace XCharts
/// <param name="dataZoom"></param>
internal void UpdateFilterData(DataZoom dataZoom)
{
if (dataZoom != null && dataZoom.enable && dataZoom.IsContainsAxisIndex(index))
if (dataZoom != null && dataZoom.enable && dataZoom.IsContainsAxis(this))
{
var startIndex = (int)((data.Count - 1) * dataZoom.start / 100);
var endIndex = (int)((data.Count - 1) * dataZoom.end / 100);

25
Runtime/Component/Main/DataZoom.cs
View File

@@ -365,6 +365,14 @@ namespace XCharts
public bool runtimeCoordinateDrag { get; internal set; }
public bool runtimeStartDrag { get; internal set; }
public bool runtimeEndDrag { get; internal set; }
/// <summary>
/// 运行时实际范围的开始值
/// </summary>
public float runtimeStartValue { get; internal set; }
/// <summary>
/// 运行时实际范围的结束值
/// </summary>
public float runtimeEndValue { get; internal set; }
class AxisIndexValueInfo
{
@@ -481,9 +489,20 @@ namespace XCharts
return rect.Contains(pos);
}
public bool IsContainsAxisIndex(int index)
public bool IsContainsAxis(Axis axis)
{
return xAxisIndexs.Contains(index);// || yAxisIndexs.Contains(index);
if (axis is XAxis) return xAxisIndexs.Contains(axis.index);
else if (axis is YAxis) return yAxisIndexs.Contains(axis.index);
else return false;
}
public bool IsContainsXAxis(int index)
{
return xAxisIndexs != null && xAxisIndexs.Contains(index);
}
public bool IsContainsYAxis(int index)
{
return yAxisIndexs != null && yAxisIndexs.Contains(index);
}
public Color32 GetFillerColor(Color32 themeColor)
@@ -957,7 +976,7 @@ namespace XCharts
dataZoom.SetLabelActive(false);
}
}
if (m_CheckDataZoomLabel)
if (m_CheckDataZoomLabel && dataZoom.xAxisIndexs.Count > 0)
{
m_CheckDataZoomLabel = false;
var xAxis = chart.GetXAxis(dataZoom.xAxisIndexs[0]);

2
Runtime/Component/Main/Serie.cs
View File

@@ -1577,7 +1577,7 @@ namespace XCharts
public List<SerieData> GetDataList(DataZoom dataZoom = null)
{
if (dataZoom != null && dataZoom.enable
&& (dataZoom.xAxisIndexs.Contains(xAxisIndex) || dataZoom.yAxisIndexs.Contains(yAxisIndex)))
&& (dataZoom.IsContainsXAxis(xAxisIndex) || dataZoom.IsContainsYAxis(yAxisIndex)))
{
SerieHelper.UpdateFilterData(this, dataZoom);
return m_FilterData;