增加Serie的avoidLabelOverlap参数避免饼图标签堆叠的情况#56

Assets/XCharts/CHANGELOG.md

@@ -1,6 +1,8 @@
 
 # 更新日志
 
+* (2020.06.16) 增加`Serie`的`avoidLabelOverlap`参数避免饼图标签堆叠的情况#56
+* (2020.06.15) 修复`SerieLabel`单独控制显示时可能错乱的问题
 * (2020.06.11) 修复`Check warning`不生效的问题
 * (2020.06.11) 修复`PieChart`和`RingChart`在数据占比很小时不显示的问题
 * (2020.06.11) 增加`Tooltip`的`titleFormatter`支持配置占位符`{i}`表示忽略不显示标题

Assets/XCharts/Documentation/XCharts配置项手册.md

@@ -574,6 +574,7 @@
 * `roundCap`：是否启用圆弧效果。
 * `ignore`：是否开启忽略数据。当为 `true` 时，数据值为 `ignoreValue` 时不进行绘制，对应的`Label`和`Legend`也不会显示。
 * `ignoreValue`：忽略数据的默认值。默认值默认为0，当 `ignore` 为 `true` 才有效。
+* `avoidLabelOverlap`：在饼图且标签外部显示的情况下，是否启用防止标签重叠策略，默认关闭，在标签拥挤重叠的情况下会挪动各个标签的位置，防止标签间的重叠。
 * `label`：图形上的文本标签 [SerieLabel](#SerieLabel)，可用于说明图形的一些数据信息，比如值，名称等。
 * `emphasis`：高亮样式 [Emphasis](#Emphasis)。
 * `animation`：起始动画 [SerieAnimation](#SerieAnimation)。

Assets/XCharts/Editor/PropertyDrawers/SerieDrawer.cs

@@ -77,6 +77,7 @@ namespace XCharts
             SerializedProperty m_ShowAsPositiveNumber = prop.FindPropertyRelative("m_ShowAsPositiveNumber");
             SerializedProperty m_Large = prop.FindPropertyRelative("m_Large");
             SerializedProperty m_LargeThreshold = prop.FindPropertyRelative("m_LargeThreshold");
+            SerializedProperty m_AvoidLabelOverlap = prop.FindPropertyRelative("m_AvoidLabelOverlap");
             SerializedProperty m_Datas = prop.FindPropertyRelative("m_Data");
 
             int index = InitToggle(prop);
@@ -213,6 +214,8 @@ namespace XCharts
                         drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
                         EditorGUI.PropertyField(drawRect, m_IgnoreValue);
                         drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+                        EditorGUI.PropertyField(drawRect, m_AvoidLabelOverlap);
+                        drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
                         EditorGUI.PropertyField(drawRect, m_ItemStyle);
                         drawRect.y += EditorGUI.GetPropertyHeight(m_ItemStyle);
                         EditorGUI.PropertyField(drawRect, m_Label);
@@ -532,7 +535,7 @@ namespace XCharts
                         height += EditorGUI.GetPropertyHeight(prop.FindPropertyRelative("m_Animation"));
                         break;
                     case SerieType.Pie:
-                        height += 11 * EditorGUIUtility.singleLineHeight + 10 * EditorGUIUtility.standardVerticalSpacing;
+                        height += 12 * EditorGUIUtility.singleLineHeight + 11 * EditorGUIUtility.standardVerticalSpacing;
                         height += EditorGUI.GetPropertyHeight(prop.FindPropertyRelative("m_ItemStyle"));
                         height += EditorGUI.GetPropertyHeight(prop.FindPropertyRelative("m_Label"));
                         height += EditorGUI.GetPropertyHeight(prop.FindPropertyRelative("m_Emphasis"));

Assets/XCharts/Runtime/Component/Main/Serie.cs

@@ -273,6 +273,7 @@ namespace XCharts
         [SerializeField] private bool m_ShowAsPositiveNumber = false;
         [SerializeField] private bool m_Large = true;
         [SerializeField] private int m_LargeThreshold = 200;
+        [SerializeField] private bool m_AvoidLabelOverlap = false;
         [SerializeField] private RadarType m_RadarType = RadarType.Multiple;
 
         [SerializeField] private List<SerieData> m_Data = new List<SerieData>();
@@ -787,6 +788,14 @@ namespace XCharts
             }
         }
         /// <summary>
+        /// 在饼图且标签外部显示的情况下，是否启用防止标签重叠策略，默认关闭，在标签拥挤重叠的情况下会挪动各个标签的位置，防止标签间的重叠。
+        /// </summary>
+        public bool avoidLabelOverlap
+        {
+            get { return m_AvoidLabelOverlap; }
+            set { if (PropertyUtility.SetStruct(ref m_AvoidLabelOverlap, value)) SetVerticesDirty(); }
+        }
+        /// <summary>
         /// 系列中的数据内容数组。SerieData可以设置1到n维数据。
         /// </summary>
         public List<SerieData> data { get { return m_Data; } }

Assets/XCharts/Runtime/Internal/Helper/SerieLabelHelper.cs

@@ -175,5 +175,134 @@ namespace XCharts
                 }
             }
         }
