Skip to content

Commit

Permalink
优化坐标轴刻度和文本显示#93
Browse files Browse the repository at this point in the history
  • Loading branch information
@monitor1394
monitor1394 committed Sep 18, 2020
1 parent be61cb9 commit a43cf64
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 43 deletions.
27 changes: 13 additions & 14 deletions Assets/XCharts/Runtime/Internal/CoordinateChart.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,7 @@ private void InitYAxis(int yAxisIndex, YAxis yAxis)
float totalWidth = 0;
float eachWidth = AxisHelper.GetEachWidth(yAxis, m_CoordinateHeight, m_DataZoom);
float gapWidth = yAxis.boundaryGap ? eachWidth / 2 : 0;
float textWidth = AxisHelper.GetScaleWidth(yAxis, m_CoordinateWidth, 0, m_DataZoom);
for (int i = 0; i < splitNumber; i++)
{
Text txt;
Expand All @@ -550,7 +551,7 @@ private void InitYAxis(int yAxisIndex, YAxis yAxis)
yAxis.axisLabel.fontSize, yAxis.axisLabel.rotate, yAxis.axisLabel.fontStyle);
}

float labelWidth = AxisHelper.GetScaleWidth(yAxis, m_CoordinateHeight, i, m_DataZoom);
float labelWidth = AxisHelper.GetScaleWidth(yAxis, m_CoordinateHeight, i + 1, m_DataZoom);
if (i == 0) yAxis.axisLabel.SetRelatedText(txt, labelWidth);
txt.transform.localPosition = GetLabelYPosition(totalWidth + gapWidth, i, yAxisIndex, yAxis);

