From 04e0297e867749adbc2e28dd582f4e53a3bbee8a Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 31 Jul 2023 14:50:44 -0400 Subject: [PATCH] refactor: Simplify 'render_piq' by using common code No need to re-invent the 'render_cells' wheel --- .../Trading/Ladder/View/LadderGridHost.cs | 2 +- .../Trading/Ladder/View/LadderRender.cs | 34 ++++--------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs index bd98f16f9..75bed40e5 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs @@ -1281,7 +1281,7 @@ namespace mbts.spark { if (!_settings.piq_column.show) return; int origin_index = LadderRender.index_of(_price_list, _mkt_break_lines.origin, _price_comparer); - LadderRender.render_piqs(_piq_vis_tup.visual, _last_vis_tup.glyph_context, origin_index, _price_list, _vm.price_vs_piq, _settings.row_height, _spec, _settings.piq_column, _fmt_mkt_quantity); + LadderRender.render_piqs(_piq_vis_tup.visual, _last_vis_tup.glyph_context, _price_list, _vm.price_vs_piq, _settings.row_height, _spec, _settings.piq_column, _fmt_mkt_quantity); } void _refresh_sizes() { diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs index 88fee8cf5..4b39b9e62 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs @@ -407,38 +407,18 @@ namespace mbts.spark { internal static void render_piqs( DrawingVisual dv, GlyphContext glyph_context, - int origin_index, IList prices, IEnumerable<(double price, uint piq)> pvp, double row_height, RegionalTickFactors spec, LadderColumnSettings settings, - Func fmt_value) { - // - using (var dc = dv.RenderOpen()) { - using (_draw_with_clip(dc, settings, row_height, prices.Count)) { - if (!prices.within_range(origin_index) || pvp.is_null_or_empty()) - return; - if (fmt_value is null) - fmt_value = FormattingDelegates.default_string(); - var foreground = settings.foreground.rgb_brush(); - int curr_index = origin_index; - double curr_price = prices[curr_index]; - foreach (var entry in pvp) { - double price = entry.price; - // prices are in descending order, so get diff from curr_price - price - var tick_diff = spec.tickdiff(curr_price, price).assert_value(); - checked { - curr_index += (int)tick_diff; - } - curr_price = price; - if (curr_index >= 0 && curr_index < prices.Count) { - var gr = format_text(fmt_value(entry.piq), curr_index, row_height, settings, glyph_context); - dc.DrawGlyphRun(foreground, gr); - } else break; - } - } - } + Func fmt_value + ) { + fmt_value ??= FormattingDelegates.default_string(); + var fg = settings.foreground.rgb_brush(); + _render_cells(dv, row_height, pvp, settings, prices, spec, (dc, row, piq) => + dc.DrawGlyphRun( + fg, format_text(fmt_value(piq), row, row_height, settings, glyph_context))); } public static void render_mkt_break(DrawingVisual dv, int index, double row_height, uint color) =>