+
+        public static void UpdatePieLabelPosition(Serie serie, SerieData serieData)
+        {
+            if (serieData.labelObject == null) return;
+            var currAngle = serieData.runtimePieHalfAngle;
+            var currRad = currAngle * Mathf.Deg2Rad;
+            var offsetRadius = serieData.runtimePieOffsetRadius;
+            var insideRadius = serieData.runtimePieInsideRadius;
+            var outsideRadius = serieData.runtimePieOutsideRadius;
+            var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
+            switch (serieLabel.position)
+            {
+                case SerieLabel.Position.Center:
+                    serieData.labelPosition = serie.runtimeCenterPos;
+                    break;
+                case SerieLabel.Position.Inside:
+                    var labelRadius = offsetRadius + insideRadius + (outsideRadius - insideRadius) / 2;
+                    var labelCenter = new Vector2(serie.runtimeCenterPos.x + labelRadius * Mathf.Sin(currRad),
+                        serie.runtimeCenterPos.y + labelRadius * Mathf.Cos(currRad));
+                    serieData.labelPosition = labelCenter;
+                    break;
+                case SerieLabel.Position.Outside:
+                    if (serieLabel.lineType == SerieLabel.LineType.HorizontalLine)
+                    {
+                        var radius1 = serie.runtimeOutsideRadius;
+                        var radius3 = insideRadius + (outsideRadius - insideRadius) / 2;
+                        var currSin = Mathf.Sin(currRad);
+                        var currCos = Mathf.Cos(currRad);
+                        var pos0 = new Vector3(serie.runtimeCenterPos.x + radius3 * currSin, serie.runtimeCenterPos.y + radius3 * currCos);
+                        if (currAngle > 180)
+                        {
+                            currSin = Mathf.Sin((360 - currAngle) * Mathf.Deg2Rad);
+                            currCos = Mathf.Cos((360 - currAngle) * Mathf.Deg2Rad);
+                        }
+                        var r4 = Mathf.Sqrt(radius1 * radius1 - Mathf.Pow(currCos * radius3, 2)) - currSin * radius3;
+                        r4 += serieLabel.lineLength1 + serieLabel.lineWidth * 4;
+                        r4 += serieData.labelObject.label.preferredWidth / 2;
+                        serieData.labelPosition = pos0 + (currAngle > 180 ? Vector3.left : Vector3.right) * r4;
+                    }
+                    else
+                    {
+                        labelRadius = serie.runtimeOutsideRadius + serieLabel.lineLength1;
+                        labelCenter = new Vector2(serie.runtimeCenterPos.x + labelRadius * Mathf.Sin(currRad),
+                            serie.runtimeCenterPos.y + labelRadius * Mathf.Cos(currRad));
+                        float labelWidth = serieData.labelObject.label.preferredWidth;
+                        serieData.labelPosition = labelCenter;
+                    }
+                    break;
+            }
+        }
+
+        internal static void AvoidLabelOverlap(Serie serie)
+        {
+            if (!serie.avoidLabelOverlap) return;
+            var lastCheckPos = Vector3.zero;
+            var data = serie.data;
+            var splitCount = 0;
+            for (int n = 0; n < data.Count; n++)
+            {
+                var serieData = data[n];
+                if (serieData.labelPosition.x != 0 && serieData.labelPosition.x < serie.runtimeCenterPos.x)
+                {
+                    splitCount = n;
+                    break;
+                }
+            }
+            if (splitCount <= 0) return;
+            for (int n = 0; n < splitCount; n++)
+            {
+                var serieData = data[n];
+                CheckSerieDataLabel(serie, serieData, false, ref lastCheckPos);
+            }
+            lastCheckPos = Vector3.zero;
+            for (int n = data.Count - 1; n >= splitCount; n--)
+            {
+                var serieData = data[n];
+                CheckSerieDataLabel(serie, serieData, true, ref lastCheckPos);
+            }
+        }
+
+        private static void CheckSerieDataLabel(Serie serie, SerieData serieData, bool isLeft, ref Vector3 lastCheckPos)
+        {
+            if (!serieData.canShowLabel)
+            {
+                serieData.SetLabelActive(false);
+                return;
+            }
+            if (!serieData.show) return;
+            var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
+            if (serieLabel.position != SerieLabel.Position.Outside) return;
+            if (lastCheckPos == Vector3.zero)
+            {
+                lastCheckPos = serieData.labelPosition;
+            }
+            else if (serieData.labelPosition.x != 0)
+            {
+                float hig = serieLabel.fontSize;
+                if (lastCheckPos.y - serieData.labelPosition.y < hig)
+                {
+                    var labelRadius = serie.runtimeOutsideRadius + serieLabel.lineLength1;
+                    var y1 = lastCheckPos.y - hig;
+                    var cy = serie.runtimeCenterPos.y;
+                    var diff = Mathf.Abs(y1 - cy);
+                    var diffX = labelRadius * labelRadius - diff * diff;
+                    diffX = diffX <= 0 ? 0 : diffX;
+                    var x1 = serie.runtimeCenterPos.x + Mathf.Sqrt(diffX) * (isLeft ? -1 : 1);
+                    serieData.labelPosition = new Vector3(x1, y1);
+                }
+                lastCheckPos = serieData.labelPosition;
+                serieData.labelObject.SetPosition(SerieLabelHelper.GetRealLabelPosition(serieData, serieLabel));
+            }
+        }
+
+        internal static Vector3 GetRealLabelPosition(SerieData serieData, SerieLabel label)
+        {
+            if (label.position == SerieLabel.Position.Outside && label.lineType != SerieLabel.LineType.HorizontalLine)
+            {
+                var currAngle = serieData.runtimePieHalfAngle;
+                var offset = label.lineLength2 + serieData.labelObject.GetLabelWidth() / 2;
+                if (currAngle > 180)
+                    return serieData.labelPosition + new Vector3(-offset, 0, 0);
+                else
+                    return serieData.labelPosition + new Vector3(offset, 0, 0);
+            }
+            else
+            {
+                return serieData.labelPosition;
+            }
+        }
     }
 }

