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

[improve][label] improve emphasis label

Browse Source
This commit is contained in:
monitor1394
2022-08-25 21:38:25 +08:00
parent 9552e877ce
commit 442a51abc1
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -58,6 +58,7 @@
## master
* (2022.08.25) 优化`EmphasisStyle`对`label`的支持
* (2022.08.25) 增加`formatter`对`{d3}`指定维度数据百分比的支持
* (2022.08.24) 修复`ScatterChart`的`label`不刷新的问题
* (2022.08.24) 修复`MarkLine`的`label`某些情况下显示异常的问题

6
Runtime/Serie/SerieHandler.cs
View File

@@ -239,7 +239,7 @@ namespace XCharts.Runtime
if (count == -1) count = serie.dataCount;
var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
if (serieLabel == null || !serieLabel.show)
if (serieLabel == null)
{
return false;
}
@@ -401,7 +401,7 @@ namespace XCharts.Runtime
SerieLabelHelper.GetFormatterContent(serie, serieData, value, total,
currLabel, color);
var offset = GetSerieDataLabelOffset(serieData, currLabel);
labelObject.SetActive(!isIgnore);
labelObject.SetActive(currLabel.show && !isIgnore);
labelObject.SetText(content);
labelObject.SetPosition(serieData.context.dataPoints[i] + offset);
labelObject.UpdateIcon(currLabel.icon);
@@ -422,7 +422,7 @@ namespace XCharts.Runtime
ChartCached.NumberToStr(value, currLabel.numericFormatter) :
SerieLabelHelper.GetFormatterContent(serie, serieData, value, total,
currLabel, color);
serieData.SetLabelActive(!isIgnore);
serieData.SetLabelActive(currLabel.show && !isIgnore);
serieData.labelObject.UpdateIcon(currLabel.icon);
serieData.labelObject.SetText(content);
UpdateLabelPosition(serieData, currLabel);

10
Runtime/Serie/SerieHelper.cs
View File

@@ -433,7 +433,7 @@ namespace XCharts.Runtime
else
{
var stateStyle = GetStateStyle(serie, serieData, state);
return stateStyle == null?serie.itemStyle : stateStyle.itemStyle;
return stateStyle == null || !stateStyle.show ? serie.itemStyle : stateStyle.itemStyle;
}
}
@@ -447,7 +447,7 @@ namespace XCharts.Runtime
else
{
var stateStyle = GetStateStyle(serie, serieData, state);
return stateStyle == null?serie.label : stateStyle.label;
return stateStyle == null || !stateStyle.show ? serie.label : stateStyle.label;
}
}
@@ -461,7 +461,7 @@ namespace XCharts.Runtime
else
{
var stateStyle = GetStateStyle(serie, serieData, state);
return stateStyle == null?serie.labelLine : stateStyle.labelLine;
return stateStyle == null || !stateStyle.show ? serie.labelLine : stateStyle.labelLine;
}
}
@@ -475,7 +475,7 @@ namespace XCharts.Runtime
else
{
var stateStyle = GetStateStyle(serie, serieData, state);
return stateStyle == null?serie.symbol : stateStyle.symbol;
return stateStyle == null || !stateStyle.show ? serie.symbol : stateStyle.symbol;
}
}
@@ -533,7 +533,7 @@ namespace XCharts.Runtime
Serie serie, SerieData serieData, ThemeStyle theme, int index)
{
bool fill;
return GetAreaColor(out color, out toColor, out fill,serie, serieData, theme, index);
return GetAreaColor(out color, out toColor, out fill, serie, serieData, theme, index);
}
public static bool GetAreaColor(out Color32 color, out Color32 toColor, out bool innerFill,