Cache method call results in variables in Draw of LineGraphWidget
This commit is contained in:
@@ -89,14 +89,21 @@ namespace OpenRA.Mods.Common.Widgets
|
|||||||
|
|
||||||
public override void Draw()
|
public override void Draw()
|
||||||
{
|
{
|
||||||
if (GetSeries == null || !GetSeries().Any()
|
if (GetSeries == null || GetLabelFont == null)
|
||||||
|| GetLabelFont == null || GetLabelFont() == null)
|
return;
|
||||||
|
|
||||||
|
var series = GetSeries();
|
||||||
|
if (!series.Any())
|
||||||
|
return;
|
||||||
|
|
||||||
|
var font = GetLabelFont();
|
||||||
|
if (font == null)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
var cr = Game.Renderer.RgbaColorRenderer;
|
var cr = Game.Renderer.RgbaColorRenderer;
|
||||||
var rect = RenderBounds;
|
var rect = RenderBounds;
|
||||||
|
|
||||||
var labelFont = Game.Renderer.Fonts[GetLabelFont()];
|
var labelFont = Game.Renderer.Fonts[font];
|
||||||
var axisFont = Game.Renderer.Fonts[GetAxisFont()];
|
var axisFont = Game.Renderer.Fonts[GetAxisFont()];
|
||||||
|
|
||||||
var xAxisSize = GetXAxisSize();
|
var xAxisSize = GetXAxisSize();
|
||||||
@@ -110,8 +117,8 @@ namespace OpenRA.Mods.Common.Widgets
|
|||||||
var graphBottomOffset = Padding * 2 + xAxisLabelSize.Y + xAxisPointLabelHeight;
|
var graphBottomOffset = Padding * 2 + xAxisLabelSize.Y + xAxisPointLabelHeight;
|
||||||
var height = rect.Height - (graphBottomOffset + Padding);
|
var height = rect.Height - (graphBottomOffset + Padding);
|
||||||
|
|
||||||
var maxValue = GetSeries().Select(p => p.Points).SelectMany(d => d).Concat(new[] { 0f }).Max();
|
var maxValue = series.Select(p => p.Points).SelectMany(d => d).Concat(new[] { 0f }).Max();
|
||||||
var longestName = GetSeries().Select(s => s.Key).OrderByDescending(s => s.Length).FirstOrDefault() ?? "";
|
var longestName = series.Select(s => s.Key).OrderByDescending(s => s.Length).FirstOrDefault() ?? "";
|
||||||
|
|
||||||
var scale = 200 / Math.Max(5000, (float)Math.Ceiling(maxValue / 1000) * 1000);
|
var scale = 200 / Math.Max(5000, (float)Math.Ceiling(maxValue / 1000) * 1000);
|
||||||
|
|
||||||
@@ -127,7 +134,7 @@ namespace OpenRA.Mods.Common.Widgets
|
|||||||
var xStep = width / xAxisSize;
|
var xStep = width / xAxisSize;
|
||||||
var yStep = height / yAxisSize;
|
var yStep = height / yAxisSize;
|
||||||
|
|
||||||
var pointCount = GetSeries().First().Points.Count();
|
var pointCount = series.First().Points.Count();
|
||||||
var pointStart = Math.Max(0, pointCount - xAxisSize);
|
var pointStart = Math.Max(0, pointCount - xAxisSize);
|
||||||
var pointEnd = Math.Max(pointCount, xAxisSize);
|
var pointEnd = Math.Max(pointCount, xAxisSize);
|
||||||
|
|
||||||
@@ -136,11 +143,11 @@ namespace OpenRA.Mods.Common.Widgets
|
|||||||
var origin = new float2(rect.Left, rect.Bottom);
|
var origin = new float2(rect.Left, rect.Bottom);
|
||||||
|
|
||||||
var keyOffset = 0;
|
var keyOffset = 0;
|
||||||
foreach (var series in GetSeries())
|
foreach (var s in series)
|
||||||
{
|
{
|
||||||
var key = series.Key;
|
var key = s.Key;
|
||||||
var color = series.Color;
|
var color = s.Color;
|
||||||
var points = series.Points;
|
var points = s.Points;
|
||||||
if (points.Any())
|
if (points.Any())
|
||||||
{
|
{
|
||||||
points = points.Reverse().Take(xAxisSize).Reverse();
|
points = points.Reverse().Take(xAxisSize).Reverse();
|
||||||
|
|||||||
Reference in New Issue
Block a user