重构SerieSymbol

2026-05-16 13:21:36 +00:00 · 2019-07-21 22:58:51 +08:00
parent 2296fb66ff
commit ff8057690c
9 changed files with 430 additions and 109 deletions
--- a/Scripts/Editor/PropertyDrawers/SerieDrawer.cs
+++ b/Scripts/Editor/PropertyDrawers/SerieDrawer.cs
@@ -7,6 +7,7 @@ namespace XCharts
    [CustomPropertyDrawer(typeof(Serie), true)]
    public class SerieDrawer : PropertyDrawer
    {
+
        private List<bool> m_SerieModuleToggle = new List<bool>();
        private List<bool> m_DataFoldout = new List<bool>();
        private int m_DataSize = 0;
@@ -23,11 +24,9 @@ namespace XCharts
            SerializedProperty stack = prop.FindPropertyRelative("m_Stack");
            SerializedProperty m_AxisIndex = prop.FindPropertyRelative("m_AxisIndex");
            SerializedProperty m_Symbol = prop.FindPropertyRelative("m_Symbol");
-            SerializedProperty m_SymbolSize = prop.FindPropertyRelative("m_SymbolSize");
-            SerializedProperty m_SymbolSelectedSize = prop.FindPropertyRelative("m_SymbolSelectedSize");
-            SerializedProperty m_TwoDimensionData = prop.FindPropertyRelative("m_TwoDimensionData");
-            SerializedProperty m_XData = prop.FindPropertyRelative("m_XData");
-            SerializedProperty m_YData = prop.FindPropertyRelative("m_YData");
+            SerializedProperty m_DataDimension = prop.FindPropertyRelative("m_ShowDataDimension");
+            SerializedProperty m_ShowDataName = prop.FindPropertyRelative("m_ShowDataName");
+            SerializedProperty m_Datas = prop.FindPropertyRelative("m_Data");

            int index = InitToggle(prop);
            string moduleName = "Serie " + index;
@@ -48,89 +47,114 @@ namespace XCharts
                if (type.enumValueIndex == (int)SerieType.Line || type.enumValueIndex == (int)SerieType.Scatter)
                {
                    EditorGUI.PropertyField(drawRect, m_Symbol);
-                    drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
-                    EditorGUI.PropertyField(drawRect, m_SymbolSize);
-                    drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
-                    EditorGUI.PropertyField(drawRect, m_SymbolSelectedSize);
-                    drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+                    drawRect.y += EditorGUI.GetPropertyHeight(m_Symbol);
                }
-                EditorGUI.PropertyField(drawRect, m_TwoDimensionData);
-                drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+
                drawRect.width = EditorGUIUtility.labelWidth + 10;
                m_DataFoldout[index] = EditorGUI.Foldout(drawRect, m_DataFoldout[index], "Data");
                ChartEditorHelper.MakeJsonData(ref drawRect, ref m_ShowJsonDataArea, ref m_JsonDataAreaText, prop);
                drawRect.width = pos.width;
                if (m_DataFoldout[index])
                {
-                    if (m_TwoDimensionData.boolValue)
+                    EditorGUI.indentLevel++;
+                    EditorGUI.PropertyField(drawRect, m_ShowDataName);
+                    drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+                    EditorGUI.PropertyField(drawRect, m_DataDimension);
+                    drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+
+                    var listSize = m_Datas.arraySize;
+                    listSize = EditorGUI.IntField(drawRect, "Size", listSize);
+                    drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+
+                    if (listSize < 0) listSize = 0;
+                    if (m_DataDimension.intValue < 1) m_DataDimension.intValue = 1;
+                    int dimension = m_DataDimension.intValue;
+                    bool showName = m_ShowDataName.boolValue;
+                    if (listSize != m_Datas.arraySize)
                    {
-                        EditorGUI.indentLevel++;
-                        var listSize = m_YData.arraySize;
-                        listSize = EditorGUI.IntField(drawRect, "Size", listSize);
-                        if (listSize < 0) listSize = 0;
-                        drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
-                        if (listSize != m_XData.arraySize)
+                        while (listSize > m_Datas.arraySize)
+                            m_Datas.InsertArrayElementAtIndex(m_Datas.arraySize);
+                        while (listSize < m_Datas.arraySize)
+                            m_Datas.DeleteArrayElementAtIndex(m_Datas.arraySize - 1);
+                    }
+                    if (listSize > 30)
+                    {
+                        int num = listSize > 10 ? 10 : listSize;
+                        for (int i = 0; i < num; i++)
                        {
-                            while (listSize > m_XData.arraySize)
-                                m_XData.InsertArrayElementAtIndex(m_XData.arraySize);
-                            while (listSize < m_XData.arraySize)
-                                m_XData.DeleteArrayElementAtIndex(m_XData.arraySize - 1);
+                            DrawDataElement(ref drawRect, dimension, m_Datas, showName, i);
                        }
-                        if (listSize != m_YData.arraySize)
+                        if (num >= 10)
                        {
-                            while (listSize > m_YData.arraySize)
-                                m_YData.InsertArrayElementAtIndex(m_YData.arraySize);
-                            while (listSize < m_YData.arraySize)
-                                m_YData.DeleteArrayElementAtIndex(m_YData.arraySize - 1);
+                            EditorGUI.LabelField(drawRect, "...");
+                            drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+                            DrawDataElement(ref drawRect, dimension, m_Datas, showName, listSize - 1);
                        }
-                        if (listSize > 30)
-                        {
-                            int num = listSize > 10 ? 10 : listSize;
-                            for (int i = 0; i < num; i++)
-                            {
-                                DrawTwoDimensionDataElement(ref drawRect, m_XData, m_YData, i);
-                            }
-                            if (num >= 10)
-                            {
-                                EditorGUI.LabelField(drawRect, "...");
-                                drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
-                                DrawTwoDimensionDataElement(ref drawRect, m_XData, m_YData, listSize - 1);
-                            }
-                        }
-                        else
-                        {
-                            for (int i = 0; i < m_YData.arraySize; i++)
-                            {
-                                DrawTwoDimensionDataElement(ref drawRect, m_XData, m_YData, i);
-                            }
-                        }
-                        EditorGUI.indentLevel--;
                    }
                    else
                    {
-                        ChartEditorHelper.MakeList(ref drawRect, ref m_DataSize, m_YData);
+                        for (int i = 0; i < m_Datas.arraySize; i++)
+                        {
+                            DrawDataElement(ref drawRect, dimension, m_Datas, showName, i);
+                        }
                    }
+                    EditorGUI.indentLevel--;
                }
                --EditorGUI.indentLevel;
            }
        }

