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

优化Axis的Time时间轴的滚动表现

Browse Source
This commit is contained in:
monitor1394
2024-07-14 15:07:26 +08:00
parent b22288eac4
commit e3098e6e16
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation~/zh/changelog.md
View File

@@ -75,6 +75,7 @@ slug: /changelog
## master ## master
* (2024.07.14) 优化`Axis`的`Time`时间轴的滚动表现
* (2024.07.12) 优化`Label`显示体验 * (2024.07.12) 优化`Label`显示体验
* (2024.07.06) 修复`Chart`在动态创建时背景没有自适应的问题 (#323) * (2024.07.06) 修复`Chart`在动态创建时背景没有自适应的问题 (#323)

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

@@ -720,12 +720,6 @@ namespace XCharts
if (AxisHelper.NeedShowSplit(axis)) if (AxisHelper.NeedShowSplit(axis))
{ {
var size = AxisHelper.GetScaleNumber(axis, axisLength, dataZoom); var size = AxisHelper.GetScaleNumber(axis, axisLength, dataZoom);
if (axis.IsTime())
{
size += 1;
if (!ChartHelper.IsEquals(axis.GetLastLabelValue(), axis.context.maxValue))
size += 1;
}
var tickWidth = axis.axisTick.GetWidth(theme.tickWidth); var tickWidth = axis.axisTick.GetWidth(theme.tickWidth);
var tickColor = axis.axisTick.GetColor(theme.tickColor); var tickColor = axis.axisTick.GetColor(theme.tickColor);
var current = orient == Orient.Horizonal ? startX : startY; var current = orient == Orient.Horizonal ? startX : startY;

13
Runtime/Utilities/DateTimeUtil.cs
View File

@@ -49,6 +49,11 @@ namespace XCharts.Runtime
} }
} }
public static DateTime GetDateTime(double timestamp)
{
return k_DateTime1970.AddSeconds(timestamp);
}
public static DateTime GetDateTime(int timestamp) public static DateTime GetDateTime(int timestamp)
{ {
return k_DateTime1970.AddSeconds(timestamp); return k_DateTime1970.AddSeconds(timestamp);
@@ -97,6 +102,8 @@ namespace XCharts.Runtime
/// <param name="splitNumber"></param> /// <param name="splitNumber"></param>
internal static float UpdateTimeAxisDateTimeList(List<double> list, int minTimestamp, int maxTimestamp, int splitNumber) internal static float UpdateTimeAxisDateTimeList(List<double> list, int minTimestamp, int maxTimestamp, int splitNumber)
{ {
var firstValue = list.Count > 0 ? list[0] : 0;
var secondValue = list.Count > 1 ? list[1] : 0;
list.Clear(); list.Clear();
var range = maxTimestamp - minTimestamp; var range = maxTimestamp - minTimestamp;
if (range <= 0) return 0; if (range <= 0) return 0;
@@ -107,7 +114,8 @@ namespace XCharts.Runtime
if (range >= ONE_YEAR * MIN_TIME_SPLIT_NUMBER) if (range >= ONE_YEAR * MIN_TIME_SPLIT_NUMBER)
{ {
var num = Math.Max(range / (splitNumber * ONE_YEAR), 1); var num = Math.Max(range / (splitNumber * ONE_YEAR), 1);
var dtStart = new DateTime(dtMin.Year + 1, 1, 1); var dtStart = (firstValue == 0 || secondValue == 0) ? new DateTime(dtMin.Year + 1, 1, 1) :
(minTimestamp > firstValue ? DateTimeUtil.GetDateTime(secondValue) : DateTimeUtil.GetDateTime(firstValue));
tick = num * 365 * 24 * 3600; tick = num * 365 * 24 * 3600;
while (dtStart.Ticks < dtMax.Ticks) while (dtStart.Ticks < dtMax.Ticks)
{ {
@@ -118,7 +126,8 @@ namespace XCharts.Runtime
else if (range >= ONE_MONTH * MIN_TIME_SPLIT_NUMBER) else if (range >= ONE_MONTH * MIN_TIME_SPLIT_NUMBER)
{ {
var num = Math.Max(range / (splitNumber * ONE_MONTH), 1); var num = Math.Max(range / (splitNumber * ONE_MONTH), 1);
var dtStart = new DateTime(dtMin.Year, dtMin.Month, 1).AddMonths(1); var dtStart = (firstValue == 0 || secondValue == 0) ? (new DateTime(dtMin.Year, dtMin.Month, 1).AddMonths(1)) :
(minTimestamp > firstValue ? DateTimeUtil.GetDateTime(secondValue) : DateTimeUtil.GetDateTime(firstValue));
tick = num * 30 * 24 * 3600; tick = num * 30 * 24 * 3600;
while (dtStart.Ticks < dtMax.Ticks) while (dtStart.Ticks < dtMax.Ticks)
{ {