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

优化Scatter类型的Serie支持Log轴#68

Browse Source
This commit is contained in:
monitor1394
2020-07-08 09:22:47 +08:00
parent 2a74388777
commit cb22db45d7
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,6 +1,7 @@
# 更新日志 # 更新日志
* (2020.07.08) 优化`Scatter`类型的`Serie`支持`Log`轴#68
* (2020.07.07) 修复`SerieLabel`位置错乱的问题 * (2020.07.07) 修复`SerieLabel`位置错乱的问题
* (2020.07.07) 增加`Tooltip`的`offset`参数配置偏移 * (2020.07.07) 增加`Tooltip`的`offset`参数配置偏移
* (2020.07.06) 增加`LiquidChart`水位图 * (2020.07.06) 增加`LiquidChart`水位图

18
Runtime/Internal/CoordinateChart_DrawScatter.cs
View File

@@ -40,8 +40,8 @@ namespace XCharts
if (serieData.IsDataChanged()) dataChanging = true; if (serieData.IsDataChanged()) dataChanging = true;
float pX = m_CoordinateX + xAxis.axisLine.width; float pX = m_CoordinateX + xAxis.axisLine.width;
float pY = m_CoordinateY + yAxis.axisLine.width; float pY = m_CoordinateY + yAxis.axisLine.width;
float xDataHig = (xValue - xAxis.runtimeMinValue) / (xAxis.runtimeMaxValue - xAxis.runtimeMinValue) * m_CoordinateWidth; float xDataHig = GetDataHig(xAxis, xValue, m_CoordinateWidth);
float yDataHig = (yValue - yAxis.runtimeMinValue) / (yAxis.runtimeMaxValue - yAxis.runtimeMinValue) * m_CoordinateHeight; float yDataHig = GetDataHig(yAxis, yValue, m_CoordinateHeight);
var pos = new Vector3(pX + xDataHig, pY + yDataHig); var pos = new Vector3(pX + xDataHig, pY + yDataHig);
serie.dataPoints.Add(pos); serie.dataPoints.Add(pos);
serieData.runtimePosition = pos; serieData.runtimePosition = pos;
@@ -83,5 +83,19 @@ namespace XCharts
RefreshChart(); RefreshChart();
} }
} }
private float GetDataHig(Axis axis, float value, float totalWidth)
{
if (axis.IsLog())
{
int minIndex = axis.runtimeMinLogIndex;
float nowIndex = axis.GetLogValue(value);
return (nowIndex - minIndex) / (axis.splitNumber - 1) * totalWidth;
}
else
{
return (value - axis.runtimeMinValue) / (axis.runtimeMaxValue - axis.runtimeMinValue) * totalWidth;
}
}
} }
} }