From cdf13268a60356a1e8b06b8985bd8ce274ac029b Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 7 Feb 2019 14:41:51 -0600 Subject: [PATCH 1/2] OrderTypeColumn will now display the DynamicOrderType --- src/client/spark/Modules/Trading/Fills/FillsVM.cs | 3 ++- .../spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 2 +- .../spark/Modules/Trading/OrderBook/OrderBookRowVM.cs | 1 + .../Columns/FrameworkElementColumns/OrderTypeColumn.cs | 6 ++++-- src/client/spark/view/Spark/Core/OrderUtils.cs | 3 +++ 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 595108167..a7abb9199 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -56,7 +56,7 @@ namespace mbts.spark { add_col(Columns.Account, DefaultColumnHeaders.Account, r => r.account, nameof(Row.account), account_filter, DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.Account); add_col(Columns.Exchange, DefaultColumnHeaders.Exchange, r => r.exchange.ToString(), nameof(Row.exchange), exchange_filter, DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.Exchange); add_col(Columns.TimeInForce, DefaultColumnHeaders.TimeInForce, r => r.time_in_force.ToString(), nameof(Row.time_in_force), time_in_force_filter, DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.TimeInForce); - columns.Add(new OrderTypeColumn(Columns.OrderType, new Binding(nameof(Row.order_type)), new Binding(nameof(Row.order_metadata)), order_type_filter) { id = col_id(Columns.OrderType), sort_member_path = nameof(Row.order_type) }); + columns.Add(new OrderTypeColumn(Columns.OrderType, new Binding(nameof(Row.order_type)), new Binding(nameof(Row.order_metadata)), new Binding(nameof(Row.dynamic_order_type_display_name)), order_type_filter) { id = col_id(Columns.OrderType), sort_member_path = nameof(Row.order_type) }); columns.Add(new SideColumn(Columns.Side, r => r.side, side_filter) { id = col_id(Columns.Side), sort_member_path = nameof(Row.side) }); add_col(Columns.Size, DefaultColumnHeaders.Size, r => r.size.ToString(), nameof(Row.size), size_filter, DataGridFilterKnownTemplates.UIntMinMax, DefaultColumnWidths.Size); add_col(Columns.Price, DefaultColumnHeaders.Price, r => r.format_price(r.price), nameof(Row.price), price_filter, DataGridFilterKnownTemplates.DoubleMinMax, DefaultColumnWidths.Price); @@ -196,6 +196,7 @@ namespace mbts.spark { public DateTime fill_time => _fill.Timestamp.ToDateTimeOffset().LocalDateTime; public TimeInForce time_in_force => _order.time_in_force(); public OrderType order_type => _order.order_type(); + public string dynamic_order_type_display_name => _order.dynamic_order_type_display_name(); public OrderMetadata order_metadata => _model.factory.get_metadata(_order.Def.CustomDef.CustomCase); public string account { get; private set; } public string user => _order.user(); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 58a62d2b4..5986961e8 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -559,7 +559,7 @@ namespace mbts.spark { public class OrderBookOrderTypeColumn : OrderTypeColumn, ICVOrderBookColumn { ListSortDirection? _cached_sort_direction; public OrderBookOrderTypeColumn(IDataGridColumnPersistentFilter filter) - : base(Columns.OrderType, new Binding(nameof(OrderBookRowVM.order_type)), new Binding(nameof(OrderBookRowVM.order_metadata)), filter) { + : base(Columns.OrderType, new Binding(nameof(OrderBookRowVM.order_type)), new Binding(nameof(OrderBookRowVM.order_metadata)), new Binding(nameof(OrderBookRowVM.dynamic_order_type_display_name)), filter) { id = key.ToString(); this.filter = filter; sort_member_path = nameof(OrderBookRowVM.order_type); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 76dc8341f..97270e0f0 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -62,6 +62,7 @@ namespace mbts.spark { public string symbol => _security_md.symbol(); // Def public CustomOrderDefinition.CustomOneofCase order_type => order.order_type(); + public string dynamic_order_type_display_name => order.dynamic_order_type_display_name(); public OrderSubType order_sub_type => order.sub_type(); public string order_sub_type_text => _fmt_order_sub_type(order_sub_type); public Side side => order.side(); diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs b/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs index ac2dce3f4..a26aa53f5 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/OrderTypeColumn.cs @@ -6,11 +6,12 @@ using System.Windows.Data; namespace mbts.ui.controls { partial class DIYGrid { internal class OrderTypeColumn : FrameworkElementColumnBase, IFilterableColumn { - readonly BindingBase _order_type_binding, _metadata_binding; + readonly BindingBase _order_type_binding, _metadata_binding, _display_name_binding; - public OrderTypeColumn(TColKey key, BindingBase order_type_binding, BindingBase metadata_binding, IDataGridColumnFilter filter) : base(key) { + public OrderTypeColumn(TColKey key, BindingBase order_type_binding, BindingBase metadata_binding, BindingBase display_name_binding, IDataGridColumnFilter filter) : base(key) { _order_type_binding = order_type_binding; _metadata_binding = metadata_binding; + _display_name_binding = display_name_binding; this.filter = filter; Header = DefaultColumnHeaders.OrderType; Width = DefaultColumnWidths.OrderType; @@ -28,6 +29,7 @@ namespace mbts.ui.controls { }; v.SetBinding(OrderTypeItem.OrderTypeProperty, _order_type_binding); v.SetBinding(OrderTypeItem.MetadataProperty, _metadata_binding); + v.SetBinding(OrderTypeItem.DisplayNameProperty, _display_name_binding); if (font_weight_binding != null) { v.SetBinding(FontWeightProperty, font_weight_binding); } else { diff --git a/src/client/spark/view/Spark/Core/OrderUtils.cs b/src/client/spark/view/Spark/Core/OrderUtils.cs index 6b588658b..c61f22eca 100644 --- a/src/client/spark/view/Spark/Core/OrderUtils.cs +++ b/src/client/spark/view/Spark/Core/OrderUtils.cs @@ -69,6 +69,9 @@ namespace mbts.spark { public static CustomOrderDefinition.CustomOneofCase order_type(this OrderRecordImmutable order) => order.HasDef && order.Def.HasCustomDef ? order.Def.CustomDef.CustomCase : CustomOrderDefinition.CustomOneofCase.None; + public static string dynamic_order_type_display_name(this OrderRecordImmutable order) => + order.HasDef && order.Def.HasCustomDef && order.Def.CustomDef.HasDynamic ? order.Def.CustomDef.Dynamic.DynamicOrderType : string.Empty; + public static OrderSubType sub_type(this OrderRecordImmutable order) => order.HasDef ? order.Def.SubType : OrderSubType.None; From 4944aaa3fa3ae1cf857215016e06b614f3d9a23c Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 11 Feb 2019 13:48:22 -0500 Subject: [PATCH 2/2] Updated release notes and tweaked DynamicIceberg name. --- doc/user/docs/release_notes.md | 1 + src/sdk/examples/order_plugin_example.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/user/docs/release_notes.md b/doc/user/docs/release_notes.md index ec048c3e1..fcf6f02bb 100644 --- a/doc/user/docs/release_notes.md +++ b/doc/user/docs/release_notes.md @@ -8,6 +8,7 @@ - Fixed the "Since Open" time filter to use the exchange open time rather than 8:30 AM #### SDK - Improved SDK documentation and usability + - Dynamic orders are now properly identified in the order book ### Internal Changes - Improved robustness of limit system test - Extensive refactoring to the market data subsystem to allow for diff --git a/src/sdk/examples/order_plugin_example.cpp b/src/sdk/examples/order_plugin_example.cpp index 3202d102a..03de5fa67 100644 --- a/src/sdk/examples/order_plugin_example.cpp +++ b/src/sdk/examples/order_plugin_example.cpp @@ -363,7 +363,7 @@ DynamicOrderDescriptor get_dynamic_iceberg_order_desc() DynamicOrderDescriptor desc; // order type name - desc.set_dynamic_order_type("DynamicIcebergOrder"); + desc.set_dynamic_order_type("dice"); // show size auto param = desc.add_param_desc();