diff --git a/src/client/spark/Modules/Market/MarketShellModule.cs b/src/client/spark/Modules/Market/MarketShellModule.cs index e3a314635..f2ac56a62 100644 --- a/src/client/spark/Modules/Market/MarketShellModule.cs +++ b/src/client/spark/Modules/Market/MarketShellModule.cs @@ -1,33 +1,29 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Media; -using mbts.ui; -using System.ComponentModel.Composition; -using bts.api; +using bts.api; using bts.spark; -using mbts.spark; -using mbts.ui.shell; -using static mbts.ui.shell.ProtoBufSerializationHelper; using mbts; using mbts.co2; +using mbts.ui; +using System.Collections.Generic; +using System.ComponentModel.Composition; +using System.IO; +using System.Threading.Tasks; +using System.Windows.Media; +using static mbts.ui.shell.ProtoBufSerializationHelper; namespace bts.shell { [Export(typeof(IShellModule))] - class MarketShellModule : IShellModule { + class MarketShellModule : IShellModule + { + [ImportingConstructor] + public MarketShellModule(IBus bus, MDConsumer consumer, [Import("username")]string user_name) { + _tsf = new TimeAndSalesWindowFactory(this, bus, consumer); + _mvf = new MarketViewWindowFactory(this, bus); + } + TimeAndSalesWindowFactory _tsf; MarketViewWindowFactory _mvf; - [ImportingConstructor] - public MarketShellModule(IBus bus, IWindowManager wm, MDConsumer consumer, [Import("username")]string user_name) { - _tsf = new TimeAndSalesWindowFactory(this, bus, consumer); - _mvf = new MarketViewWindowFactory(this, bus, wm); - } - #region IShellModule public ImageSource icon => Icons.Date; diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs index f6a53768e..c4cde1e3d 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs @@ -16,16 +16,6 @@ namespace mbts.spark { class MarketViewWindow : SparkWindow { - SingleValuePump _vm = new SingleValuePump(); - MarketViewWindowFactory.StartupData _state; - MarketViewModel _model; - MarketViewView _view; - MarketViewWindowFactory _factory; - IDisposable _subscriptions; - IReadOnlyDictionary _md = new Dictionary(); - - PartialCommand _criteria_callback_command; - public static async Task create(MarketViewWindowFactory factory, IBus bus, MarketViewWindowFactory.StartupData state, ImageSource icon) { var window = new MarketViewWindow(factory, bus, icon); await window.initialize(state); @@ -38,11 +28,11 @@ namespace mbts.spark _criteria_callback_command = SparkCommand.create("Update Market View", SparkCommands.ShowMarketView.icon, _updated_security_criteria_tag); Commands = new SparkCommand[] { SparkCommand.create("Change Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (_criteria_callback_command, _state.security_criteria)), - SparkCommands.ShowLadder.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), + SparkCommands.ShowLadder.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(bus)), md => md.HasValue, md => md.Value), // TODO: ShowLinkedLadder - SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), + SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(bus)), md => md.HasValue, md => md.Value), // TODO: ShowLinkedOrderTicket - SparkCommands.ShowFills.complete(_vm.Observable.SelectMany(vm => vm.selected_securities_observable()), secs => secs.Count > 0, secs => new SecurityCriteria(secs)), + SparkCommands.ShowFills, SparkCommands.ShowTimeAndSales.complete(_vm.Observable.SelectMany(vm => vm.selected_securities_observable()), secs => secs.Count > 0, secs => new SecurityCriteria(secs)), // SpreadMatrix ?? // SyntheticCreate @@ -54,11 +44,18 @@ namespace mbts.spark //SparkCommands.CancelSellOrders, //SparkCommands.CancelOrders, }; - _subscriptions = Disposable.Create( - _bus.subscribe(_updated_security_criteria_tag).ObserveOnDispatcher().Subscribe(update_criteria), - _bus.subscribe(SparkTags.SecuritiesTag).Subscribe(md => _md = md)); + _subscriptions = _bus.subscribe(_updated_security_criteria_tag).ObserveOnDispatcher().Subscribe(update_criteria); } + readonly MarketViewWindowFactory _factory; + + SingleValuePump _vm = new SingleValuePump(); + MarketViewWindowFactory.StartupData _state; + MarketViewModel _model; + MarketViewView _view; + PartialCommand _criteria_callback_command; + IDisposable _subscriptions; + public async Task initialize(MarketViewWindowFactory.StartupData state) { Logger.notnull(state); _state = state; diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs index eea7f2785..c8839e393 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs @@ -1,6 +1,5 @@ using bts.api; using bts.spark; -using mbts; using mbts.spark; using mbts.ui; using ProtoBuf; @@ -12,29 +11,20 @@ using static mbts.spark.DataGridColumnFilters; namespace bts.shell { - class MarketViewWindowFactory : ShellWindowFactory { - IBus _bus; - IWindowManager _wm; - IReadOnlyDictionary _securities = new Dictionary(); - - public MarketViewWindowFactory(MarketShellModule module, IBus bus, IWindowManager wm) : base(module, "MarketView") { + class MarketViewWindowFactory : ShellWindowFactory + { + public MarketViewWindowFactory(MarketShellModule module, IBus bus) : base(module, "MarketView") { _bus = bus; - _wm = wm; - - _dispose = Disposable.Create( - bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s), - bus.subscribe(SparkTags.ShowMarketViewTag).ObserveOnDispatcher().Subscribe(show) - ); + _dispose = bus.subscribe(SparkTags.ShowMarketViewTag).ObserveOnDispatcher().Subscribe(show); } - public override async Task load(StartupData state) { - return await MarketViewWindow.create(this, _bus, state, SparkCommands.PickMarketView.icon); - } + readonly IBus _bus; - public async void show(SecurityCriteria criteria) { - var w = await load(new StartupData(criteria)); - _bus.post(SparkTags.ShowWindow, w); - } + public override async Task load(StartupData state) => + await MarketViewWindow.create(this, _bus, state, SparkCommands.PickMarketView.icon); + + public async void show(SecurityCriteria criteria) => + _bus.post(SparkTags.ShowWindow, await load(new StartupData(criteria))); [ProtoContract] public class StartupData { diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index 852c2be66..2986c8f3d 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -17,18 +17,6 @@ namespace mbts.spark { class TimeAndSalesWindow : SparkWindow { - SingleValuePump _vm = new SingleValuePump(); - TimeAndSalesWindowFactory.StartupData _state; - MDConsumer _consumer; - TimeAndSalesModel _model; - TimeAndSalesView _view; - TimeAndSalesWindowFactory _factory; - - IDisposable _subscriptions; - IReadOnlyDictionary _md = new Dictionary(); - - PartialCommand _criteria_callback_command; - public static async Task create(TimeAndSalesWindowFactory factory, IBus bus, MDConsumer consumer, TimeAndSalesWindowFactory.StartupData state, ImageSource icon) { var window = new TimeAndSalesWindow(factory, bus, consumer, icon); await window.initialize(state); @@ -38,21 +26,15 @@ namespace mbts.spark private TimeAndSalesWindow(TimeAndSalesWindowFactory factory, IBus bus, MDConsumer consumer, ImageSource icon) : base("Time And Sales", bus, factory, SparkCommands.ShowTimeAndSales.icon) { _consumer = consumer; _factory = factory; - ITag _updated_security_criteria_tag = new SparkTags.SparkTag("TimeAndSales Callback"); _criteria_callback_command = SparkCommand.create("Update Time and Sales", SparkCommands.ShowTimeAndSales.icon, _updated_security_criteria_tag); - - _subscriptions = Disposable.Create( - _bus.subscribe(_updated_security_criteria_tag).ObserveOnDispatcher().Subscribe(update_criteria), - _bus.subscribe(SparkTags.SecuritiesTag).Subscribe(md => _md = md)); - Commands = new SparkCommand[] { SparkCommand.create("Change Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (_criteria_callback_command, _state.security_criteria)), - SparkCommands.ShowLadder.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), + SparkCommands.ShowLadder.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(bus)), md => md.HasValue, md => md.Value), // TODO: ShowLinkedLadder - SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), + SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(bus)), md => md.HasValue, md => md.Value), // TODO: ShowLinkedOrderTicket - SparkCommands.ShowFills.complete(_vm.Observable.SelectMany(vm => vm.selected_securities_observable()), secs => secs.Count > 0, secs => new SecurityCriteria(secs)), + SparkCommands.ShowFills, SparkCommands.ShowMarketView.complete(_vm.Observable.SelectMany(vm => vm.selected_securities_observable()), secs => secs.Count > 0, secs => new SecurityCriteria(secs)), // SpreadMatrix ?? // SyntheticCreate @@ -63,8 +45,19 @@ namespace mbts.spark //SparkCommands.CancelSellOrders, //SparkCommands.CancelOrders, }; + _subscriptions = _bus.subscribe(_updated_security_criteria_tag).ObserveOnDispatcher().Subscribe(update_criteria); } + readonly MDConsumer _consumer; + readonly TimeAndSalesWindowFactory _factory; + + SingleValuePump _vm = new SingleValuePump(); + TimeAndSalesWindowFactory.StartupData _state; + TimeAndSalesModel _model; + TimeAndSalesView _view; + PartialCommand _criteria_callback_command; + IDisposable _subscriptions; + public async Task initialize(TimeAndSalesWindowFactory.StartupData state) { Logger.notnull(state); _state = state; diff --git a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs index 457a05f4b..196bb4488 100644 --- a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs +++ b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs @@ -11,7 +11,8 @@ using bts.spark; using mbts.co2; using static mbts.spark.DataGridColumnFilters; -namespace bts.shell { +namespace bts.shell +{ class TimeAndSalesWindowFactory : ShellWindowFactory { readonly IBus _bus; diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 5abb11998..6add36e35 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -14,18 +14,12 @@ namespace mbts.spark { class FillsVM : SecurityGrid { - static IObservable> _row_models(DemoOrdersModel model, IReadOnlyCollection securities) => - model.on_orderbook().Buffer(TimeSpan.FromSeconds(1)).Where(obs => obs.Count > 0).Select(obs => obs[obs.Count - 1]).Select(ob => { - var map = ob.get_fill_tuple_sec_map(); - if (securities.Count == 0) return map.SelectMany(kv => kv.Value); - else { - var sec_keys = securities.Select(s => s.Id).ToList(); - return map.Where(kv => sec_keys.Contains(kv.Key)).SelectMany(kv => kv.Value); - } - }); + static IObservable> _row_models(DemoOrdersModel model) => model.on_orderbook() + .Buffer(TimeSpan.FromSeconds(1)).Where(obs => obs.Count > 0) + .Select(obs => obs[obs.Count - 1].get_fill_tuple_sec_map().SelectMany(kv => kv.Value)); - public FillsVM(IBus bus, DemoOrdersModel model, IReadOnlyCollection securities, IReadOnlyCollection sorting_criteria, FilterStates filters) - : base(_row_models(model, securities), sorting_criteria) { + public FillsVM(IBus bus, DemoOrdersModel model, IReadOnlyCollection sorting_criteria, FilterStates filters) + : base(_row_models(model), sorting_criteria) { _model = model; if (sorting_criteria != null) rows_view.SortDescriptions.AddRange(sorting_criteria.Select(sc => sc.to_sort_description())); else rows_view.SortDescriptions.Add(new SortDescription(nameof(Row.fill_time), ListSortDirection.Descending)); diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs index e0ca1c9b9..092e46981 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs @@ -8,7 +8,6 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reactive.Linq; -using System.Threading.Tasks; using System.Windows; using System.Windows.Media; @@ -21,14 +20,9 @@ namespace mbts.spark FillsView _view; FillsWindowFactory _factory; - IDisposable _subscriptions; - IReadOnlyDictionary _md = new Dictionary(); - - PartialCommand _criteria_callback_command; - - public static async Task create(FillsWindowFactory factory, IBus bus, FillsWindowFactory.StartupData state, ImageSource icon) { + public static FillsWindow create(FillsWindowFactory factory, IBus bus, FillsWindowFactory.StartupData state, ImageSource icon) { var window = new FillsWindow(factory, bus, icon); - await window.initialize(state); + window.initialize(state); return window; } @@ -36,13 +30,11 @@ namespace mbts.spark _factory = factory; ITag _updated_security_criteria_tag = new SparkTags.SparkTag("Fills Callback"); - _criteria_callback_command = SparkCommand.create("Update Fills", SparkCommands.ShowFills.icon, _updated_security_criteria_tag); Commands = new SparkCommand[] { - SparkCommand.create("Update Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (_criteria_callback_command, _state.security_criteria)), - SparkCommands.ShowLadder.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), + SparkCommands.ShowLadder.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(bus)), md => md.HasValue, md => md.Value), // TODO: ShowLinkedLadder - SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), + SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.Observable.SelectMany(vm => vm.current_security_md_observable(bus)), md => md.HasValue, md => md.Value), // TODO: ShowLinkedOrderTicket SparkCommands.ShowTimeAndSales.complete(_vm.Observable.SelectMany(vm => vm.selected_securities_observable()), secs => secs.Count > 0, secs => new SecurityCriteria(secs)), SparkCommands.ShowMarketView.complete(_vm.Observable.SelectMany(vm => vm.selected_securities_observable()), secs => secs.Count > 0, secs => new SecurityCriteria(secs)), @@ -55,39 +47,23 @@ namespace mbts.spark //SparkCommands.CancelSellOrders, //SparkCommands.CancelOrders, }; - - _subscriptions = Disposable.Create( - _bus.subscribe(_updated_security_criteria_tag).ObserveOnDispatcher().Subscribe(update_criteria), - _bus.subscribe(SparkTags.SecuritiesTag).Subscribe(md => _md = md)); } - public async Task initialize(FillsWindowFactory.StartupData state) { + public void initialize(FillsWindowFactory.StartupData state) { Logger.notnull(state); _state = state; - var securities = await state.security_criteria.securities(_bus); - _vm.Push(new FillsVM(_bus, new DemoOrdersModel(_bus), securities.ToList(), state.sorting_criteria, state.filters)); + _vm.Push(new FillsVM(_bus, new DemoOrdersModel(_bus), state.sorting_criteria, state.filters)); if (_view == null) _view = new FillsView { DataContext = _vm.Current }; else _view.DataContext = _vm.Current; } - public void update_criteria(SecurityCriteria c) => initialize(new FillsWindowFactory.StartupData(c, _vm.Current.rows_view.GetSortingCriteria(), _vm.Current.get_filters())).ignore(); - public override UIElement Content => _view; - SecurityMD? current_security { - get { - var security = _vm.Current.current_security; - if (security.HasValue && _md.TryGetValue(security.Value.Id, out SecurityMD md)) return md; - else return null; - } - } - public override IEnumerable Commands { get; } - public override FillsWindowFactory.StartupData SaveState => _state = new FillsWindowFactory.StartupData(_state.security_criteria, _vm.Current.rows_view.GetSortingCriteria(), _vm.Current.get_filters()); + public override FillsWindowFactory.StartupData SaveState => _state = new FillsWindowFactory.StartupData(_vm.Current.rows_view.GetSortingCriteria(), _vm.Current.get_filters()); public override void Dispose() { - Disposable.dispose(ref _subscriptions); Disposable.dispose(ref _vm); foreach (var c in Commands.OfType()) c.Dispose(); } diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs index b20aae422..7328686d8 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs @@ -1,6 +1,5 @@ using bts.api; using bts.spark; -using mbts; using mbts.spark; using mbts.ui; using ProtoBuf; @@ -14,41 +13,30 @@ namespace bts.shell { class FillsWindowFactory : ShellWindowFactory { - IBus _bus; - IWindowManager _wm; - IReadOnlyDictionary _securities = new Dictionary(); - public FillsWindowFactory(TradingShellModule module, IBus bus, IWindowManager wm) : base(module, "Fills") { _bus = bus; _wm = wm; - _dispose = Disposable.Create( - bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s), - bus.subscribe(SparkTags.ShowFillsTag).ObserveOnDispatcher().Subscribe(show) - ); + _dispose = bus.subscribe(SparkTags.ShowFillsTag).ObserveOnDispatcher().Subscribe(show); } - public override async Task load(StartupData state) { - return await FillsWindow.create(this, _bus, state, SparkCommands.PickFills.icon); - } + readonly IBus _bus; + readonly IWindowManager _wm; - public async void show(SecurityCriteria criteria) { - var w = await load(new StartupData(criteria)); - _bus.post(SparkTags.ShowWindow, w); - } + public override Task load(StartupData state) => + Task.FromResult(FillsWindow.create(this, _bus, state, SparkCommands.ShowFills.icon)); + + public async void show(SparkTags.Nothing nothing) => + _bus.post(SparkTags.ShowWindow, await load(new StartupData())); [ProtoContract] public class StartupData { public const int Version = 1; public StartupData() { } - public StartupData(SecurityCriteria securities) : this(securities, null, null) { } - public StartupData(SecurityCriteria securities, List sorting_criteria, FilterStates filters) { - this.security_criteria = securities; + public StartupData(List sorting_criteria, FilterStates filters) { this.sorting_criteria = sorting_criteria; this.filters = filters; } - [ProtoMember(1)] - public SecurityCriteria security_criteria; [ProtoMember(2)] public List sorting_criteria; [ProtoMember(3)] diff --git a/src/client/spark/Modules/Trading/TradingShellModule.cs b/src/client/spark/Modules/Trading/TradingShellModule.cs index 97ebf22f7..f92352242 100644 --- a/src/client/spark/Modules/Trading/TradingShellModule.cs +++ b/src/client/spark/Modules/Trading/TradingShellModule.cs @@ -38,7 +38,7 @@ namespace bts.shell public IEnumerable actions => new [] { SparkCommands.ShowOrders, - SparkCommands.PickFills, + SparkCommands.ShowFills, //SparkCommands.ShowPAndL, SparkCommands.PickLadder, SparkCommands.PickOrderTicket diff --git a/src/client/spark/core/Bus/SparkCommands.cs b/src/client/spark/core/Bus/SparkCommands.cs index 9eb952f8d..648161dee 100644 --- a/src/client/spark/core/Bus/SparkCommands.cs +++ b/src/client/spark/core/Bus/SparkCommands.cs @@ -24,10 +24,8 @@ namespace bts.spark public static SparkCommand ShowOrders => SparkCommand.create("Order Book", Icons.Book, SparkTags.ShowOrderBookTag); - public static PartialCommand ShowFills => + public static SparkCommand ShowFills => SparkCommand.create("Fills", Icons.Payment, SparkTags.ShowFillsTag); - public static SparkCommand PickFills => - SparkCommand.create("Fills", Icons.Payment, SparkTags.ShowPickMultiple, ShowFills); public static SparkCommand ShowPAndL => SparkCommand.create("Position/P&L", Icons.Accounting, SparkTags.ShowPositionsTag); diff --git a/src/client/spark/core/Bus/SparkTags.cs b/src/client/spark/core/Bus/SparkTags.cs index 55a657b29..150354a59 100644 --- a/src/client/spark/core/Bus/SparkTags.cs +++ b/src/client/spark/core/Bus/SparkTags.cs @@ -31,7 +31,7 @@ namespace mbts.spark #region Show Window public static ITag ShowAuditLogsTag { get; } = new SparkTag(nameof(ShowAuditLogsTag)); - public static ITag ShowFillsTag { get; } = new SparkTag(nameof(ShowFillsTag)); + public static ITag ShowFillsTag { get; } = new SparkTag(nameof(ShowFillsTag)); public static ITag ShowLadderTag { get; } = new SparkTag("Show Ladder"); public static ITag> ShowLinkedLadder { get; } = new SparkTag>("Linked Ladder"); public static ITag ShowMarketViewTag { get; } = new SparkTag("Show MarketView"); diff --git a/src/client/spark/view/Spark/Grid/SecurityGrid.cs b/src/client/spark/view/Spark/Grid/SecurityGrid.cs index 81d8291a5..3df63c275 100644 --- a/src/client/spark/view/Spark/Grid/SecurityGrid.cs +++ b/src/client/spark/view/Spark/Grid/SecurityGrid.cs @@ -59,10 +59,16 @@ namespace mbts.spark static class SecurityGridExtensions { - public static IObservable current_security_md_observable(this SecurityGrid security_grid, IReadOnlyDictionary map) + public static IObservable current_security_md_observable(this SecurityGrid security_grid, IBus bus) where TRow : class, ISecurityRow => - from s in security_grid.current_security_observable - select s.HasValue ? new SecurityMD?(map[s.Value.Id]) : null; + current_security_md_observable(security_grid, bus.subscribe(SparkTags.SecuritiesTag)); + + public static IObservable current_security_md_observable(this SecurityGrid security_grid, IObservable> md) + where TRow : class, ISecurityRow => + security_grid.current_security_observable + .CombineLatest(md, (s, m) => (s, m)) + .Select(sm => sm.s.HasValue && sm.m != null && sm.m.TryGetValue(sm.s.Value.Id, out SecurityMD smd) ? new SecurityMD?(smd) : null); + public static IObservable current_security_md_observable_straight(this SecurityGrid security_grid, IReadOnlyDictionary map) where TRow : class, ISecurityRow =>