From 52f62c19a4dca6d430e91a32d065ff3728def2cb Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 19 Oct 2019 16:29:46 -0500 Subject: [PATCH] FillsVM state doesn't need to be observable (every usage is equiv to Observable.Return) --- .../spark/Modules/Trading/Fills/FillsVM.cs | 33 +++++++++---------- .../Modules/Trading/Fills/FillsWindow.cs | 15 +-------- .../Modules/Trading/OrderBook/OrderBookVM.cs | 2 +- .../spark/Modules/Trading/PNL/VM/PNLVM.cs | 6 ++-- 4 files changed, 21 insertions(+), 35 deletions(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index caa8ed9d4..e28a12e84 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -38,10 +38,10 @@ namespace mbts.spark { IWindowSettingsManager _settings_manager; int _total_row_count; - public FillsVM(IBus bus, OrdersModel model, IObservable state_obs, IWindowSettingsManager settings_manager) - : this(bus, model, state_obs, _get_observable(bus, model, state_obs), settings_manager) { } + public FillsVM(IBus bus, OrdersModel model, FillsSettings settings, IWindowSettingsManager settings_manager) + : this(bus, model, settings, _get_observable(bus, model, settings), settings_manager) { } - public FillsVM(IBus bus, OrdersModel model, IObservable state_obs, IObservable> fills_source, IWindowSettingsManager settings_manager) { + public FillsVM(IBus bus, OrdersModel model, FillsSettings settings, IObservable> fills_source, IWindowSettingsManager settings_manager) { _model = model; _settings_manager = settings_manager; /// Columns @@ -148,6 +148,19 @@ namespace mbts.spark { _unfiltered_fills_changed += o.OnNext; return Disposable.Create(() => _unfiltered_fills_changed -= o.OnNext); }); + if (settings.grid != null && _settings_manager != null) { + // this means we are not using defaults, + // Note: settings_manager in turn notifies grid_settings_manager of this update + _settings_manager.instance_settings = settings.grid; + } + _rows_manager.on_settings(settings.filters ?? new FillsFilterStates { + fill_time = new TimeFilterTuple( + TimeFilterMode.CMEOpen, + TimeTextTuple.FromDateTime(DateTime.Today), + TimeTextTuple.FromDateTime(DateTime.Today.AddDays(1))) + }, + settings.sorting_criterion); + // resources/subscriptions _dispose = new CompositeDisposable( ObservableAutoWrapper.connect(col_tups, columns, ct => ct.col), ObservableAutoWrapper.connect_item_hooks(col_tups, ct => ct.filter as IDisposable), @@ -157,20 +170,6 @@ namespace mbts.spark { Set(ref _total_row_count, t.state.Count, nameof(total_row_count)); _unfiltered_fills_changed?.Invoke(t); }), - state_obs.OnDispatcher().Subscribe(s => { - if (s.grid != null && _settings_manager != null) { - // this means we are not using defaults, - // Note: settings_manager in turn notifies grid_settings_manager of this update - _settings_manager.instance_settings = s.grid; - } - var fs = s.filters ?? new FillsFilterStates { - fill_time = new TimeFilterTuple( - TimeFilterMode.CMEOpen, - TimeTextTuple.FromDateTime(DateTime.Today), - TimeTextTuple.FromDateTime(DateTime.Today.AddDays(1))) - }; - _rows_manager.on_settings(fs, s.sorting_criterion); - }), model.subscribe_all_algos().SelectKeyValue(AlgoDataVM.from_data, d => AlgoID.from_algo_key(d.data.key)).OnDispatcher().Subscribe(root_algo_type_observer), settings_manager == null ? Disposable.empty : settings_manager.subscribe_current().OnDispatcher().Subscribe(s => { grid_settings_manager.load_from(s); diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs index 16681a59b..564f0352c 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs @@ -26,7 +26,6 @@ namespace mbts.spark { FillsView _view; FillsSettings _state; IReadOnlyList _commands; - IDisposable _subscriptions; public FillsWindow(FillsWindowFactory factory, IBus bus, OrdersModel orders_model, FillsSettings state, WindowSettingsManager settings_manager) : base("Fills", bus, factory, SparkCommands.ShowFills().icon) { @@ -36,8 +35,6 @@ namespace mbts.spark { thread_id = config.Configuration.get().fills ? "Fills" : null; } - event Action _state_changed; - public override string window_type => window_type_name; public override UIElement Content => _view; public override IEnumerable Commands => _commands; @@ -54,8 +51,7 @@ namespace mbts.spark { public void thread_init() { _init_guard.check_access(); Log.notnull(_state); - var state_src = Observable.FromEvent, FillsSettings>(cb => _state_changed += cb, cb => _state_changed -= cb).StartWith(_state); - _vm = new FillsVM(_bus, _orders_model, state_src, _settings_manager); + _vm = new FillsVM(_bus, _orders_model, _state, _settings_manager); _view = new FillsView { DataContext = _vm }; _commands = new List { @@ -78,15 +74,6 @@ namespace mbts.spark { return dialog; })) }; - _subscriptions = Disposable.Create(() => - _state_changed?.Invoke( - _state = new FillsSettings(_state.orders, - _vm.get_sorting_criterion().ToList(), - _vm.get_filters(), - _vm.grid_settings_manager.grid_settings - ) - ) - ); } public override void Dispose() { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index d977eaa56..fade5c6b4 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -247,7 +247,7 @@ namespace mbts.spark { .Subscribe(is_visible => { if (is_visible) { var init = _cached_fills_settings.to_startup_data(); - fills_vm.value = new FillsVM(bus, model, Observable.Return(init), model.on_fill_tuples.Filter(mk_fills_slave_predicate_src(), ft => ft.fill.FillKey, _ => false), _fills_settings_manager); + fills_vm.value = new FillsVM(bus, model, init, model.on_fill_tuples.Filter(mk_fills_slave_predicate_src(), ft => ft.fill.FillKey, _ => false), _fills_settings_manager); } else if (fills_vm.value != null) { _cached_fills_settings = _get_fills_settings(fills_vm.value); fills_vm.value = null; diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs index 19b6ff8da..ffef9f99f 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs @@ -383,7 +383,7 @@ namespace bts.shell.pnl { // hide implicit cols state.grid = _hide_cols(state.grid, anchors); return new FillsVM( - _bus, _orders_model, Observable.Return(state), new WindowSettingsManager.DisconnectedImpl(state.grid)); + _bus, _orders_model, state, new WindowSettingsManager.DisconnectedImpl(state.grid)); } public FillsVM mk_fills_vm(PNLRowCollectionViewGroup group, ColumnKeys key) { @@ -393,7 +393,7 @@ namespace bts.shell.pnl { // hide implicit cols state.grid = _hide_cols(state.grid, anchors.WrapSubRange(0, group.level)); return new FillsVM( - _bus, _orders_model, Observable.Return(state), _visible_fills_source(), new WindowSettingsManager.DisconnectedImpl(state.grid)); + _bus, _orders_model, state, _visible_fills_source(), new WindowSettingsManager.DisconnectedImpl(state.grid)); } public FillsVM mk_fills_vm(PNLHeaderRowDisplay header, ColumnKeys key) { @@ -419,7 +419,7 @@ namespace bts.shell.pnl { break; } return new FillsVM( - _bus, _orders_model, Observable.Return(state), src, new WindowSettingsManager.DisconnectedImpl(state.grid)); + _bus, _orders_model, state, src, new WindowSettingsManager.DisconnectedImpl(state.grid)); } public OrderBookVM mk_orderbook_vm(PNLHeaderRowDisplay header, ColumnKeys key) {