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

增加RadarChart对Tooltip的formatter支持#77

Browse Source
This commit is contained in:
monitor1394
2020-07-25 14:09:57 +08:00
parent 9a5532724c
commit 5df8f2d3fe
9 changed files with 133 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Runtime/Component/Main/Radar.cs
View File

@@ -93,7 +93,8 @@ namespace XCharts
[SerializeField] private bool m_Indicator = true;
[SerializeField] private PositionType m_PositionType = PositionType.Vertice;
[SerializeField] private float m_IndicatorGap = 10;
[SerializeField] protected int m_CeilRate = 0;
[SerializeField] private int m_CeilRate = 0;
[SerializeField] private bool m_IsAxisTooltip;
[SerializeField] private List<Indicator> m_IndicatorList = new List<Indicator>();
/// <summary>
/// Radar render type, in which 'Polygon' and 'Circle' are supported.
@@ -179,6 +180,14 @@ namespace XCharts
set { if (PropertyUtility.SetStruct(ref m_CeilRate, value < 0 ? 0 : value)) SetAllDirty(); }
}
/// <summary>
/// 是否Tooltip显示轴线上的所有数据。
/// </summary>
public bool isAxisTooltip
{
get { return m_IsAxisTooltip; }
set { if (PropertyUtility.SetStruct(ref m_IsAxisTooltip, value)) SetAllDirty(); }
}
/// <summary>
/// The position type of indicator.
/// 显示位置类型。
/// </summary>

7
Runtime/Component/Main/Serie.cs
View File

@@ -189,22 +189,28 @@ namespace XCharts
public enum SampleType
{
/// <summary>
/// Take a peak. When the average value of the filter point is greater than or equal to 'sampleAverage',
/// take the maximum value; If you do it the other way around, you get the minimum.
/// 取峰值。
/// </summary>
Peak,
/// <summary>
/// Take the average of the filter points.
/// 取过滤点的平均值。
/// </summary>
Average,
/// <summary>
/// Take the maximum value of the filter point.
/// 取过滤点的最大值。
/// </summary>
Max,
/// <summary>
/// Take the minimum value of the filter point.
/// 取过滤点的最小值。
/// </summary>
Min,
/// <summary>
/// Take the sum of the filter points.
/// 取过滤点的和。
/// </summary>
Sum
@@ -325,6 +331,7 @@ namespace XCharts
set { if (PropertyUtility.SetClass(ref m_Name, value)) { SetVerticesDirty(); SetNameDirty(); } }
}
/// <summary>
/// Legend name. When the serie name is not empty, the legend name is the series name; Otherwise, it is index.
/// 图例名称。当系列名称不为空时，图例名称即为系列名称；反之则为索引index。
/// </summary>
public string legendName { get { return string.IsNullOrEmpty(name) ? ChartCached.IntToStr(index) : name; } }

91
Runtime/Internal/Helper/TooltipHelper.cs
View File

