From bf2a54717cf3fc998fbec1f66e0145b949dfb36f Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 5 Feb 2025 15:14:41 -0500 Subject: [PATCH] ui (orderbook): Add Filled Notional Value column --- .../Trading/OrderBook/OrderBookColumns.cs | 33 ++ .../Trading/OrderBook/OrderBookRowVM.cs | 8 + .../Settings/OrderBookFilterStates.cs | 5 + .../OrderBook/Settings/OrderBookSettings.cs | 548 +++++++++--------- .../OrderBook/View/OrderBookGridView.xaml.cs | 217 +++---- .../Controls/DIYGrid/Columns/ColumnBase.cs | 2 + .../spark_api/Orders/OrderRecordTuple.cs | 6 + .../spark_api/Orders/OrdersExtensions.cs | 3 + 8 files changed, 443 insertions(+), 379 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 139c5a0fe..9476e58ac 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -236,6 +236,10 @@ namespace mbts.spark { new DoubleMinMax( ort => ort.order.order.filled_quantity(), nameof(OrderBookRowVM.filled_quantity)))); + // filled notional value + Add(filled_notional_value_column = new FilledNotionalValueColumn( + new DoubleMinMax( + ort => ort.filled_notional_value, nameof(OrderBookRowVM.filled_notional_value)))); // price Add(price_column = new SimpleTextColumn( Columns.Price, @@ -371,6 +375,7 @@ namespace mbts.spark { public EditableQtyColumn edit_qty_column { get; } public SimpleTextColumn price_column { get; } public FilledColumn filled_qty_column { get; } + public FilledNotionalValueColumn filled_notional_value_column { get; } public SimpleTextColumn last_price_column { get; } public SimpleTextColumn avg_price_column { get; } public SimpleTextColumn status_column { get; } @@ -399,6 +404,7 @@ namespace mbts.spark { notional_value = notional_value_column.filter.get_state(), price = price_column.filter.get_state(), qty_filled = filled_qty_column.filter.get_state(), + filled_notional_value = filled_notional_value_column.filter.get_state(), avg_price = avg_price_column.filter.get_state(), last_price = last_price_column.filter.get_state(), statuses = status_column.filter.get_state(), @@ -423,6 +429,7 @@ namespace mbts.spark { qty_column.filter.load_state(fs.qty); notional_value_column.filter.load_state(fs.notional_value); filled_qty_column.filter.load_state(fs.qty_filled); + filled_notional_value_column.filter.load_state(fs.filled_notional_value); side_column.filter.load_state(fs.sides); order_type_column.filter.load_state(fs.order_types); root_algo_type_column.filter.load_state(fs.root_algo_types); @@ -690,6 +697,32 @@ namespace mbts.spark { DefaultCellPadding); } + public class FilledNotionalValueColumn : OrderbookColumnBase, IRenderColumn { + public FilledNotionalValueColumn(IDataGridColumnPersistentFilter filter) + : base( + Columns.FilledNotionalValue, + DefaultColumnHeaders.FilledNotionalValue, + r => r.filled_notional_value_text, + DefaultColumnWidths.FilledNotionalValue, + filter, + DataGridFilterKnownTemplates.DoubleMinMax, + _wrap_comparer(r => r.filled_notional_value)) { } + + public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => + CellRender.draw_text( + dc, + _get_glyph_context(row), + font_size, + row.filled_notional_value_text, + position, + row_height, + RenderUtils.get_side_brush(row), + background_brush, + horizontal_alignment, + VerticalAlignment.Center, + DefaultCellPadding); + } + public class OrderBookOrderTypeColumn : OrderTypeColumn, ICVOrderBookColumn { readonly BindingBase _foreground_binding; ListSortDirection? _cached_sort_direction; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 77e81efe4..edcdf425d 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -130,6 +130,8 @@ namespace mbts.spark { filled_quantity.safe_divide(_display_qty_divisor); public string display_filled_quantity_text => quantity_display_settings.to_tick_display_settings().format(display_filled_quantity); + public double filled_notional_value => order_tuple.filled_notional_value; + public string filled_notional_value_text => _fmt_price(filled_notional_value); public string last_msg => order.last_msg(); // piq public uint piq => order_tuple.order.piq ?? uint.MaxValue; @@ -360,6 +362,9 @@ namespace mbts.spark { if ((Columns.Filled & dirty) != 0) { RaisePropertyChanged(nameof(filled_quantity), nameof(display_filled_quantity)); } + if ((Columns.FilledNotionalValue & dirty) == Columns.FilledNotionalValue) { + RaisePropertyChanged(nameof(filled_notional_value), nameof(filled_notional_value_text)); + } // badge fill if (old_order_tuple.order.meta?.badge_color != order_tuple.order.meta?.badge_color) { // invalidate by setting to null (will be re-instantiated in the public getter) @@ -523,6 +528,9 @@ namespace mbts.spark { if (oldval.order.piq != newval.order.piq) { dirty |= Columns.Piq; } + if (oldval.filled_notional_value != newval.filled_notional_value) { + dirty |= Columns.FilledNotionalValue; + } return dirty; } } diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs index 388e48784..ebf7619be 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs @@ -47,6 +47,8 @@ namespace bts.shell.orderbook { public DoubleMinMaxState price; [ProtoMember(12)] public DoubleMinMaxState qty_filled; + [ProtoMember(27)] + public DoubleMinMaxState filled_notional_value; [ProtoMember(13)] public DoubleMinMaxState avg_price; [ProtoMember(14)] @@ -88,6 +90,7 @@ namespace bts.shell.orderbook { notional_value.safe_equals(other.notional_value) && price.safe_equals(other.price) && qty_filled.safe_equals(other.qty_filled) && + filled_notional_value.safe_equals(other.filled_notional_value) && avg_price.safe_equals(other.avg_price) && last_price.safe_equals(other.last_price) && EqualityComparer.safe_sequence_equals(statuses, other.statuses) && @@ -117,6 +120,7 @@ namespace bts.shell.orderbook { notional_value?.GetHashCode() ?? 0, price?.GetHashCode() ?? 0, qty_filled?.GetHashCode() ?? 0, + filled_notional_value?.GetHashCode() ?? 0, avg_price?.GetHashCode() ?? 0, last_price?.GetHashCode() ?? 0, EqualityComparer.safe_aggregate_hash(statuses), @@ -156,6 +160,7 @@ namespace bts.shell.orderbook { pb.add_numeric(fs.notional_value, o => o.notional_value); pb.add_price(fs.price, o => o.order.order.ui_price(), o => o.order.security); pb.add_numeric(fs.qty_filled, o => o.order.order.filled_quantity()); + pb.add_numeric(fs.filled_notional_value, o => o.filled_notional_value); pb.add_numeric(fs.avg_price, o => o.order.order.avg_price()); pb.add_numeric(fs.last_price, o => o.order.order.last_price()); pb.add_numeric(fs.piq, o => o.order.piq ?? uint.MaxValue); diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs index a2d90387e..e28a6a32e 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs @@ -1,271 +1,277 @@ -using bts.api.orderman; -using bts.shell.fills; - -using mbts; -using mbts.ui; -using mbts.ui.controls; -using mbts.ui.settings; - -using ProtoBuf; - -using System; -using System.Collections.Generic; -using System.Linq; -using System.Reactive.Linq; -using System.Windows; - -using Columns = mbts.spark.OrderBookGridView.ColumnKeys; -using GridSettings = mbts.ui.settings.GridSettings; - -namespace bts.shell.orderbook { - using ColHeader = mbts.ui.controls.DIYGrid.DefaultColumnHeaders; - using ColWidth = mbts.ui.controls.DIYGrid.DefaultColumnWidths; - - [ProtoContract] - class OrderBookStartupData { - const bool - _default_show_right_panel = true, - _default_show_order_params = true; - const double - _default_right_panel_width = 400, - _default_order_params_height = 250, - _default_fills_height = 300, - _default_ladder_height = 350; - [ProtoMember(16)] - OrderBookRightPanelSettings _right_panel; - // ALREADY USED TAGS - // [ProtoMember(5)] - // public readonly List sort_criteria; - - public OrderBookRightPanelSettings right_panel => _right_panel ?? (_right_panel = new OrderBookRightPanelSettings()); - /// TODO: remove properties below, and redirect callers to - // right panel (host) - public bool show_right_panel { get => right_panel.show; set => right_panel.show = value; } - public double right_panel_width { get => right_panel.width; set => right_panel.width = value; } - // order params - public bool show_order_params { get => right_panel.stack.show_order_params; set => right_panel.stack.show_order_params = value; } - public double order_params_height { get; set; } - // ladder - public bool show_ladder { get; set; } - public double ladder_height { get => right_panel.stack.ladder_height; set => right_panel.stack.ladder_height = value; } - // fills - public bool show_fills { get => right_panel.stack.show_fills; set => right_panel.stack.show_fills = value; } - public double fills_height { get => right_panel.stack.fills_height; set => right_panel.stack.fills_height = value; } - - // filters - [ProtoMember(10)] - public FilterStates filters; - // grid - [ProtoMember(15)] - [Obsolete] - public GridSettings grid { get; set; } - // orderbook grid - [ProtoMember(17)] - public OrderBookGridSettings orderbook_grid { get; set; } - // fills settings - [ProtoMember(26)] - public OrderBookFillsGridSettings fills_settings { get; set; } - // predicate animations - [ProtoMember(20)] - [Obsolete] - List _predicate_animations; - // use defaults - [ProtoMember(25)] - public bool use_defaults; - // menu display - [ProtoMember(27)] - public SparkMenuDisplaySettings menu_display { get; set; } - - /// - /// Please use to get a new instance (the only reason the default constructor still exists is for ProtoBuf deserialization). - /// - [Obsolete] - public OrderBookStartupData() { - show_right_panel = _default_show_right_panel; - show_order_params = _default_show_order_params; - right_panel_width = _default_right_panel_width; - order_params_height = _default_order_params_height; - fills_height = _default_fills_height; - ladder_height = _default_ladder_height; - } - - public OrderBookStartupData(FilterStates filters, OrderBookGridSettings orderbook_grid = default, bool show_right_panel = false, double right_panel_width = 0, double fills_height = 0, bool show_fills = false, bool use_defaults = false) { - this.filters = filters; - this.use_defaults = use_defaults; - this.show_right_panel = show_right_panel; - this.right_panel_width = right_panel_width; - this.fills_height = fills_height; - this.show_fills = show_fills; - this.orderbook_grid = orderbook_grid; -#pragma warning disable CS0612 // Type or member is obsolete - _predicate_animations = new List(); - if (predicate_animations != null) - _predicate_animations.AddRange(predicate_animations); -#pragma warning restore CS0612 // Type or member is obsolete - } - -#pragma warning disable CS0612 // Type or member is obsolete - [Obsolete] - public IReadOnlyList predicate_animations => _predicate_animations ?? (_predicate_animations = new List()); - public OrderBookGridSettings grid_settings_wrapper() { - if (use_defaults) - return null; - if (orderbook_grid == null) { - if (grid == null) - grid = _default_general_grid; - orderbook_grid = new OrderBookGridSettings(grid.Clone(), _predicate_animations); - } - return orderbook_grid; - } -#pragma warning restore CS0612 // Type or member is obsolete - - public static OrderBookStartupData Default => - new OrderBookStartupData( - new FilterStates { statuses = new[] { OrderStatus.Working } }, - DefaultGrid, - _default_show_right_panel, - _default_right_panel_width, - _default_fills_height, - use_defaults: true) { - show_order_params = _default_show_order_params, - order_params_height = _default_order_params_height, - fills_settings = DefaultFillsGrid - }; - - public static OrderBookGridSettings DefaultGrid => new OrderBookGridSettings(_default_general_grid) { - algo_tree_display_mode = AlgoTreeDisplayMode.RootAndLeafNodes - }; - - public static OrderBookFillsGridSettings DefaultFillsGrid { - get { - var default_fills = FillsSettings.Default(); - var rv = new OrderBookFillsGridSettings { - sorting_criteria = default_fills.sorting_criteria.ToList(), - filters = default_fills.filters, - general = FillsSettings.MiniGridSettings - }; - return rv; - } - } - static GridSettings _default_general_grid => GridSettings.Default.with(DefaultColumns.standard, DefaultColumns.sorting_criteria); - public static OrderBookGridSettings default_mini_grid => new OrderBookGridSettings(GridSettings.Default.with(DefaultColumns.mini, DefaultColumns.sorting_criteria)) { - algo_tree_display_mode = AlgoTreeDisplayMode.RootAndLeafNodes - }; - - static class DefaultColumns { - // standard - public static GridColumnSettings security => new GridColumnSettings(Columns.Security.ToString(), DIYGrid.DefaultColumnHeaders.Security, width: DIYGrid.DefaultColumnWidths.Security); - public static GridColumnSettings symbol => new GridColumnSettings(Columns.Symbol.ToString(), DIYGrid.DefaultColumnHeaders.Symbol, width: DIYGrid.DefaultColumnWidths.Symbol, horizontal_alignment: HorizontalAlignment.Left); - public static GridColumnSettings time_created => new GridColumnSettings(Columns.Time.ToString(), "Time", width: DIYGrid.DefaultColumnWidths.Time, horizontal_alignment: HorizontalAlignment.Left); - public static GridColumnSettings last_change => new GridColumnSettings(Columns.LastChange.ToString(), "Last Change", width: DIYGrid.DefaultColumnWidths.Time, horizontal_alignment: HorizontalAlignment.Left); - public static GridColumnSettings user => new GridColumnSettings(Columns.User.ToString(), DIYGrid.DefaultColumnHeaders.User, width: DIYGrid.DefaultColumnWidths.User, horizontal_alignment: HorizontalAlignment.Left); - public static GridColumnSettings account => new GridColumnSettings(Columns.Account.ToString(), DIYGrid.DefaultColumnHeaders.Account, width: DIYGrid.DefaultColumnWidths.Account, horizontal_alignment: HorizontalAlignment.Left); - public static GridColumnSettings exchange => new GridColumnSettings(Columns.Exchange.ToString(), DIYGrid.DefaultColumnHeaders.Exchange, width: DIYGrid.DefaultColumnWidths.Exchange, horizontal_alignment: HorizontalAlignment.Left); - public static GridColumnSettings time_in_force => new GridColumnSettings(Columns.TimeInForce.ToString(), DIYGrid.DefaultColumnHeaders.TimeInForce, width: DIYGrid.DefaultColumnWidths.TimeInForce); - public static GridColumnSettings order_type => new GridColumnSettings(Columns.OrderType.ToString(), DIYGrid.DefaultColumnHeaders.OrderType, width: DIYGrid.DefaultColumnWidths.OrderType); - public static GridColumnSettings root_algo_type => new GridColumnSettings(Columns.RootAlgoType.ToString(), DIYGrid.DefaultColumnHeaders.RootAlgoType, width: DIYGrid.DefaultColumnWidths.OrderType); - public static GridColumnSettings sub_type => new GridColumnSettings(Columns.SubType.ToString(), "Sub Type", width: 80, horizontal_alignment: HorizontalAlignment.Left); - - public static GridColumnSettings side => new( - Columns.Side.ToString(), ColHeader.Side, - width: ColWidth.Side, - horizontal_alignment: HorizontalAlignment.Left); - - public static GridColumnSettings quantity => new GridColumnSettings(Columns.Size.ToString(), "Qty", width: DIYGrid.DefaultColumnWidths.Qty, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings notional_value => new GridColumnSettings(Columns.Size.ToString(), DIYGrid.DefaultColumnHeaders.NotionalValue, width: DIYGrid.DefaultColumnWidths.NotionalValue, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings price => new GridColumnSettings(Columns.Price.ToString(), DIYGrid.DefaultColumnHeaders.Price, width: DIYGrid.DefaultColumnWidths.Price, horizontal_alignment: HorizontalAlignment.Right); - - public static GridColumnSettings filled_quantity => new( - Columns.Filled.ToString(), - ColHeader.FilledQuantity, - width: ColWidth.Filled, - horizontal_alignment: HorizontalAlignment.Right); - - public static GridColumnSettings avg_price => new( - Columns.AvgFilled.ToString(), - ColHeader.AvgFilled, - width: ColWidth.AveragePrice, - horizontal_alignment: HorizontalAlignment.Right); - - public static GridColumnSettings last_price => new GridColumnSettings(Columns.LastPrice.ToString(), "Last Filled", width: DIYGrid.DefaultColumnWidths.LastPrice, horizontal_alignment: HorizontalAlignment.Right); - public static GridColumnSettings status => new GridColumnSettings(Columns.Status.ToString(), "Status", width: 80, horizontal_alignment: HorizontalAlignment.Left); - public static GridColumnSettings last_message => new GridColumnSettings(Columns.LastMessage.ToString(), "Last Message", width: DIYGrid.DefaultColumnWidths.LastMessage, horizontal_alignment: HorizontalAlignment.Left); - public static GridColumnSettings security_key => new GridColumnSettings(Columns.SecurityKey.ToString(), DIYGrid.DefaultColumnHeaders.SecurityKey, is_visible: false, width: DIYGrid.DefaultColumnWidths.SecurityKey, horizontal_alignment: HorizontalAlignment.Left); - public static GridColumnSettings order_key => new GridColumnSettings(Columns.OrderKey.ToString(), DIYGrid.DefaultColumnHeaders.OrderKey, width: DIYGrid.DefaultColumnWidths.OrderKey, horizontal_alignment: HorizontalAlignment.Left); - public static GridColumnSettings parent_key => new GridColumnSettings(Columns.ParentKey.ToString(), "Parent Key", width: DIYGrid.DefaultColumnWidths.ParentKey, horizontal_alignment: HorizontalAlignment.Left); - public static GridColumnSettings attached_target_order_key => new GridColumnSettings(Columns.AttachedTargetOrderKey.ToString(), DIYGrid.DefaultColumnHeaders.AttachedTargetOrderKey, width: DIYGrid.DefaultColumnWidths.ParentKey, horizontal_alignment: HorizontalAlignment.Left); - public static GridColumnSettings piq => new GridColumnSettings(Columns.Piq.ToString(), "PIQ", width: DIYGrid.DefaultColumnWidths.Qty, horizontal_alignment: HorizontalAlignment.Right); - // editable - public static GridColumnSettings cancel => new GridColumnSettings(Columns.Cancel.ToString(), DIYGrid.DefaultColumnHeaders.Cancel, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.Cancel); - public static GridColumnSettings attach_detach => new GridColumnSettings(Columns.Attach.ToString(), DIYGrid.DefaultColumnHeaders.AttachDetach, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.AttachDetach); - public static GridColumnSettings update => new GridColumnSettings(Columns.Update.ToString(), DIYGrid.DefaultColumnHeaders.Update, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.Update); - public static GridColumnSettings edit_quantity => new GridColumnSettings(Columns.EditableQty.ToString(), DIYGrid.DefaultColumnHeaders.Qty, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.EditableSize); - public static GridColumnSettings edit_price => new GridColumnSettings(Columns.EditablePrice.ToString(), DIYGrid.DefaultColumnHeaders.Price, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.EditablePrice); - public static GridColumnSettings commit => new GridColumnSettings(Columns.Commit.ToString(), width: DIYGrid.DefaultColumnWidths.MiniOrderBook.Commit); - - public static IEnumerable sorting_criteria { - get { - yield return new SortingCriteria(time_created.id, false); - } - } - - public static IEnumerable standard { - get { - yield return security; - yield return symbol; - yield return time_created; - yield return last_change; - yield return user; - yield return account; - yield return exchange; - yield return time_in_force; - yield return order_type; - yield return root_algo_type; - yield return sub_type; - yield return side; - yield return quantity; - yield return price; - yield return piq; - yield return filled_quantity; - yield return avg_price; - yield return last_price; - yield return status; - yield return last_message; - yield return security_key; - yield return order_key; - yield return parent_key; - yield return attached_target_order_key; - } - } - - public static IEnumerable editable { - get { - yield return cancel; - yield return update; - yield return edit_quantity; - yield return edit_price; - yield return commit; - yield return attach_detach; - } - } - - private static HashSet _mini_mode_columns_to_hide = new HashSet { - symbol, last_change, exchange, sub_type, quantity, price, avg_price, last_price, status, last_message, security_key, order_key, parent_key, attached_target_order_key - }; - - public static IEnumerable mini { - get { - foreach (var col_setting in editable) - yield return col_setting; - foreach (var col_setting in standard) { - if (_mini_mode_columns_to_hide.Contains(col_setting)) { - yield return col_setting.with(is_visible: false); - } else { - yield return col_setting; - } - } - } - } - } - } -} +using bts.api.orderman; +using bts.shell.fills; + +using mbts; +using mbts.ui; +using mbts.ui.controls; +using mbts.ui.settings; + +using ProtoBuf; + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reactive.Linq; +using System.Windows; + +using Columns = mbts.spark.OrderBookGridView.ColumnKeys; +using GridSettings = mbts.ui.settings.GridSettings; + +namespace bts.shell.orderbook { + using ColHeader = mbts.ui.controls.DIYGrid.DefaultColumnHeaders; + using ColWidth = mbts.ui.controls.DIYGrid.DefaultColumnWidths; + + [ProtoContract] + class OrderBookStartupData { + const bool + _default_show_right_panel = true, + _default_show_order_params = true; + const double + _default_right_panel_width = 400, + _default_order_params_height = 250, + _default_fills_height = 300, + _default_ladder_height = 350; + [ProtoMember(16)] + OrderBookRightPanelSettings _right_panel; + // ALREADY USED TAGS + // [ProtoMember(5)] + // public readonly List sort_criteria; + + public OrderBookRightPanelSettings right_panel => _right_panel ?? (_right_panel = new OrderBookRightPanelSettings()); + /// TODO: remove properties below, and redirect callers to + // right panel (host) + public bool show_right_panel { get => right_panel.show; set => right_panel.show = value; } + public double right_panel_width { get => right_panel.width; set => right_panel.width = value; } + // order params + public bool show_order_params { get => right_panel.stack.show_order_params; set => right_panel.stack.show_order_params = value; } + public double order_params_height { get; set; } + // ladder + public bool show_ladder { get; set; } + public double ladder_height { get => right_panel.stack.ladder_height; set => right_panel.stack.ladder_height = value; } + // fills + public bool show_fills { get => right_panel.stack.show_fills; set => right_panel.stack.show_fills = value; } + public double fills_height { get => right_panel.stack.fills_height; set => right_panel.stack.fills_height = value; } + + // filters + [ProtoMember(10)] + public FilterStates filters; + // grid + [ProtoMember(15)] + [Obsolete] + public GridSettings grid { get; set; } + // orderbook grid + [ProtoMember(17)] + public OrderBookGridSettings orderbook_grid { get; set; } + // fills settings + [ProtoMember(26)] + public OrderBookFillsGridSettings fills_settings { get; set; } + // predicate animations + [ProtoMember(20)] + [Obsolete] + List _predicate_animations; + // use defaults + [ProtoMember(25)] + public bool use_defaults; + // menu display + [ProtoMember(27)] + public SparkMenuDisplaySettings menu_display { get; set; } + + /// + /// Please use to get a new instance (the only reason the default constructor still exists is for ProtoBuf deserialization). + /// + [Obsolete] + public OrderBookStartupData() { + show_right_panel = _default_show_right_panel; + show_order_params = _default_show_order_params; + right_panel_width = _default_right_panel_width; + order_params_height = _default_order_params_height; + fills_height = _default_fills_height; + ladder_height = _default_ladder_height; + } + + public OrderBookStartupData(FilterStates filters, OrderBookGridSettings orderbook_grid = default, bool show_right_panel = false, double right_panel_width = 0, double fills_height = 0, bool show_fills = false, bool use_defaults = false) { + this.filters = filters; + this.use_defaults = use_defaults; + this.show_right_panel = show_right_panel; + this.right_panel_width = right_panel_width; + this.fills_height = fills_height; + this.show_fills = show_fills; + this.orderbook_grid = orderbook_grid; +#pragma warning disable CS0612 // Type or member is obsolete + _predicate_animations = new List(); + if (predicate_animations != null) + _predicate_animations.AddRange(predicate_animations); +#pragma warning restore CS0612 // Type or member is obsolete + } + +#pragma warning disable CS0612 // Type or member is obsolete + [Obsolete] + public IReadOnlyList predicate_animations => _predicate_animations ?? (_predicate_animations = new List()); + public OrderBookGridSettings grid_settings_wrapper() { + if (use_defaults) + return null; + if (orderbook_grid == null) { + if (grid == null) + grid = _default_general_grid; + orderbook_grid = new OrderBookGridSettings(grid.Clone(), _predicate_animations); + } + return orderbook_grid; + } +#pragma warning restore CS0612 // Type or member is obsolete + + public static OrderBookStartupData Default => + new OrderBookStartupData( + new FilterStates { statuses = new[] { OrderStatus.Working } }, + DefaultGrid, + _default_show_right_panel, + _default_right_panel_width, + _default_fills_height, + use_defaults: true) { + show_order_params = _default_show_order_params, + order_params_height = _default_order_params_height, + fills_settings = DefaultFillsGrid + }; + + public static OrderBookGridSettings DefaultGrid => new OrderBookGridSettings(_default_general_grid) { + algo_tree_display_mode = AlgoTreeDisplayMode.RootAndLeafNodes + }; + + public static OrderBookFillsGridSettings DefaultFillsGrid { + get { + var default_fills = FillsSettings.Default(); + var rv = new OrderBookFillsGridSettings { + sorting_criteria = default_fills.sorting_criteria.ToList(), + filters = default_fills.filters, + general = FillsSettings.MiniGridSettings + }; + return rv; + } + } + static GridSettings _default_general_grid => GridSettings.Default.with(DefaultColumns.standard, DefaultColumns.sorting_criteria); + public static OrderBookGridSettings default_mini_grid => new OrderBookGridSettings(GridSettings.Default.with(DefaultColumns.mini, DefaultColumns.sorting_criteria)) { + algo_tree_display_mode = AlgoTreeDisplayMode.RootAndLeafNodes + }; + + static class DefaultColumns { + // standard + public static GridColumnSettings security => new GridColumnSettings(Columns.Security.ToString(), DIYGrid.DefaultColumnHeaders.Security, width: DIYGrid.DefaultColumnWidths.Security); + public static GridColumnSettings symbol => new GridColumnSettings(Columns.Symbol.ToString(), DIYGrid.DefaultColumnHeaders.Symbol, width: DIYGrid.DefaultColumnWidths.Symbol, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings time_created => new GridColumnSettings(Columns.Time.ToString(), "Time", width: DIYGrid.DefaultColumnWidths.Time, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings last_change => new GridColumnSettings(Columns.LastChange.ToString(), "Last Change", width: DIYGrid.DefaultColumnWidths.Time, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings user => new GridColumnSettings(Columns.User.ToString(), DIYGrid.DefaultColumnHeaders.User, width: DIYGrid.DefaultColumnWidths.User, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings account => new GridColumnSettings(Columns.Account.ToString(), DIYGrid.DefaultColumnHeaders.Account, width: DIYGrid.DefaultColumnWidths.Account, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings exchange => new GridColumnSettings(Columns.Exchange.ToString(), DIYGrid.DefaultColumnHeaders.Exchange, width: DIYGrid.DefaultColumnWidths.Exchange, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings time_in_force => new GridColumnSettings(Columns.TimeInForce.ToString(), DIYGrid.DefaultColumnHeaders.TimeInForce, width: DIYGrid.DefaultColumnWidths.TimeInForce); + public static GridColumnSettings order_type => new GridColumnSettings(Columns.OrderType.ToString(), DIYGrid.DefaultColumnHeaders.OrderType, width: DIYGrid.DefaultColumnWidths.OrderType); + public static GridColumnSettings root_algo_type => new GridColumnSettings(Columns.RootAlgoType.ToString(), DIYGrid.DefaultColumnHeaders.RootAlgoType, width: DIYGrid.DefaultColumnWidths.OrderType); + public static GridColumnSettings sub_type => new GridColumnSettings(Columns.SubType.ToString(), "Sub Type", width: 80, horizontal_alignment: HorizontalAlignment.Left); + + public static GridColumnSettings side => new( + Columns.Side.ToString(), ColHeader.Side, + width: ColWidth.Side, + horizontal_alignment: HorizontalAlignment.Left); + + public static GridColumnSettings quantity => new GridColumnSettings(Columns.Size.ToString(), "Qty", width: DIYGrid.DefaultColumnWidths.Qty, horizontal_alignment: HorizontalAlignment.Right); + public static GridColumnSettings notional_value => new GridColumnSettings(Columns.Size.ToString(), DIYGrid.DefaultColumnHeaders.NotionalValue, width: DIYGrid.DefaultColumnWidths.NotionalValue, horizontal_alignment: HorizontalAlignment.Right); + public static GridColumnSettings price => new GridColumnSettings(Columns.Price.ToString(), DIYGrid.DefaultColumnHeaders.Price, width: DIYGrid.DefaultColumnWidths.Price, horizontal_alignment: HorizontalAlignment.Right); + + public static GridColumnSettings filled_quantity => new( + Columns.Filled.ToString(), + ColHeader.FilledQuantity, + width: ColWidth.Filled, + horizontal_alignment: HorizontalAlignment.Right); + + public static GridColumnSettings filled_notional_value => new( + Columns.FilledNotionalValue.ToString(), + ColHeader.FilledNotionalValue, + width: ColWidth.FilledNotionalValue, + horizontal_alignment: HorizontalAlignment.Right); + + public static GridColumnSettings avg_price => new( + Columns.AvgFilled.ToString(), + ColHeader.AvgFilled, + width: ColWidth.AveragePrice, + horizontal_alignment: HorizontalAlignment.Right); + + public static GridColumnSettings last_price => new GridColumnSettings(Columns.LastPrice.ToString(), "Last Filled", width: DIYGrid.DefaultColumnWidths.LastPrice, horizontal_alignment: HorizontalAlignment.Right); + public static GridColumnSettings status => new GridColumnSettings(Columns.Status.ToString(), "Status", width: 80, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings last_message => new GridColumnSettings(Columns.LastMessage.ToString(), "Last Message", width: DIYGrid.DefaultColumnWidths.LastMessage, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings security_key => new GridColumnSettings(Columns.SecurityKey.ToString(), DIYGrid.DefaultColumnHeaders.SecurityKey, is_visible: false, width: DIYGrid.DefaultColumnWidths.SecurityKey, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings order_key => new GridColumnSettings(Columns.OrderKey.ToString(), DIYGrid.DefaultColumnHeaders.OrderKey, width: DIYGrid.DefaultColumnWidths.OrderKey, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings parent_key => new GridColumnSettings(Columns.ParentKey.ToString(), "Parent Key", width: DIYGrid.DefaultColumnWidths.ParentKey, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings attached_target_order_key => new GridColumnSettings(Columns.AttachedTargetOrderKey.ToString(), DIYGrid.DefaultColumnHeaders.AttachedTargetOrderKey, width: DIYGrid.DefaultColumnWidths.ParentKey, horizontal_alignment: HorizontalAlignment.Left); + public static GridColumnSettings piq => new GridColumnSettings(Columns.Piq.ToString(), "PIQ", width: DIYGrid.DefaultColumnWidths.Qty, horizontal_alignment: HorizontalAlignment.Right); + // editable + public static GridColumnSettings cancel => new GridColumnSettings(Columns.Cancel.ToString(), DIYGrid.DefaultColumnHeaders.Cancel, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.Cancel); + public static GridColumnSettings attach_detach => new GridColumnSettings(Columns.Attach.ToString(), DIYGrid.DefaultColumnHeaders.AttachDetach, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.AttachDetach); + public static GridColumnSettings update => new GridColumnSettings(Columns.Update.ToString(), DIYGrid.DefaultColumnHeaders.Update, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.Update); + public static GridColumnSettings edit_quantity => new GridColumnSettings(Columns.EditableQty.ToString(), DIYGrid.DefaultColumnHeaders.Qty, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.EditableSize); + public static GridColumnSettings edit_price => new GridColumnSettings(Columns.EditablePrice.ToString(), DIYGrid.DefaultColumnHeaders.Price, width: DIYGrid.DefaultColumnWidths.MiniOrderBook.EditablePrice); + public static GridColumnSettings commit => new GridColumnSettings(Columns.Commit.ToString(), width: DIYGrid.DefaultColumnWidths.MiniOrderBook.Commit); + + public static IEnumerable sorting_criteria { + get { + yield return new SortingCriteria(time_created.id, false); + } + } + + public static IEnumerable standard { + get { + yield return security; + yield return symbol; + yield return time_created; + yield return last_change; + yield return user; + yield return account; + yield return exchange; + yield return time_in_force; + yield return order_type; + yield return root_algo_type; + yield return sub_type; + yield return side; + yield return quantity; + yield return price; + yield return piq; + yield return filled_quantity; + yield return avg_price; + yield return last_price; + yield return status; + yield return last_message; + yield return security_key; + yield return order_key; + yield return parent_key; + yield return attached_target_order_key; + } + } + + public static IEnumerable editable { + get { + yield return cancel; + yield return update; + yield return edit_quantity; + yield return edit_price; + yield return commit; + yield return attach_detach; + } + } + + private static HashSet _mini_mode_columns_to_hide = new HashSet { + symbol, last_change, exchange, sub_type, quantity, price, avg_price, last_price, status, last_message, security_key, order_key, parent_key, attached_target_order_key + }; + + public static IEnumerable mini { + get { + foreach (var col_setting in editable) + yield return col_setting; + foreach (var col_setting in standard) { + if (_mini_mode_columns_to_hide.Contains(col_setting)) { + yield return col_setting.with(is_visible: false); + } else { + yield return col_setting; + } + } + } + } + } + } +} diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs index 64b44da59..923e4a1ed 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs @@ -1,108 +1,109 @@ -using bts.api.orderman; - -using mbts.ui; -using mbts.ui.controls; -using mbts.ui.converters; - -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Media; - -namespace mbts.spark { - internal partial class OrderBookGridView : DIYGrid { - public const string - SubTypeFilterTemplateKey = "SubTypeFilterTemplate", - ExpandCollapseToggleStyleKey = "ExpandCollapseToggleStyle", - RowStyleKey = "RowStyle", - RowTemplateKey = "RowTemplateKey", - CVRowStyleKey = "CVRowStyle", - CVRowTemplateKey = "CVRowTemplateKey"; - - // 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 ColumnKeys { - Security = 1, - Symbol = 1 << 1, - Time = 1 << 2, - LastChange = 1 << 3, - User = 1 << 4, - Account = 1 << 5, - Exchange = 1 << 6, - TimeInForce = 1 << 7, - OrderType = 1 << 8, - SubType = 1 << 9, - Side = 1 << 10, - Size = 1 << 11, - Price = 1 << 12, - Filled = 1 << 13, - AvgFilled = 1 << 14, - LastPrice = 1 << 15, - Status = 1 << 16, - LastMessage = 1 << 17, - SecurityKey = 1 << 18, - OrderKey = 1 << 19, - ParentKey = 1 << 20, - AttachedTargetOrderKey = 1 << 21, - Cancel = 1 << 22, - EditableQty = 1 << 23, - EditablePrice = 1 << 24, - Attach = 1 << 25, - Detach = 1 << 26, - Update = 1 << 27, - Commit = 1 << 28, - RootAlgoType = 1 << 29, - Piq = 1 << 30, - Check = 1 << 31, - NotionalValue = 1 & (1 << 1), - } - - public OrderBookGridView() { - InitializeComponent(); - var row_template_factory = new FrameworkElementFactory(typeof(OrderBookRowView)); - row_template_factory.SetValue(OrderBookRowView.BackgroundProperty, RowBackgroundHelper.row_background_binding); - RowTemplate = new DataTemplate { VisualTree = row_template_factory }; - } - - static class RowBackgroundHelper { - public static readonly BindingBase row_background_binding; - - static RowBackgroundHelper() { - var bg_binding = new MultiBinding(); - bg_binding.Bindings.Add(new Binding(nameof(OrderBookRowVM.status))); - bg_binding.Bindings.Add(new Binding(nameof(ListBoxItem.IsSelected)) { RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(ListBoxItem), 1) }); - double overlay_opacity = config.Configuration.get().StatusColorOpacityWhenSelected; - if (overlay_opacity > 0.1 && overlay_opacity < 0.9) { - bg_binding.Converter = ValueConverter.create((status, is_selected) => { - var color = _status_color(status); - return color.HasValue ? new SolidColorBrush(color.Value) { Opacity = is_selected ? overlay_opacity : 1.0 } : null; - }); - } else { - bg_binding.Converter = ValueConverter.create((status, is_selected) => { - if (is_selected) - return null; - var color = _status_color(status); - return color.HasValue ? new SolidColorBrush(color.Value) : null; - }); - } - row_background_binding = bg_binding; - } - - static Color? _status_color(OrderStatus status) { - switch (status) { - case OrderStatus.Canceled: return BTSColors.Orders.canceled_order_background; - case OrderStatus.Completed: return BTSColors.Orders.completed_order_background; - case OrderStatus.Disconnected: - case OrderStatus.RejectedBySpark: - case OrderStatus.Error: - return BTSColors.Orders.error_order_background; - default: return null; - } - } - } - } - - class OrderBookRowView : DIYGrid.HighPerformanceRow { - public OrderBookRowView() : base() { } - } -} +using bts.api.orderman; + +using mbts.ui; +using mbts.ui.controls; +using mbts.ui.converters; + +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Media; + +namespace mbts.spark { + internal partial class OrderBookGridView : DIYGrid { + public const string + SubTypeFilterTemplateKey = "SubTypeFilterTemplate", + ExpandCollapseToggleStyleKey = "ExpandCollapseToggleStyle", + RowStyleKey = "RowStyle", + RowTemplateKey = "RowTemplateKey", + CVRowStyleKey = "CVRowStyle", + CVRowTemplateKey = "CVRowTemplateKey"; + + // 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 ColumnKeys { + Security = 1, + Symbol = 1 << 1, + Time = 1 << 2, + LastChange = 1 << 3, + User = 1 << 4, + Account = 1 << 5, + Exchange = 1 << 6, + TimeInForce = 1 << 7, + OrderType = 1 << 8, + SubType = 1 << 9, + Side = 1 << 10, + Size = 1 << 11, + Price = 1 << 12, + Filled = 1 << 13, + AvgFilled = 1 << 14, + LastPrice = 1 << 15, + Status = 1 << 16, + LastMessage = 1 << 17, + SecurityKey = 1 << 18, + OrderKey = 1 << 19, + ParentKey = 1 << 20, + AttachedTargetOrderKey = 1 << 21, + Cancel = 1 << 22, + EditableQty = 1 << 23, + EditablePrice = 1 << 24, + Attach = 1 << 25, + Detach = 1 << 26, + Update = 1 << 27, + Commit = 1 << 28, + RootAlgoType = 1 << 29, + Piq = 1 << 30, + Check = 1 << 31, + NotionalValue = 1 & (1 << 1), + FilledNotionalValue = 1 & (1 << 2), + } + + public OrderBookGridView() { + InitializeComponent(); + var row_template_factory = new FrameworkElementFactory(typeof(OrderBookRowView)); + row_template_factory.SetValue(OrderBookRowView.BackgroundProperty, RowBackgroundHelper.row_background_binding); + RowTemplate = new DataTemplate { VisualTree = row_template_factory }; + } + + static class RowBackgroundHelper { + public static readonly BindingBase row_background_binding; + + static RowBackgroundHelper() { + var bg_binding = new MultiBinding(); + bg_binding.Bindings.Add(new Binding(nameof(OrderBookRowVM.status))); + bg_binding.Bindings.Add(new Binding(nameof(ListBoxItem.IsSelected)) { RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(ListBoxItem), 1) }); + double overlay_opacity = config.Configuration.get().StatusColorOpacityWhenSelected; + if (overlay_opacity > 0.1 && overlay_opacity < 0.9) { + bg_binding.Converter = ValueConverter.create((status, is_selected) => { + var color = _status_color(status); + return color.HasValue ? new SolidColorBrush(color.Value) { Opacity = is_selected ? overlay_opacity : 1.0 } : null; + }); + } else { + bg_binding.Converter = ValueConverter.create((status, is_selected) => { + if (is_selected) + return null; + var color = _status_color(status); + return color.HasValue ? new SolidColorBrush(color.Value) : null; + }); + } + row_background_binding = bg_binding; + } + + static Color? _status_color(OrderStatus status) { + switch (status) { + case OrderStatus.Canceled: return BTSColors.Orders.canceled_order_background; + case OrderStatus.Completed: return BTSColors.Orders.completed_order_background; + case OrderStatus.Disconnected: + case OrderStatus.RejectedBySpark: + case OrderStatus.Error: + return BTSColors.Orders.error_order_background; + default: return null; + } + } + } + } + + class OrderBookRowView : DIYGrid.HighPerformanceRow { + public OrderBookRowView() : base() { } + } +} diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index 59d5758d1..bc5f0a568 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -45,6 +45,7 @@ namespace mbts.ui.controls { MergedQty = 68, NotionalValue = 68, Filled = 56, + FilledNotionalValue = 81, Symbol = 60, Time = 112, TimeOfDay = 84, @@ -146,6 +147,7 @@ namespace mbts.ui.controls { FillKind = "Fill Kind", FilledPrice = "Fill Price", FilledQuantity = "Fill Qty", + FilledNotionalValue = "Fill Notional", FillStatus = "Fill Status", Name = "Name", Description = "Description", diff --git a/src/client/spark_api/Orders/OrderRecordTuple.cs b/src/client/spark_api/Orders/OrderRecordTuple.cs index 51538c022..f73177dbb 100644 --- a/src/client/spark_api/Orders/OrderRecordTuple.cs +++ b/src/client/spark_api/Orders/OrderRecordTuple.cs @@ -75,6 +75,12 @@ namespace Spark.Api.Orders { ? order.order.quantity() : order.order.notional_value(); + // TODO: remove assumption that synthetic quantities are already notional values + public double filled_notional_value => + (security?.HasSynthetic ?? false) + ? order.order.filled_quantity() + : order.order.filled_notional_value(); + public bool Equals(OrderRecordTupleWithRoot other) => order.Equals(other.order) && EqualityComparer.nullable_equals(_root, other._root); diff --git a/src/client/spark_api/Orders/OrdersExtensions.cs b/src/client/spark_api/Orders/OrdersExtensions.cs index 992e22e16..720d8f490 100644 --- a/src/client/spark_api/Orders/OrdersExtensions.cs +++ b/src/client/spark_api/Orders/OrdersExtensions.cs @@ -51,6 +51,9 @@ namespace Spark.Api.Orders { public static double notional_value(this OrderRecordImmutable order) => order.quantity() * order.ui_price(); + public static double filled_notional_value(this OrderRecordImmutable order) => + order.avg_price() * order.filled_quantity(); + public static double working_quantity(this OrderRecordImmutable order) => order.HasState ? order.State.working_quantity() : 0;