From 28fd04293ba1982125dbaceb2f62b35df090d855 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 24 Jan 2019 13:41:33 -0600 Subject: [PATCH] adding single-click delete/cancel functionality --- .../Trading/OrderBook/OrderBookColumns.cs | 51 ++++++++++++++++++- .../Trading/OrderBook/OrderBookRowVM.cs | 5 +- .../Modules/Trading/OrderBook/OrderBookVM.cs | 14 +++-- .../Trading/OrderBook/OrderBookView.xaml.cs | 2 +- .../Trading/OrderBook/OrderBookWindow.cs | 2 +- .../Controls/DIYGrid/Columns/ColumnBase.cs | 3 +- .../spark/view/Spark/Ladder/LadderOrderVM.cs | 1 + 7 files changed, 69 insertions(+), 9 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index acb550f67..1ba081d1b 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -63,7 +63,6 @@ namespace mbts.spark { readonly List _active_comparers = new List(); public OrderBookColumnCollection(IBus bus, OrdersModel model, IObservable<(IEnumerable added, IEnumerable removed)> order_securities) { - // security Add(security_column = new SecurityColumn( DiscreteValuesFilterVM.Create( order_securities, @@ -291,6 +290,7 @@ namespace mbts.spark { public event Action filter_changed; + public CancelColumn cancel_column { get; } public SecurityColumn security_column { get; } public SimpleTextColumn symbol_column { get; } public SimpleTextColumn time_created_column { get; } @@ -651,6 +651,55 @@ namespace mbts.spark { base.OnSortDirectionChanged(new_value); } } + + public class CancelColumn : FrameworkElementColumnBase { + readonly BindingBase _command_binding; + + public CancelColumn(Columns key, string command_property) : base(key) { + id = key.ToString(); + Header = DefaultColumnHeaders.Delete; + _command_binding = new Binding(command_property); + } + + public override FrameworkElement view_factory() { + var grid = new Grid() { + HorizontalAlignment = HorizontalAlignment.Center, + VerticalAlignment = VerticalAlignment.Center, + }; + var l1 = new System.Windows.Shapes.Line() { + StrokeThickness = 1, + Stroke = Brushes.White, + X1 = 0.5, + Y1 = 0.5, + X2 = 7, + Y2 = 7 + }; + var l2 = new System.Windows.Shapes.Line() { + StrokeThickness = 1, + Stroke = Brushes.White, + X1 = 0.5, + Y1 = 7, + X2 = 7, + Y2 = 0.5 + }; + grid.Children.Add(l1); + grid.Children.Add(l2); + + var button = new Button() { + Content = grid, + Background = Brushes.Red, + Foreground = Brushes.White, + Margin = new Thickness(2), + VerticalAlignment = VerticalAlignment.Center, + Height = 14, + Width = 14 + }; + + button.SetBinding(Button.CommandProperty, _command_binding); + return button; + } + } + #endregion static class RenderUtils { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index eb20fbb3c..ab0b19c37 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -13,7 +13,7 @@ namespace mbts.spark { const string _unknown_security_price_format_string = "0.#########"; const int _unknown_security_price_num_fractional_digits = 9; readonly OrderBookVM _owner; - IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd; + IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd; bool _is_parent, _is_expanded; int _depth_level; SecurityMD? _security_md => order_tuple.security_md; @@ -80,6 +80,9 @@ namespace mbts.spark { ICommand DIYGrid.IActionableRowVM.default_command => _show_order_modify_cmd ?? (_show_order_modify_cmd = new DelegateCommand(() => _owner.show_order_modify(this), () => status == OrderStatus.Working)); + public ICommand cancel_command => _cancel_cmd ?? + (_cancel_cmd = new DelegateCommand(() => _owner.cancel_order(this), () => status == OrderStatus.Working)); + // These fns present a way for the orderbook to avoid noisy, intermittent collection changes during "Expand/Collapse All" ops, // when incremental changes are ignored in favor of a full reset, after 'is_expanded' is updated for all rows. internal void expand_internal() => Set(ref _is_expanded, true); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index f938c0e2e..5c62ac6ed 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -34,17 +34,19 @@ namespace mbts.spark { readonly List _resources; OrderBookStartupData _state; - public OrderBookVM(IObservable owner_title, IBus bus, INotificationService notification_service, OrdersModel model, IWindowSettingsManager settings_manager, bool _rows_are_initially_expanded = false) { + public OrderBookVM(IObservable owner_title, IBus bus, INotificationService notification_service, OrdersModel model, IWindowSettingsManager settings_manager, bool rows_are_initially_expanded = false) { _bus = bus; _model = model; _settings_manager = settings_manager; _columns = new OrderBookColumnCollection(bus, model, model.on_order_securities.Select(u => (u.added.Values.Select(smd => smd.security), u.removed.Values.Select(smd => smd.security)))); - _row_collection = new OrderBookRowCollection(ort => new OrderBookRowVM(this, ort, _rows_are_initially_expanded), _columns.get_sorting_data().comparer) { filter = _columns.get_filter() }; + // we use an ObservableAppendCollection b/c the mini-ob needs a cancel column at the front + columns = new ObservableAppendCollection(_columns); + _row_collection = new OrderBookRowCollection(ort => new OrderBookRowVM(this, ort, rows_are_initially_expanded), _columns.get_sorting_data().comparer) { filter = _columns.get_filter() }; _current_row = backing(nameof(current_row)); _columns.filter_changed += on_filter_changed; collapse_all_rows_command = new DelegateCommand(_row_collection.collapse_all); expand_all_rows_command = new DelegateCommand(_row_collection.expand_all); - grid_settings_manager = _create_grid_settings_manager(owner_title, bus, notification_service, model, rows, columns); + grid_settings_manager = _create_grid_settings_manager(owner_title, bus, notification_service, model, rows, core_columns); _resources = new List { model.on_order_tuples_table.OnDispatcher().Subscribe(_row_collection.update), grid_settings_manager, @@ -63,7 +65,8 @@ namespace mbts.spark { public event Action selected_order_changed; public event Action OnDisposed; - public ObservableCollection columns => _columns; + public ObservableAppendCollection columns { get; set; } + public ObservableCollection core_columns => _columns; public ObservableCollection rows => _row_collection; public OrderBookRowVM current_row { get => _current_row.Value; set => _current_row.Value = value ?? _selected_rows.FirstOrDefault(); } public OrderRecordImmutable? current_order => current_row?.order; @@ -133,6 +136,9 @@ namespace mbts.spark { internal void show_order_modify(OrderBookRowVM row) => _bus.post(SparkTags.ShowModifyOrderTag, row.order_key); + internal void cancel_order(OrderBookRowVM row) => + _bus.post(SparkTags.CancelOrders, new List { row.order_key }); + internal void on_expanded_changed(OrderBookRowVM row) { using (_row_collection.defer_refresh(true)) { if (row.is_expanded) { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs index a497b3cbe..7f30240d6 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs @@ -5,7 +5,7 @@ namespace mbts.spark { internal partial class OrderBookView : UserControl { // IMPORTANT: these enums are stored as strings in the general-purpose GridColumnSettings proto, and are used to ID THE COLUMNS! // Do NOT RENAME them! However, if you must, be sure to write an IShellWindowMigrationRule or something to account for backwards compatability. - public enum Columns { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey } + public enum Columns { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey, Cancel } public const string SubTypeFilterTemplateKey = "SubTypeFilterTemplate", ExpandCollapseToggleStyleKey = "ExpandCollapseToggleStyle", diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs index 1bbf0173e..3c4c08060 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs @@ -131,7 +131,7 @@ namespace mbts.spark { return _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.general.with(_vm.columns.Select(c => c.create())), + s.general.with(_vm.core_columns.Select(c => c.create())), this.observe_title() ); } diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index 3edb17e7d..019581851 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -97,7 +97,8 @@ namespace mbts.ui.controls { DayPnL = "Day PnL", TotalNetPos = "Total Net Pos", TotalPnL = "Total PnL", - PnLPrice = "PnL Price"; + PnLPrice = "PnL Price", + Delete = "Delete"; } public interface IKeyedColumn { diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 5ee091bc9..0edefcfa4 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -214,6 +214,7 @@ namespace mbts.spark { use_defaults: false ); obvm.load_from(state); + obvm.columns.Insert(0, new OrderBookVM.CancelColumn(OrderBookView.Columns.Cancel, nameof(OrderBookRowVM.cancel_command))); return obvm; } }