[optimize][bar] bar support clip and min-max (#196)

This commit is contained in:
monitor1394
2022-05-01 10:30:58 +08:00
parent 96b0ec45d2
commit 4e4d0bc85d
8 changed files with 19 additions and 8 deletions

View File

@@ -10,6 +10,8 @@ namespace XCharts.Runtime
public Orient orient;
public float x;
public float y;
public float zeroX;
public float zeroY;
public float width;
public float height;
public Vector3 position;

View File

@@ -166,6 +166,10 @@ namespace XCharts
: (float)(Math.Abs(axis.context.minValue) * (grid.context.width
/ (Math.Abs(axis.context.minValue) + Math.Abs(axis.context.maxValue))))
);
axis.context.x = grid.context.x;
axis.context.y = grid.context.y;
axis.context.zeroY = grid.context.y;
axis.context.zeroX = grid.context.x - (float)(axis.context.minValue * grid.context.width / axis.context.minMaxRange);
}
if (grid != null && axis is YAxis && axis.IsValue())
{
@@ -176,6 +180,10 @@ namespace XCharts
: (float)(Math.Abs(axis.context.minValue) * (grid.context.height
/ (Math.Abs(axis.context.minValue) + Math.Abs(axis.context.maxValue))))
);
axis.context.x = grid.context.x;
axis.context.y = grid.context.y;
axis.context.zeroX = grid.context.x;
axis.context.zeroY = grid.context.y - (float)(axis.context.minValue * grid.context.height / axis.context.minMaxRange);
}
}
var dataZoom = chart.GetDataZoomOfAxis(axis);

View File

@@ -511,7 +511,7 @@ namespace XCharts.Runtime
}
/// <summary>
/// 获得数值value在坐标轴上对的长度
/// 获得数值value在坐标轴上对的长度
/// </summary>
/// <param name="grid"></param>
/// <param name="axis"></param>
@@ -549,10 +549,10 @@ namespace XCharts.Runtime
var yDataHig = 0f;
if (axis.context.minMaxRange != 0)
{
if (!realLength || (realLength && axis.context.minValue > 0))
yDataHig = (float)((value - axis.context.minValue) / axis.context.minMaxRange * gridHeight);
if (realLength)
yDataHig = (float)(value * gridHeight / axis.context.minMaxRange);
else
yDataHig = (float)(value / axis.context.minMaxRange * gridHeight);
yDataHig = (float)((value - axis.context.minValue) / axis.context.minMaxRange * gridHeight);
}
return includeGridXY
? gridXY + yDataHig