diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index e370685ea..917d0f88e 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 @@ -136,8 +136,6 @@ namespace mbts.spark { // this will initialize the immutable properties that correspond to the col_settings_flags above (e.g. Bid/Ask font_color_override, etc.) if (_settings_manager != null) grid_settings_manager.load_from(_settings_manager.current_settings()); - var filter_src = Observable.FromEvent>, Func>(cb => _rows_manager.filter_changed += cb, cb => _rows_manager.filter_changed -= cb); - var comp_src = Observable.FromEvent>, IComparer>(cb => _rows_manager.comparer_changed += cb, cb => _rows_manager.comparer_changed -= cb); TableUpdate last_unfiltered_fills = TableUpdate.mk_empty(FillTuple.key_fn); var fills_buffer = Observable.Create>(o => { // this is what .Cache() does, but is a little cheaper, since we know subscriptions and callbacks occur on the same thread (i.e., on this Dispatcher). @@ -145,29 +143,28 @@ 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), - RXCollection.connect(rows, fills_buffer.Filter(filter_src, FillTuple.key_fn), comp_src, ft => new Row(ft, model), r => r.fill_tuple), + RXCollection.connect(rows, fills_buffer.Filter(_rows_manager.observe_filter(), FillTuple.key_fn), _rows_manager.observe_comparer(), ft => new Row(ft, model), r => r.fill_tuple), fills_source.OnDispatcher().Subscribe(t => { last_unfiltered_fills = t; 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(grid_settings_manager) ); diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs index 090fd86b5..1b2b66464 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs @@ -6,7 +6,6 @@ using bts.spark; using mbts.persist; using mbts.ui; using mbts.ui.settings; -using mbts.ui.shell; using mbts.ui.spark; using mbts.ui.utility; using mbts.utils; @@ -26,7 +25,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 +34,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 +50,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 { @@ -77,15 +72,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.create() - ) - ) - ); } public override void Dispose() { @@ -93,4 +79,4 @@ namespace mbts.spark { Commands.OfType().DisposeAll(); } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 612a0adeb..091533b24 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -245,7 +245,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) { diff --git a/src/client/spark/view/Controls/DIYGrid/Utils/DIYGridRowsManager.cs b/src/client/spark/view/Controls/DIYGrid/Utils/DIYGridRowsManager.cs index c9f5e4126..89c5dfeaf 100644 --- a/src/client/spark/view/Controls/DIYGrid/Utils/DIYGridRowsManager.cs +++ b/src/client/spark/view/Controls/DIYGrid/Utils/DIYGridRowsManager.cs @@ -6,6 +6,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; +using System.Reactive.Linq; namespace mbts.ui.controls { static class DIYGridRowsManager { @@ -23,6 +24,22 @@ namespace mbts.ui.controls { get_comparer_for_column, window_name, build_filter_from_state); + + public static IObservable> observe_comparer(this DIYGridRowsManager rows_manager) where TColKey : struct => + Observable.Create>(o => { + rows_manager.comparer_changed += o.OnNext; + if (rows_manager.comparer != null) + o.OnNext(rows_manager.comparer); + return Disposable.Create(() => rows_manager.comparer_changed -= o.OnNext); + }); + + public static IObservable> observe_filter(this DIYGridRowsManager rows_manager) where TColKey : struct => + Observable.Create>(o => { + rows_manager.filter_changed += o.OnNext; + if (rows_manager.filter != null) + o.OnNext(rows_manager.filter); + return Disposable.Create(() => rows_manager.filter_changed -= o.OnNext); + }); } class DIYGridRowsManager where TColKey : struct { @@ -37,20 +54,20 @@ namespace mbts.ui.controls { _update = new DeferrableActionWrapper(() => { if (_filters_dirty) { if (_sorting_dirty) { - var comp = build_comparer(out string comp_desc); - var filter = build_filter(out string filter_desc); + comparer = build_comparer(out string comp_desc); + filter = build_filter(out string filter_desc); Log.Ui.info($"{window_name} begin filter '{filter_desc}' and sort '{comp_desc}.'"); filter_changed?.Invoke(filter); - comparer_changed?.Invoke(comp); + comparer_changed?.Invoke(comparer); } else { - var filter = build_filter(out string filter_desc); + filter = build_filter(out string filter_desc); Log.Ui.info($"{window_name} begin filter '{filter_desc}.'"); filter_changed?.Invoke(filter); } } else if (_sorting_dirty) { - var comp = build_comparer(out string comp_desc); + comparer = build_comparer(out string comp_desc); Log.Ui.info($"{window_name} begin sort '{comp_desc}.'"); - comparer_changed?.Invoke(comp); + comparer_changed?.Invoke(comparer); } _sorting_dirty = false; _filters_dirty = false; @@ -93,6 +110,9 @@ namespace mbts.ui.controls { public event Action> filter_changed; public event Action> comparer_changed; + public IComparer comparer { get; private set; } + public Func filter { get; private set; } + public TFiltersState get_filters() => _filters.create(); public IEnumerable get_sorting_criterion() => _sorting.create();