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

优化Legend数量过多时自动换行显示

Browse Source
This commit is contained in:
monitor1394
2020-06-04 07:06:41 +08:00
parent 8851e54266
commit 930fb59755
3 changed files with 119 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/XCharts/CHANGELOG.md
View File

@@ -1,6 +1,7 @@
# 更新日志 # 更新日志
* (2020.06.04) 优化`Legend`数量过多时自动换行显示
* (2020.06.03) 发布`v1.5.1`版本 * (2020.06.03) 发布`v1.5.1`版本
* (2020.06.02) 增加`Radar`的`ceilRate`，设置最大最小值的取整倍率 * (2020.06.02) 增加`Radar`的`ceilRate`，设置最大最小值的取整倍率
* (2020.06.02) 优化`Tooltip`的`formatter`，支持`{c1:1-1:f1}`格式配置 * (2020.06.02) 优化`Tooltip`的`formatter`，支持`{c1:1-1:f1}`格式配置

2
Assets/XCharts/Runtime/Internal/BaseChart.cs
View File

@@ -450,7 +450,7 @@ namespace XCharts
OnLegendButtonClick(n, m_LegendRealShowName[n], n == 0 ? true : false); OnLegendButtonClick(n, m_LegendRealShowName[n], n == 0 ? true : false);
} }
} }
LegendHelper.ResetItemPosition(m_Legend); LegendHelper.ResetItemPosition(m_Legend, m_ChartWidth, m_ChartHeight);
} }
private void InitSerieLabel() private void InitSerieLabel()

156
Assets/XCharts/Runtime/Internal/Helper/LegendHelper.cs
View File

