diff --git a/Editor/MainComponents/MarkLineEditor.cs b/Editor/MainComponents/MarkLineEditor.cs index 34e5bd96..b7e002f9 100644 --- a/Editor/MainComponents/MarkLineEditor.cs +++ b/Editor/MainComponents/MarkLineEditor.cs @@ -34,7 +34,7 @@ namespace XCharts.Editor PropertyField(prop, "m_Name"); switch (type) { - case MarkLineType.None: + case MarkLineType.Custom: PropertyField(prop, "m_XPosition"); PropertyField(prop, "m_YPosition"); PropertyField(prop, "m_XValue"); @@ -48,7 +48,7 @@ namespace XCharts.Editor break; } PropertyField(prop, "m_Group"); - if (group > 0 && type == MarkLineType.None) PropertyField(prop, "m_ZeroPosition"); + if (group > 0 && type == MarkLineType.Custom) PropertyField(prop, "m_ZeroPosition"); PropertyField(prop, "m_LineStyle"); PropertyField(prop, "m_StartSymbol"); PropertyField(prop, "m_EndSymbol"); diff --git a/Runtime/Component/Mark/MarkLine.cs b/Runtime/Component/Mark/MarkLine.cs index 47f1e2ba..c917b3e0 100644 --- a/Runtime/Component/Mark/MarkLine.cs +++ b/Runtime/Component/Mark/MarkLine.cs @@ -4,25 +4,34 @@ using UnityEngine; namespace XCharts.Runtime { /// - /// 标线类型 + /// Mark line type. + /// ||标线类型 /// public enum MarkLineType { - None, /// - /// 最小值。 + /// Custom. You can customize the xy coordinates or values. + /// ||自定义。可自定义xy坐标或数值。 + /// + Custom, + /// + /// Minimum value. + /// ||最小值。 /// Min, /// - /// 最大值。 + /// Maximum value. + /// ||最大值。 /// Max, /// - /// 平均值。 + /// Average value. + /// ||平均值。 /// Average, /// - /// 中位数。 + /// Median. + /// ||中位数。 /// Median } @@ -118,7 +127,7 @@ namespace XCharts.Runtime [System.Serializable] public class MarkLineData : ChildComponent { - [SerializeField] private MarkLineType m_Type = MarkLineType.None; + [SerializeField] private MarkLineType m_Type = MarkLineType.Custom; [SerializeField] private string m_Name; [SerializeField] private int m_Dimension = 1; [SerializeField] private float m_XPosition; @@ -170,7 +179,7 @@ namespace XCharts.Runtime } /// /// The x coordinate relative to the origin, in pixels. - /// ||相对原点的 x 坐标,单位像素。当type为None时有效。 + /// ||相对原点的 x 坐标,单位像素。当type为Custom时有效。 /// public float xPosition { @@ -179,7 +188,7 @@ namespace XCharts.Runtime } /// /// The y coordinate relative to the origin, in pixels. - /// ||相对原点的 y 坐标,单位像素。当type为None时有效。 + /// ||相对原点的 y 坐标,单位像素。当type为Custom时有效。 /// public float yPosition { @@ -188,7 +197,7 @@ namespace XCharts.Runtime } /// /// The value specified on the X-axis. A value specified when the X-axis is the category axis represents the index of the category axis data, otherwise a specific value. - /// ||X轴上的指定值。当X轴为类目轴时指定值表示类目轴数据的索引,否则为具体的值。当type为None时有效。 + /// ||X轴上的指定值。当X轴为类目轴时指定值表示类目轴数据的索引,否则为具体的值。当type为Custom时有效。 /// public double xValue { @@ -197,7 +206,7 @@ namespace XCharts.Runtime } /// /// That's the value on the Y-axis. The value specified when the Y axis is the category axis represents the index of the category axis data, otherwise the specific value. - /// ||Y轴上的指定值。当Y轴为类目轴时指定值表示类目轴数据的索引,否则为具体的值。当type为None时有效。 + /// ||Y轴上的指定值。当Y轴为类目轴时指定值表示类目轴数据的索引,否则为具体的值。当type为Custom时有效。 /// public double yValue { diff --git a/Runtime/Component/Mark/MarkLineHandler.cs b/Runtime/Component/Mark/MarkLineHandler.cs index ccf6cf1b..754dccfc 100644 --- a/Runtime/Component/Mark/MarkLineHandler.cs +++ b/Runtime/Component/Mark/MarkLineHandler.cs @@ -146,7 +146,7 @@ namespace XCharts.Runtime data.runtimeValue = SerieHelper.GetMedianData(serie, data.dimension, dataZoom); GetStartEndPos(yAxis, grid, data.runtimeValue, ref sp, ref ep); break; - case MarkLineType.None: + case MarkLineType.Custom: if (data.xPosition != 0) { data.runtimeValue = data.xPosition; @@ -303,7 +303,7 @@ namespace XCharts.Runtime pX = GetAxisPosition(grid, xAxis, dataZoom, serieDataCount, serieData.index); pY = GetAxisPosition(grid, yAxis, dataZoom, serieDataCount, data.runtimeValue); return new Vector3(pX, pY); - case MarkLineType.None: + case MarkLineType.Custom: if (data.zeroPosition) { data.runtimeValue = 0;