[refactor] refactor symbol and label

Runtime/Component/Child/SymbolStyle.cs

@@ -61,75 +61,31 @@ namespace XCharts.Runtime
         EmptyArrow
     }
 
-    /// <summary>
-    /// The way to get serie symbol size.
-    /// |获取标记图形大小的方式。
-    /// </summary>
-    public enum SymbolSizeType
-    {
-        /// <summary>
-        /// Specify constant for symbol size.
-        /// |自定义大小。
-        /// </summary>
-        Custom,
-        /// <summary>
-        /// Specify the dataIndex and dataScale to calculate symbol size.
-        /// |通过 dataIndex 从数据中获取，再乘以一个比例系数 dataScale 。
-        /// </summary>
-        FromData,
-        /// <summary>
-        /// Specify function for symbol size.
-        /// |通过委托函数获取。
-        /// </summary>
-        Function,
-    }
-
     /// <summary>
     /// 系列数据项的标记的图形
     /// </summary>
     [System.Serializable]
-    public class SymbolStyle : ChildComponent, ISerieDataComponent
+    public class SymbolStyle : ChildComponent
     {
-        [SerializeField] private bool m_Show = true;
-        [SerializeField] private SymbolType m_Type = SymbolType.EmptyCircle;
-        [SerializeField] private SymbolSizeType m_SizeType = SymbolSizeType.Custom;
-        [SerializeField] private float m_Size = 0f;
-        [SerializeField] private float m_SelectedSize = 0f;
-        [SerializeField] private int m_DataIndex = 1;
-        [SerializeField] private float m_DataScale = 1;
-        [SerializeField] private float m_SelectedDataScale = 1.5f;
-        [SerializeField] private SymbolSizeFunction m_SizeFunction;
-        [SerializeField] private SymbolSizeFunction m_SelectedSizeFunction;
-        [SerializeField] private int m_StartIndex;
-        [SerializeField] private int m_Interval;
-        [SerializeField] private bool m_ForceShowLast = false;
-        [SerializeField] private float m_Gap = 0;
-        [SerializeField] private float m_Width = 0f;
-        [SerializeField] private float m_Height = 0f;
-        [SerializeField] private bool m_Repeat = false;
-        [SerializeField] private Vector2 m_Offset = Vector2.zero;
-        [SerializeField] private Sprite m_Image;
-        [SerializeField] private Image.Type m_ImageType;
+        [SerializeField] protected bool m_Show = true;
+        [SerializeField] protected SymbolType m_Type = SymbolType.EmptyCircle;
+        [SerializeField] protected float m_Size = 0f;
+        [SerializeField] protected float m_Gap = 0;
+        [SerializeField] protected float m_Width = 0f;
+        [SerializeField] protected float m_Height = 0f;
+        [SerializeField] protected Vector2 m_Offset = Vector2.zero;
+        [SerializeField] protected Sprite m_Image;
+        [SerializeField] protected Image.Type m_ImageType;
+        [SerializeField] protected Color32 m_Color;
 
-        public void Reset()
+        public virtual void Reset()
         {
             m_Show = false;
             m_Type = SymbolType.EmptyCircle;
-            m_SizeType = SymbolSizeType.Custom;
             m_Size = 0f;
-            m_SelectedSize = 0f;
-            m_DataIndex = 1;
-            m_DataScale = 1;
-            m_SelectedDataScale = 1.5f;
-            m_SizeFunction = null;
-            m_SelectedSizeFunction = null;
-            m_StartIndex = 0;
-            m_Interval = 0;
-            m_ForceShowLast = false;
             m_Gap = 0;
             m_Width = 0f;
             m_Height = 0f;
-            m_Repeat = false;
             m_Offset = Vector2.zero;
             m_Image = null;
             m_ImageType = Image.Type.Simple;
@@ -154,15 +110,6 @@ namespace XCharts.Runtime
             set { if (PropertyUtil.SetStruct(ref m_Type, value)) SetVerticesDirty(); }
         }
         /// <summary>
-        /// the type of symbol size.
-        /// |标记图形的大小获取方式。
-        /// </summary>
-        public SymbolSizeType sizeType
-        {
-            get { return m_SizeType; }
-            set { if (PropertyUtil.SetStruct(ref m_SizeType, value)) SetVerticesDirty(); }
-        }
-        /// <summary>
         /// the size of symbol.
         /// |标记的大小。
         /// </summary>
@@ -172,87 +119,6 @@ namespace XCharts.Runtime
             set { if (PropertyUtil.SetStruct(ref m_Size, value)) SetVerticesDirty(); }
         }
         /// <summary>
