# HG changeset patch # User Alys Brooks # Date 2022-08-07 21:33:08 # Node ID 6fe5cb4e2f9a413aa85ad947b0e7f46361344ad8 # Parent 8265f143e6a184cf0a1878ba0050a47eb2b07b7c Clean up style. 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 @@ -76,9 +76,6 @@ } public static async void DrawLinearLabels(ImFontPtr font, ImDrawListPtr draw_list, Num.Vector2 domain, Num.Vector2 range, bool vertical, int labels, Num.Vector2 starting_position) { - //probably not the best solution - //var normalized_range = new Num.Vector2(Math.Min(range.X, range.Y), Math.Max(range.X, range.Y)); - var tick_spacing = (int)Math.Abs((range.Y - range.X) / labels); var tick_length = 5; var tick_adjust = vertical ? new Num.Vector2(tick_length, 0) : new Num.Vector2(0, tick_length); @@ -106,14 +103,10 @@ public static void DrawLine(ImDrawListPtr draw_list, Num.Vector2 c, Num.Vector2[] points, uint col) { - - var p = Num.Vector2.Zero;// ImGui.GetCursorScreenPos(); - - // var points = new Num.Vector2[] { new Num.Vector2(0, 0), new Num.Vector2(25, 25), new Num.Vector2(50, 500) }; + var p = Num.Vector2.Zero; for (int i = 0; i < points.Length; i++) { - // var c = ImGui.GetCursorScreenPos(); points[i] = Num.Vector2.Add(points[i], c); } @@ -174,14 +167,14 @@ var max = 0.0d; var min = 0.0d; - foreach( var key in keys) { + foreach (var key in keys) { if (data_sets_show[key] && totals.Count() > 0) { var series_max = data_sets[key].Max() * 1.10f; max = Math.Max(series_max, max); } } - foreach( var key in keys) { + foreach (var key in keys) { if (data_sets_show[key] && totals.Count() > 0) { var series_min = data_sets[key].Min(); series_min = series_min >= 0? series_min * 0.90f : series_min *1.10f; @@ -193,8 +186,7 @@ ImPlot.PushStyleVar(ImPlotStyleVar.MinorAlpha, 0.0f); ImPlot.SetNextPlotLimits(totals.Count()-periods, totals.Count(), min, max, ImGuiCond.Always); - if( ImPlot.BeginPlot("My Plot", null, null, new Num.Vector2(-1,0), ImPlotFlags.NoLegend | ImPlotFlags.NoMousePos )) { - // Span totals = new Span(new double[]{0.0, 1.0, 2.0, 9.0}); + if (ImPlot.BeginPlot("My Plot", null, null, new Num.Vector2(-1,0), ImPlotFlags.NoLegend | ImPlotFlags.NoMousePos )) { foreach (var key in keys) { var show = data_sets_show[key]; var data = data_sets[key]; @@ -204,7 +196,6 @@ ImPlot.PlotLine(key, ref data_array[0], data_array.Length); ImPlot.AnnotateClamped(data_array.Length-1, data_array[data_array.Length-1], new Num.Vector2(5, -10), StyleSets.grey, key); - } } @@ -213,7 +204,6 @@ ImPlot.PopStyleVar(2); - ImGui.RadioButton("1 year", ref GraphWindow.year, 1); ImGui.SameLine(); ImGui.RadioButton("5 years", ref GraphWindow.year, 5); @@ -235,7 +225,6 @@ { ImGui.SameLine(); } - } ImGui.Text("Money:"); @@ -274,7 +263,6 @@ foreach (var key in keys) { - if (data_sets_show[key] && data_sets[key].Count() > 0) { domain_min = Math.Min(domain_min, (int)data_sets[key].Min()); @@ -315,7 +303,6 @@ ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left; StyleSets.defaultSet.pop(); ImGui.PopFont(); - } } }