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

增加Serie的barMaxWidth可设置Bar的最大宽度

Browse Source
This commit is contained in:
monitor1394
2022-11-30 09:39:41 +08:00
parent 7ea0fbd66d
commit 59c9d758e1
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Editor/Series/BarEditor.cs
View File

@@ -21,6 +21,7 @@ namespace XCharts.Editor
PropertyField("m_BarType"); PropertyField("m_BarType");
PropertyField("m_BarWidth"); PropertyField("m_BarWidth");
PropertyField("m_BarGap"); PropertyField("m_BarGap");
PropertyField("m_BarMaxWidth");
if (serie.IsUseCoord<PolarCoord>()) if (serie.IsUseCoord<PolarCoord>())
{ {
PropertyField("m_RoundCap"); PropertyField("m_RoundCap");

35
Runtime/Serie/Serie.cs
View File

@@ -252,6 +252,7 @@ namespace XCharts.Runtime
[SerializeField] private BarType m_BarType = BarType.Normal; [SerializeField] private BarType m_BarType = BarType.Normal;
[SerializeField] private bool m_BarPercentStack = false; [SerializeField] private bool m_BarPercentStack = false;
[SerializeField] private float m_BarWidth = 0; [SerializeField] private float m_BarWidth = 0;
[SerializeField][Since("v3.5.0")] private float m_BarMaxWidth = 0;
[SerializeField] private float m_BarGap = 0.1f; [SerializeField] private float m_BarGap = 0.1f;
[SerializeField] private float m_BarZebraWidth = 4f; [SerializeField] private float m_BarZebraWidth = 4f;
[SerializeField] private float m_BarZebraGap = 2f; [SerializeField] private float m_BarZebraGap = 2f;
@@ -573,6 +574,15 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_BarWidth, value)) SetVerticesDirty(); } set { if (PropertyUtil.SetStruct(ref m_BarWidth, value)) SetVerticesDirty(); }
} }
/// <summary> /// <summary>
/// The max width of the bar. Adaptive when default 0.
/// |柱条的最大宽度，默认为0为不限制最大宽度。支持设置成相对于类目宽度的百分比。
/// </summary>
public float barMaxWidth
{
get { return m_BarMaxWidth; }
set { if (PropertyUtil.SetStruct(ref m_BarMaxWidth, value)) SetVerticesDirty(); }
}
/// <summary>
/// The gap between bars between different series, is a percent value like '0.3f' , which means 30% of the bar width, can be set as a fixed value. /// The gap between bars between different series, is a percent value like '0.3f' , which means 30% of the bar width, can be set as a fixed value.
/// Set barGap as '-1' can overlap bars that belong to different series, which is useful when making a series of bar be background. /// Set barGap as '-1' can overlap bars that belong to different series, which is useful when making a series of bar be background.
/// In a single coodinate system, this attribute is shared by multiple 'bar' series. /// In a single coodinate system, this attribute is shared by multiple 'bar' series.
@@ -1742,17 +1752,32 @@ namespace XCharts.Runtime
public float GetBarWidth(float categoryWidth, int barCount = 0) public float GetBarWidth(float categoryWidth, int barCount = 0)
{ {
if (categoryWidth < 2) return categoryWidth; var realWidth = 0f;
if (m_BarWidth == 0) if (categoryWidth < 2)
{
realWidth = categoryWidth;
}
else if (m_BarWidth == 0)
{ {
var width = ChartHelper.GetActualValue(0.6f, categoryWidth); var width = ChartHelper.GetActualValue(0.6f, categoryWidth);
if (barCount == 0) if (barCount == 0)
return width < 1 ? categoryWidth : width; realWidth = width < 1 ? categoryWidth : width;
else else
return width / barCount; realWidth = width / barCount;
} }
else else
return ChartHelper.GetActualValue(m_BarWidth, categoryWidth); {
realWidth = ChartHelper.GetActualValue(m_BarWidth, categoryWidth);
}
if (m_BarMaxWidth == 0)
{
return realWidth;
}
else
{
var maxWidth = ChartHelper.GetActualValue(m_BarMaxWidth, categoryWidth);
return realWidth > maxWidth ? maxWidth : realWidth;
}
} }
public bool IsIgnoreIndex(int index, int dimension = 1) public bool IsIgnoreIndex(int index, int dimension = 1)