-        private void DrawTwoDimensionDataElement(ref Rect drawRect, SerializedProperty m_Data1,
-            SerializedProperty m_Data2, int i)
+        private void DrawDataElement(ref Rect drawRect, int dimension, SerializedProperty m_Datas, bool showName, int index)
        {
            var lastX = drawRect.x;
-            SerializedProperty element1 = m_Data1.GetArrayElementAtIndex(i);
-            SerializedProperty element2 = m_Data2.GetArrayElementAtIndex(i);
-            EditorGUI.LabelField(drawRect, "Element " + i);
-            var startX = EditorGUIUtility.labelWidth - (EditorGUI.indentLevel - 1) * 15 - 1;
-            var dataWid = (EditorGUIUtility.currentViewWidth - startX) / 2 + 15;
-            drawRect.x = startX;
-            drawRect.width = dataWid;
-            element1.floatValue = EditorGUI.FloatField(drawRect, element1.floatValue);
-            drawRect.x += dataWid - 35;
-            element2.floatValue = EditorGUI.FloatField(drawRect, element2.floatValue);
-            drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
-            drawRect.x = lastX;
+            var lastWid = drawRect.width;
+            var lastFieldWid = EditorGUIUtility.fieldWidth;
+            var lastLabelWid = EditorGUIUtility.labelWidth;
+            var serieData = m_Datas.GetArrayElementAtIndex(index);
+            var sereName = serieData.FindPropertyRelative("m_Name");
+            var data = serieData.FindPropertyRelative("m_Data");
+            var fieldCount = dimension + (showName ? 1 : 0);
+
+            if (fieldCount <= 1)
+            {
+                while (2 > data.arraySize)
+                    data.InsertArrayElementAtIndex(data.arraySize);
+                SerializedProperty element = data.GetArrayElementAtIndex(1);
+                EditorGUI.PropertyField(drawRect, element);
+                drawRect.y += EditorGUI.GetPropertyHeight(element) + EditorGUIUtility.standardVerticalSpacing;
+            }
+            else
+            {
+                EditorGUI.LabelField(drawRect, "Element " + index);
+                var startX = drawRect.x + EditorGUIUtility.labelWidth - EditorGUI.indentLevel * 15 - 1;
+                var dataWidTotal = (EditorGUIUtility.currentViewWidth - (startX + EditorGUI.indentLevel * 15 + 1) - 5);
+                var dataWid = dataWidTotal / fieldCount;
+                var xWid = dataWid - 4;
+                for (int i = 0; i < dimension; i++)
+                {
+                    if (i >= data.arraySize - 1)
+                    {
+                        data.InsertArrayElementAtIndex(data.arraySize);
+                    }
+                    drawRect.x = startX + i * xWid;
+                    drawRect.width = dataWid + 40;
+                    SerializedProperty element = data.GetArrayElementAtIndex(i);
+                    EditorGUI.PropertyField(drawRect, element, GUIContent.none);
+                }
+                if (showName)
+                {
+                    drawRect.x = startX + (fieldCount - 1) * xWid;
+                    drawRect.width = dataWid + 40;
+                    EditorGUI.PropertyField(drawRect, sereName, GUIContent.none);
+                }
+                drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+                drawRect.x = lastX;
+                drawRect.width = lastWid;
+                EditorGUIUtility.fieldWidth = lastFieldWid;
+                EditorGUIUtility.labelWidth = lastLabelWid;
+            }
+            SerializedProperty element1 = data.GetArrayElementAtIndex(0);
+            SerializedProperty element2 = data.GetArrayElementAtIndex(1);
        }

        public override float GetPropertyHeight(SerializedProperty prop, GUIContent label)