@@ -71,102 +71,150 @@ namespace XCharts
return item; return item;
} }
public static void ResetItemPosition(Legend legend) public static void ResetItemPosition(Legend legend, float chartWidth, float chartHeight)
{ {
var startX = 0f; var startX = 0f;
var startY = 0f;
var offsetX = 0f;
var currWidth = 0f; var currWidth = 0f;
var currHeight = 0f; var currHeight = 0f;
var legendWidth = chartWidth - legend.location.left - legend.location.right;
var legendHeight = chartHeight - legend.location.top - legend.location.bottom;
var legendRuntimeWidth = legend.runtimeWidth;
var legendRuntimeHeight = legend.runtimeHeight;
switch (legend.orient) switch (legend.orient)
{ {
case Orient.Vertical: case Orient.Vertical:
switch (legend.location.align) switch (legend.location.align)
{ {
case Location.Align.TopCenter: case Location.Align.TopCenter:
startX = legend.runtimeWidth / 2; startX = legendRuntimeWidth / 2;
currHeight = 0f;
foreach (var kv in legend.buttonList) foreach (var kv in legend.buttonList)
{ {
var item = kv.Value; var item = kv.Value;
item.SetPosition(new Vector3(-startX + item.width / 2, -currHeight)); if (currHeight + item.height + legend.itemGap > legendHeight)
{
currHeight = 0;
offsetX += legendRuntimeWidth + legend.itemGap;
}
item.SetPosition(new Vector3(-startX + item.width / 2 + offsetX, -currHeight));
currHeight += item.height + legend.itemGap; currHeight += item.height + legend.itemGap;
} }
break; break;
case Location.Align.TopLeft: case Location.Align.TopLeft:
currHeight = 0f;
foreach (var kv in legend.buttonList) foreach (var kv in legend.buttonList)
{ {
var item = kv.Value; var item = kv.Value;
item.SetPosition(new Vector3(0, -currHeight)); if (currHeight + item.height + legend.itemGap > legendHeight)
{
currHeight = 0;
offsetX += legendRuntimeWidth + legend.itemGap;
}
item.SetPosition(new Vector3(0 + offsetX, -currHeight));
currHeight += item.height + legend.itemGap; currHeight += item.height + legend.itemGap;
} }
break; break;
case Location.Align.TopRight: case Location.Align.TopRight:
currHeight = 0f;
foreach (var kv in legend.buttonList) foreach (var kv in legend.buttonList)
{ {
var item = kv.Value; var item = kv.Value;
item.SetPosition(new Vector3(item.width - legend.runtimeWidth, -currHeight)); if (currHeight + item.height + legend.itemGap > legendHeight)
{
currHeight = 0;
offsetX -= legendRuntimeWidth + legend.itemGap;
}
item.SetPosition(new Vector3(item.width - legendRuntimeWidth + offsetX, -currHeight));
currHeight += item.height + legend.itemGap; currHeight += item.height + legend.itemGap;
} }
break; break;
case Location.Align.Center: case Location.Align.Center:
startX = legend.runtimeWidth / 2; startX = legendRuntimeWidth / 2;
currHeight = legend.runtimeHeight; startY = legendRuntimeHeight > legendHeight ? legendHeight / 2 : legendRuntimeHeight / 2;
foreach (var kv in legend.buttonList) foreach (var kv in legend.buttonList)
{ {
var item = kv.Value; var item = kv.Value;
item.SetPosition(new Vector3(-startX + item.width / 2, currHeight - item.height)); if (currHeight + item.height + legend.itemGap > legendHeight)
currHeight -= item.height + legend.itemGap; {
currHeight = 0;
offsetX += legendRuntimeWidth + legend.itemGap;
}
item.SetPosition(new Vector3(-startX + item.width / 2 + offsetX, startY - currHeight));
currHeight += item.height + legend.itemGap;
} }
break; break;
case Location.Align.CenterLeft: case Location.Align.CenterLeft:
currHeight = legend.runtimeHeight; startY = legendRuntimeHeight > legendHeight ? legendHeight / 2 : legendRuntimeHeight / 2;
foreach (var kv in legend.buttonList) foreach (var kv in legend.buttonList)
{ {
var item = kv.Value; var item = kv.Value;
item.SetPosition(new Vector3(0, currHeight - item.height)); if (currHeight + item.height + legend.itemGap > legendHeight)
currHeight -= item.height + legend.itemGap; {
currHeight = 0;
offsetX += legendRuntimeWidth + legend.itemGap;
}
item.SetPosition(new Vector3(offsetX, startY - currHeight - item.height));
currHeight += item.height + legend.itemGap;
} }
break; break;
case Location.Align.CenterRight: case Location.Align.CenterRight:
currHeight = legend.runtimeHeight; startX = 0;
startY = legendRuntimeHeight > legendHeight ? legendHeight / 2 : legendRuntimeHeight / 2;
foreach (var kv in legend.buttonList) foreach (var kv in legend.buttonList)
{ {
var item = kv.Value; var item = kv.Value;
item.SetPosition(new Vector3(item.width - legend.runtimeWidth, currHeight - item.height)); if (currHeight + item.height + legend.itemGap > legendHeight)
currHeight -= item.height + legend.itemGap; {
currHeight = 0;
offsetX -= legendRuntimeWidth + legend.itemGap;
}
item.SetPosition(new Vector3(item.width - legendRuntimeWidth + offsetX, startY - currHeight - item.height));
currHeight += item.height + legend.itemGap;
} }
break; break;
case Location.Align.BottomCenter: case Location.Align.BottomCenter:
startX = legend.runtimeWidth / 2; startX = legendRuntimeWidth / 2;
currHeight = legend.runtimeHeight; startY = legendRuntimeHeight > legendHeight ? legendHeight : legendRuntimeHeight;
foreach (var kv in legend.buttonList) foreach (var kv in legend.buttonList)
{ {
var item = kv.Value; var item = kv.Value;
item.SetPosition(new Vector3(-startX + item.width / 2, currHeight - item.height)); if (currHeight + item.height + legend.itemGap > legendHeight)
currHeight -= item.height + legend.itemGap; {
currHeight = 0;
offsetX += legendRuntimeWidth + legend.itemGap;
}
item.SetPosition(new Vector3(-startX + item.width / 2 + offsetX, startY - currHeight - item.height));
currHeight += item.height + legend.itemGap;
} }
break; break;
case Location.Align.BottomLeft: case Location.Align.BottomLeft:
currHeight = legend.runtimeHeight; startX = 0;
startY = legendRuntimeHeight > legendHeight ? legendHeight : legendRuntimeHeight;
foreach (var kv in legend.buttonList) foreach (var kv in legend.buttonList)
{ {
var item = kv.Value; var item = kv.Value;
item.SetPosition(new Vector3(0, currHeight - item.height)); if (currHeight + item.height + legend.itemGap > legendHeight)
currHeight -= item.height + legend.itemGap; {
currHeight = 0;
offsetX += legendRuntimeWidth + legend.itemGap;
}
item.SetPosition(new Vector3(startX + offsetX, startY - currHeight - item.height));
currHeight += item.height + legend.itemGap;
} }
break; break;
case Location.Align.BottomRight: case Location.Align.BottomRight:
currHeight = legend.runtimeHeight; startX = 0;
startY = legendRuntimeHeight > legendHeight ? legendHeight : legendRuntimeHeight;
foreach (var kv in legend.buttonList) foreach (var kv in legend.buttonList)
{ {
var item = kv.Value; var item = kv.Value;
item.SetPosition(new Vector3(item.width - legend.runtimeWidth, currHeight - item.height)); if (currHeight + item.height + legend.itemGap > legendHeight)
currHeight -= item.height + legend.itemGap; {
currHeight = 0;
offsetX -= legendRuntimeWidth + legend.itemGap;
}
item.SetPosition(new Vector3(item.width - legendRuntimeWidth + offsetX, startY - currHeight - item.height));
currHeight += item.height + legend.itemGap;
} }
break; break;
} }
@@ -177,35 +225,53 @@ namespace XCharts
case Location.Align.TopLeft: case Location.Align.TopLeft:
case Location.Align.CenterLeft: case Location.Align.CenterLeft:
case Location.Align.BottomLeft: case Location.Align.BottomLeft:
currWidth = 0f; var isBottom = legend.location.align == Location.Align.BottomLeft;
foreach (var kv in legend.buttonList) foreach (var kv in legend.buttonList)
{ {
var item = kv.Value; var item = kv.Value;
item.SetPosition(new Vector3(currWidth, 0)); if (currWidth + item.width + legend.itemGap >= legendWidth)
{
currWidth = 0f;
if (isBottom) currHeight += legend.itemGap + item.height;
else currHeight -= legend.itemGap + item.height;
}
item.SetPosition(new Vector3(currWidth, currHeight));
currWidth += item.width + legend.itemGap; currWidth += item.width + legend.itemGap;
} }
break; break;
case Location.Align.TopCenter: case Location.Align.TopCenter:
case Location.Align.Center: case Location.Align.Center:
case Location.Align.BottomCenter: case Location.Align.BottomCenter:
startX = legend.runtimeWidth / 2; isBottom = legend.location.align == Location.Align.BottomCenter;
currWidth = 0f; startX = legendRuntimeWidth > legendWidth ? legendWidth / 2 : legendRuntimeWidth / 2;
foreach (var kv in legend.buttonList) foreach (var kv in legend.buttonList)
{ {
var item = kv.Value; var item = kv.Value;
item.SetPosition(new Vector3(-startX + item.width / 2 + currWidth, 0)); if (currWidth + item.width + legend.itemGap >= legendWidth)
{
currWidth = 0f;
if (isBottom) currHeight += legend.itemGap + item.height;
else currHeight -= legend.itemGap + item.height;
}
item.SetPosition(new Vector3(-startX + item.width / 2 + currWidth, currHeight));
currWidth += item.width + legend.itemGap; currWidth += item.width + legend.itemGap;
} }
break; break;
case Location.Align.TopRight: case Location.Align.TopRight:
case Location.Align.CenterRight: case Location.Align.CenterRight:
case Location.Align.BottomRight: case Location.Align.BottomRight:
startX = -legend.runtimeWidth; isBottom = legend.location.align == Location.Align.BottomRight;
currWidth = 0f; startX = legendRuntimeWidth > legendWidth ? -legendWidth : -legendRuntimeWidth;
foreach (var kv in legend.buttonList) foreach (var kv in legend.buttonList)
{ {
var item = kv.Value; var item = kv.Value;
item.SetPosition(new Vector3(startX + currWidth + item.width, 0)); if (currWidth + item.width + legend.itemGap >= legendWidth)
{
currWidth = 0f;
if (isBottom) currHeight += legend.itemGap + item.height;
else currHeight -= legend.itemGap + item.height;
}
item.SetPosition(new Vector3(startX + currWidth + item.width, currHeight));
currWidth += item.width + legend.itemGap; currWidth += item.width + legend.itemGap;
} }
break; break;
@@ -214,6 +280,18 @@ namespace XCharts
} }
} }
private static bool IsBeyondWidth(Legend legend, float maxWidth)
{
var totalWidth = 0f;
foreach (var kv in legend.buttonList)
{
var item = kv.Value;
totalWidth += item.width + legend.itemGap;
if (totalWidth > maxWidth) return true;
}
return false;
}
public static bool CheckDataShow(Series series, string legendName, bool show) public static bool CheckDataShow(Series series, string legendName, bool show)
{ {
bool needShow = false; bool needShow = false;