diff --git a/Assets/XCharts/Demo.cs b/Assets/Demo.cs similarity index 80% rename from Assets/XCharts/Demo.cs rename to Assets/Demo.cs index 20694dbd..0a56f965 100644 --- a/Assets/XCharts/Demo.cs +++ b/Assets/Demo.cs @@ -17,13 +17,12 @@ public class Demo : MonoBehaviour var xchart = transform.Find("xchart"); GridLayoutGroup grid = xchart.GetComponent(); - RectTransform rect = xchart.GetComponent(); + RectTransform rect = transform.GetComponent(); var wid = rect.sizeDelta.x; int childNum = xchart.childCount; - int numWid =(int) ((wid - grid.padding.left - grid.padding.right) / (grid.cellSize.x+grid.spacing.x)); - int numHig = (childNum + numWid - 1) / numWid; - float hig = grid.padding.top + numHig * (grid.cellSize.y+ grid.spacing.y); + float hig = grid.padding.top + childNum * (grid.cellSize.y+ grid.spacing.y); rect.sizeDelta = new Vector2(wid,hig); + xchart.GetComponent().sizeDelta = new Vector2(wid, hig); } void Update() diff --git a/Assets/XCharts/Demo.cs.meta b/Assets/Demo.cs.meta similarity index 100% rename from Assets/XCharts/Demo.cs.meta rename to Assets/Demo.cs.meta diff --git a/Assets/XCharts/Scripts/BarChart.cs b/Assets/XCharts/Scripts/BarChart.cs index a4138549..a6ac4dfc 100644 --- a/Assets/XCharts/Scripts/BarChart.cs +++ b/Assets/XCharts/Scripts/BarChart.cs @@ -57,11 +57,11 @@ namespace xcharts } for (int i = startIndex; i < series.dataList.Count; i++) { - SeriesData data = series.dataList[i]; + float data = series.dataList[i]; float pX = zeroX + coordinate.tickness; float pY = zeroY + i * coordinateHig / (yAxis.splitNumber - 1); if (!yAxis.boundaryGap) pY -= scaleWid / 2; - float barHig = data.value / max * coordinateWid; + float barHig = data / max * coordinateWid; float space = offset + j * (barWid + barInfo.space); Vector3 p1 = new Vector3(pX, pY + space + barWid); Vector3 p2 = new Vector3(pX + barHig, pY + space + barWid); @@ -100,11 +100,11 @@ namespace xcharts } for (int i = startIndex; i < series.dataList.Count; i++) { - SeriesData data = series.dataList[i]; + float data = series.dataList[i]; float pX = zeroX + i * coordinateWid / (xAxis.splitNumber - 1); if (!xAxis.boundaryGap) pX -= scaleWid / 2; float pY = zeroY + coordinate.tickness; - float barHig = data.value / max * coordinateHig; + float barHig = data / max * coordinateHig; float space = offset + j * (barWid + barInfo.space); Vector3 p1 = new Vector3(pX + space, pY); Vector3 p2 = new Vector3(pX + space, pY + barHig); diff --git a/Assets/XCharts/Scripts/BaseAxesChart.cs b/Assets/XCharts/Scripts/BaseAxesChart.cs index 779700e9..accba7d7 100644 --- a/Assets/XCharts/Scripts/BaseAxesChart.cs +++ b/Assets/XCharts/Scripts/BaseAxesChart.cs @@ -209,7 +209,7 @@ namespace xcharts tooltip.SetActive(true); if (seriesList.Count == 1) { - string txt = tempAxis.data[index] + ": " + seriesList[0].dataList[index].value; + string txt = tempAxis.data[index] + ": " + seriesList[0].dataList[index]; tooltip.UpdateTooltipText(txt); } else @@ -218,8 +218,8 @@ namespace xcharts for(int i=0; i● ", strColor); sb.AppendFormat("{0}: {1}", key, value); diff --git a/Assets/XCharts/Scripts/BaseChart.cs b/Assets/XCharts/Scripts/BaseChart.cs index 54f388fc..a0358d7e 100644 --- a/Assets/XCharts/Scripts/BaseChart.cs +++ b/Assets/XCharts/Scripts/BaseChart.cs @@ -44,15 +44,6 @@ namespace xcharts end, } - [System.Serializable] - public class LegendData - { - public bool show = true; - public string key; - public string text; - public Button button { get; set; } - } - [System.Serializable] public class Legend { @@ -65,14 +56,58 @@ namespace xcharts public float right = 5; public float top; public float bottom; - public List dataList = new List(); + public List dataList = new List(); public int checkDataListCount { get; set; } + private List dataShowList = new List(); + private List