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

优化Axis的刻度表现 #135

Browse Source
This commit is contained in:
monitor1394
2021-05-07 08:35:49 +08:00
parent 424577ca4d
commit 53085b01b6
5 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/XCharts/CHANGELOG-EN.md
View File

@@ -34,6 +34,7 @@
## Latest
* (2021.05.07) Improved the `Axis` scale performance #135
* (2021.05.01) Added `Settings` parameters for painter's material #140
* (2021.05.01) Fixed an issue where some super large or super small values could not be properly represented
* (2021.04.29) Fixed an issue with `Radar` switching to `Circle` anomaly #139

1
Assets/XCharts/CHANGELOG.md
View File

@@ -34,6 +34,7 @@
## Latest
* (2021.05.07) 优化`Axis`的刻度表现 #135
* (2021.05.01) 增加`Settings`中关于关于材质球设置的参数 #140
* (2021.05.01) 修复无法正确表示部分超大或超小数值的问题
* (2021.04.29) 修复`Radar`切换到`Circle`异常的问题 #139

1
Assets/XCharts/Runtime/Component/Main/Axis.cs
View File

@@ -681,6 +681,7 @@ namespace XCharts
internal void SetTooltipLabelActive(bool flag)
{
if(m_TooltipLabel == null) return;
ChartHelper.SetActive(m_TooltipLabel, flag);
}

49
Assets/XCharts/Runtime/Helper/AxisHelper.cs
View File

@@ -84,20 +84,6 @@ namespace XCharts
return 0;
}
/// <summary>
/// 获得分割段的宽度
/// </summary>
/// <param name="coordinateWidth"></param>
/// <param name="dataZoom"></param>
/// <returns></returns>
public static float GetSplitWidth(Axis axis, float coordinateWidth, DataZoom dataZoom)
{
int split = GetSplitNumber(axis, coordinateWidth, dataZoom);
int segment = (axis.boundaryGap ? split : split - 1);
segment = segment <= 0 ? 1 : segment;
return coordinateWidth / segment;
}
/// <summary>
/// 获得一个类目数据在坐标系中代表的宽度
/// </summary>
@@ -182,7 +168,8 @@ namespace XCharts
var showData = axis.GetDataList(dataZoom);
int dataCount = showData.Count;
if (dataCount <= 0) return "";
int rate = Mathf.RoundToInt(dataCount * 1f / split);
int rate = axis.boundaryGap ? (dataCount / split) : (dataCount - 1) / split;
if (rate == 0) rate = 1;
int newIndex = index * rate;
if (newIndex <= dataCount - 1)
{
@@ -190,13 +177,8 @@ namespace XCharts
}
else
{
if (rate == 1) return string.Empty;
else if (axis.boundaryGap && coordinateWidth / dataCount > 10) return string.Empty;
else
{
if ((index - 1) * rate > dataCount - 1) return string.Empty;
else return axis.axisLabel.GetFormatterContent(showData[dataCount - 1]);
}
if (axis.boundaryGap && coordinateWidth / dataCount > 10) return string.Empty;
else return axis.axisLabel.GetFormatterContent(showData[dataCount - 1]);
}
}
@@ -208,14 +190,21 @@ namespace XCharts
public static int GetScaleNumber(Axis axis, float coordinateWidth, DataZoom dataZoom = null)
{
int splitNum = GetSplitNumber(axis, coordinateWidth, dataZoom);
if (splitNum == 0) return 0;
if (axis.IsCategory())
{
var data = axis.GetDataList(dataZoom);
int tick = Mathf.RoundToInt(data.Count * 1f / splitNum);
var scaleNum = 0;
if (axis.boundaryGap)
return Mathf.CeilToInt(data.Count * 1.0f / tick) + 1;
{
scaleNum = data.Count % splitNum == 0 ? splitNum : splitNum + 1;
}
else
return Mathf.CeilToInt(data.Count * 1.0f / tick);
{
if (data.Count - 1 < splitNum) scaleNum = splitNum;
else scaleNum = (data.Count - 1) % splitNum == 0 ? splitNum + 1 : splitNum + 1;
}
return scaleNum;
}
else
{
@@ -252,16 +241,20 @@ namespace XCharts
var data = axis.GetDataList(dataZoom);
if (axis.IsCategory() && data.Count > 0)
{
int tick = Mathf.RoundToInt(data.Count * 1f / splitNum);
var count = axis.boundaryGap ? data.Count : data.Count - 1;
int tick = count / splitNum;
if (count <= 0) return 0;
var each = coordinateWidth / count;
if (index >= num - 1)
if (index >= num)
{
if (axis.axisTick.alignWithLabel) return each * tick;
else return coordinateWidth - each * tick * (index - 1);
}
else return each * tick;
else
{
if (count < splitNum) return each;
else return each * (count / splitNum);
}
}
else
{

6
Assets/XCharts/Runtime/Internal/CoordinateChart.cs
View File

@@ -690,6 +690,7 @@ namespace XCharts
ChartHelper.HideAllObject(axisObj);
var grid = GetAxisGridOrDefault(xAxis);
if (grid == null) return;
if (!xAxis.show) return;
var axisLabelTextStyle = xAxis.axisLabel.textStyle;
int splitNumber = AxisHelper.GetScaleNumber(xAxis, grid.runtimeWidth, dataZoom);
float totalWidth = 0;
@@ -1193,15 +1194,16 @@ namespace XCharts
var size = AxisHelper.GetScaleNumber(xAxis, grid.runtimeWidth, dataZoom);
var totalWidth = grid.runtimeX;
var yAxis = m_YAxes[xAxisIndex];
for (int i = 0; i < size; i++)
for (int i = 0; i <= size; i++)
{
var scaleWidth = AxisHelper.GetScaleWidth(xAxis, grid.runtimeWidth, i + 1, dataZoom);
if (i == 0 && !xAxis.axisTick.showStartTick)
{
totalWidth += scaleWidth;
continue;
}
if (i == size - 1 && !xAxis.axisTick.showEndTick)
if (i == size && !xAxis.axisTick.showEndTick)
{
totalWidth += scaleWidth;
continue;