diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index f02bfb6f9..2e3850bac 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -1,4 +1,4 @@ -using bts; +using bts; using bts.api; using bts.api.core; using bts.api.orderman; @@ -223,6 +223,10 @@ namespace mbts.spark { Add(qty_column = new SizeColumn( new DoubleMinMax( ort => ort.order.order.quantity(), nameof(OrderBookRowVM.quantity)))); + // notional value + Add(notional_value_column = new NotionalValueColumn( + new DoubleMinMax( + ort => ort.order.order.notional_value(), nameof(OrderBookRowVM.notional_value)))); // edit quantity column // not usually part of the main order book, but it's useful to add it // rather than debugging the popup window @@ -363,6 +367,7 @@ namespace mbts.spark { public SimpleTextColumn sub_type_column { get; } public SideColumn side_column { get; } public SizeColumn qty_column { get; } + public NotionalValueColumn notional_value_column { get; } public EditableQtyColumn edit_qty_column { get; } public SimpleTextColumn price_column { get; } public FilledColumn filled_qty_column { get; } @@ -645,6 +650,25 @@ namespace mbts.spark { DefaultCellPadding); } + public class NotionalValueColumn : OrderbookColumnBase, IRenderColumn { + public NotionalValueColumn(IDataGridColumnPersistentFilter filter) + : base(Columns.NotionalValue, DefaultColumnHeaders.NotionalValue, r => r.notional_value_text, DefaultColumnWidths.Qty, filter, DataGridFilterKnownTemplates.UIntMinMax, _wrap_comparer(r => r.quantity)) { } + + public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => + CellRender.draw_text( + dc, + _get_glyph_context(row), + font_size, + row.notional_value_text, + position, + row_height, + RenderUtils.get_side_brush(row), + background_brush, + horizontal_alignment, + VerticalAlignment.Center, + DefaultCellPadding); + } + public class FilledColumn : OrderbookColumnBase, IRenderColumn { public FilledColumn(IDataGridColumnPersistentFilter filter) : base(Columns.Filled, "Filled Qty", r => r.display_filled_quantity.ToString(), DefaultColumnWidths.Qty, filter, DataGridFilterKnownTemplates.DoubleMinMax, _wrap_comparer(r => r.filled_quantity)) { } diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 2af345e5e..d2986401c 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -1,4 +1,4 @@ -using bts; +using bts; using bts.api; using bts.api.orderman; using bts.collections; @@ -108,6 +108,8 @@ namespace mbts.spark { public double display_quantity => quantity.safe_divide(_display_qty_divisor); public string display_quantity_text => quantity_display_settings.to_tick_display_settings().format(display_quantity); + public double notional_value => order.notional_value(); + public string notional_value_text => _fmt_price(notional_value); public TickDisplaySettingsImmutable quantity_display_settings { get => _quantity_display_settings; set { diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs index 18b1b1f1d..a2d90387e 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs @@ -172,6 +172,7 @@ namespace bts.shell.orderbook { 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( 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 d02e0ffc5..64b44da59 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs @@ -53,7 +53,8 @@ namespace mbts.spark { Commit = 1 << 28, RootAlgoType = 1 << 29, Piq = 1 << 30, - Check = 1 << 31 + Check = 1 << 31, + NotionalValue = 1 & (1 << 1), } public OrderBookGridView() { diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index d412d2b86..59d5758d1 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -1,4 +1,4 @@ -namespace mbts.ui.controls { +namespace mbts.ui.controls { using bts; using bts.utils; @@ -43,6 +43,7 @@ Side = 47, Qty = 48, MergedQty = 68, + NotionalValue = 68, Filled = 56, Symbol = 60, Time = 112, @@ -122,6 +123,7 @@ SecurityType = "Security Type", Side = "B/S", Qty = "Qty", + NotionalValue = "Notional", MergedQty = "Qty", DirectQty = "Qty (D)", ImpliedQty = "Qty (I)", diff --git a/src/client/spark_api/Orders/OrdersExtensions.cs b/src/client/spark_api/Orders/OrdersExtensions.cs index 75eb99c11..107a42a94 100644 --- a/src/client/spark_api/Orders/OrdersExtensions.cs +++ b/src/client/spark_api/Orders/OrdersExtensions.cs @@ -48,6 +48,9 @@ namespace Spark.Api.Orders { public static double quantity(this OrderRecordImmutable order) => order.HasState ? order.State.quantity() : 0; + public static double notional_value(this OrderRecordImmutable order) => + order.HasState ? order.State.Quantity * order.ui_price() : double.NaN; + public static double working_quantity(this OrderRecordImmutable order) => order.HasState ? order.State.working_quantity() : 0;