From 9307eceb0e0d90bc1f05aabaac7d77abc74c77af Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 25 Jan 2018 12:04:14 -0500 Subject: [PATCH] MarketView observes securities from criteria (no longer depends on hard set) --- .../Market/MarketView/MarketViewModel.cs | 30 ------------------- .../Modules/Market/MarketView/MarketViewVM.cs | 10 +++---- .../Market/MarketView/MarketViewWindow.cs | 14 ++++----- .../MarketView/MarketViewWindowFactory.cs | 4 +-- 4 files changed, 12 insertions(+), 46 deletions(-) delete mode 100644 src/client/spark/Modules/Market/MarketView/MarketViewModel.cs diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewModel.cs b/src/client/spark/Modules/Market/MarketView/MarketViewModel.cs deleted file mode 100644 index cb229362f..000000000 --- a/src/client/spark/Modules/Market/MarketView/MarketViewModel.cs +++ /dev/null @@ -1,30 +0,0 @@ -using bts.api; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; -using static mbts.spark.SparkTags; -using SecurityKey = System.UInt32; - -namespace mbts.spark -{ - class MarketViewModel : IDisposable - { - public MarketViewModel(IBus bus, OrdersModel orders_model, IEnumerable securities) { - _bus = bus; - _securities = new HashSet(securities.Select(s => s.Id)); - _orders_model = orders_model; - } - - readonly IBus _bus; - readonly OrdersModel _orders_model; - readonly HashSet _securities; - IDisposable _sub; - - public IObservable> rows => _bus.subscribe(SecuritiesTag).Select(md => md.Intersect(_securities, kv => kv.Key).Select(kv => kv.Value)); - public OrdersModel orders_model => _orders_model; - - public void Dispose() => - Disposable.dispose(ref _sub); - } -} \ No newline at end of file diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs index 9407bf29b..a8a1a9f19 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs @@ -9,10 +9,10 @@ namespace mbts.spark { partial class MarketViewVM : SecurityMDGrid { - public MarketViewVM(IBus bus, MarketViewModel model, IReadOnlyCollection sorting_criteria, FilterStates filters) - : base(new RXObservableCollection(model.rows, SecurityDataHelper.EqualityComparer.MDComparer), sorting_criteria) { + public MarketViewVM(IBus bus, OrdersModel orders_model, SecurityCriteria security_criteria, IReadOnlyCollection sorting_criteria, FilterStates filters) + : base(new RXObservableCollection(security_criteria.subscribe(bus), SecurityDataHelper.EqualityComparer.MDComparer), sorting_criteria) { _bus = bus; - _model = model; + _orders_model = orders_model; security_filter = new DiscreteValues(_rows_vm, r => r.security, secs => new SecurityCriteria(secs), sc => sc.securities(bus), nameof(Row.security)); if (filters != null) { security_filter.load_state(filters.security); @@ -38,9 +38,9 @@ namespace mbts.spark } readonly IBus _bus; - readonly MarketViewModel _model; + readonly OrdersModel _orders_model; - protected override Row row_factory(SecurityMD smd) => new Row(_bus, smd, _model.orders_model.on_security_orders(smd.security.Id)); + protected override Row row_factory(SecurityMD smd) => new Row(_bus, smd, _orders_model.on_security_orders(smd.security.Id)); protected override void on_row_removed(Row row) => row.Dispose(); protected override IEnumerable get_default_sorting() { yield return new SortingCriteria(nameof(Row.security), true); } diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs index 64acf6a02..6423877bf 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.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; @@ -16,9 +15,9 @@ namespace mbts.spark { class MarketViewWindow : SparkWindow { - public static async Task create(MarketViewWindowFactory factory, IBus bus, OrdersModel orders_model, MarketViewWindowFactory.StartupData state, ImageSource icon) { + public static MarketViewWindow create(MarketViewWindowFactory factory, IBus bus, OrdersModel orders_model, MarketViewWindowFactory.StartupData state, ImageSource icon) { var window = new MarketViewWindow(factory, bus, orders_model, icon); - await window.initialize(state); + window._initialize(state); return window; } @@ -53,17 +52,14 @@ namespace mbts.spark SingleValuePump _vm = new SingleValuePump(destroy: vm => vm.Dispose()); MarketViewWindowFactory.StartupData _state; - MarketViewModel _model; MarketViewView _view; PartialCommand _criteria_callback_command; IDisposable _subscriptions; - public async Task initialize(MarketViewWindowFactory.StartupData state) { + void _initialize(MarketViewWindowFactory.StartupData state) { Logger.notnull(state); _state = state; - var securities = await state.security_criteria.securities(_bus); - _model = new MarketViewModel(_bus, _orders_model, securities); - _vm.Push(new MarketViewVM(_bus, _model, state.sorting_criteria, state.filters)); + _vm.Push(new MarketViewVM(_bus, _orders_model, state.security_criteria, state.sorting_criteria, state.filters)); if (_view == null) { _view = new MarketViewView { DataContext = _vm.Current }; } else { @@ -71,7 +67,7 @@ namespace mbts.spark } } - public void update_criteria(SecurityCriteria c) => initialize(new MarketViewWindowFactory.StartupData(c, _vm.Current.rows_view.GetSortingCriteria(), _vm.Current.get_filter_states())).ignore(); + public void update_criteria(SecurityCriteria c) => _initialize(new MarketViewWindowFactory.StartupData(c, _vm.Current.rows_view.GetSortingCriteria(), _vm.Current.get_filter_states())); public override UIElement Content => _view; public override IEnumerable Commands { get; } diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs index e0ed06c46..f1dcb0ba6 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs @@ -22,8 +22,8 @@ namespace bts.shell readonly IBus _bus; readonly OrdersModel _orders_model; - public override async Task load(StartupData state) => - await MarketViewWindow.create(this, _bus, _orders_model, state, SparkCommands.PickMarketView.icon); + public override Task load(StartupData state) => + Task.FromResult(MarketViewWindow.create(this, _bus, _orders_model, state, SparkCommands.PickMarketView.icon)); public async void show(SecurityCriteria criteria) => _bus.post(SparkTags.ShowWindow, await load(new StartupData(criteria)));