diff --git a/Demo/BarChartDemo.cs b/Demo/BarChartDemo.cs index 62d3eaec..57aa7121 100644 --- a/Demo/BarChartDemo.cs +++ b/Demo/BarChartDemo.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; using UnityEngine.UI; -using xcharts; +using XCharts; public class BarChartDemo : MonoBehaviour { @@ -14,7 +14,6 @@ public class BarChartDemo : MonoBehaviour private int dataCount = 0; private BarChart bigdataChart; - void Awake() { var xchart = transform.Find("xchart"); @@ -66,7 +65,7 @@ public class BarChartDemo : MonoBehaviour for (var i = 0; i < count; i++) { - chart.XAxis.AddMultiData(time.ToString("hh:mm:ss")); + chart.XAxis.AddData(time.ToString("hh:mm:ss")); smallBaseValue = i % 30 == 0 ? UnityEngine.Random.Range(0, 700) @@ -79,7 +78,7 @@ public class BarChartDemo : MonoBehaviour //var index = i % 100; //var value = (Mathf.Sin(index / 5) * (index / 5 - 10) + index / 6) * 5; value = Mathf.Abs(value); - chart.AddMultiData(0, value); + chart.AddData(0, value); time = time.AddSeconds(1); } } diff --git a/Demo/Demo.cs b/Demo/Demo.cs index ac0ea11a..2e052e5c 100644 --- a/Demo/Demo.cs +++ b/Demo/Demo.cs @@ -1,6 +1,6 @@ using UnityEngine; using UnityEngine.UI; -using xcharts; +using XCharts; public class Demo : MonoBehaviour { diff --git a/Scripts/BarChart.cs b/Scripts/BarChart.cs index 5fac35b2..4a171c53 100644 --- a/Scripts/BarChart.cs +++ b/Scripts/BarChart.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.UI; -namespace xcharts +namespace XCharts { [System.Serializable] public class BarInfo diff --git a/Scripts/BaseAxesChart.cs b/Scripts/BaseAxesChart.cs index cc5710fe..15201095 100644 --- a/Scripts/BaseAxesChart.cs +++ b/Scripts/BaseAxesChart.cs @@ -4,7 +4,7 @@ using UnityEngine.UI; using System.Collections.Generic; using System.Text; -namespace xcharts +namespace XCharts { [System.Serializable] @@ -46,16 +46,8 @@ namespace xcharts public bool boundaryGap = true; [SerializeField] private List data; - private List multidata = new List(); - private List Data - { - get - { - if (multidata.Count > 0) return multidata; - else return data; - } - } + private List Data { get { return data; } } public void AddData(string category) { @@ -66,15 +58,6 @@ namespace xcharts data.Add(category); } - public void AddMultiData(string category) - { - if (multidata.Count >= maxSplitNumber && maxSplitNumber != 0) - { - multidata.RemoveAt(0); - } - multidata.Add(category); - } - public string GetData(int index) { return Data[index]; diff --git a/Scripts/BaseChart.cs b/Scripts/BaseChart.cs index d3943ff8..ef3b2244 100644 --- a/Scripts/BaseChart.cs +++ b/Scripts/BaseChart.cs @@ -2,7 +2,7 @@ using UnityEngine.UI; using System.Collections.Generic; -namespace xcharts +namespace XCharts { [System.Serializable] public enum ChartType @@ -174,11 +174,10 @@ namespace xcharts public int showDataNumber = 0; [SerializeField] private List dataList = new List(); - private List multiDataList = new List(); public List DataList { - get { return multiDataList.Count > 0 ? multiDataList : dataList; } + get { return dataList; } } public float Max @@ -219,15 +218,6 @@ namespace xcharts dataList.Add(value); } - public void AddMultiData(float value) - { - if (multiDataList.Count >= showDataNumber && showDataNumber != 0) - { - multiDataList.RemoveAt(0); - } - multiDataList.Add(value); - } - public float GetData(int index) { if (index >= 0 && index <= DataList.Count - 1) @@ -244,14 +234,6 @@ namespace xcharts dataList[index] = value; } } - - public void UpdateMultiData(int index, float value) - { - if (index >= 0 && index <= multiDataList.Count - 1) - { - multiDataList[index] = value; - } - } } public class BaseChart : MaskableGraphic @@ -259,18 +241,13 @@ namespace xcharts private const string TILTE_TEXT = "title"; private const string SUB_TILTE_TEXT = "sub_title"; private const string LEGEND_TEXT = "legend"; - [SerializeField] - protected Theme theme = Theme.Dark; - [SerializeField] - protected ThemeInfo themeInfo = new ThemeInfo(); - [SerializeField] - protected Title title = new Title(); - [SerializeField] - protected Legend legend = new Legend(); - [SerializeField] - protected Tooltip tooltip = new Tooltip(); - [SerializeField] - protected List seriesList = new List(); + + [SerializeField] protected Theme theme = Theme.Dark; + [SerializeField] protected ThemeInfo themeInfo = new ThemeInfo(); + [SerializeField] protected Title title = new Title(); + [SerializeField] protected Legend legend = new Legend(); + [SerializeField] protected Tooltip tooltip = new Tooltip(); + [SerializeField] protected List seriesList = new List(); private Theme checkTheme = 0; private Title checkTitle = new Title(); @@ -326,29 +303,11 @@ namespace xcharts RefreshChart(); } - public void AddMultiData(string legend, float value) - { - for (int i = 0; i < seriesList.Count; i++) - { - if (seriesList[i].name.Equals(legend)) - { - seriesList[i].AddMultiData(value); - break; - } - } - RefreshChart(); - } - public void AddData(int legend,float value) { seriesList[legend].AddData(value); } - public void AddMultiData(int legend, float value) - { - seriesList[legend].AddMultiData(value); - } - public void UpdateData(string legend, float value, int dataIndex = 0) { for (int i = 0; i < seriesList.Count; i++) @@ -375,32 +334,6 @@ namespace xcharts RefreshChart(); } - public void UpdateMultiData(string legend, float value, int dataIndex = 0) - { - for (int i = 0; i < seriesList.Count; i++) - { - if (seriesList[i].name.Equals(legend)) - { - seriesList[i].UpdateMultiData(dataIndex, value); - break; - } - } - RefreshChart(); - } - - public void UpdateMultiData(int legendIndex, float value, int dataIndex = 0) - { - for (int i = 0; i < seriesList.Count; i++) - { - if (i == legendIndex) - { - seriesList[i].UpdateMultiData(dataIndex, value); - break; - } - } - RefreshChart(); - } - public void UpdateTheme(Theme theme) { this.theme = theme; diff --git a/Scripts/ChartTheme.cs b/Scripts/ChartTheme.cs index 981140f5..5d5fa4b6 100644 --- a/Scripts/ChartTheme.cs +++ b/Scripts/ChartTheme.cs @@ -1,7 +1,7 @@ using UnityEngine; using System.Collections; -namespace xcharts +namespace XCharts { [System.Serializable] public enum Theme diff --git a/Scripts/ChartUtils.cs b/Scripts/ChartUtils.cs index 01c788f8..bc95bbdc 100644 --- a/Scripts/ChartUtils.cs +++ b/Scripts/ChartUtils.cs @@ -2,7 +2,7 @@ using UnityEngine; using UnityEngine.UI; -namespace xcharts +namespace XCharts { public static class ChartUtils { diff --git a/Scripts/LineChart.cs b/Scripts/LineChart.cs index 84380858..1fb372ac 100644 --- a/Scripts/LineChart.cs +++ b/Scripts/LineChart.cs @@ -1,7 +1,7 @@ using UnityEngine; using UnityEngine.UI; -namespace xcharts +namespace XCharts { [System.Serializable] public class LineInfo diff --git a/Scripts/PieChart.cs b/Scripts/PieChart.cs index a7a36297..92a541a0 100644 --- a/Scripts/PieChart.cs +++ b/Scripts/PieChart.cs @@ -3,7 +3,7 @@ using System.Text; using UnityEngine; using UnityEngine.UI; -namespace xcharts +namespace XCharts { [System.Serializable] public class PieInfo diff --git a/Scripts/RadarChart.cs b/Scripts/RadarChart.cs index f6089bfb..dcee759e 100644 --- a/Scripts/RadarChart.cs +++ b/Scripts/RadarChart.cs @@ -3,7 +3,7 @@ using System.Text; using UnityEngine; using UnityEngine.UI; -namespace xcharts +namespace XCharts { [System.Serializable] public class RadarIndicator