diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs index 9ee16c293..765bd16c2 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs @@ -43,6 +43,7 @@ namespace mbts.spark { static readonly IComparer _sec_md_key_comparer = Comparer.Default.wrap(SecurityMD.key_fn); static readonly IComparer _row_key_comparer = _sec_md_key_comparer.wrap(r => r.security_md); + static readonly string _security_delimiter = $" {SpecialCharacters.Dot} "; readonly IBus _bus; readonly OrdersModel _orders_model; @@ -84,6 +85,11 @@ namespace mbts.spark { IsLiveFiltering = true }; _rows_view.LiveFilteringProperties.Add(nameof(Row.is_visible)); + // Important: these selected_security/md wrappers should be instantiated in the constructor (rather than lazily), + // to prevent situations where callers subscribe up to the selected_rows.CollectionChanged event before the wrappers do. + // This way, the wrappers are protected from unintended side effects of the foreign callbacks, as they will always receive CollectionChange notifications first. + selected_securities = selected_rows.SelectObservable(r => r.security); + selected_security_mds = selected_rows.SelectObservable(r => r.security_md); // Columns const string merged_size_col_header = "Qty", direct_size_col_header = "Direct", implied_size_col_header = "Implied", working_col_header = "Working"; const double working_orders_col_width = 105; @@ -215,7 +221,8 @@ namespace mbts.spark { Color? foreground = null, Color? background = null, HorizontalAlignment h_alignment = HorizontalAlignment.Right, - string tooltip = null) { + string tooltip = null, + BindingBase tooltip_binding = null) { var col = new HyperlinkElementColumn( col_key, filter, filter_template) { @@ -236,7 +243,12 @@ namespace mbts.spark { // void on_view_generated(HyperlinkCell cell_view) { cell_view.SetValue(ColumnKeyProperty, col_key); - cell_view.ToolTip = tooltip; + cell_view.SetValue(ColumnProperty, col); + if (tooltip != null) { + cell_view.ToolTip = tooltip; + } else if (tooltip_binding != null) { + cell_view.SetBinding(FrameworkElement.ToolTipProperty, tooltip_binding); + } if (use_mouse_state_transitions) init_hyperlink_hover_animation(cell_view, col); } @@ -321,9 +333,13 @@ namespace mbts.spark { public ICollectionView rows_view => _rows_view; public ObservableCollection rows => _rows; public ObservableCollection selected_rows { get; } = new ObservableCollection(); + public IReadOnlyObservableCollection selected_securities { get; } + public IReadOnlyObservableCollection selected_security_mds { get; } public Color selection_highlight { get => _selection_highlight; set => Set(ref _selection_highlight, value); } public ObservableCollection columns { get; } = new ObservableCollection(); public Row current_row { get => _current_row.Value; set => _current_row.set(value); } + public SecurityImmutable? current_security => current_row?.security; + public SecurityMD? current_security_md => current_row?.security_md; internal IBus bus => _bus; internal OrdersModel orders_model => _orders_model; @@ -408,12 +424,12 @@ namespace mbts.spark { Comparer.Default.wrap(selector); } - public (FillsVM vm, string context, string title, Color fg) fills_params(SecurityImmutable security, Columns column) { + public (FillsVM vm, string context, string title, Color fg) fills_params(IEnumerable securities, Columns column) { var (title_desc, fg) = _fills_title(column); var state = StartupData.DefaultAuxiliaryFills; if (state.filters == null) state.filters = new bts.shell.fills.FillsFilterStates(); - state.filters.security = SecurityCriteria.from_keys(new[] { security.Id }); + state.filters.security = SecurityCriteria.from_keys(securities.Select(SecurityDataHelper.key_fn)); switch (column) { case Columns.RawDayPosition: state.filters.fill_kind = new[] { @@ -430,13 +446,13 @@ namespace mbts.spark { state.grid = GridSettingsHelper.hide_cols(state.grid, new[] { ui.spark.FillsView.Columns.Security }); var vm = new FillsVM( _bus, _orders_model, state, new WindowSettingsManager.DisconnectedImpl(state.grid)); - return (vm, $"{security}", title_desc, fg); + return (vm, $"{string.Join(_security_delimiter, securities)}", title_desc, fg); } - public (OrderBookVM vm, string context, string title, Color fg) orderbook_params(SecurityImmutable security, Columns column) { + public (OrderBookVM vm, string context, string title, Color fg) orderbook_params(IEnumerable securities, Columns column) { var (title_desc, fg) = _orderbook_title(column); var filters = new bts.shell.orderbook.FilterStates { - security_criteria = SecurityCriteria.from_keys(new[] { security.Id }) + security_criteria = SecurityCriteria.from_keys(securities.Select(SecurityDataHelper.key_fn)) }; switch (column) { case Columns.WorkingBids: filters.sides = new[] { Side.Buy }; break; @@ -446,7 +462,7 @@ namespace mbts.spark { OrderBookGridView.ColumnKeys.Security, OrderBookGridView.ColumnKeys.Side }); - return (vm, $"{security}", title_desc, fg); + return (vm, $"{string.Join(_security_delimiter, securities)}", title_desc, fg); } public FilterStates get_filter_states() { diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs index 228f4fc71..5f205a0f5 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs @@ -5,6 +5,7 @@ using mbts.ui.controls; using mbts.ui.converters; using mbts.ui.extensions; +using System.Collections.Generic; using System.Linq; using System.Reactive.Linq; using System.Windows; @@ -74,32 +75,38 @@ namespace mbts.ui.spark { DIYGridPopupManager _popup_man => _popup_man_backing ?? (_popup_man_backing = DIYGridPopupManager.create(this)); - public void show_mini_orderbook(SecurityMD security_md) => - _show_mini_orderbook(security_md, Columns.None); + public void show_working_orders(IReadOnlyList securities) => + _show_mini_orderbook(securities, Columns.None); + + public void show_mini_fills(IReadOnlyList securities) => + _show_mini_fills(securities, Columns.None); + + public void show_order_ticket(SecurityMD security_md) => + _show_order_ticket(security_md); void _on_cell_click(MarketViewVM.Row row, Columns col) { switch (col) { case Columns.WorkingAsks: case Columns.WorkingBids: - _show_mini_orderbook(row.security_md, col); + _show_mini_orderbook(row.security, col); break; case Columns.Bid: - _show_order_ticket(row.security, row.bid_price); + _show_order_ticket(row.security_md, row.bid_price); break; - case Columns.BidMergedSize: _show_order_ticket(row.security, row.bid_price, row.bid_merged_size); break; - case Columns.BidDirectSize: _show_order_ticket(row.security, row.bid_price, row.bid_direct_size); break; - case Columns.BidImpliedSize: _show_order_ticket(row.security, row.bid_price, row.bid_implied_size); break; + case Columns.BidMergedSize: _show_order_ticket(row.security_md, row.bid_price, row.bid_merged_size); break; + case Columns.BidDirectSize: _show_order_ticket(row.security_md, row.bid_price, row.bid_direct_size); break; + case Columns.BidImpliedSize: _show_order_ticket(row.security_md, row.bid_price, row.bid_implied_size); break; case Columns.Ask: - _show_order_ticket(row.security, row.ask_price); + _show_order_ticket(row.security_md, row.ask_price); break; - case Columns.AskMergedSize: _show_order_ticket(row.security, row.ask_price, row.ask_merged_size); break; - case Columns.AskDirectSize: _show_order_ticket(row.security, row.ask_price, row.ask_direct_size); break; - case Columns.AskImpliedSize: _show_order_ticket(row.security, row.ask_price, row.ask_implied_size); break; + case Columns.AskMergedSize: _show_order_ticket(row.security_md, row.ask_price, row.ask_merged_size); break; + case Columns.AskDirectSize: _show_order_ticket(row.security_md, row.ask_price, row.ask_direct_size); break; + case Columns.AskImpliedSize: _show_order_ticket(row.security_md, row.ask_price, row.ask_implied_size); break; case Columns.Last: - _show_order_ticket(row.security, row.last_price); + _show_order_ticket(row.security_md, row.last_price); break; case Columns.LastSize: - _show_order_ticket(row.security, row.last_price, row.last_size); + _show_order_ticket(row.security_md, row.last_price, row.last_size); break; case Columns.Position: case Columns.RawDayPosition: @@ -108,8 +115,11 @@ namespace mbts.ui.spark { } } - void _show_mini_orderbook(SecurityMD security_md, Columns col) { - var (vm, context, title, fg) = _vm.orderbook_params(security_md.security, col); + void _show_mini_orderbook(SecurityImmutable security, Columns col) => + _show_mini_orderbook(new[] { security }, col); + + void _show_mini_orderbook(IReadOnlyList securities, Columns col) { + var (vm, context, title, fg) = _vm.orderbook_params(securities, col); _show_popup(vm, new AuxiliaryDataHeader { context = context, title = title, @@ -117,8 +127,11 @@ namespace mbts.ui.spark { }); } - void _show_mini_fills(SecurityImmutable security, Columns col) { - var (vm, context, title, fg) = _vm.fills_params(security, col); + void _show_mini_fills(SecurityImmutable security, Columns col) => + _show_mini_fills(new[] { security }, col); + + void _show_mini_fills(IEnumerable securities, Columns col) { + var (vm, context, title, fg) = _vm.fills_params(securities, col); _show_popup(vm, new AuxiliaryDataHeader { context = context, title = title, @@ -126,18 +139,12 @@ namespace mbts.ui.spark { }); } - async void _show_order_ticket(SecurityImmutable security, double price = double.NaN, uint size = 0) { - var sec_md = await _bus.subscribe(SparkTags.SecuritiesTag) - .Select(sec_map => sec_map.TryGetValue(security.Id, out var smd) ? smd : (SecurityMD?)null) - .SkipWhile(smd => !smd.HasValue) - .FirstOrDefaultAsync(); - if (sec_md.HasValue) { - var resources = new OrderTicketResources(); - resources.MergedDictionaries.Add(new AuxiliaryDataResources()); - var ticket_vm = new NewOrderTicketVM( - _model, sec_md.Value, _model.factory.order(security), price, size, Observable.Return(mbts.spark.LadderSettings.Default.calculator_buttons)); - _show_popup(ticket_vm, new OrderTicketHeader { bbo = ticket_vm.bbo }, resources); - } + void _show_order_ticket(SecurityMD security_md, double price = double.NaN, uint size = 0) { + var resources = new OrderTicketResources(); + resources.MergedDictionaries.Add(new AuxiliaryDataResources()); + var ticket_vm = new NewOrderTicketVM( + _model, security_md, _model.factory.order(security_md.security), price, size, Observable.Return(mbts.spark.LadderSettings.Default.calculator_buttons)); + _show_popup(ticket_vm, new OrderTicketHeader { bbo = ticket_vm.bbo }, resources); } void _show_popup(object content, object header) { diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs index 35918e733..edd014bd3 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs @@ -144,6 +144,13 @@ namespace mbts.spark { }); var show_fills_actual_cmd = SparkCommands.ShowFills(); var show_fills_cmd_wrapper = new SparkCommandCommand(show_fills_actual_cmd.title, show_fills_actual_cmd.icon, show_fills_cmd, SparkCommands.KeyGestures.ShowFills); + var show_mini_fills_cmd = new DelegateCommand(() => _view.show_mini_fills(_vm.selected_securities), () => _vm.selected_securities.Count > 0); + var show_ticket_cmd = new DelegateCommand(() => { + var smd = _vm.current_security_md; + if (smd.HasValue) + _view.show_order_ticket(smd.Value); + }, () => _vm.current_security_md.HasValue); + var show_ticket_actual_cmd = SparkCommands.ShowOrderTicketFromSecurity(SparkCommands.KeyGestures.ShowOrderTicket); // show synthetic create var show_synth_create_cmd = new DelegateCommand(() => { var sc = _sorted_selected_security_criteria; @@ -152,9 +159,8 @@ namespace mbts.spark { }, () => _vm.selected_rows.Count > 0 && _vm.selected_rows.Count <= 24); var show_synth_create_actual_cmd = SparkCommands.ShowSyntheticCreate(); var show_synth_create_cmd_wrapper = new SparkCommandCommand(show_synth_create_actual_cmd.title, show_synth_create_actual_cmd.icon, show_synth_create_cmd, SparkCommands.KeyGestures.ShowSyntheticCreate); + var show_working_orders_cmd = new DelegateCommand(() => _view.show_working_orders(_vm.selected_securities), () => _vm.selected_securities.Count > 0); - var show_mini_ob_cmd = ObservantCommand.create(_view.show_mini_orderbook, s => s.HasValue, s => s.Value, out var show_mini_ob_observer); - // commands var current_sec_md_src = Observable.Create(o => { notify(null, null); _vm.current_row_changed += notify; @@ -167,9 +173,11 @@ namespace mbts.spark { }); _commands = new List { SparkCommands.ShowLadders(SparkCommands.KeyGestures.ShowLadder).complete(_vm.selected_rows.Observe().Select(_ => _vm.selected_rows.WrapSelectorRO(r => r.security_md)), smds => smds.Count > 0), - SparkCommands.ShowOrderTicketFromSecurity(SparkCommands.KeyGestures.ShowOrderTicket).complete(current_sec_md_src, md => md.HasValue, ConvertUtils.ValueOrDefault), - new SparkCommandCommand("Working Orders", Icons.Orders, show_mini_ob_cmd), - show_fills_cmd_wrapper, + //show_ticket_actual_cmd.complete(current_sec_md_src, md => md.HasValue, ConvertUtils.ValueOrDefault), + new SparkCommandCommand("Working Orders", Icons.Orders, show_working_orders_cmd), + new SparkCommandCommand("Fills", show_fills_actual_cmd.icon, show_mini_fills_cmd), + new SparkCommandCommand(show_ticket_actual_cmd.title, show_ticket_actual_cmd.icon, show_ticket_cmd), + //show_fills_cmd_wrapper, show_tas_cmd_wrapper, show_synth_create_cmd_wrapper, SparkCommands.change_securities_command(() => (update_securities_cmd, _state.security_criteria)), @@ -195,7 +203,6 @@ namespace mbts.spark { // _vm.selected_rows.CollectionChanged += on_selection_changed; _subscriptions = new CompositeDisposable( - current_sec_md_src.Subscribe(show_mini_ob_observer), _settings_manager.subscribe_current().OnDispatcher().Subscribe(new CompositeObserver(_grid_settings_manager) { s => _vm.selection_highlight = s.selection_highlight })) { @@ -212,6 +219,9 @@ namespace mbts.spark { show_tas_cmd.RaiseCanExecuteChanged(); show_fills_cmd.RaiseCanExecuteChanged(); show_synth_create_cmd.RaiseCanExecuteChanged(); + show_working_orders_cmd.RaiseCanExecuteChanged(); + show_mini_fills_cmd.RaiseCanExecuteChanged(); + show_ticket_cmd.RaiseCanExecuteChanged(); } void on_grid_sorting(object sender, ui.controls.DIYGridSortingEventArgs e) => diff --git a/src/client/spark_core/data/SecurityDataHelper.cs b/src/client/spark_core/data/SecurityDataHelper.cs index 0add8fd87..fb3feb363 100644 --- a/src/client/spark_core/data/SecurityDataHelper.cs +++ b/src/client/spark_core/data/SecurityDataHelper.cs @@ -1,8 +1,11 @@ using bts.api; +using System; using System.Collections.Generic; namespace mbts.spark { static class SecurityDataHelper { + public static Func key_fn => s => s.Id; + public static class Defaults { public static ContractSpecification ContractSpecification => new ContractSpecification {