Expand Down Expand Up @@ -639,16 +640,17 @@ private void InitXAxis(int xAxisIndex, XAxis xAxis)
float totalWidth = 0;
float eachWidth = AxisHelper.GetEachWidth(xAxis, m_CoordinateWidth, m_DataZoom);
float gapWidth = xAxis.boundaryGap ? eachWidth / 2 : 0;
float textWidth = AxisHelper.GetScaleWidth(xAxis, m_CoordinateWidth, 0, m_DataZoom);
for (int i = 0; i < splitNumber; i++)
{
float labelWidth = AxisHelper.GetScaleWidth(xAxis, m_CoordinateWidth, i, m_DataZoom);
float labelWidth = AxisHelper.GetScaleWidth(xAxis, m_CoordinateWidth, i + 1, m_DataZoom);
bool inside = xAxis.axisLabel.inside;
Text txt = ChartHelper.AddTextObject(ChartCached.GetXAxisName(xAxisIndex, i), axisObj.transform,
m_ThemeInfo.font, labelColor, TextAnchor.MiddleCenter, new Vector2(0, 1),
new Vector2(0, 1), new Vector2(1, 0.5f), new Vector2(labelWidth, 20),
new Vector2(0, 1), new Vector2(1, 0.5f), new Vector2(textWidth, 20),
xAxis.axisLabel.fontSize, xAxis.axisLabel.rotate, xAxis.axisLabel.fontStyle);
if (i == 0) xAxis.axisLabel.SetRelatedText(txt, labelWidth);
txt.transform.localPosition = GetLabelXPosition(totalWidth + labelWidth / 2 + gapWidth,
txt.transform.localPosition = GetLabelXPosition(totalWidth + textWidth / 2 + gapWidth,
i, xAxisIndex, xAxis);
totalWidth += labelWidth;
var isPercentStack = SeriesHelper.IsPercentStack(m_Series, SerieType.Bar);
Expand Down Expand Up @@ -927,7 +929,7 @@ private void DrawYAxisSplit(VertexHelper vh, int yAxisIndex, YAxis yAxis)
var zeroPos = new Vector3(m_CoordinateX + xAxis.runtimeZeroXOffset, m_CoordinateY + yAxis.runtimeZeroYOffset);
for (int i = 0; i < size; i++)
{
var scaleWidth = AxisHelper.GetScaleWidth(yAxis, m_CoordinateHeight, i, m_DataZoom);
var scaleWidth = AxisHelper.GetScaleWidth(yAxis, m_CoordinateHeight, i + 1, m_DataZoom);
float pY = totalWidth;
if (yAxis.boundaryGap && yAxis.axisTick.alignWithLabel)
{
Expand Down Expand Up @@ -966,7 +968,7 @@ private void DrawYAxisTick(VertexHelper vh, int yAxisIndex, YAxis yAxis)
var xAxis = m_XAxises[yAxisIndex];
for (int i = 0; i < size; i++)
{
var scaleWidth = AxisHelper.GetScaleWidth(yAxis, m_CoordinateHeight, i, m_DataZoom);
var scaleWidth = AxisHelper.GetScaleWidth(yAxis, m_CoordinateHeight, i + 1, m_DataZoom);
float pX = 0;
float pY = totalWidth;
if (yAxis.boundaryGap && yAxis.axisTick.alignWithLabel)
Expand Down Expand Up @@ -1027,7 +1029,7 @@ private void DrawXAxisSplit(VertexHelper vh, int xAxisIndex, XAxis xAxis)
var zeroPos = new Vector3(m_CoordinateX, m_CoordinateY + yAxis.runtimeZeroYOffset);
for (int i = 0; i < size; i++)
{
var scaleWidth = AxisHelper.GetScaleWidth(xAxis, m_CoordinateWidth, i, m_DataZoom);
var scaleWidth = AxisHelper.GetScaleWidth(xAxis, m_CoordinateWidth, i + 1, m_DataZoom);
float pX = totalWidth;
if (xAxis.boundaryGap && xAxis.axisTick.alignWithLabel)
{
Expand All @@ -1052,7 +1054,7 @@ private void DrawXAxisSplit(VertexHelper vh, int xAxisIndex, XAxis xAxis)
}
}
}
totalWidth += scaleWidth;
totalWidth += AxisHelper.GetScaleWidth(xAxis, m_CoordinateWidth, i + 1, m_DataZoom);
}
}
}
Expand All @@ -1066,7 +1068,7 @@ private void DrawXAxisTick(VertexHelper vh, int xAxisIndex, XAxis xAxis)
var yAxis = m_YAxises[xAxisIndex];
for (int i = 0; i < size; i++)
{
var scaleWidth = AxisHelper.GetScaleWidth(xAxis, m_CoordinateWidth, i, m_DataZoom);
var scaleWidth = AxisHelper.GetScaleWidth(xAxis, m_CoordinateWidth, i + 1, m_DataZoom);
float pX = totalWidth;
float pY = 0;
if (xAxis.boundaryGap && xAxis.axisTick.alignWithLabel)
Expand All @@ -1087,11 +1089,8 @@ private void DrawXAxisTick(VertexHelper vh, int xAxisIndex, XAxis xAxis)
{
pY += startY - xAxis.axisTick.length;
}
if (pX <= m_CoordinateX + m_CoordinateWidth + yAxis.axisLine.width)
{
ChartDrawer.DrawLine(vh, new Vector3(pX, startY), new Vector3(pX, pY),
AxisHelper.GetTickWidth(xAxis), m_ThemeInfo.axisLineColor);
}
ChartDrawer.DrawLine(vh, new Vector3(pX, startY), new Vector3(pX, pY),
AxisHelper.GetTickWidth(xAxis), m_ThemeInfo.axisLineColor);
}
totalWidth += scaleWidth;
}
Expand Down
81 changes: 52 additions & 29 deletions Assets/XCharts/Runtime/Internal/Helper/AxisHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,35 +43,30 @@ public static int GetSplitNumber(Axis axis, float coordinateWid, DataZoom dataZo
if (axis.interval > 0)
{
if (coordinateWid <= 0) return 0;
int num = Mathf.CeilToInt(axis.runtimeMinMaxRange / axis.interval) + 1;
int num = Mathf.CeilToInt(axis.runtimeMinMaxRange / axis.interval);
int maxNum = Mathf.CeilToInt(coordinateWid / 15);
if (num > maxNum)
{
axis.interval *= 2;
num = Mathf.CeilToInt(axis.runtimeMinMaxRange / axis.interval) + 1;
num = Mathf.CeilToInt(axis.runtimeMinMaxRange / axis.interval);
}
return num;
}
else return axis.splitNumber;
else
{
return axis.splitNumber > 0 ? axis.splitNumber : 4;
}
}
else if (axis.type == Axis.AxisType.Log)
{
return axis.splitNumber;
return axis.splitNumber > 0 ? axis.splitNumber : 4;
}
else if (axis.type == Axis.AxisType.Category)
{
int dataCount = axis.GetDataList(dataZoom).Count;
if (dataCount <= 0) return 0;
if (axis.splitNumber <= 0) return dataCount;
if (dataCount >= 2 * axis.splitNumber)
{
int tick = dataCount / axis.splitNumber;
return (int)dataCount / tick;
}
else
{
return dataCount;
}
if (axis.splitNumber <= 0 || axis.splitNumber > dataCount) return dataCount;
if (dataCount >= axis.splitNumber * 2) return axis.splitNumber;
else return dataCount;
}
return 0;
}
Expand Down Expand Up @@ -124,12 +119,12 @@ internal static string GetLabelName(Axis axis, float coordinateWidth, int index,
if (forcePercent) maxValue = 100;
if (axis.interval > 0)
{
if (index == split - 1) value = maxValue;
if (index == split) value = maxValue;
else value = minValue + index * axis.interval;
}
else
{
value = (minValue + (maxValue - minValue) * index / (split - 1));
value = (minValue + (maxValue - minValue) * index / split);
if (!axis.clockwise && value != minValue) value = maxValue - value;
}
if (axis.inverse)
Expand All @@ -156,12 +151,22 @@ internal static string GetLabelName(Axis axis, float coordinateWidth, int index,
var showData = axis.GetDataList(dataZoom);
int dataCount = showData.Count;
if (dataCount <= 0) return "";
if (split == 1) return axis.axisLabel.GetFormatterContent(showData[0]);
int rate = dataCount / (split - (axis.boundaryGap ? 0 : 1));
if (rate < 1) rate = 1;
int rate = Mathf.RoundToInt(dataCount * 1f / split);
int newIndex = index * rate;
if (newIndex > dataCount - 1) return string.Empty;
else return axis.axisLabel.GetFormatterContent(showData[newIndex]);
if (newIndex <= dataCount - 1)
{
return axis.axisLabel.GetFormatterContent(showData[newIndex]);
}
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]);
}
}
}