Assets/XCharts/Runtime/Internal/Object/LabelObject.cs

@@ -18,6 +18,8 @@ namespace XCharts
         private Text m_LabelText;
         private RectTransform m_LabelRect;
         private RectTransform m_IconRect;
+        private RectTransform m_ObjectRect;
+
         private Image m_IconImage;
 
         public GameObject gameObject { get { return m_GameObject; } }
@@ -36,6 +38,7 @@ namespace XCharts
             m_LabelPaddingTopBottom = paddingTopBottom;
             m_LabelText = labelObj.GetComponentInChildren<Text>();
             m_LabelRect = m_LabelText.GetComponent<RectTransform>();
+            m_ObjectRect = labelObj.GetComponent<RectTransform>();
         }
 
         public void SetIcon(Image image)
@@ -137,7 +140,11 @@ namespace XCharts
                         new Vector2(m_LabelText.preferredWidth + m_LabelPaddingLeftRight * 2,
                                         m_LabelText.preferredHeight + m_LabelPaddingTopBottom * 2);
                     var sizeChange = newSize.x != m_LabelRect.sizeDelta.x || newSize.y != m_LabelRect.sizeDelta.y;
-                    if (sizeChange) m_LabelRect.sizeDelta = newSize;
+                    if (sizeChange)
+                    {
+                        m_LabelRect.sizeDelta = newSize;
+                        m_ObjectRect.sizeDelta = newSize;
+                    }
                     return sizeChange;
                 }
             }

