diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index e4e5e6e9b..4dce5ec3a 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -35,7 +35,7 @@ namespace mbts.spark { readonly CellProperty _working_bids_text, _working_asks_text; readonly MyOrderSummarizer _order_summarizer = new MyOrderSummarizer(); readonly MDDisplayHelper.SizeFormatter _size_formatter = MDDisplayHelper.get_formatter(MarketSizeDisplay.get_default()); - uint _bid_direct_size, _bid_merged_size, _ask_direct_size, _ask_merged_size; + Property _bid_direct_size, _bid_merged_size, _ask_direct_size, _ask_merged_size; string _bid_merged_size_text, _ask_merged_size_text; ulong _bbo_ref, _last_ref; @@ -60,6 +60,11 @@ namespace mbts.spark { _working_bid_volume = new CellProperty(this, nameof(working_bid_volume)); _working_ask_volume = new CellProperty(this, nameof(working_ask_volume)); // + _bid_direct_size = backing(nameof(bid_direct_size), default(uint)); + _bid_merged_size = backing(nameof(bid_merged_size), default(uint)); + _ask_direct_size = backing(nameof(ask_direct_size), default(uint)); + _ask_merged_size = backing(nameof(ask_merged_size), default(uint)); + // _working_orders = new ObservableFilterCollection(_orders, o => o.is_active()); _working_bids = new ObservableFilterCollection(_working_orders, o => o.Def.Side == Side.Buy); _working_asks = new ObservableFilterCollection(_working_orders, o => o.Def.Side == Side.Sell); @@ -100,15 +105,15 @@ namespace mbts.spark { public double last_price => _last_price.Value; public uint last_size => _last_size.value; public double bid_price => _bid_price.Value; - public uint bid_direct_size => _bid_direct_size; - public uint bid_implied_size => _bid_merged_size - _bid_direct_size; - public uint bid_merged_size => _bid_merged_size; - public string bid_merged_size_text => _bid_merged_size_text ?? (_bid_merged_size_text = _size_formatter(_bid_merged_size, bid_implied_size)); + public uint bid_direct_size => _bid_direct_size.Value; + public uint bid_implied_size => _bid_merged_size.Value - _bid_direct_size.Value; + public uint bid_merged_size => _bid_merged_size.Value; + public string bid_merged_size_text => _bid_merged_size_text ?? (_bid_merged_size_text = _size_formatter(_bid_merged_size.Value, bid_implied_size)); public double ask_price => _ask_price.Value; - public uint ask_direct_size => _ask_direct_size; - public uint ask_implied_size => _ask_merged_size - _ask_direct_size; - public uint ask_merged_size => _ask_merged_size; - public string ask_merged_size_text => _ask_merged_size_text ?? (_ask_merged_size_text = _size_formatter(_ask_merged_size, ask_implied_size)); + public uint ask_direct_size => _ask_direct_size.Value; + public uint ask_implied_size => _ask_merged_size.Value - _ask_direct_size.Value; + public uint ask_merged_size => _ask_merged_size.Value; + public string ask_merged_size_text => _ask_merged_size_text ?? (_ask_merged_size_text = _size_formatter(_ask_merged_size.Value, ask_implied_size)); public ulong volume => _volume.value; public double settlement => _settlement.Value; public double day_change => _day_change.Value; @@ -144,9 +149,9 @@ namespace mbts.spark { bool dirty = false; if (md.md.get_bbo(ref _bbo_ref, out NativePriceSize b, out NativePriceSize a)) { _bid_price.set(b.price); - refresh_size(ref b, ref _bid_direct_size, ref _bid_merged_size, ref _bid_merged_size_text, nameof(bid_merged_size_text)); + refresh_size(ref b, _bid_direct_size, _bid_merged_size, ref _bid_merged_size_text, nameof(bid_merged_size_text)); _ask_price.set(a.price); - refresh_size(ref a, ref _ask_direct_size, ref _ask_merged_size, ref _ask_merged_size_text, nameof(ask_merged_size_text)); + refresh_size(ref a, _ask_direct_size, _ask_merged_size, ref _ask_merged_size_text, nameof(ask_merged_size_text)); _inside_bids.on_next_distinct(_bid_price.Value >= _working_best_bid.value, ref dirty); _inside_asks.on_next_distinct(_ask_price.Value <= _working_best_ask.value, ref dirty); } @@ -162,10 +167,10 @@ namespace mbts.spark { if (dirty) invalidated?.Invoke(); - void refresh_size(ref NativePriceSize nps, ref uint direct, ref uint merged, ref string text, string text_prop) { - if (nps.size != merged || nps.direct_size != direct) { - merged = nps.size; - direct = nps.direct_size; + void refresh_size(ref NativePriceSize nps, Property direct, Property merged, ref string text, string text_prop) { + if (nps.size != merged.Value || nps.direct_size != direct.Value) { + merged.set(nps.size); + direct.set(nps.direct_size); text = null; dirty = true; RaisePropertyChanged(text_prop); @@ -267,32 +272,11 @@ namespace mbts.spark { _inside_bids.on_next_distinct(_order_summarizer.best_working_bid >= bid_price, ref dirty); _inside_asks.on_next_distinct(_order_summarizer.best_working_ask <= ask_price, ref dirty); - // Here we need to RaisePropertyChanged for the non-Property/CellProperty<> cols that are bound to a filter - // (Property and CellProperty implement INotifyPropretyChanged and/or IRaiseNotifyPropertyChanged, so this is taken care of for us autmagically) - // This is so that when the data changes behind the filter, the filter runs again for evaulation - // on whether to show or hide the row RaisePropertyChanged( - nameof(security), - // volume is a CellProperty<> - // last price is a Property<> - // last_size is a CellProperty<> - // position is a CellProperty<> - // working_bid_volume is a CellProperty<> - nameof(bid_implied_size), - nameof(bid_direct_size), - nameof(bid_merged_size), - // bid price is a Property<> - // ask price is a Property<> - nameof(ask_merged_size), - nameof(ask_direct_size), - nameof(ask_implied_size), - // working_ask_volume is a CellProperty - // setlltement is a Property<> - // change is a Property<> - // low is a Property<> - // high is a Property<> - nameof(security_key), - + // Implied might not be ever set, so it probably does not RaisePropertyChanged either + // This might be part of the filter funk? + //nameof(bid_implied_size), + //nameof(ask_implied_size), nameof(working_bids_text), nameof(working_asks_text) );