/// <summary>
Expand All @@ -172,7 +177,15 @@ internal static string GetLabelName(Axis axis, float coordinateWidth, int index,
internal static int GetScaleNumber(Axis axis, float coordinateWidth, DataZoom dataZoom = null)
{
int splitNum = GetSplitNumber(axis, coordinateWidth, dataZoom);
return axis.boundaryGap ? splitNum + 1 : splitNum;
if (axis.IsCategory())
{
int tick = Mathf.RoundToInt(axis.data.Count * 1f / splitNum);
return Mathf.CeilToInt(axis.data.Count * 1.0f / tick) + 1;
}
else
{
return splitNum + 1;
}
}

/// <summary>
Expand All @@ -183,22 +196,32 @@ internal static int GetScaleNumber(Axis axis, float coordinateWidth, DataZoom da
/// <returns></returns>
internal static float GetScaleWidth(Axis axis, float coordinateWidth, int index, DataZoom dataZoom = null)
{
int num = GetScaleNumber(axis, coordinateWidth, dataZoom) - 1;
if (index < 0) return 0;
int num = GetScaleNumber(axis, coordinateWidth, dataZoom);
int splitNum = GetSplitNumber(axis, coordinateWidth, dataZoom);
if (num <= 0) num = 1;
if (axis.type == Axis.AxisType.Value && axis.interval > 0)
{
return axis.interval * coordinateWidth / axis.runtimeMinMaxRange;
if (axis.runtimeMinMaxRange <= 0) return 0;
if (index >= splitNum) return coordinateWidth - (index - 1) * axis.interval * coordinateWidth / axis.runtimeMinMaxRange;
else return axis.interval * coordinateWidth / axis.runtimeMinMaxRange;
}
else
{
if (axis.data.Count > 0)
if (axis.IsCategory() && axis.data.Count > 0)
{
int tick = axis.data.Count / num;
int tick = Mathf.RoundToInt(axis.data.Count * 1f / splitNum);
var count = axis.boundaryGap ? axis.data.Count : axis.data.Count - 1;
if (count <= 0) return 0;
var each = coordinateWidth / count;
return each * tick;
if (index >= num - 1) return coordinateWidth - each * tick * (index - 1);
else return each * tick;
}
else
{
if (splitNum <= 0) return 0;
else return coordinateWidth / splitNum;
}
else return coordinateWidth / num;
}
}

Expand Down

0 comments on commit a43cf64

Please sign in to comment.