diff --git a/Editor/RingChartEditor.cs b/Editor/RingChartEditor.cs new file mode 100644 index 00000000..f480e370 --- /dev/null +++ b/Editor/RingChartEditor.cs @@ -0,0 +1,28 @@ +/******************************************/ +/* */ +/* Copyright (c) 2018 monitor1394 */ +/* https://github.com/monitor1394 */ +/* */ +/******************************************/ + +using UnityEditor; + +namespace XCharts +{ + /// + /// Editor class used to edit UI RingChart. + /// + + [CustomEditor(typeof(RingChart), false)] + public class RingChartEditor : BaseChartEditor + { + protected SerializedProperty m_Radar; + protected SerializedProperty m_Radars; + + protected override void OnEnable() + { + base.OnEnable(); + m_Target = (RingChart)target; + } + } +} \ No newline at end of file diff --git a/Editor/RingChartEditor.cs.meta b/Editor/RingChartEditor.cs.meta new file mode 100644 index 00000000..8f4abfc9 --- /dev/null +++ b/Editor/RingChartEditor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f61a72b23edc44f48884d4989b04c509 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Runtime/GaugeChart.cs b/Runtime/GaugeChart.cs index beed6897..1593313c 100644 --- a/Runtime/GaugeChart.cs +++ b/Runtime/GaugeChart.cs @@ -93,6 +93,7 @@ namespace XCharts var serieLabel = serie.gaugeAxis.axisLabel; serie.gaugeAxis.ClearLabelObject(); + serie.UpdateCenter(chartWidth, chartHeight); var count = serie.splitNumber > 36 ? 36 : (serie.splitNumber + 1); var startAngle = serie.startAngle; for (int j = 0; j < count; j++) @@ -146,7 +147,6 @@ namespace XCharts DrawPointer(vh, serie, currAngle); TitleStyleHelper.CheckTitle(serie, ref m_ReinitTitle, ref m_UpdateTitleText); SerieLabelHelper.CheckLabel(serie, ref m_ReinitLabel, ref m_UpdateLabelText); - CheckAnimation(serie); if (!serie.animation.IsFinish()) { diff --git a/Runtime/Internal/BaseChart.cs b/Runtime/Internal/BaseChart.cs index 8d859338..13536d61 100644 --- a/Runtime/Internal/BaseChart.cs +++ b/Runtime/Internal/BaseChart.cs @@ -370,6 +370,7 @@ namespace XCharts for (int i = 0; i < m_Series.Count; i++) { var serie = m_Series.list[i]; + serie.UpdateCenter(chartWidth, chartHeight); for (int j = 0; j < serie.data.Count; j++) { var serieData = serie.data[j]; diff --git a/Runtime/RingChart.cs b/Runtime/RingChart.cs index 9e00cb2d..ca5b7408 100644 --- a/Runtime/RingChart.cs +++ b/Runtime/RingChart.cs @@ -182,6 +182,7 @@ namespace XCharts serieData.labelPosition = serie.runtimeCenterPos + new Vector3(px2, py2); break; } + serieData.SetLabelPosition(serieData.labelPosition); } private void DrawBackground(VertexHelper vh, Serie serie, SerieData serieData, int index, float insideRadius, float outsideRadius)