diff --git a/isometric-park-fna/UI/Graph.cs b/isometric-park-fna/UI/Graph.cs --- a/isometric-park-fna/UI/Graph.cs +++ b/isometric-park-fna/UI/Graph.cs @@ -50,7 +50,7 @@ public static Dictionary data_sets_color = new List() .Concat(money_series) .Concat(tree_series) - .Zip(colors) + .Zip(colors, (first, second) => (first, second)) .ToDictionary(t => t.Item1, t => t.Item2); @@ -70,7 +70,6 @@ // uint col = 0xFF000000; draw_list.AddPolyline(ref points[0], points.Length, col, ImDrawFlags.RoundCornersDefault, 1.0f); - } public static int Scale(Num.Vector2 domain, Num.Vector2 range, int num) { @@ -81,17 +80,7 @@ var start = range.X - domain.X; - - // return (int)((domain_span / range_span) * (num + start)); - - checked - { - return (int) (((num - domain.X) / domain_span) * range_span + range.X); - } - - - } @@ -242,15 +231,14 @@ { var show = data_sets_show[key]; var data = data_sets[key]; - // var domain = new Num.Vector2((int)data.Min(), (int)data.Max()); - // var data_array = datasets[key].Select((p) => Scale(domain, range, (int)p) ).Select((p,i) => new Num.Vector2(i*10, (int)p)).ToArray(); + var color = data_sets_color[key]; + if (data.Count() > 0 && show) { - // Logging.Spy(range); - // Logging.Spy(domain); IEnumerable data_array = data_sets[key].Select((p) => Scale(domain, range, (int)p)); var data_array2 = data_array.Select((p, i) => new Num.Vector2(i * 10 + padding, p)).ToArray(); - DrawLine(draw_list, data_array2, data_sets_color[key]); + DrawLine(draw_list, data_array2, color); + draw_list.AddText(data_array2.Last(), color, key); } }