Description:
Clean up style.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
@@ -76,9 +76,6 | |||||
|
76 | } |
|
76 | } |
|
77 |
|
77 | ||
|
78 | public static async void DrawLinearLabels(ImFontPtr font, ImDrawListPtr draw_list, Num.Vector2 domain, Num.Vector2 range, bool vertical, int labels, Num.Vector2 starting_position) { |
|
78 | public static async void DrawLinearLabels(ImFontPtr font, ImDrawListPtr draw_list, Num.Vector2 domain, Num.Vector2 range, bool vertical, int labels, Num.Vector2 starting_position) { |
|
79 | //probably not the best solution |
|
||
|
80 | //var normalized_range = new Num.Vector2(Math.Min(range.X, range.Y), Math.Max(range.X, range.Y)); |
|
||
|
81 |
|
|||
|
82 | var tick_spacing = (int)Math.Abs((range.Y - range.X) / labels); |
|
79 | var tick_spacing = (int)Math.Abs((range.Y - range.X) / labels); |
|
83 | var tick_length = 5; |
|
80 | var tick_length = 5; |
|
84 | var tick_adjust = vertical ? new Num.Vector2(tick_length, 0) : new Num.Vector2(0, tick_length); |
|
81 | var tick_adjust = vertical ? new Num.Vector2(tick_length, 0) : new Num.Vector2(0, tick_length); |
@@ -106,14 +103,10 | |||||
|
106 |
|
103 | ||
|
107 |
|
104 | ||
|
108 | public static void DrawLine(ImDrawListPtr draw_list, Num.Vector2 c, Num.Vector2[] points, uint col) { |
|
105 | public static void DrawLine(ImDrawListPtr draw_list, Num.Vector2 c, Num.Vector2[] points, uint col) { |
|
109 |
|
106 | var p = Num.Vector2.Zero; | |
|
110 | var p = Num.Vector2.Zero;// ImGui.GetCursorScreenPos(); |
|
||
|
111 |
|
|||
|
112 | // var points = new Num.Vector2[] { new Num.Vector2(0, 0), new Num.Vector2(25, 25), new Num.Vector2(50, 500) }; |
|
||
|
113 |
|
107 | ||
|
114 | for (int i = 0; i < points.Length; i++) |
|
108 | for (int i = 0; i < points.Length; i++) |
|
115 | { |
|
109 | { |
|
116 | // var c = ImGui.GetCursorScreenPos(); |
|
||
|
117 | points[i] = Num.Vector2.Add(points[i], c); |
|
110 | points[i] = Num.Vector2.Add(points[i], c); |
|
118 | } |
|
111 | } |
|
119 |
|
112 | ||
@@ -174,14 +167,14 | |||||
|
174 | var max = 0.0d; |
|
167 | var max = 0.0d; |
|
175 | var min = 0.0d; |
|
168 | var min = 0.0d; |
|
176 |
|
169 | ||
|
177 |
foreach( |
|
170 | foreach (var key in keys) { |
|
178 | if (data_sets_show[key] && totals.Count() > 0) { |
|
171 | if (data_sets_show[key] && totals.Count() > 0) { |
|
179 | var series_max = data_sets[key].Max() * 1.10f; |
|
172 | var series_max = data_sets[key].Max() * 1.10f; |
|
180 | max = Math.Max(series_max, max); |
|
173 | max = Math.Max(series_max, max); |
|
181 | } |
|
174 | } |
|
182 | } |
|
175 | } |
|
183 |
|
176 | ||
|
184 |
foreach( |
|
177 | foreach (var key in keys) { |
|
185 | if (data_sets_show[key] && totals.Count() > 0) { |
|
178 | if (data_sets_show[key] && totals.Count() > 0) { |
|
186 | var series_min = data_sets[key].Min(); |
|
179 | var series_min = data_sets[key].Min(); |
|
187 | series_min = series_min >= 0? series_min * 0.90f : series_min *1.10f; |
|
180 | series_min = series_min >= 0? series_min * 0.90f : series_min *1.10f; |
@@ -193,8 +186,7 | |||||
|
193 | ImPlot.PushStyleVar(ImPlotStyleVar.MinorAlpha, 0.0f); |
|
186 | ImPlot.PushStyleVar(ImPlotStyleVar.MinorAlpha, 0.0f); |
|
194 |
|
187 | ||
|
195 | ImPlot.SetNextPlotLimits(totals.Count()-periods, totals.Count(), min, max, ImGuiCond.Always); |
|
188 | ImPlot.SetNextPlotLimits(totals.Count()-periods, totals.Count(), min, max, ImGuiCond.Always); |
|
196 |
if( |
|
189 | if (ImPlot.BeginPlot("My Plot", null, null, new Num.Vector2(-1,0), ImPlotFlags.NoLegend | ImPlotFlags.NoMousePos )) { |
|
197 | // Span<double> totals = new Span<double>(new double[]{0.0, 1.0, 2.0, 9.0}); |
|
||
|
198 | foreach (var key in keys) { |
|
190 | foreach (var key in keys) { |
|
199 | var show = data_sets_show[key]; |
|
191 | var show = data_sets_show[key]; |
|
200 | var data = data_sets[key]; |
|
192 | var data = data_sets[key]; |
@@ -204,7 +196,6 | |||||
|
204 | ImPlot.PlotLine(key, ref data_array[0], data_array.Length); |
|
196 | ImPlot.PlotLine(key, ref data_array[0], data_array.Length); |
|
205 | ImPlot.AnnotateClamped(data_array.Length-1, data_array[data_array.Length-1], |
|
197 | ImPlot.AnnotateClamped(data_array.Length-1, data_array[data_array.Length-1], |
|
206 | new Num.Vector2(5, -10), StyleSets.grey, key); |
|
198 | new Num.Vector2(5, -10), StyleSets.grey, key); |
|
207 |
|
|||
|
208 | } |
|
199 | } |
|
209 | } |
|
200 | } |
|
210 |
|
201 | ||
@@ -213,7 +204,6 | |||||
|
213 |
|
204 | ||
|
214 | ImPlot.PopStyleVar(2); |
|
205 | ImPlot.PopStyleVar(2); |
|
215 |
|
206 | ||
|
216 |
|
|||
|
217 | ImGui.RadioButton("1 year", ref GraphWindow.year, 1); |
|
207 | ImGui.RadioButton("1 year", ref GraphWindow.year, 1); |
|
218 | ImGui.SameLine(); |
|
208 | ImGui.SameLine(); |
|
219 | ImGui.RadioButton("5 years", ref GraphWindow.year, 5); |
|
209 | ImGui.RadioButton("5 years", ref GraphWindow.year, 5); |
@@ -235,7 +225,6 | |||||
|
235 | { |
|
225 | { |
|
236 | ImGui.SameLine(); |
|
226 | ImGui.SameLine(); |
|
237 | } |
|
227 | } |
|
238 |
|
|||
|
239 | } |
|
228 | } |
|
240 |
|
229 | ||
|
241 | ImGui.Text("Money:"); |
|
230 | ImGui.Text("Money:"); |
@@ -274,7 +263,6 | |||||
|
274 |
|
263 | ||
|
275 | foreach (var key in keys) |
|
264 | foreach (var key in keys) |
|
276 | { |
|
265 | { |
|
277 |
|
|||
|
278 | if (data_sets_show[key] && data_sets[key].Count() > 0) |
|
266 | if (data_sets_show[key] && data_sets[key].Count() > 0) |
|
279 | { |
|
267 | { |
|
280 | domain_min = Math.Min(domain_min, (int)data_sets[key].Min()); |
|
268 | domain_min = Math.Min(domain_min, (int)data_sets[key].Min()); |
@@ -315,7 +303,6 | |||||
|
315 | ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left; |
|
303 | ImGui.GetStyle().WindowMenuButtonPosition = ImGuiDir.Left; |
|
316 | StyleSets.defaultSet.pop(); |
|
304 | StyleSets.defaultSet.pop(); |
|
317 | ImGui.PopFont(); |
|
305 | ImGui.PopFont(); |
|
318 |
|
|||
|
319 | } |
|
306 | } |
|
320 | } |
|
307 | } |
|
321 | } |
|
308 | } |
You need to be logged in to leave comments.
Login now