Assets/XCharts/Runtime/PieChart.cs

@@ -5,7 +5,6 @@
 /*                                        */
 /******************************************/
 
-using System.Text;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
@@ -203,17 +202,15 @@ namespace XCharts
         {
             foreach (var serie in m_Series.list)
             {
-                if (serie.type == SerieType.Pie)
+                if (serie.type != SerieType.Pie) continue;
+                foreach (var serieData in serie.data)
                 {
-                    foreach (var serieData in serie.data)
+                    var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
+                    if (SerieLabelHelper.CanShowLabel(serie, serieData, serieLabel, 1))
                     {
-                        var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
+                        int colorIndex = m_LegendRealShowName.IndexOf(serieData.name);
-                        if (SerieLabelHelper.CanShowLabel(serie, serieData, serieLabel, 1))
+                        Color color = m_ThemeInfo.GetColor(colorIndex);
-                        {
+                        DrawLabelLine(vh, serie, serieData, color);
-                            int colorIndex = m_LegendRealShowName.IndexOf(serieData.name);
-                            Color color = m_ThemeInfo.GetColor(colorIndex);
-                            DrawLabelLine(vh, serie, serieData, color);
-                        }
                     }
                 }
             }
@@ -223,16 +220,14 @@ namespace XCharts
         {
             foreach (var serie in m_Series.list)
             {
-                if (serie.type == SerieType.Pie)
+                if (serie.type != SerieType.Pie) continue;
+                foreach (var serieData in serie.data)
                 {
-                    foreach (var serieData in serie.data)
+                    var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
+                    if (SerieLabelHelper.CanShowLabel(serie, serieData, serieLabel, 1))
                     {
-                        var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
+                        SerieLabelHelper.UpdatePieLabelPosition(serie, serieData);
-                        if (SerieLabelHelper.CanShowLabel(serie, serieData, serieLabel, 1))
+                        DrawLabelBackground(vh, serie, serieData);
-                        {
-                            UpdateLabelPostion(serie, serieData);
-                            DrawLabelBackground(vh, serie, serieData);
-                        }
                     }
                 }
             }
@@ -261,7 +256,11 @@ namespace XCharts
                 radius1 -= 0.1f;
                 var pos0 = new Vector3(center.x + radius3 * currSin, center.y + radius3 * currCos);
                 var pos1 = new Vector3(center.x + radius1 * currSin, center.y + radius1 * currCos);
-                var pos2 = new Vector3(center.x + radius2 * currSin, center.y + radius2 * currCos);
+                var pos2 = serieData.labelPosition;
+                if (pos2.x == 0)
+                {
+                    pos2 = new Vector3(center.x + radius2 * currSin, center.y + radius2 * currCos);
+                }
                 float tx, ty;
                 Vector3 pos3, pos4, pos6;
                 var horizontalLineCircleRadius = serieLabel.lineWidth * 4f;
@@ -337,7 +336,6 @@ namespace XCharts
                 serie.index = i;
                 if (!serie.show) continue;
                 var data = serie.data;
-
                 for (int n = 0; n < data.Count; n++)
                 {
                     var serieData = data[n];
@@ -349,9 +347,9 @@ namespace XCharts
                     if (!serieData.show) continue;
                     serieNameCount = m_LegendRealShowName.IndexOf(serieData.name);
                     Color color = m_ThemeInfo.GetColor(serieNameCount);
-
                     DrawLabel(serie, n, serieData, color);
                 }
+                SerieLabelHelper.AvoidLabelOverlap(serie);
             }
         }
 
