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

v3.3.0

Browse Source
This commit is contained in:
monitor1394
2022-09-28 08:20:10 +08:00
parent aec3e59aca
commit 75bf6e0e6c
5 changed files with 62 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -368,10 +368,6 @@ namespace XCharts
((inside && axis.IsLeft()) || (!inside && axis.IsRight()) ?
TextAnchor.MiddleLeft :
TextAnchor.MiddleRight);
if (axis.IsCategory() && axis.boundaryGap)
splitNumber -= 1;
for (int i = 0; i < splitNumber; i++)
{
var labelWidth = AxisHelper.GetScaleWidth(axis, axisLength, i + 1, dataZoom);

14
Runtime/Component/Axis/AxisHelper.cs
View File

@@ -65,9 +65,9 @@ namespace XCharts.Runtime
if (axis.splitNumber <= 0)
{
var eachWid = coordinateWid / dataCount;
if (eachWid > 40) return dataCount;
for (int i = 2; i < dataCount / 2; i++)
if (eachWid * i > 40) return dataCount / i;
if (eachWid > 80) return dataCount;
var tick = Mathf.CeilToInt(80 / eachWid);
return (int) (dataCount / tick);
}
else
{
@@ -191,7 +191,8 @@ namespace XCharts.Runtime
}
else
{
if (axis.boundaryGap && coordinateWidth / dataCount > 5)
var diff = newIndex - dataCount;
if (axis.boundaryGap && ((diff > 0 && diff / rate < 0.4f) || dataCount >= axis.data.Count))
return string.Empty;
else
return axis.axisLabel.GetFormatterContent(dataCount - 1, showData[dataCount - 1]);
@@ -223,10 +224,7 @@ namespace XCharts.Runtime
}
else
{
if (dataCount < splitNum) scaleNum = splitNum;
else scaleNum = dataCount > 2 && dataCount % splitNum == 0 ?
splitNum :
splitNum + 1;
scaleNum = splitNum + 1;
}
return scaleNum;
}

4
Runtime/Serie/SeriesHelper.cs
View File

@@ -359,9 +359,11 @@ namespace XCharts.Runtime
}
else
{
var performanceMode = serie.IsPerformanceMode();
foreach (var data in showData)
{
var currData = data.GetCurrData(yValue ? 1 : 0, updateDuration, inverse);
var currData = performanceMode? data.GetData(yValue?1 : 0, inverse):
data.GetCurrData(yValue ? 1 : 0, updateDuration, inverse);
if (!serie.IsIgnoreValue(currData))
{
if (currData > max) max = currData;