# HG changeset patch # User Alys Brooks # Date 2022-07-28 08:39:33 # Node ID f09301fe0a74c90d09d9f63b31b03eff8fcd0612 # Parent 6c3cff88436ab7f26022bea94022372297bc7c12 Handle the chosen range. 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 @@ -66,10 +66,7 @@ points[i] = Num.Vector2.Add(points[i], c); } - // uint col = 0b_1111_1111_1111_0000; - // uint col = 0xFF000000; - - draw_list.AddPolyline(ref points[0], points.Length, col, ImDrawFlags.RoundCornersDefault, 1.0f); + draw_list.AddPolyline(ref points[0], points.Length, col, 0 /*ImDrawFlags.RoundCornersDefault*/, 1.0f); } public static int Scale(Num.Vector2 domain, Num.Vector2 range, int num) { @@ -224,8 +221,12 @@ var padding = 10; + var domain = new Num.Vector2(domain_min, domain_max); var range = new Num.Vector2(200 - padding, 0 + padding); - var domain = new Num.Vector2(domain_min, domain_max); + + var x_domain = new Num.Vector2((data_sets["Misc"].Count() - (int)periods), + data_sets["Misc"].Count()); + var x_range = new Num.Vector2(0 + padding, 350 - padding); foreach (var key in keys) { @@ -236,13 +237,14 @@ if (data.Count() > 0 && show) { 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(); + var data_array2 = data_array.Select((p, i) => new Num.Vector2(Scale(x_domain, x_range, i), p)).ToArray(); + DrawLine(draw_list, data_array2, color); - draw_list.AddText(data_array2.Last(), color, key); + draw_list.AddText(font, 12, data_array2.Last(), color, key); } } - ImGui.Dummy(new Num.Vector2(200, 200)); + ImGui.Dummy(new Num.Vector2(350, 200)); ImGui.End(); ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left;