Merged in SPARK-2023 (pull request #161)

OrderTypeColumn will now display the DynamicOrderType

Approved-by: John Colvin <john.colvin@bluetradesys.com>
This commit is contained in:
Jake Norbut authored and Pedro Pinto committed 2019-02-11 18:48:48 +00:00
commit eccabd72f7
7 files changed
+13 -5

No files matched your search

+1
View File
@@ -10,6 +10,7 @@
highlighted after an order is modified
#### 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 market data refactoring allow for security definition updates
@@ -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>(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>(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<Row, Columns>(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();
@@ -559,7 +559,7 @@ namespace mbts.spark {
public class OrderBookOrderTypeColumn : OrderTypeColumn<Columns>, ICVOrderBookColumn {
ListSortDirection? _cached_sort_direction;
public OrderBookOrderTypeColumn(IDataGridColumnPersistentFilter<OrderRecordTuple, OrderType[]> 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);
@@ -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();
@@ -6,11 +6,12 @@ using System.Windows.Data;
namespace mbts.ui.controls {
partial class DIYGrid {
internal class OrderTypeColumn<TColKey> : FrameworkElementColumnBase<TColKey>, 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 {
@@ -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;
+1 -1
View File
@@ -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();