diff --git a/Demo/Scripts/Demo12_CustomDrawing.cs b/Demo/Scripts/Demo12_CustomDrawing.cs index 6ce4a302..03b5e0b0 100644 --- a/Demo/Scripts/Demo12_CustomDrawing.cs +++ b/Demo/Scripts/Demo12_CustomDrawing.cs @@ -20,7 +20,7 @@ public class Demo12_CustomDrawing : MonoBehaviour var pos = dataPoints[3]; var zeroPos = new Vector3(chart.coordinateX, chart.coordinateY); var startPos = new Vector3(pos.x, zeroPos.y); - var endPos = new Vector3(pos.x, zeroPos.y + chart.coordinateHig); + var endPos = new Vector3(pos.x, zeroPos.y + chart.coordinateHeight); ChartDrawer.DrawLine(vh, startPos, endPos, 1, Color.blue); ChartDrawer.DrawCricle(vh,pos,5,Color.blue); } diff --git a/Demo/Scripts/Demo60_Heatmap.cs b/Demo/Scripts/Demo60_Heatmap.cs index 499dc9ef..3c63ab56 100644 --- a/Demo/Scripts/Demo60_Heatmap.cs +++ b/Demo/Scripts/Demo60_Heatmap.cs @@ -60,8 +60,8 @@ public class Demo60_Heatmap : MonoBehaviour chart.visualMap.inRange.Clear(); var heatmapGridWid = 10f; - int xSplitNumber = (int)(chart.coordinateWid / heatmapGridWid); - int ySplitNumber = (int)(chart.coordinateHig / heatmapGridWid); + int xSplitNumber = (int)(chart.coordinateWidth / heatmapGridWid); + int ySplitNumber = (int)(chart.coordinateHeight / heatmapGridWid); var colors = new List{"#313695", "#4575b4", "#74add1", "#abd9e9", "#e0f3f8", "#ffffbf", "#fee090", "#fdae61", "#f46d43", "#d73027", "#a50026"}; foreach (var str in colors) diff --git a/Scripts/UI/API/BaseChart_API.cs b/Scripts/UI/API/BaseChart_API.cs index d009d76e..b5703eb5 100644 --- a/Scripts/UI/API/BaseChart_API.cs +++ b/Scripts/UI/API/BaseChart_API.cs @@ -383,7 +383,7 @@ namespace XCharts m_RefreshChart = true; } - [Obsolete("rename. use RefreshLabel() instead.", true)] + [Obsolete("Use BaseChart.RefreshLabel() instead.", true)] public void ReinitChartLabel() { RefreshLabel(); diff --git a/Scripts/UI/API/CoordinateChart_API.cs b/Scripts/UI/API/CoordinateChart_API.cs index ebc9308b..c0cf3430 100644 --- a/Scripts/UI/API/CoordinateChart_API.cs +++ b/Scripts/UI/API/CoordinateChart_API.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using UnityEngine; namespace XCharts @@ -20,16 +21,23 @@ namespace XCharts /// 坐标系的左下角坐标Y。 /// public float coordinateY { get { return m_Grid.bottom; } } + + [Obsolete("Use CoordinateChart.coordinateWidth instead.", true)] + public float coordinateWid { get { return coordinateWidth; } } + + [Obsolete("Use CoordinateChart.coordinateHeight instead.", true)] + public float coordinateHig { get { return coordinateHeight; } } + /// /// the width of coordinate system。 /// 坐标系的宽。 /// - public float coordinateWid { get { return chartWidth - m_Grid.left - m_Grid.right; } } + public float coordinateWidth { get { return chartWidth - m_Grid.left - m_Grid.right; } } /// /// the height of coordinate system。 /// 坐标系的高。 /// - public float coordinateHig { get { return chartHeight - m_Grid.top - m_Grid.bottom; } } + public float coordinateHeight { get { return chartHeight - m_Grid.top - m_Grid.bottom; } } /// /// grid component. /// 网格组件。 @@ -162,8 +170,8 @@ namespace XCharts public bool IsInCooridate(Vector2 local) { - if (local.x < coordinateX - 1 || local.x > coordinateX + coordinateWid + 1 || - local.y < coordinateY - 1 || local.y > coordinateY + coordinateHig + 1) + if (local.x < coordinateX - 1 || local.x > coordinateX + coordinateWidth + 1 || + local.y < coordinateY - 1 || local.y > coordinateY + coordinateHeight + 1) { return false; } diff --git a/Scripts/UI/Component/Main/Series.cs b/Scripts/UI/Component/Main/Series.cs index 497d3c77..c52d17c8 100644 --- a/Scripts/UI/Component/Main/Series.cs +++ b/Scripts/UI/Component/Main/Series.cs @@ -14,25 +14,18 @@ namespace XCharts [SerializeField] protected List m_Series; - /// - /// the list of serie - /// 系列列表。 - /// - /// - [Obsolete("Use series.list instead.", true)] + [Obsolete("Use Series.list instead.", true)] public List series { get { return m_Series; } } /// /// the list of serie /// 系列列表。 /// - /// public List list { get { return m_Series; } } /// /// the size of serie list. /// 系列个数。 /// - /// public int Count { get { return m_Series.Count; } } public static Series defaultSeries diff --git a/Scripts/UI/HeatmapChart.cs b/Scripts/UI/HeatmapChart.cs index cd368f11..1414fb74 100644 --- a/Scripts/UI/HeatmapChart.cs +++ b/Scripts/UI/HeatmapChart.cs @@ -30,8 +30,8 @@ namespace XCharts RemoveData(); var serie = AddSerie(SerieType.Heatmap, "serie1"); var heatmapGridWid = 10f; - int xSplitNumber = (int)(coordinateWid / heatmapGridWid); - int ySplitNumber = (int)(coordinateHig / heatmapGridWid); + int xSplitNumber = (int)(coordinateWidth / heatmapGridWid); + int ySplitNumber = (int)(coordinateHeight / heatmapGridWid); serie.itemStyle.show = true; serie.itemStyle.borderWidth = 1; serie.itemStyle.borderColor = Color.clear; diff --git a/Scripts/UI/Internal/CoordinateChart.cs b/Scripts/UI/Internal/CoordinateChart.cs index cc169587..6bc94260 100644 --- a/Scripts/UI/Internal/CoordinateChart.cs +++ b/Scripts/UI/Internal/CoordinateChart.cs @@ -146,8 +146,8 @@ namespace XCharts if (!xAxis.show && !yAxis.show) continue; if (isCartesian && xAxis.show && yAxis.show) { - var yRate = (yAxis.maxValue - yAxis.minValue) / coordinateHig; - var xRate = (xAxis.maxValue - xAxis.minValue) / coordinateWid; + var yRate = (yAxis.maxValue - yAxis.minValue) / coordinateHeight; + var xRate = (xAxis.maxValue - xAxis.minValue) / coordinateWidth; var yValue = yRate * (local.y - coordinateY - yAxis.zeroYOffset); if (yAxis.minValue > 0) yValue += yAxis.minValue; m_Tooltip.yValues[i] = yValue; @@ -182,7 +182,7 @@ namespace XCharts for (int j = 0; j < xAxis.GetDataNumber(m_DataZoom); j++) { - float splitWid = xAxis.GetDataWidth(coordinateWid, m_DataZoom); + float splitWid = xAxis.GetDataWidth(coordinateWidth, m_DataZoom); float pX = coordinateX + j * splitWid; if ((xAxis.boundaryGap && (local.x > pX && local.x <= pX + splitWid)) || (!xAxis.boundaryGap && (local.x > pX - splitWid / 2 && local.x <= pX + splitWid / 2))) @@ -194,7 +194,7 @@ namespace XCharts } for (int j = 0; j < yAxis.GetDataNumber(m_DataZoom); j++) { - float splitWid = yAxis.GetDataWidth(coordinateHig, m_DataZoom); + float splitWid = yAxis.GetDataWidth(coordinateHeight, m_DataZoom); float pY = coordinateY + j * splitWid; if ((yAxis.boundaryGap && (local.y > pY && local.y <= pY + splitWid)) || (!yAxis.boundaryGap && (local.y > pY - splitWid / 2 && local.y <= pY + splitWid / 2))) @@ -206,12 +206,12 @@ namespace XCharts } else if (xAxis.IsCategory()) { - var value = (yAxis.maxValue - yAxis.minValue) * (local.y - coordinateY - yAxis.zeroYOffset) / coordinateHig; + var value = (yAxis.maxValue - yAxis.minValue) * (local.y - coordinateY - yAxis.zeroYOffset) / coordinateHeight; if (yAxis.minValue > 0) value += yAxis.minValue; m_Tooltip.yValues[i] = value; for (int j = 0; j < xAxis.GetDataNumber(m_DataZoom); j++) { - float splitWid = xAxis.GetDataWidth(coordinateWid, m_DataZoom); + float splitWid = xAxis.GetDataWidth(coordinateWidth, m_DataZoom); float pX = coordinateX + j * splitWid; if ((xAxis.boundaryGap && (local.x > pX && local.x <= pX + splitWid)) || (!xAxis.boundaryGap && (local.x > pX - splitWid / 2 && local.x <= pX + splitWid / 2))) @@ -224,12 +224,12 @@ namespace XCharts } else if (yAxis.IsCategory()) { - var value = (xAxis.maxValue - xAxis.minValue) * (local.x - coordinateX - xAxis.zeroXOffset) / coordinateWid; + var value = (xAxis.maxValue - xAxis.minValue) * (local.x - coordinateX - xAxis.zeroXOffset) / coordinateWidth; if (xAxis.minValue > 0) value += xAxis.minValue; m_Tooltip.xValues[i] = value; for (int j = 0; j < yAxis.GetDataNumber(m_DataZoom); j++) { - float splitWid = yAxis.GetDataWidth(coordinateHig, m_DataZoom); + float splitWid = yAxis.GetDataWidth(coordinateHeight, m_DataZoom); float pY = coordinateY + j * splitWid; if ((yAxis.boundaryGap && (local.y > pY && local.y <= pY + splitWid)) || (!yAxis.boundaryGap && (local.y > pY - splitWid / 2 && local.y <= pY + splitWid / 2))) @@ -363,7 +363,7 @@ namespace XCharts Vector2 labelPos = Vector2.zero; if (axis is XAxis) { - var posY = axisIndex > 0 ? coordinateY + coordinateHig : coordinateY; + var posY = axisIndex > 0 ? coordinateY + coordinateHeight : coordinateY; var diff = axisIndex > 0 ? -axis.axisLabel.fontSize - axis.axisLabel.margin - 3.5f : axis.axisLabel.margin / 2 + 1; if (axis.IsValue()) { @@ -373,7 +373,7 @@ namespace XCharts else { labelText = axis.GetData((int)m_Tooltip.xValues[axisIndex], m_DataZoom); - float splitWidth = axis.GetSplitWidth(coordinateWid, m_DataZoom); + float splitWidth = axis.GetSplitWidth(coordinateWidth, m_DataZoom); int index = (int)m_Tooltip.xValues[axisIndex]; float px = coordinateX + index * splitWidth + (axis.boundaryGap ? splitWidth / 2 : 0) + 0.5f; labelPos = new Vector2(px, posY - diff); @@ -381,7 +381,7 @@ namespace XCharts } else if (axis is YAxis) { - var posX = axisIndex > 0 ? coordinateX + coordinateWid : coordinateX; + var posX = axisIndex > 0 ? coordinateX + coordinateWidth : coordinateX; var diff = axisIndex > 0 ? -axis.axisLabel.margin + 3 : axis.axisLabel.margin - 3; if (axis.IsValue()) { @@ -391,7 +391,7 @@ namespace XCharts else { labelText = axis.GetData((int)m_Tooltip.yValues[axisIndex], m_DataZoom); - float splitWidth = axis.GetSplitWidth(coordinateHig, m_DataZoom); + float splitWidth = axis.GetSplitWidth(coordinateHeight, m_DataZoom); int index = (int)m_Tooltip.yValues[axisIndex]; float py = coordinateY + index * splitWidth + (axis.boundaryGap ? splitWidth / 2 : 0); labelPos = new Vector2(posX - diff, py); @@ -458,7 +458,7 @@ namespace XCharts var labelColor = yAxis.axisLabel.color == Color.clear ? (Color)m_ThemeInfo.axisTextColor : yAxis.axisLabel.color; - int splitNumber = yAxis.GetSplitNumber(coordinateHig, m_DataZoom); + int splitNumber = yAxis.GetSplitNumber(coordinateHeight, m_DataZoom); float totalWidth = 0; for (int i = 0; i < splitNumber; i++) { @@ -478,11 +478,11 @@ namespace XCharts Vector2.zero, new Vector2(1, 0.5f), new Vector2(m_Grid.left, 20), yAxis.axisLabel.fontSize, yAxis.axisLabel.rotate, yAxis.axisLabel.fontStyle); } - float labelWidth = yAxis.GetScaleWidth(coordinateHig, i, m_DataZoom); + float labelWidth = yAxis.GetScaleWidth(coordinateHeight, i, m_DataZoom); txt.transform.localPosition = GetLabelYPosition(totalWidth + (yAxis.boundaryGap ? labelWidth / 2 : 0), i, yAxisIndex, yAxis); - txt.text = yAxis.GetLabelName(coordinateHig, i, yAxis.minValue, yAxis.maxValue, m_DataZoom); + txt.text = yAxis.GetLabelName(coordinateHeight, i, yAxis.minValue, yAxis.maxValue, m_DataZoom); txt.gameObject.SetActive(yAxis.show && (yAxis.axisLabel.interval == 0 || i % (yAxis.axisLabel.interval + 1) == 0)); yAxis.axisLabelTextList.Add(txt); @@ -504,7 +504,7 @@ namespace XCharts new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new Vector2(100, 20), fontSize, yAxis.axisName.rotate, yAxis.axisName.fontStyle); axisName.transform.localPosition = yAxisIndex > 0 ? - new Vector2(coordinateX + coordinateWid + offset.x, coordinateY - offset.y) : + new Vector2(coordinateX + coordinateWidth + offset.x, coordinateY - offset.y) : new Vector2(zeroPos.x + offset.x, coordinateY - offset.y); break; case AxisName.Location.Middle: @@ -513,8 +513,8 @@ namespace XCharts new Vector2(1, 0.5f), new Vector2(1, 0.5f), new Vector2(100, 20), fontSize, yAxis.axisName.rotate, yAxis.axisName.fontStyle); axisName.transform.localPosition = yAxisIndex > 0 ? - new Vector2(coordinateX + coordinateWid - offset.x, coordinateY + coordinateHig / 2 + offset.y) : - new Vector2(coordinateX - offset.x, coordinateY + coordinateHig / 2 + offset.y); + new Vector2(coordinateX + coordinateWidth - offset.x, coordinateY + coordinateHeight / 2 + offset.y) : + new Vector2(coordinateX - offset.x, coordinateY + coordinateHeight / 2 + offset.y); break; case AxisName.Location.End: axisName = ChartHelper.AddTextObject(objName + "_name", axisObj.transform, @@ -522,8 +522,8 @@ namespace XCharts new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new Vector2(100, 20), fontSize, yAxis.axisName.rotate, yAxis.axisName.fontStyle); axisName.transform.localPosition = yAxisIndex > 0 ? - new Vector2(coordinateX + coordinateWid + offset.x, coordinateY + coordinateHig + offset.y) : - new Vector2(zeroPos.x + offset.x, coordinateY + coordinateHig + offset.y); + new Vector2(coordinateX + coordinateWidth + offset.x, coordinateY + coordinateHeight + offset.y) : + new Vector2(zeroPos.x + offset.x, coordinateY + coordinateHeight + offset.y); break; } axisName.text = yAxis.axisName.name; @@ -562,11 +562,11 @@ namespace XCharts var labelColor = xAxis.axisLabel.color == Color.clear ? (Color)m_ThemeInfo.axisTextColor : xAxis.axisLabel.color; - int splitNumber = xAxis.GetSplitNumber(coordinateWid, m_DataZoom); + int splitNumber = xAxis.GetSplitNumber(coordinateWidth, m_DataZoom); float totalWidth = 0; for (int i = 0; i < splitNumber; i++) { - float labelWidth = xAxis.GetScaleWidth(coordinateWid, i, m_DataZoom); + float labelWidth = xAxis.GetScaleWidth(coordinateWidth, i, m_DataZoom); bool inside = xAxis.axisLabel.inside; Text txt = ChartHelper.AddTextObject(ChartHelper.Cancat(objName, i), axisObj.transform, m_ThemeInfo.font, labelColor, TextAnchor.MiddleCenter, new Vector2(0, 1), @@ -576,7 +576,7 @@ namespace XCharts txt.transform.localPosition = GetLabelXPosition(totalWidth + (xAxis.boundaryGap ? labelWidth : labelWidth / 2), i, xAxisIndex, xAxis); totalWidth += labelWidth; - txt.text = xAxis.GetLabelName(coordinateWid, i, xAxis.minValue, xAxis.maxValue, m_DataZoom); + txt.text = xAxis.GetLabelName(coordinateWidth, i, xAxis.minValue, xAxis.maxValue, m_DataZoom); txt.gameObject.SetActive(xAxis.show && (xAxis.axisLabel.interval == 0 || i % (xAxis.axisLabel.interval + 1) == 0)); xAxis.axisLabelTextList.Add(txt); @@ -597,7 +597,7 @@ namespace XCharts new Vector2(1, 0.5f), new Vector2(1, 0.5f), new Vector2(100, 20), fontSize, xAxis.axisName.rotate, xAxis.axisName.fontStyle); axisName.transform.localPosition = xAxisIndex > 0 ? - new Vector2(zeroPos.x - offset.x, coordinateY + coordinateHig + offset.y) : + new Vector2(zeroPos.x - offset.x, coordinateY + coordinateHeight + offset.y) : new Vector2(zeroPos.x - offset.x, zeroPos.y + offset.y); break; case AxisName.Location.Middle: @@ -606,8 +606,8 @@ namespace XCharts new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new Vector2(100, 20), fontSize, xAxis.axisName.rotate, xAxis.axisName.fontStyle); axisName.transform.localPosition = xAxisIndex > 0 ? - new Vector2(coordinateX + coordinateWid / 2 + offset.x, coordinateY + coordinateHig - offset.y) : - new Vector2(coordinateX + coordinateWid / 2 + offset.x, coordinateY - offset.y); + new Vector2(coordinateX + coordinateWidth / 2 + offset.x, coordinateY + coordinateHeight - offset.y) : + new Vector2(coordinateX + coordinateWidth / 2 + offset.x, coordinateY - offset.y); break; case AxisName.Location.End: axisName = ChartHelper.AddTextObject(ChartHelper.Cancat(objName, "_name"), axisObj.transform, @@ -615,8 +615,8 @@ namespace XCharts new Vector2(0, 0.5f), new Vector2(0, 0.5f), new Vector2(100, 20), fontSize, xAxis.axisName.rotate, xAxis.axisName.fontStyle); axisName.transform.localPosition = xAxisIndex > 0 ? - new Vector2(coordinateX + coordinateWid + offset.x, coordinateY + coordinateHig + offset.y) : - new Vector2(coordinateX + coordinateWid + offset.x, zeroPos.y + offset.y); + new Vector2(coordinateX + coordinateWidth + offset.x, coordinateY + coordinateHeight + offset.y) : + new Vector2(coordinateX + coordinateWidth + offset.x, zeroPos.y + offset.y); break; } axisName.text = xAxis.axisName.name; @@ -659,7 +659,7 @@ namespace XCharts private Vector3 GetLabelYPosition(float scaleWid, int i, int yAxisIndex, YAxis yAxis) { - var startX = yAxisIndex == 0 ? coordinateX : coordinateX + coordinateWid; + var startX = yAxisIndex == 0 ? coordinateX : coordinateX + coordinateWidth; var posX = 0f; var inside = yAxis.axisLabel.inside; if ((inside && yAxisIndex == 0) || (!inside && yAxisIndex == 1)) @@ -675,7 +675,7 @@ namespace XCharts private Vector3 GetLabelXPosition(float scaleWid, int i, int xAxisIndex, XAxis xAxis) { - var startY = xAxisIndex == 0 ? coordinateY : coordinateY + coordinateHig; + var startY = xAxisIndex == 0 ? coordinateY : coordinateY + coordinateHeight; var posY = 0f; var inside = xAxis.axisLabel.inside; if ((inside && xAxisIndex == 0) || (!inside && xAxisIndex == 1)) @@ -788,17 +788,17 @@ namespace XCharts if (axis is XAxis && axis.IsValue()) { axis.zeroXOffset = axis.minValue > 0 ? 0 : - axis.maxValue < 0 ? coordinateWid : - Mathf.Abs(axis.minValue) * (coordinateWid / (Mathf.Abs(axis.minValue) + Mathf.Abs(axis.maxValue))); + axis.maxValue < 0 ? this.coordinateWidth : + Mathf.Abs(axis.minValue) * (this.coordinateWidth / (Mathf.Abs(axis.minValue) + Mathf.Abs(axis.maxValue))); } if (axis is YAxis && axis.IsValue()) { axis.zeroYOffset = axis.minValue > 0 ? 0 : - axis.maxValue < 0 ? coordinateHig : - Mathf.Abs(axis.minValue) * (coordinateHig / (Mathf.Abs(axis.minValue) + Mathf.Abs(axis.maxValue))); + axis.maxValue < 0 ? coordinateHeight : + Mathf.Abs(axis.minValue) * (coordinateHeight / (Mathf.Abs(axis.minValue) + Mathf.Abs(axis.maxValue))); } } - float coordinateWidth = axis is XAxis ? coordinateWid : coordinateHig; + float coordinateWidth = axis is XAxis ? this.coordinateWidth : coordinateHeight; axis.UpdateLabelText(coordinateWidth, m_DataZoom); RefreshChart(); } @@ -853,9 +853,9 @@ namespace XCharts if (m_Grid.show && m_Grid.backgroundColor != Color.clear) { var p1 = new Vector2(coordinateX, coordinateY); - var p2 = new Vector2(coordinateX, coordinateY + coordinateHig); - var p3 = new Vector2(coordinateX + coordinateWid, coordinateY + coordinateHig); - var p4 = new Vector2(coordinateX + coordinateWid, coordinateY); + var p2 = new Vector2(coordinateX, coordinateY + coordinateHeight); + var p3 = new Vector2(coordinateX + coordinateWidth, coordinateY + coordinateHeight); + var p4 = new Vector2(coordinateX + coordinateWidth, coordinateY); ChartDrawer.DrawPolygon(vh, p1, p2, p3, p4, m_Grid.backgroundColor); } } @@ -864,13 +864,13 @@ namespace XCharts { if (yAxis.show) { - var size = yAxis.GetScaleNumber(coordinateWid, m_DataZoom); + var size = yAxis.GetScaleNumber(coordinateWidth, m_DataZoom); var totalWidth = coordinateY; var xAxis = m_XAxises[yAxisIndex]; var zeroPos = new Vector3(coordinateX + xAxis.zeroXOffset, coordinateY + yAxis.zeroYOffset); for (int i = 0; i < size; i++) { - var scaleWidth = yAxis.GetScaleWidth(coordinateHig, i, m_DataZoom); + var scaleWidth = yAxis.GetScaleWidth(coordinateHeight, i, m_DataZoom); float pX = 0; float pY = totalWidth; if (yAxis.boundaryGap && yAxis.axisTick.alignWithLabel) @@ -880,15 +880,15 @@ namespace XCharts if (yAxis.splitArea.show && i < size - 1) { ChartDrawer.DrawPolygon(vh, new Vector2(coordinateX, pY), - new Vector2(coordinateX + coordinateWid, pY), - new Vector2(coordinateX + coordinateWid, pY + scaleWidth), + new Vector2(coordinateX + coordinateWidth, pY), + new Vector2(coordinateX + coordinateWidth, pY + scaleWidth), new Vector2(coordinateX, pY + scaleWidth), yAxis.splitArea.getColor(i)); } if (yAxis.axisTick.show) { var startX = coordinateX + m_XAxises[yAxisIndex].zeroXOffset; - if (yAxis.IsValue() && yAxisIndex > 0) startX += coordinateWid; + if (yAxis.IsValue() && yAxisIndex > 0) startX += coordinateWidth; bool inside = yAxis.axisTick.inside; if ((inside && yAxisIndex == 0) || (!inside && yAxisIndex == 1)) { @@ -906,7 +906,7 @@ namespace XCharts if (!xAxis.axisLine.show || zeroPos.y != pY) { DrawSplitLine(vh, yAxis, yAxis.splitLineType, new Vector3(coordinateX, pY), - new Vector3(coordinateX + coordinateWid, pY), m_ThemeInfo.axisSplitLineColor); + new Vector3(coordinateX + coordinateWidth, pY), m_ThemeInfo.axisSplitLineColor); } } totalWidth += scaleWidth; @@ -918,13 +918,13 @@ namespace XCharts { if (xAxis.show) { - var size = xAxis.GetScaleNumber(coordinateWid, m_DataZoom); + var size = xAxis.GetScaleNumber(coordinateWidth, m_DataZoom); var totalWidth = coordinateX; var yAxis = m_YAxises[xAxisIndex]; var zeroPos = new Vector3(coordinateX, coordinateY + yAxis.zeroYOffset); for (int i = 0; i < size; i++) { - var scaleWidth = xAxis.GetScaleWidth(coordinateWid, i, m_DataZoom); + var scaleWidth = xAxis.GetScaleWidth(coordinateWidth, i, m_DataZoom); float pX = totalWidth; float pY = 0; if (xAxis.boundaryGap && xAxis.axisTick.alignWithLabel) @@ -934,15 +934,15 @@ namespace XCharts if (xAxis.splitArea.show && i < size - 1) { ChartDrawer.DrawPolygon(vh, new Vector2(pX, coordinateY), - new Vector2(pX, coordinateY + coordinateHig), - new Vector2(pX + scaleWidth, coordinateY + coordinateHig), + new Vector2(pX, coordinateY + coordinateHeight), + new Vector2(pX + scaleWidth, coordinateY + coordinateHeight), new Vector2(pX + scaleWidth, coordinateY), xAxis.splitArea.getColor(i)); } if (xAxis.axisTick.show) { var startY = coordinateY + m_YAxises[xAxisIndex].zeroYOffset; - if (xAxis.IsValue() && xAxisIndex > 0) startY += coordinateHig; + if (xAxis.IsValue() && xAxisIndex > 0) startY += coordinateHeight; bool inside = xAxis.axisTick.inside; if ((inside && xAxisIndex == 0) || (!inside && xAxisIndex == 1)) { @@ -960,7 +960,7 @@ namespace XCharts if (!yAxis.axisLine.show || zeroPos.x != pX) { DrawSplitLine(vh, xAxis, xAxis.splitLineType, new Vector3(pX, coordinateY), - new Vector3(pX, coordinateY + coordinateHig), m_ThemeInfo.axisSplitLineColor); + new Vector3(pX, coordinateY + coordinateHeight), m_ThemeInfo.axisSplitLineColor); } } totalWidth += scaleWidth; @@ -973,9 +973,9 @@ namespace XCharts if (xAxis.show && xAxis.axisLine.show) { var lineY = coordinateY + (xAxis.axisLine.onZero ? m_YAxises[xAxisIndex].zeroYOffset : 0); - if (xAxis.IsValue() && xAxisIndex > 0) lineY += coordinateHig; + if (xAxis.IsValue() && xAxisIndex > 0) lineY += coordinateHeight; var left = new Vector3(coordinateX - xAxis.axisLine.width, lineY); - var top = new Vector3(coordinateX + coordinateWid + xAxis.axisLine.width, lineY); + var top = new Vector3(coordinateX + coordinateWidth + xAxis.axisLine.width, lineY); ChartDrawer.DrawLine(vh, left, top, xAxis.axisLine.width, m_ThemeInfo.axisLineColor); if (xAxis.axisLine.symbol) { @@ -991,8 +991,8 @@ namespace XCharts if (yAxis.show && yAxis.axisLine.show) { var lineX = coordinateX + (yAxis.axisLine.onZero ? m_XAxises[yAxisIndex].zeroXOffset : 0); - if (yAxis.IsValue() && yAxisIndex > 0) lineX += coordinateWid; - var top = new Vector3(lineX, coordinateY + coordinateHig + yAxis.axisLine.width); + if (yAxis.IsValue() && yAxisIndex > 0) lineX += coordinateWidth; + var top = new Vector3(lineX, coordinateY + coordinateHeight + yAxis.axisLine.width); ChartDrawer.DrawLine(vh, new Vector3(lineX, coordinateY - yAxis.axisLine.width), top, yAxis.axisLine.width, m_ThemeInfo.axisLineColor); if (yAxis.axisLine.symbol) @@ -1010,8 +1010,8 @@ namespace XCharts var hig = m_DataZoom.GetHeight(grid.bottom); var p1 = new Vector2(coordinateX, m_DataZoom.bottom); var p2 = new Vector2(coordinateX, m_DataZoom.bottom + hig); - var p3 = new Vector2(coordinateX + coordinateWid, m_DataZoom.bottom + hig); - var p4 = new Vector2(coordinateX + coordinateWid, m_DataZoom.bottom); + var p3 = new Vector2(coordinateX + coordinateWidth, m_DataZoom.bottom + hig); + var p4 = new Vector2(coordinateX + coordinateWidth, m_DataZoom.bottom); var xAxis = xAxises[0]; ChartDrawer.DrawLine(vh, p1, p2, xAxis.axisLine.width, m_ThemeInfo.dataZoomLineColor); ChartDrawer.DrawLine(vh, p2, p3, xAxis.axisLine.width, m_ThemeInfo.dataZoomLineColor); @@ -1022,7 +1022,7 @@ namespace XCharts Serie serie = m_Series.list[0]; Axis axis = yAxises[0]; var showData = serie.GetDataList(null); - float scaleWid = coordinateWid / (showData.Count - 1); + float scaleWid = coordinateWidth / (showData.Count - 1); Vector3 lp = Vector3.zero; Vector3 np = Vector3.zero; int minValue = 0; @@ -1033,7 +1033,7 @@ namespace XCharts int rate = 1; var sampleDist = serie.sampleDist < 2 ? 2 : serie.sampleDist; var maxCount = showData.Count; - if (sampleDist > 0) rate = (int)((maxCount - serie.minShow) / (coordinateWid / sampleDist)); + if (sampleDist > 0) rate = (int)((maxCount - serie.minShow) / (coordinateWidth / sampleDist)); if (rate < 1) rate = 1; var totalAverage = serie.sampleAverage > 0 ? serie.sampleAverage : DataAverage(ref showData, serie.sampleType, serie.minShow, maxCount, rate); @@ -1062,8 +1062,8 @@ namespace XCharts switch (m_DataZoom.rangeMode) { case DataZoom.RangeMode.Percent: - var start = coordinateX + coordinateWid * m_DataZoom.start / 100; - var end = coordinateX + coordinateWid * m_DataZoom.end / 100; + var start = coordinateX + coordinateWidth * m_DataZoom.start / 100; + var end = coordinateX + coordinateWidth * m_DataZoom.end / 100; p1 = new Vector2(start, m_DataZoom.bottom); p2 = new Vector2(start, m_DataZoom.bottom + hig); p3 = new Vector2(end, m_DataZoom.bottom + hig); @@ -1108,7 +1108,7 @@ namespace XCharts var xAxis = m_XAxises[i]; var yAxis = m_YAxises[i]; if (!xAxis.show) continue; - float splitWidth = xAxis.GetDataWidth(coordinateWid, m_DataZoom); + float splitWidth = xAxis.GetDataWidth(coordinateWidth, m_DataZoom); switch (m_Tooltip.type) { case Tooltip.Type.Corss: @@ -1117,12 +1117,12 @@ namespace XCharts + (xAxis.boundaryGap ? splitWidth / 2 : 0); if (xAxis.IsValue()) pX = m_Tooltip.pointerPos.x; Vector2 sp = new Vector2(pX, coordinateY); - Vector2 ep = new Vector2(pX, coordinateY + coordinateHig); + Vector2 ep = new Vector2(pX, coordinateY + coordinateHeight); DrawSplitLine(vh, xAxis, Axis.SplitLineType.Solid, sp, ep, m_ThemeInfo.tooltipLineColor); if (m_Tooltip.type == Tooltip.Type.Corss) { sp = new Vector2(coordinateX, m_Tooltip.pointerPos.y); - ep = new Vector2(coordinateX + coordinateWid, m_Tooltip.pointerPos.y); + ep = new Vector2(coordinateX + coordinateWidth, m_Tooltip.pointerPos.y); DrawSplitLine(vh, yAxis, Axis.SplitLineType.Dashed, sp, ep, m_ThemeInfo.tooltipLineColor); } break; @@ -1131,7 +1131,7 @@ namespace XCharts pX = coordinateX + splitWidth * m_Tooltip.xValues[i] - (xAxis.boundaryGap ? 0 : splitWidth / 2); if (xAxis.IsValue()) pX = m_Tooltip.xValues[i]; - float pY = coordinateY + coordinateHig; + float pY = coordinateY + coordinateHeight; Vector3 p1 = new Vector3(pX, coordinateY); Vector3 p2 = new Vector3(pX, pY); Vector3 p3 = new Vector3(pX + tooltipSplitWid, pY); @@ -1152,7 +1152,7 @@ namespace XCharts var yAxis = m_YAxises[i]; var xAxis = m_XAxises[i]; if (!yAxis.show) continue; - float splitWidth = yAxis.GetDataWidth(coordinateHig, m_DataZoom); + float splitWidth = yAxis.GetDataWidth(coordinateHeight, m_DataZoom); switch (m_Tooltip.type) { case Tooltip.Type.Corss: @@ -1160,18 +1160,18 @@ namespace XCharts float pY = coordinateY + m_Tooltip.yValues[i] * splitWidth + (yAxis.boundaryGap ? splitWidth / 2 : 0); Vector2 sp = new Vector2(coordinateX, pY); - Vector2 ep = new Vector2(coordinateX + coordinateWid, pY); + Vector2 ep = new Vector2(coordinateX + coordinateWidth, pY); DrawSplitLine(vh, xAxis, Axis.SplitLineType.Solid, sp, ep, m_ThemeInfo.tooltipLineColor); if (m_Tooltip.type == Tooltip.Type.Corss) { sp = new Vector2(coordinateX, m_Tooltip.pointerPos.y); - ep = new Vector2(coordinateX + coordinateWid, m_Tooltip.pointerPos.y); + ep = new Vector2(coordinateX + coordinateWidth, m_Tooltip.pointerPos.y); DrawSplitLine(vh, yAxis, Axis.SplitLineType.Dashed, sp, ep, m_ThemeInfo.tooltipLineColor); } break; case Tooltip.Type.Shadow: float tooltipSplitWid = splitWidth < 1 ? 1 : splitWidth; - float pX = coordinateX + coordinateWid; + float pX = coordinateX + coordinateWidth; pY = coordinateY + splitWidth * m_Tooltip.yValues[i] - (yAxis.boundaryGap ? 0 : splitWidth / 2); Vector3 p1 = new Vector3(coordinateX, pY); @@ -1242,9 +1242,9 @@ namespace XCharts m_DataZoom.SetLabelActive(false); return; } - if (m_DataZoom.IsInSelectedZoom(local, coordinateX, coordinateWid) - || m_DataZoom.IsInStartZoom(local, coordinateX, coordinateWid) - || m_DataZoom.IsInEndZoom(local, coordinateX, coordinateWid)) + if (m_DataZoom.IsInSelectedZoom(local, coordinateX, coordinateWidth) + || m_DataZoom.IsInStartZoom(local, coordinateX, coordinateWidth) + || m_DataZoom.IsInEndZoom(local, coordinateX, coordinateWidth)) { m_DataZoom.SetLabelActive(true); RefreshDataZoomLabel(); @@ -1272,8 +1272,8 @@ namespace XCharts } InitAxisX(); } - var start = coordinateX + coordinateWid * m_DataZoom.start / 100; - var end = coordinateX + coordinateWid * m_DataZoom.end / 100; + var start = coordinateX + coordinateWidth * m_DataZoom.start / 100; + var end = coordinateX + coordinateWidth * m_DataZoom.end / 100; var hig = m_DataZoom.GetHeight(grid.bottom); m_DataZoom.startLabel.transform.localPosition = new Vector3(start - 10, m_DataZoom.bottom + hig / 2); @@ -1399,15 +1399,15 @@ namespace XCharts } if (m_DataZoom.supportSlider) { - if (m_DataZoom.IsInStartZoom(pos, coordinateX, coordinateWid)) + if (m_DataZoom.IsInStartZoom(pos, coordinateX, coordinateWidth)) { m_DataZoomStartDrag = true; } - else if (m_DataZoom.IsInEndZoom(pos, coordinateX, coordinateWid)) + else if (m_DataZoom.IsInEndZoom(pos, coordinateX, coordinateWidth)) { m_DataZoomEndDrag = true; } - else if (m_DataZoom.IsInSelectedZoom(pos, coordinateX, coordinateWid)) + else if (m_DataZoom.IsInSelectedZoom(pos, coordinateX, coordinateWidth)) { m_DataZoomDrag = true; } @@ -1419,7 +1419,7 @@ namespace XCharts { if (Input.touchCount > 1) return; float deltaX = eventData.delta.x; - float deltaPercent = deltaX / coordinateWid * 100; + float deltaPercent = deltaX / coordinateWidth * 100; OnDragInside(deltaPercent); OnDragSlider(deltaPercent); OnDragVisualMap(); @@ -1532,16 +1532,16 @@ namespace XCharts { return; } - if (m_DataZoom.IsInStartZoom(localPos, coordinateX, coordinateWid) || - m_DataZoom.IsInEndZoom(localPos, coordinateX, coordinateWid)) + if (m_DataZoom.IsInStartZoom(localPos, coordinateX, coordinateWidth) || + m_DataZoom.IsInEndZoom(localPos, coordinateX, coordinateWidth)) { return; } - if (m_DataZoom.IsInZoom(localPos, coordinateX, coordinateWid) - && !m_DataZoom.IsInSelectedZoom(localPos, coordinateX, coordinateWid)) + if (m_DataZoom.IsInZoom(localPos, coordinateX, coordinateWidth) + && !m_DataZoom.IsInSelectedZoom(localPos, coordinateX, coordinateWidth)) { var pointerX = localPos.x; - var selectWidth = coordinateWid * (m_DataZoom.end - m_DataZoom.start) / 100; + var selectWidth = coordinateWidth * (m_DataZoom.end - m_DataZoom.start) / 100; var startX = pointerX - selectWidth / 2; var endX = pointerX + selectWidth / 2; if (startX < coordinateX) @@ -1549,13 +1549,13 @@ namespace XCharts startX = coordinateX; endX = coordinateX + selectWidth; } - else if (endX > coordinateX + coordinateWid) + else if (endX > coordinateX + coordinateWidth) { - endX = coordinateX + coordinateWid; - startX = coordinateX + coordinateWid - selectWidth; + endX = coordinateX + coordinateWidth; + startX = coordinateX + coordinateWidth - selectWidth; } - m_DataZoom.start = (startX - coordinateX) / coordinateWid * 100; - m_DataZoom.end = (endX - coordinateX) / coordinateWid * 100; + m_DataZoom.start = (startX - coordinateX) / coordinateWidth * 100; + m_DataZoom.end = (endX - coordinateX) / coordinateWidth * 100; RefreshDataZoomLabel(); RefreshChart(); } @@ -1580,7 +1580,7 @@ namespace XCharts private void ScaleDataZoom(float delta) { - float deltaPercent = Mathf.Abs(delta / coordinateWid * 100); + float deltaPercent = Mathf.Abs(delta / coordinateWidth * 100); if (delta > 0) { if (m_DataZoom.end <= m_DataZoom.start) return; diff --git a/Scripts/UI/Internal/CoordinateChart_DrawBar.cs b/Scripts/UI/Internal/CoordinateChart_DrawBar.cs index 03192fab..f48446b5 100644 --- a/Scripts/UI/Internal/CoordinateChart_DrawBar.cs +++ b/Scripts/UI/Internal/CoordinateChart_DrawBar.cs @@ -16,7 +16,7 @@ namespace XCharts var yAxis = m_YAxises[serie.axisIndex]; if (!yAxis.show) yAxis = m_YAxises[(serie.axisIndex + 1) % m_YAxises.Count]; - float categoryWidth = yAxis.GetDataWidth(coordinateHig, m_DataZoom); + float categoryWidth = yAxis.GetDataWidth(coordinateHeight, m_DataZoom); float barGap = GetBarGap(); float totalBarWidth = GetBarTotalWidth(categoryWidth, barGap); float barWidth = serie.GetBarWidth(categoryWidth); @@ -46,7 +46,7 @@ namespace XCharts float pY = coordinateY + +i * categoryWidth; if (!yAxis.boundaryGap) pY -= categoryWidth / 2; float barHig = (xAxis.minValue > 0 ? value - xAxis.minValue : value) - / (xAxis.maxValue - xAxis.minValue) * coordinateWid; + / (xAxis.maxValue - xAxis.minValue) * coordinateWidth; seriesHig[i] += barHig; float currHig = CheckAnimation(serie, i, barHig); @@ -101,7 +101,7 @@ namespace XCharts var yAxis = m_YAxises[serie.axisIndex]; var xAxis = m_XAxises[serie.axisIndex]; if (!xAxis.show) xAxis = m_XAxises[(serie.axisIndex + 1) % m_XAxises.Count]; - float categoryWidth = xAxis.GetDataWidth(coordinateWid, m_DataZoom); + float categoryWidth = xAxis.GetDataWidth(coordinateWidth, m_DataZoom); float barGap = GetBarGap(); float totalBarWidth = GetBarTotalWidth(categoryWidth, barGap); float barWidth = serie.GetBarWidth(categoryWidth); @@ -131,7 +131,7 @@ namespace XCharts if (!xAxis.boundaryGap) pX -= categoryWidth / 2; float pY = seriesHig[i] + zeroY + xAxis.axisLine.width; float barHig = (yAxis.minValue > 0 ? value - yAxis.minValue : value) - / (yAxis.maxValue - yAxis.minValue) * coordinateHig; + / (yAxis.maxValue - yAxis.minValue) * coordinateHeight; seriesHig[i] += barHig; float currHig = CheckAnimation(serie, i, barHig); diff --git a/Scripts/UI/Internal/CoordinateChart_DrawHeatmap.cs b/Scripts/UI/Internal/CoordinateChart_DrawHeatmap.cs index 776d64ef..02afceee 100644 --- a/Scripts/UI/Internal/CoordinateChart_DrawHeatmap.cs +++ b/Scripts/UI/Internal/CoordinateChart_DrawHeatmap.cs @@ -120,8 +120,8 @@ namespace XCharts var xAxis = m_XAxises[serie.axisIndex]; var xCount = xAxis.data.Count; var yCount = yAxis.data.Count; - var xWidth = coordinateWid / xCount; - var yWidth = coordinateHig / yCount; + var xWidth = coordinateWidth / xCount; + var yWidth = coordinateHeight / yCount; var zeroX = coordinateX; var zeroY = coordinateY; diff --git a/Scripts/UI/Internal/CoordinateChart_DrawLine.cs b/Scripts/UI/Internal/CoordinateChart_DrawLine.cs index b2f68bf6..e90a8353 100644 --- a/Scripts/UI/Internal/CoordinateChart_DrawLine.cs +++ b/Scripts/UI/Internal/CoordinateChart_DrawLine.cs @@ -84,7 +84,7 @@ namespace XCharts var zeroPos = new Vector3(coordinateX, coordinateY + yAxis.zeroYOffset); var isStack = m_Series.IsStack(serie.stack, SerieType.Line); if (!xAxis.show) xAxis = m_XAxises[(serie.axisIndex + 1) % m_XAxises.Count]; - float scaleWid = xAxis.GetDataWidth(coordinateWid, m_DataZoom); + float scaleWid = xAxis.GetDataWidth(coordinateWidth, m_DataZoom); float startX = coordinateX + (xAxis.boundaryGap ? scaleWid / 2 : 0); int maxCount = serie.maxShow > 0 ? (serie.maxShow > showData.Count ? showData.Count : serie.maxShow) @@ -99,7 +99,7 @@ namespace XCharts } int rate = 1; var sampleDist = serie.sampleDist; - if (sampleDist > 0) rate = (int)((maxCount - serie.minShow) / (coordinateWid / sampleDist)); + if (sampleDist > 0) rate = (int)((maxCount - serie.minShow) / (coordinateWidth / sampleDist)); if (rate < 1) rate = 1; var includeLastData = false; var totalAverage = serie.sampleAverage > 0 ? serie.sampleAverage : @@ -288,9 +288,9 @@ namespace XCharts float pX = coordinateX + xAxis.axisLine.width; float pY = serieHig + coordinateY + xAxis.axisLine.width; if ((xAxis.maxValue - xAxis.minValue) <= 0) xDataHig = 0; - else xDataHig = (xValue - xAxis.minValue) / (xAxis.maxValue - xAxis.minValue) * coordinateWid; + else xDataHig = (xValue - xAxis.minValue) / (xAxis.maxValue - xAxis.minValue) * coordinateWidth; if ((yAxis.maxValue - yAxis.minValue) <= 0) yDataHig = 0; - else yDataHig = (yValue - yAxis.minValue) / (yAxis.maxValue - yAxis.minValue) * coordinateHig; + else yDataHig = (yValue - yAxis.minValue) / (yAxis.maxValue - yAxis.minValue) * coordinateHeight; np = new Vector3(pX + xDataHig, pY + yDataHig); } else @@ -298,7 +298,7 @@ namespace XCharts float pX = startX + i * scaleWid; float pY = serieHig + coordinateY + yAxis.axisLine.width; if ((yAxis.maxValue - yAxis.minValue) <= 0) yDataHig = 0; - else yDataHig = (yValue - yAxis.minValue) / (yAxis.maxValue - yAxis.minValue) * coordinateHig; + else yDataHig = (yValue - yAxis.minValue) / (yAxis.maxValue - yAxis.minValue) * coordinateHeight; np = new Vector3(pX, pY + yDataHig); } return yDataHig; @@ -323,7 +323,7 @@ namespace XCharts var zeroPos = new Vector3(coordinateX + xAxis.zeroXOffset, coordinateY); var isStack = m_Series.IsStack(serie.stack, SerieType.Line); if (!yAxis.show) yAxis = m_YAxises[(serie.axisIndex + 1) % m_YAxises.Count]; - float scaleWid = yAxis.GetDataWidth(coordinateHig, m_DataZoom); + float scaleWid = yAxis.GetDataWidth(coordinateHeight, m_DataZoom); float startY = coordinateY + (yAxis.boundaryGap ? scaleWid / 2 : 0); int maxCount = serie.maxShow > 0 ? (serie.maxShow > showData.Count ? showData.Count : serie.maxShow) @@ -338,7 +338,7 @@ namespace XCharts } int rate = 1; var sampleDist = serie.sampleDist; - if (sampleDist > 0) rate = (int)((maxCount - serie.minShow) / (coordinateWid / sampleDist)); + if (sampleDist > 0) rate = (int)((maxCount - serie.minShow) / (coordinateWidth / sampleDist)); if (rate < 1) rate = 1; for (i = serie.minShow; i < maxCount; i += rate) { @@ -349,7 +349,7 @@ namespace XCharts float value = showData[i].data[1]; float pY = startY + i * scaleWid; float pX = seriesHig[i] + coordinateX + yAxis.axisLine.width; - float dataHig = (value - xAxis.minValue) / (xAxis.maxValue - xAxis.minValue) * coordinateWid; + float dataHig = (value - xAxis.minValue) / (xAxis.maxValue - xAxis.minValue) * coordinateWidth; np = new Vector3(pX + dataHig, pY); serie.dataPoints.Add(np); seriesHig[i] += dataHig; @@ -361,7 +361,7 @@ namespace XCharts float value = showData[i].data[1]; float pY = startY + i * scaleWid; float pX = seriesHig[i] + coordinateX + yAxis.axisLine.width; - float dataHig = (value - xAxis.minValue) / (xAxis.maxValue - xAxis.minValue) * coordinateWid; + float dataHig = (value - xAxis.minValue) / (xAxis.maxValue - xAxis.minValue) * coordinateWidth; np = new Vector3(pX + dataHig, pY); serie.dataPoints.Add(np); seriesHig[i] += dataHig; @@ -647,7 +647,7 @@ namespace XCharts else { var points = ((isYAxis && lp.x < zeroPos.x) || (!isYAxis && lp.y < zeroPos.y)) ? smoothPoints : smoothDownPoints; - Vector3 aep = isYAxis ? new Vector3(zeroPos.x, zeroPos.y + coordinateHig) : new Vector3(zeroPos.x + coordinateWid, zeroPos.y); + Vector3 aep = isYAxis ? new Vector3(zeroPos.x, zeroPos.y + coordinateHeight) : new Vector3(zeroPos.x + coordinateWidth, zeroPos.y); var cross = ChartHelper.GetIntersection(points[0], points[points.Count - 1], zeroPos, aep); if (cross == Vector3.zero || smoothDownPoints.Count <= 3) { @@ -666,9 +666,9 @@ namespace XCharts var sp1 = smoothDownPoints[1]; var ep1 = smoothDownPoints[smoothDownPoints.Count - 2]; var axisUpStart = zeroPos + (isYAxis ? Vector3.right : Vector3.up) * axis.axisLine.width; - var axisUpEnd = axisUpStart + (isYAxis ? Vector3.up * coordinateHig : Vector3.right * coordinateWid); + var axisUpEnd = axisUpStart + (isYAxis ? Vector3.up * coordinateHeight : Vector3.right * coordinateWidth); var axisDownStart = zeroPos - (isYAxis ? Vector3.right : Vector3.up) * axis.axisLine.width; - var axisDownEnd = axisDownStart + (isYAxis ? Vector3.up * coordinateHig : Vector3.right * coordinateWid); + var axisDownEnd = axisDownStart + (isYAxis ? Vector3.up * coordinateHeight : Vector3.right * coordinateWidth); var luPos = ChartHelper.GetIntersection(sp1, ep1, axisUpStart, axisUpEnd); var ldPos = ChartHelper.GetIntersection(sp1, ep1, axisDownStart, axisDownEnd); sp1 = smoothPoints[1]; diff --git a/Scripts/UI/Internal/CoordinateChart_DrawScatter.cs b/Scripts/UI/Internal/CoordinateChart_DrawScatter.cs index 14ed0cdf..adf352d7 100644 --- a/Scripts/UI/Internal/CoordinateChart_DrawScatter.cs +++ b/Scripts/UI/Internal/CoordinateChart_DrawScatter.cs @@ -25,8 +25,8 @@ namespace XCharts float yValue = serieData.data[1]; float pX = coordinateX + xAxis.axisLine.width; float pY = coordinateY + yAxis.axisLine.width; - float xDataHig = (xValue - xAxis.minValue) / (xAxis.maxValue - xAxis.minValue) * coordinateWid; - float yDataHig = (yValue - yAxis.minValue) / (yAxis.maxValue - yAxis.minValue) * coordinateHig; + float xDataHig = (xValue - xAxis.minValue) / (xAxis.maxValue - xAxis.minValue) * coordinateWidth; + float yDataHig = (yValue - yAxis.minValue) / (yAxis.maxValue - yAxis.minValue) * coordinateHeight; var pos = new Vector3(pX + xDataHig, pY + yDataHig); var datas = serie.data[n].data;