@@ -89,23 +89,77 @@ namespace XCharts
switch (serie.radarType)
{
case RadarType.Multiple:
sb.Append(serieData.name);
for (int i = 0; i < radar.indicatorList.Count; i++)
if (radar.isAxisTooltip)
{
string key = radar.indicatorList[i].name;
float value = serieData.GetData(i);
if ((i == 0 && !string.IsNullOrEmpty(serieData.name)) || i > 0) sb.Append(FormatterHelper.PH_NN);
sb.AppendFormat("{0}: {1}", key, ChartCached.FloatToStr(value, numericFormatter));
var dimension = tooltip.runtimeDataIndex[2];
if (!string.IsNullOrEmpty(serie.name))
sb.Append(serie.name).Append("\n");
var total = serie.GetDataTotal(dimension);
var first = true;
for (int i = 0; i < serie.dataCount; i++)
{
var sd = serie.GetSerieData(i);
var key = sd.name;
var value = sd.GetData(dimension);
var itemFormatter = GetItemFormatter(tooltip, serie, sd);
numericFormatter = GetItemNumericFormatter(tooltip, serie, sd);
if (!first) sb.Append("\n");
first = false;
sb.Append("<color=#").Append(themeInfo.GetColorStr(i)).Append(">● </color>");
if (string.IsNullOrEmpty(itemFormatter))
{
if (string.IsNullOrEmpty(key))
{
//key = radar.indicatorList[dataIndex].name;
sb.AppendFormat("{0}\n", ChartCached.FloatToStr(value, numericFormatter));
}
else
{
sb.AppendFormat("{0}: {1}\n", key, ChartCached.FloatToStr(value, numericFormatter));
}
}
else
{
string content = itemFormatter;
FormatterHelper.ReplaceSerieLabelContent(ref content, numericFormatter, value, total, serie.name, sd.name);
sb.Append(content);
}
}
}
else
{
if (serie.index != tooltip.runtimeDataIndex[0]) return;
sb.Append(serieData.name);
for (int i = 0; i < radar.indicatorList.Count; i++)
{
string key = radar.indicatorList[i].name;
float value = serieData.GetData(i);
if ((i == 0 && !string.IsNullOrEmpty(serieData.name)) || i > 0) sb.Append(FormatterHelper.PH_NN);
sb.AppendFormat("{0}: {1}", key, ChartCached.FloatToStr(value, numericFormatter));
}
}
break;
case RadarType.Single:
string key2 = serieData.name;
float value2 = serieData.GetData(1);
if (string.IsNullOrEmpty(key2))
var key2 = serieData.name;
var value2 = serieData.GetData(1);
var total2 = serie.GetDataTotal(1);
var itemFormatter2 = GetItemFormatter(tooltip, serie, serieData);
if (string.IsNullOrEmpty(itemFormatter2))
{
key2 = radar.indicatorList[dataIndex].name;
if (string.IsNullOrEmpty(key2))
{
key2 = radar.indicatorList[dataIndex].name;
}
sb.AppendFormat("{0}: {1}", key2, ChartCached.FloatToStr(value2, numericFormatter));
}
sb.AppendFormat("{0}: {1}", key2, ChartCached.FloatToStr(value2, numericFormatter));
else
{
string content = itemFormatter2;
FormatterHelper.ReplaceSerieLabelContent(ref content, numericFormatter, value2, total2, serie.name, serieData.name);
sb.Append(content);
}
break;
}
}
@@ -139,7 +193,8 @@ namespace XCharts
}
private static void InitDefaultContent(ref StringBuilder sb, Tooltip tooltip, Serie serie, int index,
string category, ThemeInfo themeInfo = null, DataZoom dataZoom = null, bool isCartesian = false)
string category, ThemeInfo themeInfo = null, DataZoom dataZoom = null, bool isCartesian = false,
Radar radar = null)
{
switch (serie.type)
{
@@ -152,6 +207,7 @@ namespace XCharts
InitScatterTooltip(ref sb, tooltip, serie, index, themeInfo);
break;
case SerieType.Radar:
InitRadarTooltip(ref sb, tooltip, serie, radar, themeInfo);
break;
case SerieType.Pie:
InitPieTooltip(ref sb, tooltip, serie, index, themeInfo);
@@ -259,7 +315,7 @@ namespace XCharts
}
public static string GetFormatterContent(Tooltip tooltip, int dataIndex, Series series, ThemeInfo themeInfo,
string category = null, DataZoom dataZoom = null, bool isCartesian = false)
string category = null, DataZoom dataZoom = null, bool isCartesian = false, Radar radar = null)
{
if (string.IsNullOrEmpty(tooltip.formatter))
{
@@ -289,7 +345,7 @@ namespace XCharts
if (string.IsNullOrEmpty(itemFormatter))
{
if (!first) sb.Append(FormatterHelper.PH_NN);
InitDefaultContent(ref sb, tooltip, serie, dataIndex, category, themeInfo, dataZoom);
InitDefaultContent(ref sb, tooltip, serie, dataIndex, category, themeInfo, dataZoom, isCartesian, radar);
first = false;
continue;
}
@@ -324,10 +380,10 @@ namespace XCharts
}
if (serie.show)
{
if (string.IsNullOrEmpty(itemFormatter))
if (string.IsNullOrEmpty(itemFormatter) || serie.type == SerieType.Radar)
{
if (!first) sb.Append(FormatterHelper.PH_NN);
InitDefaultContent(ref sb, tooltip, serie, dataIndex, category, themeInfo, dataZoom);
InitDefaultContent(ref sb, tooltip, serie, dataIndex, category, themeInfo, dataZoom, isCartesian, radar);
first = false;
continue;
}
@@ -368,7 +424,8 @@ namespace XCharts
private static bool IsNeedTooltipSerie(Serie serie, Tooltip tooltip)
{
if (serie.type == SerieType.Pie || serie.type == SerieType.Radar || serie.type == SerieType.Ring)
//if (serie.type == SerieType.Pie || serie.type == SerieType.Radar || serie.type == SerieType.Ring)
if (serie.type == SerieType.Pie || serie.type == SerieType.Ring)
{
return tooltip.runtimeDataIndex[serie.index] >= 0;
}

19
Runtime/RadarChart.cs
View File

@@ -1,4 +1,5 @@
/******************************************/
using System.Linq;
/******************************************/
/* */
/* Copyright (c) 2018 monitor1394 */
/* https://github.com/monitor1394 */
@@ -619,6 +620,7 @@ namespace XCharts
if (m_IsEnterLegendButtom) return;
bool highlight = false;
//m_Tooltip.ClearValue();
for (int i = 0; i < m_Series.Count; i++)
{
if (!IsActive(i)) continue;
@@ -638,12 +640,16 @@ namespace XCharts
if (radar.runtimeDataPosList.ContainsKey(posKey))
{
var posList = radar.runtimeDataPosList[posKey];
foreach (var pos in posList)
for (int k = 0; k < posList.Count; k++)
{
if (Vector2.Distance(pos, local) <= serie.symbol.size * 1.2f)
if (Vector2.Distance(posList[k], local) <= serie.symbol.size * 1.3f)
{
m_Tooltip.runtimeDataIndex[0] = i;
m_Tooltip.runtimeDataIndex[1] = n;
if (m_Tooltip.runtimeDataIndex.Count >= 3)
m_Tooltip.runtimeDataIndex[2] = k;
else
m_Tooltip.runtimeDataIndex.Add(k);
highlight = true;
break;
}
@@ -655,7 +661,7 @@ namespace XCharts
for (int n = 0; n < serie.data.Count; n++)
{
var serieData = serie.data[n];
if (Vector2.Distance(serieData.labelPosition, local) <= serie.symbol.size * 1.2f)
if (Vector2.Distance(serieData.labelPosition, local) <= serie.symbol.size * 1.3f)
{
m_Tooltip.runtimeDataIndex[0] = i;
m_Tooltip.runtimeDataIndex[1] = n;
@@ -700,9 +706,10 @@ namespace XCharts
m_Tooltip.SetActive(true);
var serie = m_Series.GetSerie(serieIndex);
var radar = m_Radars[serie.radarIndex];
var dataIndex = tooltip.runtimeDataIndex[1];
StringBuilder sb = new StringBuilder();
TooltipHelper.InitRadarTooltip(ref sb, tooltip, serie, radar, themeInfo);
TooltipHelper.SetContentAndPosition(tooltip, sb.ToString(), chartRect);
var content = TooltipHelper.GetFormatterContent(m_Tooltip, dataIndex, m_Series, m_ThemeInfo, null, null, false, radar);
TooltipHelper.SetContentAndPosition(tooltip, content, chartRect);
}
protected override void OnRefreshLabel()