From 5254b7367afd73cfbc2fa2e758a23a8bd2803fc4 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 6 Jun 2018 13:52:50 -0500 Subject: [PATCH] PR suggestions; changing summary and description to backings as well since the tooltip was not changing as the lovm updated --- .../spark/view/Spark/Ladder/LadderOrderVM.cs | 19 +++++++++++-------- .../spark/view/Spark/Ladder/LadderVM.cs | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index dd255c5f5..17eb0c159 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -36,6 +36,7 @@ namespace mbts.spark { readonly Property _font_weight; readonly Property _font_size; readonly Property _foreground, _background, _hoverbackground, _border; + readonly Property _summary, _description; IObservable _bs; LadderSettings.BadgeStyle _current_badge_style; int _n_active_price_change_ops = 0; @@ -60,6 +61,8 @@ namespace mbts.spark { _background = backing(nameof(background), _color_bg_brush); _hoverbackground = backing(nameof(hoverbackground), _color_bg_brush); _border = backing(nameof(border), _color_bg_brush); + _summary = backing(nameof(summary), string.Empty); + _description = backing(nameof(description), string.Empty); FontFamily get_font_family(LadderSettings s) => new FontFamily(s.orders_column.font_family); FontWeight get_font_weight(LadderSettings s) => ui.utility.text.TextUtils.from_open_type_weight_safe(s.orders_column.font_weight); double get_font_size(LadderSettings s) => s.orders_column.font_size; @@ -97,6 +100,9 @@ namespace mbts.spark { working_quantity = _parent_and_child_not_sharing_slot().Select(order => order.working_quantity()).Sum(); quantity = _parent_and_child_not_sharing_slot().Select(order => order.State.Quantity).Sum(); + summary = _orders.Values.Select(order => order.short_description(_parent.security.ContractSpec)).Aggregate((s1, s2) => $"{s1}{Environment.NewLine}{Environment.NewLine}{s2}"); + description = _orders.Values.Select(order => order.full_description(_parent.security)).Aggregate((s1, s2) => $"{s1}{Environment.NewLine}{Environment.NewLine}{s2}"); + _set_badge_text(); } @@ -116,12 +122,10 @@ namespace mbts.spark { public void add_order(OrderRecordImmutable new_order) { _orders[new_order.Key] = new_order; - is_dirty = true; } public void remove_order(uint order_key) { _orders.Remove(order_key); - is_dirty = true; } //public void update(OrderRecordImmutable neworder) { @@ -131,7 +135,6 @@ namespace mbts.spark { // } //} - public bool is_dirty { get; private set; } public uint security_key => _parent.security.Id; public double price { get => double.IsNaN(_phantom_price) ? _real_price : _phantom_price; } public double real_price => _real_price; @@ -195,8 +198,6 @@ namespace mbts.spark { } } - public string summary => _orders.Values.Select(order => order.short_description(_parent.security.ContractSpec)).Aggregate((s1, s2) => $"{s1}{Environment.NewLine}{Environment.NewLine}{s2}"); - public string description => _orders.Values.Select(order => order.full_description(_parent.security)).Aggregate((s1, s2) => $"{s1}{Environment.NewLine}{Environment.NewLine}{s2}"); public bool has_parent => _orders.Values.Any( order => order.has_parent()); public bool has_phantom_price => !double.IsNaN(_phantom_price); @@ -213,9 +214,11 @@ namespace mbts.spark { public FontWeight font_weight => _font_weight.Value; public double font_size => _font_size.Value; public Brush foreground => _foreground.Value; - public Brush background { get; private set; } - public Brush hoverbackground { get; private set; } - public Brush border { get; private set; } + public Brush background { get => _background.Value; private set => _background.Value = value; } + public Brush hoverbackground { get => _hoverbackground.Value; private set => _hoverbackground.Value = value; } + public Brush border { get => _border.Value; private set => _border.Value = value; } + public string summary { get => _summary.Value; private set => _summary.Value = value; } + public string description { get => _description.Value; private set => _description.Value = value; } public IEnumerable orders => _orders.Values; void _cancel_order() { diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index 5fd8a4a83..2cc693f00 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -117,7 +117,7 @@ namespace mbts.spark { // update dirty brushes and text - foreach (var lovm in _slot_price_vs_orders.Values.Where(lovm => lovm.is_dirty)) { + foreach (var lovm in _slot_price_vs_orders.Values) { lovm.update(); }