diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index 1773b4de9..a1013ac54 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -1,36 +1,40 @@ -using bts.api; -using bts.collections; -using bts.shell.fills; -using bts.spark; -using bts.view; - -using mbts; -using mbts.co2; -using mbts.persist; -using mbts.spark; -using mbts.ui; -using mbts.ui.settings; -using mbts.ui.spark; -using mbts.ui.utility; -using mbts.utils; - -using System; -using System.Collections.Generic; -using System.Collections.Immutable; -using System.Linq; -using System.Reactive.Linq; -using System.Windows; -using System.Windows.Media; - namespace bts.shell.time_and_sales { + using bts.api; + using bts.collections; + using bts.shell.fills; + using bts.spark; + using bts.view; + + using mbts; + using mbts.co2; + using mbts.persist; + using mbts.spark; + using mbts.ui; + using mbts.ui.settings; + using mbts.ui.spark; + using mbts.ui.utility; + using mbts.utils; + + using System; + using System.Collections.Generic; + using System.Collections.Immutable; + using System.Diagnostics.CodeAnalysis; + using System.Linq; + using System.Reactive.Linq; + using System.Windows; + class TimeAndSalesWindow : SparkWindow, ISharedWindow { - const string _window_type = "TimeAndSales", _window_type_display_name = "Time And Sales"; + public const string WINDOW_TYPE_NAME = "TimeAndSales"; + public const string WINDOW_DISPLAY_NAME = "Time And Sales"; + static readonly TimeSpan _trade_poll_interval = TimeSpan.FromSeconds(0.4); + [DisallowNull] readonly MDConsumer _consumer; - readonly TimeAndSalesWindowFactory _factory; + [DisallowNull] readonly IWindowSettingsManager _settings_manager; readonly bool _can_pause_updates; + [DisallowNull] readonly Func _get_display_qty_divisor; TimeAndSalesVM _vm; @@ -42,33 +46,40 @@ namespace bts.shell.time_and_sales { IDisposable _subscriptions; public TimeAndSalesWindow( - TimeAndSalesWindowFactory factory, - IBus bus, - MDConsumer consumer, - TimeAndSalesSettings state, - ImageSource icon, - IWindowSettingsManager settings_manager, + [DisallowNull] TimeAndSalesWindowFactory factory, + [DisallowNull] IBus bus, + [DisallowNull] MDConsumer consumer, + [DisallowNull] TimeAndSalesSettings state, + [DisallowNull] IWindowSettingsManager settings_manager, bool can_pause_updates, - Func get_display_qty_divisor) - : base("Time And Sales", bus, factory, SparkCommands.ShowTimeAndSales.icon) { - Log.assert(state != null); - _consumer = consumer; - _factory = factory; - _state = state ?? TimeAndSalesSettings.Default(new SecurityCriteria()); - _get_display_qty_divisor = get_display_qty_divisor ?? new Func(sec => 1); - if (_state.security_criteria == null) + Func get_display_qty_divisor, + string thread_id) + : base(WINDOW_DISPLAY_NAME, bus, factory, SparkCommands.ShowTimeAndSales.icon) { + if (factory is null) { + throw new ArgumentNullException(nameof(factory)); + } + if (bus is null) { + throw new ArgumentNullException(nameof(bus)); + } + _consumer = consumer ?? throw new ArgumentNullException(nameof(consumer)); + _state = state ?? throw new ArgumentNullException(nameof(state)); + if (_state.security_criteria is null) { _state = _state.with(new SecurityCriteria()); + } + _state.grid ??= TimeAndSalesSettings.DefaultGridSettings; _security_criteria_backing = _state.security_criteria; - _settings_manager = settings_manager; + _settings_manager = settings_manager ?? throw new ArgumentNullException(nameof(settings_manager)); _can_pause_updates = can_pause_updates; - thread_id = mbts.config.Configuration.get().time_and_sales ? _window_type : null; + _get_display_qty_divisor = get_display_qty_divisor ?? new Func(sec => 1); + this.thread_id = thread_id; + Icon.Freeze(); _dispose = Disposable.Create(_dispose_resources); } event Action _security_criteria_changed; - public override string window_type => _window_type; + public override string window_type => WINDOW_TYPE_NAME; public override IEnumerable Commands => _commands; public override UIElement Content => _view; public override double MinWidth => TimeAndSalesSettings.DefaultGridSettings.columns.Sum(gcs => gcs.width) @@ -92,32 +103,29 @@ namespace bts.shell.time_and_sales { } } + [MemberNotNull(nameof(_vm), nameof(_menu_display_vm), nameof(_commands), nameof(_view))] public void thread_init() { - _dispose_resources(); - _ensure_state(); - if (!_state.use_defaults) + ExceptionAssert.InvalidOperation.member_null(_vm, nameof(_vm)); + ExceptionAssert.InvalidOperation.member_null(_menu_display_vm, nameof(_menu_display_vm)); + ExceptionAssert.InvalidOperation.member_null(_commands, nameof(_commands)); + ExceptionAssert.InvalidOperation.member_null(_view, nameof(_view)); + + if (!_state.use_defaults) { _settings_manager.instance_settings = _state.grid; + } _menu_display_vm = new SparkMenuDisplayVM(); _menu_display_vm.load_from(_state.menu_display); _vm = new TimeAndSalesVM(_settings_manager, _get_display_qty_divisor); - var selected_rows_src = Observable.Create>(o => { - _vm.selected_rows_changed += o.OnNext; - return Disposable.Create(() => _vm.selected_rows_changed -= o.OnNext); - }); - var current_row_src = Observable.Create(o => { - if (_vm.current_row != null) - o.OnNext(_vm.current_row); - _vm.current_row_changed += o.OnNext; - return Disposable.Create(() => _vm.current_row_changed -= o.OnNext); - }); - var current_sec_key_src = current_row_src.Select(r => { + var current_sec_key_src = _observe_current_row().Select(r => { var result = ImmutableHashSet.Empty; - if (r != null) + if (r is not null) { result = result.Add(r.security_key); + } return result; }); - var update_securities_cmd = SparkCommands.change_securities_callback(_window_type_display_name); + var update_securities_cmd = SparkCommands.change_securities_callback(WINDOW_DISPLAY_NAME); var security_criteria_changed = new Action(sc => { }); + SparkCommand toggle_is_paused_cmd = null; toggle_is_paused_cmd = new SparkCommandCommand(get_is_paused_cmd_title(), Icons.Pause, new DelegateCommand(() => { _vm.is_paused = !_vm.is_paused; @@ -135,33 +143,35 @@ namespace bts.shell.time_and_sales { .complete(current_sec_key_src, sec_keys => sec_keys.Count > 0), // fills SparkCommands.ShowFills(SparkCommands.KeyGestures.ShowFills) - .complete(selected_rows_src, always_true, get_fills_startup_data), + .complete(_observe_selected_rows().Select(get_fills_startup_data)), // mview - SparkCommands.ShowMarketView - .complete(selected_rows_src, always_true, rows => rows.Count > 0 ? SecurityCriteria.from_securities(rows.Select(r => r.security)) : _security_criteria), + SparkCommands.ShowMarketView.complete(_observe_selected_criteria()), // pause toggle_is_paused_cmd, // change securities SparkCommands.change_securities_command(() => (update_securities_cmd, _security_criteria)), - // wrap the grid settings view factory in a dialogCommand here since the vm is destroyed/recreated when the security criteria changes - SparkCommands.window_settings_command(new DialogCommand(() => { - var vm = new ShellSettingsDialogVM( - _settings_manager, - s => s.time_and_sales_grid, - UserSettings.FileExtensions.GRID, - s => _vm.grid_settings_manager.create_vm( - // we need to get the most up to date GridSettings when launching b/c users may - // have changed some settings on the grid directly, like column widths. - s.with(_vm.columns.Select(c => c.create())) - ) - ); - vm.SubscribeDisposed(literal_title_source.OnDispatcher().Subscribe(t => vm.title = t)); - var dialog = new ShellSettingsDialog { DataContext = vm }; - vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog); - return dialog; - })), + // wrap the grid settings view factory in a dialogCommand here since the vm is + // destroyed/recreated when the security criteria changes + SparkCommands.window_settings_command(new DialogCommand(create_settings_win)), _menu_display_vm.spark_cmd }; + + Window create_settings_win() { + var vm = new ShellSettingsDialogVM( + _settings_manager, + s => s.time_and_sales_grid, + UserSettings.FileExtensions.GRID, + s => { + // Generate fresh col settings, as col widths can be changed outside of the dialog + var curr_grid_settings = s.with(_vm.columns.Select(c => c.create())); + return _vm.grid_settings_manager.create_vm(curr_grid_settings); + }); + vm.SubscribeDisposed(literal_title_source.OnDispatcher().Subscribe(t => vm.title = t)); + var dialog = new ShellSettingsDialog { DataContext = vm }; + vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog); + return dialog; + } + _vm.load(_state.filters, _state.sorting_criteria, _state.grid); _vm.request_show_ladder += show_ladder; var security_criteria_src = _bus.subscribe(update_securities_cmd.tag); @@ -180,15 +190,15 @@ namespace bts.shell.time_and_sales { subs.Add(trades_source.OnDispatcher().Subscribe(ts => _vm.on_new_trades(ts.as_immutable()))); _subscriptions = Disposable.Create(subs.ToArray()); - if (_view == null) - _view = new TimeAndSalesView(); - _view.DataContext = _vm; - // local methods - bool always_true(T _) => true; + _view = new() { + DataContext = _vm + }; FillsSettings get_fills_startup_data(ImmutableHashSet rows) => - new FillsSettings(new FillsFilterStates { - security = rows.Count > 0 ? SecurityCriteria.from_securities(rows.Select(r => r.security)) : _security_criteria + new(new FillsFilterStates { + security = rows.Count > 0 ? + SecurityCriteria.from_securities(rows.Select(r => r.security)) : + _security_criteria }); string get_is_paused_cmd_title() => @@ -203,30 +213,48 @@ namespace bts.shell.time_and_sales { protected override void OnParentViewCreated(SparkWindowView parent_view) => _menu_display_vm.safe_bind_to_view(parent_view); - void _dispose_resources() { - Disposable.dispose(ref _subscriptions); - if (_commands != null) { - _commands.OfType().DisposeAll(); - _commands = null; - } - Disposable.dispose(ref _vm); - } + IObservable _observe_current_row() => + Observable.Create(o => { + if (_vm.current_row != null) + o.OnNext(_vm.current_row); + _vm.current_row_changed += o.OnNext; + return Disposable.Create(() => _vm.current_row_changed -= o.OnNext); + }); + + IObservable> _observe_selected_rows() => + Observable.Create>(o => { + _vm.selected_rows_changed += o.OnNext; + return Disposable.Create(() => _vm.selected_rows_changed -= o.OnNext); + }); + + IObservable _observe_selected_criteria() => + _observe_selected_rows().Select(rows => rows.Count > 0 ? + SecurityCriteria.from_keys(rows.Select(r => r.security_key).Distinct()) : + _security_criteria); void _ensure_state(bool force_recreate = false) { - if (_state == null || force_recreate) { - if (_vm == null) { - _state = TimeAndSalesSettings.Default(_security_criteria); - } else { - var (filters, sorting, grid) = _vm.create(); - _state = new TimeAndSalesSettings(_security_criteria, filters, grid, sorting.ToList()) { - use_defaults = _settings_manager.instance_settings == null - }; - } - // should be safe to assume _menu_display_vm and _vm will either both be null, or both be non null, - // but redundant null checks don't hurt, and just may prevent a crash. - if (_menu_display_vm != null) - _state.menu_display = _menu_display_vm.safe_create(); + if (_state is not null && !force_recreate) { + return; } + if (_vm is null) { + _state = TimeAndSalesSettings.Default(_security_criteria); + } else { + var (filters, sorting, grid) = _vm.create(); + _state = new TimeAndSalesSettings(_security_criteria, filters, grid, sorting.ToList()) { + use_defaults = _settings_manager.instance_settings == null + }; + } + /// It should be safe to assume _menu_display_vm and _vm will either both be null, or both + /// be non-null, but redundant null checks don't hurt, and just may prevent a crash + if (_menu_display_vm is not null) { + _state.menu_display = _menu_display_vm.safe_create(); + } + } + + void _dispose_resources() { + Disposable.dispose(ref _subscriptions); + _commands.OfTypeSafe().DisposeAll(); + Disposable.dispose(ref _vm); } } } diff --git a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs index 4f761fd9b..f8373cce2 100644 --- a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs +++ b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs @@ -1,58 +1,66 @@ -using bts.api; -using bts.shell.time_and_sales; -using bts.spark; +namespace bts.shell { + using bts.api; + using bts.shell.time_and_sales; -using mbts; -using mbts.co2; -using mbts.config; -using mbts.persist; -using mbts.spark; -using mbts.ui; -using mbts.ui.settings; + using mbts; + using mbts.co2; + using mbts.config; + using mbts.persist; + using mbts.spark; + using mbts.ui; + using mbts.ui.settings; -using System; -using System.Collections.Generic; -using System.Reactive.Linq; -using System.Threading.Tasks; + using System; + using System.Collections.Generic; + using System.Reactive.Linq; + using System.Threading.Tasks; -namespace bts.shell { class TimeAndSalesWindowFactory : ShellWindowFactory { readonly IBus _bus; readonly MDConsumer _consumer; readonly UserSettingsHub _settings_hub; - readonly TimeAndSalesConfig _time_and_sales_conf; readonly ISecurityAuxiliaryDataModel _security_auxiliary_model; + IReadOnlyDictionary _securities = new Dictionary(); - public TimeAndSalesWindowFactory(IShellModule module, IBus bus, MDConsumer consumer, UserSettingsHub settings_hub, ISecurityAuxiliaryDataModel security_auxiliary_model) - : base(module, "TimeAndSales") { + public TimeAndSalesWindowFactory( + IShellModule module, + IBus bus, + MDConsumer consumer, + UserSettingsHub settings_hub, + ISecurityAuxiliaryDataModel security_auxiliary_model) + : base(module, TimeAndSalesWindow.WINDOW_TYPE_NAME) { _bus = bus; _consumer = consumer; _settings_hub = settings_hub; _security_auxiliary_model = security_auxiliary_model; - _time_and_sales_conf = new TimeAndSalesConfig(Configuration.get()); _dispose = Disposable.Create( bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s), bus.subscribe(SparkTags.ShowTimeAndSalesTag).OnDispatcher().Subscribe(show) ); } - public override Task load(TimeAndSalesSettings state) => - Task.FromResult(new TimeAndSalesWindow(this, _bus, _consumer, state, SparkCommands.PickTimeAndSales.icon, - new WindowSettingsManager(_settings_hub, state.grid, s => s.time_and_sales_grid, (s, g) => s.with(time_and_sales: g)), - _time_and_sales_conf.can_pause_updates, - _security_auxiliary_model.get_display_quantity_divisor)); + public override Task load(TimeAndSalesSettings state) { + var conf = Configuration.get(); + var thread_id = Configuration.get().time_and_sales ? + TimeAndSalesWindow.WINDOW_TYPE_NAME : null; + var settings_man = new WindowSettingsManager( + _settings_hub, state.grid, s => s.time_and_sales_grid, (s, g) => s.with(time_and_sales: g)); + var win = new TimeAndSalesWindow( + this, + _bus, + _consumer, + state, + settings_man, + conf.can_pause_updates, + _security_auxiliary_model.get_display_quantity_divisor, + thread_id); + return Task.FromResult(win); + } public async void show(SecurityCriteria criteria) { var w = await load(TimeAndSalesSettings.Default(criteria)); _bus.post(SparkTags.ShowWindow, w); } - - readonly struct TimeAndSalesConfig { - public readonly bool can_pause_updates; - - public TimeAndSalesConfig(bts.config.TimeAndSalesOptions options) => - can_pause_updates = options.can_pause_updates; - } } } diff --git a/src/client/spark_core/utils/Exceptions/ExceptionAssert.cs b/src/client/spark_core/utils/Exceptions/ExceptionAssert.cs index 5c6b09869..9d0bc1921 100644 --- a/src/client/spark_core/utils/Exceptions/ExceptionAssert.cs +++ b/src/client/spark_core/utils/Exceptions/ExceptionAssert.cs @@ -110,6 +110,12 @@ namespace mbts.utils { foreach ((object value, string name) prop in properties) PropertyNotNull(prop.value, prop.name); } + + public static void member_null(T value, string name) where T : class { + if (value is not null) { + throw new InvalidOperationException($"{name} has already been created"); + } + } } } }