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

优化Log对数轴

Browse Source
This commit is contained in:
monitor1394
2023-10-19 23:06:26 +08:00
parent 6b931497ab
commit 68d5bc36d6
3 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Component/Axis/Axis.cs
View File

@@ -828,6 +828,8 @@ namespace XCharts.Runtime
public double GetLogMinIndex() public double GetLogMinIndex()
{ {
if (context.minValue <= 0 || context.minValue == 1)
return 0;
return logBaseE ? return logBaseE ?
Math.Log(context.minValue) : Math.Log(context.minValue) :
Math.Log(context.minValue, logBase); Math.Log(context.minValue, logBase);
@@ -835,6 +837,8 @@ namespace XCharts.Runtime
public double GetLogMaxIndex() public double GetLogMaxIndex()
{ {
if (context.maxValue <= 0 || context.maxValue == 1)
return 0;
return logBaseE ? return logBaseE ?
Math.Log(context.maxValue) : Math.Log(context.maxValue) :
Math.Log(context.maxValue, logBase); Math.Log(context.maxValue, logBase);

3
Runtime/Component/Axis/AxisHelper.cs
View File

@@ -344,7 +344,8 @@ namespace XCharts.Runtime
int maxSplit = 0; int maxSplit = 0;
maxValue = ChartHelper.GetMaxLogValue(maxValue, axis.logBase, axis.logBaseE, out maxSplit); maxValue = ChartHelper.GetMaxLogValue(maxValue, axis.logBase, axis.logBaseE, out maxSplit);
minValue = ChartHelper.GetMinLogValue(minValue, axis.logBase, axis.logBaseE, out minSplit); minValue = ChartHelper.GetMinLogValue(minValue, axis.logBase, axis.logBaseE, out minSplit);
var splitNumber = (minSplit > 0 && maxSplit > 0) ? (maxSplit + minSplit - 1) : (maxSplit + minSplit);
var splitNumber = maxSplit + minSplit;
if (splitNumber > 15) if (splitNumber > 15)
splitNumber = 15; splitNumber = 15;
axis.splitNumber = splitNumber; axis.splitNumber = splitNumber;

29
Runtime/Internal/Utilities/ChartHelper.cs
View File

@@ -682,7 +682,7 @@ namespace XCharts.Runtime
public static double GetMaxDivisibleValue(double max, double ceilRate) public static double GetMaxDivisibleValue(double max, double ceilRate)
{ {
if (max == 0) return 0; if (max == 0) return 0;
double pow = 1; double pow = 1;
if (max > -1 && max < 1) if (max > -1 && max < 1)
{ {
pow = Mathf.Pow(10, MathUtil.GetPrecision(max)); pow = Mathf.Pow(10, MathUtil.GetPrecision(max));
@@ -739,7 +739,7 @@ namespace XCharts.Runtime
public static double GetMinDivisibleValue(double min, double ceilRate) public static double GetMinDivisibleValue(double min, double ceilRate)
{ {
if (min == 0) return 0; if (min == 0) return 0;
double pow = 1; double pow = 1;
if (min > -1 && min < 1) if (min > -1 && min < 1)
{ {
pow = Mathf.Pow(10, MathUtil.GetPrecision(min)); pow = Mathf.Pow(10, MathUtil.GetPrecision(min));
@@ -770,20 +770,13 @@ namespace XCharts.Runtime
public static double GetMaxLogValue(double value, float logBase, bool isLogBaseE, out int splitNumber) public static double GetMaxLogValue(double value, float logBase, bool isLogBaseE, out int splitNumber)
{ {
splitNumber = 0; splitNumber = 1;
if (value <= 0) return 0; if (value <= 0) return 0;
double max = 0; double max = isLogBaseE ? Math.Exp(splitNumber) : Math.Pow(logBase, splitNumber);
while (max < value) while (max < value)
{ {
if (isLogBaseE)
{
max = Math.Exp(splitNumber);
}
else
{
max = Math.Pow(logBase, splitNumber);
}
splitNumber++; splitNumber++;
max = isLogBaseE ? Math.Exp(splitNumber) : Math.Pow(logBase, splitNumber);
} }
return max; return max;
} }
@@ -791,19 +784,13 @@ namespace XCharts.Runtime
public static double GetMinLogValue(double value, float logBase, bool isLogBaseE, out int splitNumber) public static double GetMinLogValue(double value, float logBase, bool isLogBaseE, out int splitNumber)
{ {
splitNumber = 0; splitNumber = 0;
if (value <= 0) return 0;
if (value > 1) return 1; if (value > 1) return 1;
double min = 1; double min = isLogBaseE ? Math.Exp(-splitNumber) : Math.Pow(logBase, -splitNumber);
while (min > value) while (min > value)
{ {
if (isLogBaseE)
{
min = Math.Exp(-splitNumber);
}
else
{
min = Math.Pow(logBase, -splitNumber);
}
splitNumber++; splitNumber++;
min = isLogBaseE ? Math.Exp(-splitNumber) : Math.Pow(logBase, -splitNumber);
} }
return min; return min;
} }