@@ -392,8 +390,7 @@ namespace XCharts
                 serieData.labelObject.label.fontSize = fontSize;
                 serieData.labelObject.label.fontStyle = fontStyle;
                 serieData.labelObject.SetLabelRotate(rotate);
-
+                SerieLabelHelper.UpdatePieLabelPosition(serie, serieData);
-                UpdateLabelPostion(serie, serieData);
                 if (!string.IsNullOrEmpty(serieLabel.formatter))
                 {
                     var value = serieData.data[1];
@@ -405,7 +402,7 @@ namespace XCharts
                 {
                     if (serieData.labelObject.SetText(serieData.name)) RefreshChart();
                 }
-                serieData.labelObject.SetPosition(serieData.labelPosition);
+                serieData.labelObject.SetPosition(SerieLabelHelper.GetRealLabelPosition(serieData, serieLabel));
                 if (showLabel) serieData.labelObject.SetLabelPosition(serieLabel.offset);
                 else serieData.SetLabelActive(false);
             }
@@ -416,63 +413,6 @@ namespace XCharts
             serieData.labelObject.UpdateIcon(serieData.iconStyle);
         }
 
-        protected void UpdateLabelPostion(Serie serie, SerieData serieData)
-        {
-            if (serieData.labelObject == null) return;
-            var currAngle = serieData.runtimePieHalfAngle;
-            var currRad = currAngle * Mathf.Deg2Rad;
-            var offsetRadius = serieData.runtimePieOffsetRadius;
-            var insideRadius = serieData.runtimePieInsideRadius;
-            var outsideRadius = serieData.runtimePieOutsideRadius;
-            var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
-            switch (serieLabel.position)
-            {
-                case SerieLabel.Position.Center:
-                    serieData.labelPosition = serie.runtimeCenterPos;
-                    break;
-                case SerieLabel.Position.Inside:
-                    var labelRadius = offsetRadius + insideRadius + (outsideRadius - insideRadius) / 2;
-                    var labelCenter = new Vector2(serie.runtimeCenterPos.x + labelRadius * Mathf.Sin(currRad),
-                        serie.runtimeCenterPos.y + labelRadius * Mathf.Cos(currRad));
-                    serieData.labelPosition = labelCenter;
-                    break;
-                case SerieLabel.Position.Outside:
-                    if (serieLabel.lineType == SerieLabel.LineType.HorizontalLine)
-                    {
-                        var radius1 = serie.runtimeOutsideRadius;
-                        var radius3 = insideRadius + (outsideRadius - insideRadius) / 2;
-                        var currSin = Mathf.Sin(currRad);
-                        var currCos = Mathf.Cos(currRad);
-                        var pos0 = new Vector3(serie.runtimeCenterPos.x + radius3 * currSin, serie.runtimeCenterPos.y + radius3 * currCos);
-                        if (currAngle > 180)
-                        {
-                            currSin = Mathf.Sin((360 - currAngle) * Mathf.Deg2Rad);
-                            currCos = Mathf.Cos((360 - currAngle) * Mathf.Deg2Rad);
-                        }
-                        var r4 = Mathf.Sqrt(radius1 * radius1 - Mathf.Pow(currCos * radius3, 2)) - currSin * radius3;
-                        r4 += serieLabel.lineLength1 + serieLabel.lineWidth * 4;
-                        r4 += serieData.labelObject.label.preferredWidth / 2;
-                        serieData.labelPosition = pos0 + (currAngle > 180 ? Vector3.left : Vector3.right) * r4;
-                    }
-                    else
-                    {
-                        labelRadius = serie.runtimeOutsideRadius + serieLabel.lineLength1;
-                        labelCenter = new Vector2(serie.runtimeCenterPos.x + labelRadius * Mathf.Sin(currRad),
-                            serie.runtimeCenterPos.y + labelRadius * Mathf.Cos(currRad));
-                        float labelWidth = serieData.labelObject.label.preferredWidth;
-                        if (currAngle > 180)
-                        {
-                            serieData.labelPosition = new Vector2(labelCenter.x - serieLabel.lineLength2 - 5 - labelWidth / 2, labelCenter.y);
-                        }
-                        else
-                        {
-                            serieData.labelPosition = new Vector2(labelCenter.x + serieLabel.lineLength2 + 5 + labelWidth / 2, labelCenter.y);
-                        }
-                    }
-                    break;
-            }
-        }
-
         protected override void OnLegendButtonClick(int index, string legendName, bool show)
         {
             LegendHelper.CheckDataShow(m_Series, legendName, show);
@@ -532,7 +472,7 @@ namespace XCharts
             var dist = Vector2.Distance(local, serie.runtimeCenterPos);
             if (dist < serie.runtimeInsideRadius || dist > serie.runtimeOutsideRadius) return -1;
             Vector2 dir = local - new Vector2(serie.runtimeCenterPos.x, serie.runtimeCenterPos.y);
-            float angle = VectorAngle(Vector2.up, dir);
+            float angle = ChartHelper.GetAngle360(Vector2.up, dir);
             for (int i = 0; i < serie.data.Count; i++)
             {
                 var serieData = serie.data[i];
@@ -544,17 +484,6 @@ namespace XCharts
             return -1;
         }
 
-        float VectorAngle(Vector2 from, Vector2 to)
-        {
-            float angle;
-
-            Vector3 cross = Vector3.Cross(from, to);
-            angle = Vector2.Angle(from, to);
-            angle = cross.z > 0 ? -angle : angle;
-            angle = (angle + 360) % 360;
-            return angle;
-        }
-
         protected override void UpdateTooltip()
         {
             base.UpdateTooltip();
@@ -583,16 +512,14 @@ namespace XCharts
             for (int i = 0; i < m_Series.Count; i++)
             {
                 var serie = m_Series.GetSerie(i);
-                if (serie.type == SerieType.Pie)
+                if (serie.type != SerieType.Pie) continue;
+                var index = GetPosPieIndex(serie, local);
+                if (index >= 0)
                 {
-                    var index = GetPosPieIndex(serie, local);
+                    for (int j = 0; j < serie.data.Count; j++)
-                    if (index >= 0)
                     {
-                        for (int j = 0; j < serie.data.Count; j++)
+                        if (j == index) serie.data[j].selected = !serie.data[j].selected;
-                        {
+                        else serie.data[j].selected = false;
-                            if (j == index) serie.data[j].selected = !serie.data[j].selected;
-                            else serie.data[j].selected = false;
-                        }
                     }
                 }
             }

Assets/XCharts/Runtime/Utility/ChartHelper.cs

@@ -742,5 +742,22 @@ namespace XCharts
             var py = Mathf.Cos(rad) * radius;
             return center + new Vector3(px, py);
         }
+
+        /// <summary>
+        /// 获得0-360的角度（12点钟方向为0度）
+        /// </summary>
+        /// <param name="from"></param>
+        /// <param name="to"></param>
+        /// <returns></returns>
+        public static float GetAngle360(Vector2 from, Vector2 to)
+        {
+            float angle;
+
+            Vector3 cross = Vector3.Cross(from, to);
+            angle = Vector2.Angle(from, to);
+            angle = cross.z > 0 ? -angle : angle;
+            angle = (angle + 360) % 360;
+            return angle;
+        }
     }
 }