-        /// the size of selected symbol.
-        /// |被选中的标记的大小。
-        /// </summary>
-        public float selectedSize
-        {
-            get { return m_SelectedSize; }
-            set { if (PropertyUtil.SetStruct(ref m_SelectedSize, value)) SetVerticesDirty(); }
-        }
-        /// <summary>
-        /// whitch data index is when the sizeType assined as FromData.
-        /// |当sizeType指定为FromData时，指定的数据源索引。
-        /// </summary>
-        public int dataIndex
-        {
-            get { return m_DataIndex; }
-            set { if (PropertyUtil.SetStruct(ref m_DataIndex, value)) SetVerticesDirty(); }
-        }
-        /// <summary>
-        /// the scale of data when sizeType assined as FromData.
-        /// |当sizeType指定为FromData时，指定的倍数系数。
-        /// </summary>
-        public float dataScale
-        {
-            get { return m_DataScale; }
-            set { if (PropertyUtil.SetStruct(ref m_DataScale, value)) SetVerticesDirty(); }
-        }
-        /// <summary>
-        /// the scale of selected data when sizeType assined as FromData.
-        /// |当sizeType指定为FromData时，指定的高亮倍数系数。
-        /// </summary>
-        public float selectedDataScale
-        {
-            get { return m_SelectedDataScale; }
-            set { if (PropertyUtil.SetStruct(ref m_SelectedDataScale, value)) SetVerticesDirty(); }
-        }
-        /// <summary>
-        /// the function of size when sizeType assined as Function.
-        /// |当sizeType指定为Function时，指定的委托函数。
-        /// </summary>
-        public SymbolSizeFunction sizeFunction
-        {
-            get { return m_SizeFunction; }
-            set { if (PropertyUtil.SetClass(ref m_SizeFunction, value)) SetVerticesDirty(); }
-        }
-        /// <summary>
-        /// the function of size when sizeType assined as Function.
-        /// |当sizeType指定为Function时，指定的高亮委托函数。
-        /// </summary>
-        public SymbolSizeFunction selectedSizeFunction
-        {
-            get { return m_SelectedSizeFunction; }
-            set { if (PropertyUtil.SetClass(ref m_SelectedSizeFunction, value)) SetVerticesDirty(); }
-        }
-        /// <summary>
-        /// the index start to show symbol.
-        /// |开始显示图形标记的索引。
-        /// </summary>
-        public int startIndex
-        {
-            get { return m_StartIndex; }
-            set { if (PropertyUtil.SetStruct(ref m_StartIndex, value)) SetVerticesDirty(); }
-        }
-        /// <summary>
-        /// the interval of show symbol.
-        /// |显示图形标记的间隔。0表示显示所有标签，1表示隔一个隔显示一个标签，以此类推。
-        /// </summary>
-        public int interval
-        {
-            get { return m_Interval; }
-            set { if (PropertyUtil.SetStruct(ref m_Interval, value)) SetVerticesDirty(); }
-        }
-        /// <summary>
-        /// whether to show the last symbol.
-        /// |是否强制显示最后一个图形标记。
-        /// </summary>
-        public bool forceShowLast
-        {
-            get { return m_ForceShowLast; }
-            set { if (PropertyUtil.SetStruct(ref m_ForceShowLast, value)) SetVerticesDirty(); }
-        }
-        /// <summary>
         /// the gap of symbol and line segment.
         /// |图形标记和线条的间隙距离。
         /// </summary>
@@ -278,14 +144,6 @@ namespace XCharts.Runtime
             set { if (PropertyUtil.SetStruct(ref m_Height, value)) SetAllDirty(); }
         }
         /// <summary>
-        /// 图形是否重复。
-        /// </summary>
-        public bool repeat
-        {
-            get { return m_Repeat; }
-            set { if (PropertyUtil.SetStruct(ref m_Repeat, value)) SetAllDirty(); }
-        }
-        /// <summary>
         /// 自定义的标记图形。
         /// </summary>
         public Sprite image
@@ -306,6 +164,14 @@ namespace XCharts.Runtime
             get { return m_Offset; }
             set { if (PropertyUtil.SetStruct(ref m_Offset, value)) SetAllDirty(); }
         }
+        /// <summary>
+        /// 图形的颜色。
+        /// </summary>
+        public Color32 color
+        {
+            get { return m_Color; }
+            set { if (PropertyUtil.SetStruct(ref m_Color, value)) SetAllDirty(); }
+        }
         public Vector3 offset3 { get { return new Vector3(m_Offset.x, m_Offset.y, 0); } }
         private List<float> m_AnimationSize = new List<float>() { 0, 5, 10 };
         /// <summary>
@@ -313,84 +179,11 @@ namespace XCharts.Runtime
         /// |带有涟漪特效动画的散点图的动画参数。
         /// </summary>
         public List<float> animationSize { get { return m_AnimationSize; } }
+        
 
-        /// <summary>
-        /// 根据指定的sizeType获得标记的大小
-        /// </summary>
-        /// <param name="data"></param>
-        /// <returns></returns>
-        public float GetSize(List<double> data, float themeSize)
+        public Color32 GetColor(Color32 defaultColor)
         {
-            switch (m_SizeType)
-            {
-                case SymbolSizeType.Custom:
-                    return size == 0 ? themeSize : size;
-                case SymbolSizeType.FromData:
-                    if (data != null && dataIndex >= 0 && dataIndex < data.Count)
-                    {
-                        return (float)data[dataIndex] * m_DataScale;
-                    }
-                    else
-                    {
-                        return size == 0 ? themeSize : size;
-                    }
-                case SymbolSizeType.Function:
-                    if (data != null && sizeFunction != null) return sizeFunction(data);
-                    else return size == 0 ? themeSize : size;
-                default: return size == 0 ? themeSize : size;
-            }
-        }
-
-        /// <summary>
-        /// 根据sizeType获得高亮时的标记大小
-        /// </summary>
-        /// <param name="data"></param>
-        /// <returns></returns>
-        public float GetSelectedSize(List<double> data, float themeSelectedSize)
-        {
-            switch (m_SizeType)
-            {
-                case SymbolSizeType.Custom:
-
-                    return selectedSize == 0 ? themeSelectedSize : selectedSize;
-
-                case SymbolSizeType.FromData:
-
-                    if (data != null && dataIndex >= 0 && dataIndex < data.Count)
-                    {
-                        return (float)data[dataIndex] * m_SelectedDataScale;
-                    }
-                    else
-                    {
-                        return selectedSize == 0 ? themeSelectedSize : selectedSize;
-                    }
-
-                case SymbolSizeType.Function:
-
-                    if (data != null && selectedSizeFunction != null)
-                        return selectedSizeFunction(data);
-                    else
-                        return selectedSize == 0 ? themeSelectedSize : selectedSize;
-
-                default: return selectedSize == 0 ? themeSelectedSize : selectedSize;
-            }
-        }
-
-        public bool ShowSymbol(int dataIndex, int dataCount)
-        {
-            if (!show)
-                return false;
-
-            if (dataIndex < startIndex)
-                return false;
-
-            if (m_Interval <= 0)
-                return true;
-
-            if (m_ForceShowLast && dataIndex == dataCount - 1)
-                return true;
-
-            return (dataIndex - startIndex) % (m_Interval + 1) == 0;
+            return ChartHelper.IsClearColor(m_Color) ? defaultColor : m_Color;
         }
     }
 }