foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-18 06:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化Axis.minMaxType的显示

Browse Source
This commit is contained in:
monitor1394
2019-06-20 09:39:39 +08:00
parent 7fc8503714
commit 499275a93d
3 changed files with 43 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
Scripts/UI/Internal/CoordinateChart.cs
View File

@@ -376,58 +376,39 @@ namespace XCharts
{
m_Series.GetMinMaxValue(m_DataZoom, out tempMinValue, out tempMaxValue);
}
if (m_XAxis.type == Axis.AxisType.Value)
Axis axis;
if (m_XAxis.type == Axis.AxisType.Value) axis = m_XAxis;
else axis = m_YAxis;
switch (axis.minMaxType)
{
switch (m_XAxis.minMaxType)
{
case Axis.AxisMinMaxType.Default:
if (tempMinValue > 0 && tempMaxValue > 0)
{
tempMinValue = 0;
tempMaxValue = ChartHelper.GetMaxDivisibleValue(tempMaxValue);
}
else if (tempMinValue < 0 && tempMaxValue < 0)
{
tempMinValue = ChartHelper.GetMinDivisibleValue(tempMinValue);
tempMaxValue = 0;
}
break;
case Axis.AxisMinMaxType.MinMax:
case Axis.AxisMinMaxType.Default:
if (tempMinValue > 0 && tempMaxValue > 0)
{
tempMinValue = 0;
tempMaxValue = ChartHelper.GetMaxDivisibleValue(tempMaxValue);
}
else if (tempMinValue < 0 && tempMaxValue < 0)
{
tempMinValue = ChartHelper.GetMinDivisibleValue(tempMinValue);
tempMaxValue = 0;
}
else
{
tempMinValue = ChartHelper.GetMinDivisibleValue(tempMinValue);
tempMaxValue = ChartHelper.GetMaxDivisibleValue(tempMaxValue);
break;
case Axis.AxisMinMaxType.Custom:
if (m_XAxis.min != 0) tempMinValue = m_XAxis.min;
if (m_XAxis.max != 0) tempMaxValue = m_XAxis.max;
break;
}
}
else if (m_YAxis.type == Axis.AxisType.Value)
{
switch (m_YAxis.minMaxType)
{
case Axis.AxisMinMaxType.Default:
if (tempMinValue > 0 && tempMaxValue > 0)
{
tempMinValue = 0;
tempMaxValue = ChartHelper.GetMaxDivisibleValue(tempMaxValue);
}
else if (tempMinValue < 0 && tempMaxValue < 0)
{
tempMinValue = ChartHelper.GetMinDivisibleValue(tempMinValue);
tempMaxValue = 0;
}
break;
case Axis.AxisMinMaxType.MinMax:
tempMinValue = ChartHelper.GetMinDivisibleValue(tempMinValue);
tempMaxValue = ChartHelper.GetMaxDivisibleValue(tempMaxValue);
break;
case Axis.AxisMinMaxType.Custom:
if (m_YAxis.min != 0) tempMinValue = m_YAxis.min;
if (m_YAxis.max != 0) tempMaxValue = m_YAxis.max;
break;
}
}
break;
case Axis.AxisMinMaxType.MinMax:
tempMinValue = ChartHelper.GetMinDivisibleValue(tempMinValue);
tempMaxValue = ChartHelper.GetMaxDivisibleValue(tempMaxValue);
break;
case Axis.AxisMinMaxType.Custom:
if (axis.min != 0 || axis.max != 0)
{
tempMinValue = axis.min;
tempMaxValue = axis.max;
}
break;
}
if (tempMinValue != minValue || tempMaxValue != maxValue)
{
@@ -436,12 +417,14 @@ namespace XCharts
if (m_XAxis.type == Axis.AxisType.Value)
{
m_ZeroXOffset = minValue > 0 ? 0 :
maxValue < 0 ? coordinateWid :
Mathf.Abs(minValue) * (coordinateWid / (Mathf.Abs(minValue) + Mathf.Abs(maxValue)));
OnXMaxValueChanged();
}
else if (m_YAxis.type == Axis.AxisType.Value)
{
m_ZeroYOffset = minValue > 0 ? 0 :
maxValue < 0 ? coordinateHig :
Mathf.Abs(minValue) * (coordinateHig / (Mathf.Abs(minValue) + Mathf.Abs(maxValue)));
OnYMaxValueChanged();
}
@@ -468,6 +451,8 @@ namespace XCharts
protected override void OnSizeChanged()
{
base.OnSizeChanged();
minValue = 0;
maxValue = 100;
InitSplitX();
InitSplitY();
}