@@ -143,16 +167,17 @@ namespace XCharts
            }
            else
            {
-                height += 7 * EditorGUIUtility.singleLineHeight + 6 * EditorGUIUtility.standardVerticalSpacing;
+                height += 6 * EditorGUIUtility.singleLineHeight + 5 * EditorGUIUtility.standardVerticalSpacing;
                SerializedProperty type = prop.FindPropertyRelative("m_Type");
                if (type.enumValueIndex == (int)SerieType.Line || type.enumValueIndex == (int)SerieType.Scatter)
                {
-                    height += 3 * EditorGUIUtility.singleLineHeight + 2 * EditorGUIUtility.standardVerticalSpacing;
+
+                    height += EditorGUI.GetPropertyHeight(prop.FindPropertyRelative("m_Symbol"));
                }
                if (m_DataFoldout[index])
                {
-                    SerializedProperty m_Data = prop.FindPropertyRelative("m_YData");
-                    int num = m_Data.arraySize + 1;
+                    SerializedProperty m_Data = prop.FindPropertyRelative("m_Data");
+                    int num = m_Data.arraySize + 3;
                    if (num > 30) num = 13;
                    height += num * EditorGUIUtility.singleLineHeight + (num - 1) * EditorGUIUtility.standardVerticalSpacing;
                }
@@ -167,7 +192,16 @@ namespace XCharts
        private int InitToggle(SerializedProperty prop)
        {
            int index = 0;
-            int.TryParse(prop.displayName.Split(' ')[1], out index);
+            var temp = prop.displayName.Split(' ');
+            if (temp == null || temp.Length < 2)
+            {
+                Debug.LogError("SERIE:"+prop.name+","+prop.displayName+","+prop.FindPropertyRelative("m_Name").stringValue);
+                index =0;
+            }
+            else
+            {
+                int.TryParse(temp[1], out index);
+            }
            if (index >= m_DataFoldout.Count)
            {
                m_DataFoldout.Add(false);
--- a/Scripts/Editor/PropertyDrawers/SerieSymbolDrawer.cs
+++ b/Scripts/Editor/PropertyDrawers/SerieSymbolDrawer.cs
@@ -0,0 +1,74 @@
+using System.Collections.Generic;
+using UnityEditor;
+using UnityEngine;
+
+namespace XCharts
+{
+    [CustomPropertyDrawer(typeof(SerieSymbol), true)]
+    public class SerieSymbolDrawer : PropertyDrawer
+    {
+
+        private List<bool> m_SerieModuleToggle = new List<bool>();
+        private List<bool> m_DataFoldout = new List<bool>();
+        private int m_DataSize = 0;
+        private bool m_ShowJsonDataArea = false;
+        private string m_JsonDataAreaText;
+
+        public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label)
+        {
+            Rect drawRect = pos;
+            drawRect.height = EditorGUIUtility.singleLineHeight;
+            SerializedProperty m_Type = prop.FindPropertyRelative("m_Type");
+            SerializedProperty m_SizeType = prop.FindPropertyRelative("m_SizeType");
+            SerializedProperty m_Size = prop.FindPropertyRelative("m_Size");
+            SerializedProperty m_SelectedSize = prop.FindPropertyRelative("m_SelectedSize");
+            SerializedProperty m_DataIndex = prop.FindPropertyRelative("m_DataIndex");
+            SerializedProperty m_DataScale = prop.FindPropertyRelative("m_DataScale");
+            SerializedProperty m_SelectedDataScale = prop.FindPropertyRelative("m_SelectedDataScale");
+
+            SerializedProperty m_SizeCallback = prop.FindPropertyRelative("m_SizeCallback");
+            SerializedProperty m_SelectedSizeCallback = prop.FindPropertyRelative("m_SelectedSizeCallback");
+
+            EditorGUI.PropertyField(drawRect, m_Type, new GUIContent("Symbol Type"));
+            drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+            EditorGUI.PropertyField(drawRect, m_SizeType, new GUIContent("Symbol SizeType"));
+            drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+            SerieSymbolSizeType sizeType = (SerieSymbolSizeType)m_SizeType.enumValueIndex;
+            switch (sizeType)
+            {
+                case SerieSymbolSizeType.Custom:
+                    EditorGUI.PropertyField(drawRect, m_Size, new GUIContent("Symbol Size"));
+                    drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+                    EditorGUI.PropertyField(drawRect, m_SelectedSize, new GUIContent("Symbol SelectedSize"));
+                    drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+                    break;
+                case SerieSymbolSizeType.FromData:
+                    EditorGUI.PropertyField(drawRect, m_DataIndex, new GUIContent("Symbol DataIndex"));
+                    drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+                    EditorGUI.PropertyField(drawRect, m_DataScale, new GUIContent("Symbol DataScale"));
+                    drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+                    EditorGUI.PropertyField(drawRect, m_SelectedDataScale, new GUIContent("Symbol SelectedDataScale"));
+                    drawRect.y += EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
+                    break;
+                case SerieSymbolSizeType.Callback:
+                    break;
+            }
+        }
+
+        public override float GetPropertyHeight(SerializedProperty prop, GUIContent label)
+        {
+            SerializedProperty m_SizeType = prop.FindPropertyRelative("m_SizeType");
+            SerieSymbolSizeType sizeType = (SerieSymbolSizeType)m_SizeType.enumValueIndex;
+            switch (sizeType)
+            {
+                case SerieSymbolSizeType.Custom:
+                    return 4 * EditorGUIUtility.singleLineHeight + 3 * EditorGUIUtility.standardVerticalSpacing;
+                case SerieSymbolSizeType.FromData:
+                    return 5 * EditorGUIUtility.singleLineHeight + 4 * EditorGUIUtility.standardVerticalSpacing;
+                case SerieSymbolSizeType.Callback:
+                    return 4 * EditorGUIUtility.singleLineHeight + 3 * EditorGUIUtility.standardVerticalSpacing;
+            }
+            return 4 * EditorGUIUtility.singleLineHeight + 3 * EditorGUIUtility.standardVerticalSpacing;
+        }
+    }
+}
--- a/Scripts/Editor/PropertyDrawers/SerieSymbolDrawer.cs.meta
+++ b/Scripts/Editor/PropertyDrawers/SerieSymbolDrawer.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e0c4d3c3303994821bde654cf67d414d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: