From a0ef2c33485cd78e58b04fa2e9fefaa6db6db729 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 21 Jul 2025 10:06:13 -0400 Subject: [PATCH] cleanup: Remove "partial" class modifiers from OrderBook vm classes They simply weren't necessary. --- .../Modules/Market/MarketView/MarketViewVM.cs | 2 +- .../Trading/Ladder/VM/LadderOrderVM.cs | 14 +- .../Trading/OrderBook/OrderBookColumns.cs | 912 +++++++++--------- .../Trading/OrderBook/OrderBookRowVM.cs | 2 +- .../Modules/Trading/OrderBook/OrderBookVM.cs | 2 +- .../spark/Modules/Trading/PNL/VM/PNLVM.cs | 2 +- 6 files changed, 466 insertions(+), 468 deletions(-) diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs index 93862b00c..e6190ab25 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs @@ -681,7 +681,7 @@ namespace mbts.spark { var obvm = orders_source == null ? new OrderBookVM(_bus, null, _orders_model, _position_model, _sec_meta_store, settings_man, true) : new OrderBookVM(_bus, null, _orders_model, _position_model, _sec_meta_store, orders_source, settings_man, true); - foreach (var c in OrderBookVM.OrderBookColumnCollection.editable_columns) { + foreach (var c in OrderBookColumnCollection.editable_columns) { obvm.columns.Insert(0, c); } obvm.load_from(state); diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs index 46bb192d3..48a0aad81 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs @@ -275,18 +275,18 @@ namespace mbts.spark { _owner.settings.Subscribe(s => settings_man.instance_settings = settings_man.instance_settings.with(s.mini_ob.value)); - obvm.columns.Insert(0, new OrderBookVM.AttachDetachColumn(typeof(MiniOrderBookView))); - obvm.columns.Insert(0, new OrderBookVM.CommitColumn()); - obvm.columns.Insert(0, new OrderBookVM.EditablePriceColumn()); - obvm.columns.Insert(0, new OrderBookVM.EditableQtyColumn()); - obvm.columns.Insert(0, new OrderBookVM.UpdateColumn(typeof(MiniOrderBookView))); - obvm.columns.Insert(0, new OrderBookVM.CancelColumn(nameof(OrderBookRowVM.cancel_command))); + obvm.columns.Insert(0, new OrderBookColumnCollection.AttachDetachColumn(typeof(MiniOrderBookView))); + obvm.columns.Insert(0, new OrderBookColumnCollection.CommitColumn()); + obvm.columns.Insert(0, new OrderBookColumnCollection.EditablePriceColumn()); + obvm.columns.Insert(0, new OrderBookColumnCollection.EditableQtyColumn()); + obvm.columns.Insert(0, new OrderBookColumnCollection.UpdateColumn(typeof(MiniOrderBookView))); + obvm.columns.Insert(0, new OrderBookColumnCollection.CancelColumn(nameof(OrderBookRowVM.cancel_command))); // the CheckColumn must be inserted at the front of the ObservableAppendCollection, // and not mixed with the other columns in said ObservableAppendCollection's underlying // ObservableCollection (the settings dialog uses the underlying collection). // The user cannot adjust this column in the settings dialog, and it should always be the // left-most column. - obvm.columns.insert_front(new OrderBookVM.CheckColumn(nameof(OrderBookRowVM.is_selected))); + obvm.columns.insert_front(new OrderBookColumnCollection.CheckColumn(nameof(OrderBookRowVM.is_selected))); obvm.load_from(state); return obvm; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 532472448..7b3bc7c7e 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -68,483 +68,481 @@ namespace mbts.spark { public override string ToString() => desc; } - partial class OrderBookVM { - public class OrderBookColumnCollection : ObservableCollection, IValueFactory<(FilterStates filters, IReadOnlyList sorting)>, IDisposable { - readonly List _active_comparers = new List(); - readonly List _resources = new(1); + class OrderBookColumnCollection : ObservableCollection, IValueFactory<(FilterStates filters, IReadOnlyList sorting)>, IDisposable { + readonly List _active_comparers = new List(); + readonly List _resources = new(1); - public OrderBookColumnCollection(IBus bus, OrdersModel model, IObservable<(IEnumerable added, IEnumerable removed)> order_securities) { - // security - Add(security_column = new SecurityColumn( - DiscreteValuesFilterVM.Create( - order_securities, - ort => ort.order.security ?? Security.Defaults.SecurityImmutable, - SecurityCriteria.from_securities, - SecurityCriteria.get_to_securities(bus.subscribe(SparkTags.SecuritiesTag)), - nameof(OrderBookRowVM.security), - EqualityComparer.Default, - SecurityComparer.instance_immutable - ))); - // symbol - Add(symbol_column = new SimpleTextColumn( - Columns.Symbol, - DefaultColumnHeaders.Symbol, - r => r.symbol, - DefaultColumnWidths.Symbol, - DiscreteValuesFilterVM.Create( - mbts.co2.UserSymbol.get_all().Select(u => u.symbol).Distinct().ToList(), - ort => ort.order.security?.Symbol ?? string.Empty, - nameof(OrderBookRowVM.symbol) - ), - DataGridFilterKnownTemplates.DiscreteValues, - _wrap_comparer(r => r.symbol))); - // time_created - Add(time_created_column = new SimpleTextColumn( - Columns.Time, - "Time", - r => r.time_created_text, - DefaultColumnWidths.Time, - new TimeFilterVM( - ort => ort.order.order.created(), - nameof(OrderBookRowVM.time_created)), - DataGridFilterKnownTemplates.TimeFilter, - _wrap_comparer(r => r.time_created))); - // last_change - Add(last_change_column = new SimpleTextColumn( - Columns.LastChange, - "Last Change", - r => r.last_change_text, - DefaultColumnWidths.Time, - new TimeFilterVM( - ort => ort.order.order.last_change(), - nameof(OrderBookRowVM.last_change)), - DataGridFilterKnownTemplates.TimeFilter, - _wrap_comparer(r => r.last_change))); - // user - Add(user_column = new SimpleTextColumn( - Columns.User, - DefaultColumnHeaders.User, - r => r.user, - DefaultColumnWidths.User, - DiscreteValuesFilterVM.Create( - bus.subscribe(SparkTags.Users) - .Select(d => d.Values.Select(ut => ut.name).Distinct().Ordered()), - ort => ort.order.order.user(), - nameof(OrderBookRowVM.user)), - DataGridFilterKnownTemplates.DiscreteValues, - _wrap_comparer(r => r.user))); - // account - Add(account_column = new SimpleTextColumn( - Columns.Account, - DefaultColumnHeaders.Account, - r => r.account, - DefaultColumnWidths.Account, - DiscreteValuesFilterVM.Create( - bus.subscribe(SparkTags.AccountsTag) - .Select(d => d.Values.Select(ut => ut.name).Distinct().Ordered()), - ort => ort.order.order.account(), - vals => vals.ToArray(), - vals => Observable.Return(vals), - nameof(OrderBookRowVM.account)), - DataGridFilterKnownTemplates.DiscreteValues, - _wrap_comparer(r => r.account))); - // exchange - Add(exchange_column = new SimpleTextColumn( - Columns.Exchange, - DefaultColumnHeaders.Exchange, - r => r.exchange.ToString(), - DefaultColumnWidths.Exchange, - DiscreteValuesFilterVM.Create( - EnumHelper.get_values_except(Venue.Unset).ToList(), - ort => ort.order.security.exchange_or_default(), - nameof(OrderBookRowVM.exchange)), - DataGridFilterKnownTemplates.EnumValues, - _wrap_comparer(r => r.exchange))); - // time in force - Add(time_in_force_column = new SimpleTextColumn( - Columns.TimeInForce, - DefaultColumnHeaders.TimeInForce, - r => r.time_in_force.ToString(), - DefaultColumnWidths.TimeInForce, - DiscreteValuesFilterVM.Create( - EnumHelper.get_values().ToList(), - ort => ort.order.order.time_in_force(), - nameof(OrderBookRowVM.time_in_force)), - DataGridFilterKnownTemplates.EnumValues, - _wrap_comparer(r => r.time_in_force))); - // (algo items) - var algo_items_source = model.subscribe_all_algos().SelectKeyValue(AlgoDataVM.from_data, d => AlgoID.from_algo_key(d.data.key)).OnDispatcher(); - var algo_items_comp = AlgoCollectionHelper.algo_data_vm_comparer.to_non_generic(); - var algo_items_group_desc = new PropertyGroupDescription(nameof(AlgoDataVM.group)); - // order type - Add(order_type_column = new OrderBookOrderTypeColumn( - Columns.OrderType, - nameof(OrderBookRowVM.badge_fill), - nameof(OrderBookRowVM.display_name), - _wrap_comparer(r => r.order_type), - DiscreteValuesFilterVM.CreateTableUpdate( - o => new AlgoDataVM(o.order.algo ?? AlgoData.empty), - vm => AlgoID.from_algo_key(vm.data.key), out var order_type_filter_observer, out var order_type_items_view))); - _resources.Add(algo_items_source.Subscribe(order_type_filter_observer)); - order_type_items_view.CustomSort = algo_items_comp; - order_type_items_view.GroupDescriptions.Add(algo_items_group_desc); - // root algo type - Add(root_algo_type_column = new OrderBookOrderTypeColumn( - Columns.RootAlgoType, - nameof(OrderBookRowVM.root_algo_badge_fill), - nameof(OrderBookRowVM.root_algo_display_name), - _wrap_comparer(r => r.order_tuple.root.algo_type), - DiscreteValuesFilterVM.CreateTableUpdate( - o => new AlgoDataVM(o.root.algo ?? AlgoData.empty), - vm => AlgoID.from_algo_key(vm.data.key), out var root_algo_type_observer, out var root_algo_type_items_view), - DefaultColumnHeaders.RootAlgoType)); - _resources.Add(algo_items_source.Subscribe(root_algo_type_observer)); - root_algo_type_items_view.CustomSort = algo_items_comp; - root_algo_type_items_view.GroupDescriptions.Add(algo_items_group_desc); - // order sub type - Add(sub_type_column = new SimpleTextColumn( - Columns.SubType, - "Sub Type", - r => r.order_sub_type_text, - 80, - DiscreteValuesFilterVM.Create( - EnumHelper.get_values().ToList(), - ort => ort.order.order.sub_type(), - nameof(OrderBookRowVM.order_sub_type)), - OrderBookGridView.SubTypeFilterTemplateKey, - _wrap_comparer(r => r.order_sub_type))); - // side - Add(side_column = new SideColumn( - DiscreteValuesFilterVM.Create( - new[] { Side.Buy, Side.Sell }, - ort => ort.order.order.side(), - nameof(OrderBookRowVM.side)))); - // quantity - 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.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 - //Add(edit_qty_column = new EditableQtyColumn()); - // filled quantity - Add(filled_qty_column = new FilledColumn( - 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, - "Price", - r => r.price_text, - DefaultColumnWidths.Price, - new PriceMinMax( - ort => ort.order.order.price(), - nameof(OrderBookRowVM.price)), - DataGridFilterKnownTemplates.DoubleMinMax, - _wrap_comparer(r => r.price))); - // edit price column - // not usually part of the main order book, but it's useful to add it - // rather than debugging the popup window - //Add(edit_price_column = new OrderBookVM.EditablePriceColumn()); - //Add(new OrderBookVM.AttachColumn("DataContext.attach_vm")); - // avg filled price - Add(avg_price_column = new SimpleTextColumn( - Columns.AvgFilled, - "Avg Price", - r => r.avg_price_text, - DefaultColumnWidths.Price, - new PriceMinMax( - ort => ort.order.order.avg_price(), - nameof(OrderBookRowVM.avg_price)), - DataGridFilterKnownTemplates.DoubleMinMax, - _wrap_comparer(r => r.avg_price))); - // last filled price - Add(last_price_column = new SimpleTextColumn( - Columns.LastPrice, - "Last Filled", - r => r.last_price_text, - DefaultColumnWidths.Price, - new PriceMinMax( - ort => ort.order.order.last_price(), - nameof(OrderBookRowVM.last_price)), - DataGridFilterKnownTemplates.DoubleMinMax, - _wrap_comparer(r => r.last_price))); - // piq - Add(piq_column = new PiqColumn( - new UIntMinMax(ort => ort.order.piq ?? uint.MaxValue, nameof(OrderBookRowVM.piq)))); - // status - Add(status_column = new SimpleTextColumn( - Columns.Status, - "Status", - r => r.status.ToString(), - 80, - DiscreteValuesFilterVM.Create( - EnumHelper.get_values().ToList(), - ort => ort.order.order.status(), - nameof(OrderBookRowVM.status)), - DataGridFilterKnownTemplates.EnumValues, - _wrap_comparer(r => r.status))); - // last message - Add(last_message_column = new OrderBookLastMessageColumn( - new RegexFilterVM( - ort => ort.order.order.last_msg(), - nameof(OrderBookRowVM.last_msg)))); - // security key - Add(security_key_column = new SimpleTextColumn( - Columns.SecurityKey, - DefaultColumnHeaders.SecurityKey, - r => r.security_key.ToString(), - DefaultColumnWidths.SecurityKey, - new RegexFilterVM( - ort => ort.order.order.security_key().ToString(), - nameof(OrderBookRowVM.security_key)), - DataGridFilterKnownTemplates.Regex, - _wrap_comparer(r => r.security_key))); - // order key - Add(order_key_column = new SimpleTextColumn( - Columns.OrderKey, - DefaultColumnHeaders.OrderKey, - r => r.order_key.ToString(), - DefaultColumnWidths.OrderKey, - new RegexFilterVM( - ort => ort.order.order.Key.ToString(), - nameof(OrderBookRowVM.order_key)), - DataGridFilterKnownTemplates.Regex, - _wrap_comparer(r => r.order_key))); - // parent key (this is for diagnostic purposes, remove this column once OrderBook seems stable again) - Add(parent_key_column = new SimpleTextColumn( - Columns.ParentKey, - "Parent Key", - r => r.parent_order_key.ToString(), - DefaultColumnWidths.ParentKey, - new RegexFilterVM( - ort => ort.order.order.ParentKey.ToString(), - nameof(OrderBookRowVM.parent_order_key)), - DataGridFilterKnownTemplates.Regex, - _wrap_comparer(r => r.parent_order_key))); - // attached target order key - Add(attached_target_order_key_column = new SimpleTextColumn( - Columns.AttachedTargetOrderKey, - DefaultColumnHeaders.AttachedTargetOrderKey, - r => r.order.attached_target_order_key().ToString(), - DefaultColumnWidths.AttachedTargetOrderKey, - new RegexFilterVM( - ort => ort.order.order.attached_target_order_key().ToString(), - nameof(OrderBookRowVM.parent_order_key)), - DataGridFilterKnownTemplates.Regex, - _wrap_comparer(r => r.order.attached_target_order_key()))); + public OrderBookColumnCollection(IBus bus, OrdersModel model, IObservable<(IEnumerable added, IEnumerable removed)> order_securities) { + // security + Add(security_column = new SecurityColumn( + DiscreteValuesFilterVM.Create( + order_securities, + ort => ort.order.security ?? Security.Defaults.SecurityImmutable, + SecurityCriteria.from_securities, + SecurityCriteria.get_to_securities(bus.subscribe(SparkTags.SecuritiesTag)), + nameof(OrderBookRowVM.security), + EqualityComparer.Default, + SecurityComparer.instance_immutable + ))); + // symbol + Add(symbol_column = new SimpleTextColumn( + Columns.Symbol, + DefaultColumnHeaders.Symbol, + r => r.symbol, + DefaultColumnWidths.Symbol, + DiscreteValuesFilterVM.Create( + mbts.co2.UserSymbol.get_all().Select(u => u.symbol).Distinct().ToList(), + ort => ort.order.security?.Symbol ?? string.Empty, + nameof(OrderBookRowVM.symbol) + ), + DataGridFilterKnownTemplates.DiscreteValues, + _wrap_comparer(r => r.symbol))); + // time_created + Add(time_created_column = new SimpleTextColumn( + Columns.Time, + "Time", + r => r.time_created_text, + DefaultColumnWidths.Time, + new TimeFilterVM( + ort => ort.order.order.created(), + nameof(OrderBookRowVM.time_created)), + DataGridFilterKnownTemplates.TimeFilter, + _wrap_comparer(r => r.time_created))); + // last_change + Add(last_change_column = new SimpleTextColumn( + Columns.LastChange, + "Last Change", + r => r.last_change_text, + DefaultColumnWidths.Time, + new TimeFilterVM( + ort => ort.order.order.last_change(), + nameof(OrderBookRowVM.last_change)), + DataGridFilterKnownTemplates.TimeFilter, + _wrap_comparer(r => r.last_change))); + // user + Add(user_column = new SimpleTextColumn( + Columns.User, + DefaultColumnHeaders.User, + r => r.user, + DefaultColumnWidths.User, + DiscreteValuesFilterVM.Create( + bus.subscribe(SparkTags.Users) + .Select(d => d.Values.Select(ut => ut.name).Distinct().Ordered()), + ort => ort.order.order.user(), + nameof(OrderBookRowVM.user)), + DataGridFilterKnownTemplates.DiscreteValues, + _wrap_comparer(r => r.user))); + // account + Add(account_column = new SimpleTextColumn( + Columns.Account, + DefaultColumnHeaders.Account, + r => r.account, + DefaultColumnWidths.Account, + DiscreteValuesFilterVM.Create( + bus.subscribe(SparkTags.AccountsTag) + .Select(d => d.Values.Select(ut => ut.name).Distinct().Ordered()), + ort => ort.order.order.account(), + vals => vals.ToArray(), + vals => Observable.Return(vals), + nameof(OrderBookRowVM.account)), + DataGridFilterKnownTemplates.DiscreteValues, + _wrap_comparer(r => r.account))); + // exchange + Add(exchange_column = new SimpleTextColumn( + Columns.Exchange, + DefaultColumnHeaders.Exchange, + r => r.exchange.ToString(), + DefaultColumnWidths.Exchange, + DiscreteValuesFilterVM.Create( + EnumHelper.get_values_except(Venue.Unset).ToList(), + ort => ort.order.security.exchange_or_default(), + nameof(OrderBookRowVM.exchange)), + DataGridFilterKnownTemplates.EnumValues, + _wrap_comparer(r => r.exchange))); + // time in force + Add(time_in_force_column = new SimpleTextColumn( + Columns.TimeInForce, + DefaultColumnHeaders.TimeInForce, + r => r.time_in_force.ToString(), + DefaultColumnWidths.TimeInForce, + DiscreteValuesFilterVM.Create( + EnumHelper.get_values().ToList(), + ort => ort.order.order.time_in_force(), + nameof(OrderBookRowVM.time_in_force)), + DataGridFilterKnownTemplates.EnumValues, + _wrap_comparer(r => r.time_in_force))); + // (algo items) + var algo_items_source = model.subscribe_all_algos().SelectKeyValue(AlgoDataVM.from_data, d => AlgoID.from_algo_key(d.data.key)).OnDispatcher(); + var algo_items_comp = AlgoCollectionHelper.algo_data_vm_comparer.to_non_generic(); + var algo_items_group_desc = new PropertyGroupDescription(nameof(AlgoDataVM.group)); + // order type + Add(order_type_column = new OrderBookOrderTypeColumn( + Columns.OrderType, + nameof(OrderBookRowVM.badge_fill), + nameof(OrderBookRowVM.display_name), + _wrap_comparer(r => r.order_type), + DiscreteValuesFilterVM.CreateTableUpdate( + o => new AlgoDataVM(o.order.algo ?? AlgoData.empty), + vm => AlgoID.from_algo_key(vm.data.key), out var order_type_filter_observer, out var order_type_items_view))); + _resources.Add(algo_items_source.Subscribe(order_type_filter_observer)); + order_type_items_view.CustomSort = algo_items_comp; + order_type_items_view.GroupDescriptions.Add(algo_items_group_desc); + // root algo type + Add(root_algo_type_column = new OrderBookOrderTypeColumn( + Columns.RootAlgoType, + nameof(OrderBookRowVM.root_algo_badge_fill), + nameof(OrderBookRowVM.root_algo_display_name), + _wrap_comparer(r => r.order_tuple.root.algo_type), + DiscreteValuesFilterVM.CreateTableUpdate( + o => new AlgoDataVM(o.root.algo ?? AlgoData.empty), + vm => AlgoID.from_algo_key(vm.data.key), out var root_algo_type_observer, out var root_algo_type_items_view), + DefaultColumnHeaders.RootAlgoType)); + _resources.Add(algo_items_source.Subscribe(root_algo_type_observer)); + root_algo_type_items_view.CustomSort = algo_items_comp; + root_algo_type_items_view.GroupDescriptions.Add(algo_items_group_desc); + // order sub type + Add(sub_type_column = new SimpleTextColumn( + Columns.SubType, + "Sub Type", + r => r.order_sub_type_text, + 80, + DiscreteValuesFilterVM.Create( + EnumHelper.get_values().ToList(), + ort => ort.order.order.sub_type(), + nameof(OrderBookRowVM.order_sub_type)), + OrderBookGridView.SubTypeFilterTemplateKey, + _wrap_comparer(r => r.order_sub_type))); + // side + Add(side_column = new SideColumn( + DiscreteValuesFilterVM.Create( + new[] { Side.Buy, Side.Sell }, + ort => ort.order.order.side(), + nameof(OrderBookRowVM.side)))); + // quantity + 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.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 + //Add(edit_qty_column = new EditableQtyColumn()); + // filled quantity + Add(filled_qty_column = new FilledColumn( + 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, + "Price", + r => r.price_text, + DefaultColumnWidths.Price, + new PriceMinMax( + ort => ort.order.order.price(), + nameof(OrderBookRowVM.price)), + DataGridFilterKnownTemplates.DoubleMinMax, + _wrap_comparer(r => r.price))); + // edit price column + // not usually part of the main order book, but it's useful to add it + // rather than debugging the popup window + //Add(edit_price_column = new OrderBookVM.EditablePriceColumn()); + //Add(new OrderBookVM.AttachColumn("DataContext.attach_vm")); + // avg filled price + Add(avg_price_column = new SimpleTextColumn( + Columns.AvgFilled, + "Avg Price", + r => r.avg_price_text, + DefaultColumnWidths.Price, + new PriceMinMax( + ort => ort.order.order.avg_price(), + nameof(OrderBookRowVM.avg_price)), + DataGridFilterKnownTemplates.DoubleMinMax, + _wrap_comparer(r => r.avg_price))); + // last filled price + Add(last_price_column = new SimpleTextColumn( + Columns.LastPrice, + "Last Filled", + r => r.last_price_text, + DefaultColumnWidths.Price, + new PriceMinMax( + ort => ort.order.order.last_price(), + nameof(OrderBookRowVM.last_price)), + DataGridFilterKnownTemplates.DoubleMinMax, + _wrap_comparer(r => r.last_price))); + // piq + Add(piq_column = new PiqColumn( + new UIntMinMax(ort => ort.order.piq ?? uint.MaxValue, nameof(OrderBookRowVM.piq)))); + // status + Add(status_column = new SimpleTextColumn( + Columns.Status, + "Status", + r => r.status.ToString(), + 80, + DiscreteValuesFilterVM.Create( + EnumHelper.get_values().ToList(), + ort => ort.order.order.status(), + nameof(OrderBookRowVM.status)), + DataGridFilterKnownTemplates.EnumValues, + _wrap_comparer(r => r.status))); + // last message + Add(last_message_column = new OrderBookLastMessageColumn( + new RegexFilterVM( + ort => ort.order.order.last_msg(), + nameof(OrderBookRowVM.last_msg)))); + // security key + Add(security_key_column = new SimpleTextColumn( + Columns.SecurityKey, + DefaultColumnHeaders.SecurityKey, + r => r.security_key.ToString(), + DefaultColumnWidths.SecurityKey, + new RegexFilterVM( + ort => ort.order.order.security_key().ToString(), + nameof(OrderBookRowVM.security_key)), + DataGridFilterKnownTemplates.Regex, + _wrap_comparer(r => r.security_key))); + // order key + Add(order_key_column = new SimpleTextColumn( + Columns.OrderKey, + DefaultColumnHeaders.OrderKey, + r => r.order_key.ToString(), + DefaultColumnWidths.OrderKey, + new RegexFilterVM( + ort => ort.order.order.Key.ToString(), + nameof(OrderBookRowVM.order_key)), + DataGridFilterKnownTemplates.Regex, + _wrap_comparer(r => r.order_key))); + // parent key (this is for diagnostic purposes, remove this column once OrderBook seems stable again) + Add(parent_key_column = new SimpleTextColumn( + Columns.ParentKey, + "Parent Key", + r => r.parent_order_key.ToString(), + DefaultColumnWidths.ParentKey, + new RegexFilterVM( + ort => ort.order.order.ParentKey.ToString(), + nameof(OrderBookRowVM.parent_order_key)), + DataGridFilterKnownTemplates.Regex, + _wrap_comparer(r => r.parent_order_key))); + // attached target order key + Add(attached_target_order_key_column = new SimpleTextColumn( + Columns.AttachedTargetOrderKey, + DefaultColumnHeaders.AttachedTargetOrderKey, + r => r.order.attached_target_order_key().ToString(), + DefaultColumnWidths.AttachedTargetOrderKey, + new RegexFilterVM( + ort => ort.order.order.attached_target_order_key().ToString(), + nameof(OrderBookRowVM.parent_order_key)), + DataGridFilterKnownTemplates.Regex, + _wrap_comparer(r => r.order.attached_target_order_key()))); + } + + public event Action filter_changed; + + public static IEnumerable editable_columns { + get { + yield return new AttachDetachColumn(typeof(MiniOrderBookView)); + yield return new CommitColumn(); + yield return new EditablePriceColumn(); + yield return new EditableQtyColumn(); + yield return new UpdateColumn(typeof(MiniOrderBookView)); + yield return new CancelColumn(nameof(OrderBookRowVM.cancel_command)); + yield return new CheckColumn(nameof(OrderBookRowVM.is_selected)); } + } - public event Action filter_changed; + public SecurityColumn security_column { get; } + public SimpleTextColumn symbol_column { get; } + public SimpleTextColumn time_created_column { get; } + public SimpleTextColumn last_change_column { get; } + public SimpleTextColumn user_column { get; } + public SimpleTextColumn account_column { get; } + public SimpleTextColumn exchange_column { get; } + public SimpleTextColumn time_in_force_column { get; } + public OrderBookOrderTypeColumn order_type_column { get; } + public OrderBookOrderTypeColumn root_algo_type_column { get; } + 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; } + public FilledNotionalValueColumn filled_notional_value_column { get; } + public SimpleTextColumn last_price_column { get; } + public SimpleTextColumn avg_price_column { get; } + public SimpleTextColumn status_column { get; } + public OrderBookLastMessageColumn last_message_column { get; } + public SimpleTextColumn security_key_column { get; } + public SimpleTextColumn order_key_column { get; } + public SimpleTextColumn parent_key_column { get; } + public SimpleTextColumn attached_target_order_key_column { get; } + public PiqColumn piq_column { get; } - public static IEnumerable editable_columns { - get { - yield return new AttachDetachColumn(typeof(MiniOrderBookView)); - yield return new CommitColumn(); - yield return new EditablePriceColumn(); - yield return new EditableQtyColumn(); - yield return new UpdateColumn(typeof(MiniOrderBookView)); - yield return new CancelColumn(nameof(OrderBookRowVM.cancel_command)); - yield return new CheckColumn(nameof(OrderBookRowVM.is_selected)); + public FilterStates create_filter_states() => + new FilterStates { + order_key_regex = order_key_column.filter.get_state(), + parent_key_regex = parent_key_column.filter.get_state(), + attached_target_order_key_regex = attached_target_order_key_column.filter.get_state(), + time_created = time_created_column.filter.get_state(), + users = user_column.filter.get_state(), + accounts = account_column.filter.get_state(), + exchanges = exchange_column.filter.get_state(), + tifs = time_in_force_column.filter.get_state(), + order_types = order_type_column.filter.get_state(), + root_algo_types = root_algo_type_column.filter.get_state(), + order_sub_types = sub_type_column.filter.get_state(), + sides = side_column.filter.get_state(), + qty = qty_column.filter.get_state(), + 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(), + exchange_message_regex = last_message_column.filter.get_state(), + last_change = last_change_column.filter.get_state(), + security_criteria = security_column.filter.get_state(), + symbols = symbol_column.filter.get_state(), + piq = piq_column.filter.get_state() + }; + + public (FilterStates filters, IReadOnlyList sorting) create() => + (create_filter_states(), get_sorting_data().sorting_criteria); + + public void load_from((FilterStates filters, IReadOnlyList sorting) state) { + if (state.filters is FilterStates fs) { + security_column.filter.load_state(fs.security_criteria); + symbol_column.filter.load_state(fs.symbols); + time_created_column.filter.load_state(fs.time_created); + user_column.filter.load_state(fs.users); + account_column.filter.load_state(fs.accounts); + price_column.filter.load_state(fs.price); + 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); + sub_type_column.filter.load_state(fs.order_sub_types); + time_in_force_column.filter.load_state(fs.tifs); + exchange_column.filter.load_state(fs.exchanges); + order_key_column.filter.load_state(fs.order_key_regex); + parent_key_column.filter.load_state(fs.parent_key_regex); + attached_target_order_key_column.filter.load_state(fs.attached_target_order_key_regex); + avg_price_column.filter.load_state(fs.avg_price); + last_price_column.filter.load_state(fs.last_price); + status_column.filter.load_state(fs.statuses); + last_message_column.filter.load_state(fs.exchange_message_regex); + last_change_column.filter.load_state(fs.last_change); + piq_column.filter.load_state(fs.piq); + } + _active_comparers.Clear(); + foreach (var col in this) + col.SortDirection = null; + if (state.sorting is IReadOnlyList sorting) { + foreach (var sc in sorting) { + this.OfType().ApplyToFirst(col => col.id.iequals(sc.col_name), + col => { + col.SortDirection = sc.is_ascending ? ListSortDirection.Ascending : ListSortDirection.Descending; + _active_comparers.Add(col); + }); } } + if (_active_comparers.Count == 0) { + // safeguard against empty sort, fallback to time-created + time_created_column.SortDirection = ListSortDirection.Descending; + _active_comparers.Add(time_created_column); + } + } - public SecurityColumn security_column { get; } - public SimpleTextColumn symbol_column { get; } - public SimpleTextColumn time_created_column { get; } - public SimpleTextColumn last_change_column { get; } - public SimpleTextColumn user_column { get; } - public SimpleTextColumn account_column { get; } - public SimpleTextColumn exchange_column { get; } - public SimpleTextColumn time_in_force_column { get; } - public OrderBookOrderTypeColumn order_type_column { get; } - public OrderBookOrderTypeColumn root_algo_type_column { get; } - 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; } - public FilledNotionalValueColumn filled_notional_value_column { get; } - public SimpleTextColumn last_price_column { get; } - public SimpleTextColumn avg_price_column { get; } - public SimpleTextColumn status_column { get; } - public OrderBookLastMessageColumn last_message_column { get; } - public SimpleTextColumn security_key_column { get; } - public SimpleTextColumn order_key_column { get; } - public SimpleTextColumn parent_key_column { get; } - public SimpleTextColumn attached_target_order_key_column { get; } - public PiqColumn piq_column { get; } + public Func get_filter() { + var active_filters = this.OfType().Where(c => c.filter.active.GetValueOrDefault()).Select(c => c.filter).ToArray(); + return active_filters.Length == 0 ? null : new Func(r => active_filters.All(f => f.filter(r))); + } - public FilterStates create_filter_states() => - new FilterStates { - order_key_regex = order_key_column.filter.get_state(), - parent_key_regex = parent_key_column.filter.get_state(), - attached_target_order_key_regex = attached_target_order_key_column.filter.get_state(), - time_created = time_created_column.filter.get_state(), - users = user_column.filter.get_state(), - accounts = account_column.filter.get_state(), - exchanges = exchange_column.filter.get_state(), - tifs = time_in_force_column.filter.get_state(), - order_types = order_type_column.filter.get_state(), - root_algo_types = root_algo_type_column.filter.get_state(), - order_sub_types = sub_type_column.filter.get_state(), - sides = side_column.filter.get_state(), - qty = qty_column.filter.get_state(), - 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(), - exchange_message_regex = last_message_column.filter.get_state(), - last_change = last_change_column.filter.get_state(), - security_criteria = security_column.filter.get_state(), - symbols = symbol_column.filter.get_state(), - piq = piq_column.filter.get_state() - }; - - public (FilterStates filters, IReadOnlyList sorting) create() => - (create_filter_states(), get_sorting_data().sorting_criteria); - - public void load_from((FilterStates filters, IReadOnlyList sorting) state) { - if (state.filters is FilterStates fs) { - security_column.filter.load_state(fs.security_criteria); - symbol_column.filter.load_state(fs.symbols); - time_created_column.filter.load_state(fs.time_created); - user_column.filter.load_state(fs.users); - account_column.filter.load_state(fs.accounts); - price_column.filter.load_state(fs.price); - 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); - sub_type_column.filter.load_state(fs.order_sub_types); - time_in_force_column.filter.load_state(fs.tifs); - exchange_column.filter.load_state(fs.exchanges); - order_key_column.filter.load_state(fs.order_key_regex); - parent_key_column.filter.load_state(fs.parent_key_regex); - attached_target_order_key_column.filter.load_state(fs.attached_target_order_key_regex); - avg_price_column.filter.load_state(fs.avg_price); - last_price_column.filter.load_state(fs.last_price); - status_column.filter.load_state(fs.statuses); - last_message_column.filter.load_state(fs.exchange_message_regex); - last_change_column.filter.load_state(fs.last_change); - piq_column.filter.load_state(fs.piq); - } + public OrderBookSortingData get_sorting_data() { + var desc_parts = new List(); + var comp_builder = new ComparerBuilder(); + // this should be unneccesary, safe_active_comparers is just an extra guard against unexpected results from future code changes + // (get_comparer_data() should NEVER return a null/non-deterministic IComparer, fallback to sorting by Time Created in descending order if necessary) + var safe_active_comparers = _active_comparers.Where(c => c.SortDirection.HasValue).ToList(); + if (safe_active_comparers.Count == 0) { + time_created_column.SortDirection = ListSortDirection.Descending; _active_comparers.Clear(); - foreach (var col in this) - col.SortDirection = null; - if (state.sorting is IReadOnlyList sorting) { - foreach (var sc in sorting) { - this.OfType().ApplyToFirst(col => col.id.iequals(sc.col_name), - col => { - col.SortDirection = sc.is_ascending ? ListSortDirection.Ascending : ListSortDirection.Descending; - _active_comparers.Add(col); - }); - } - } - if (_active_comparers.Count == 0) { - // safeguard against empty sort, fallback to time-created - time_created_column.SortDirection = ListSortDirection.Descending; - _active_comparers.Add(time_created_column); - } + _active_comparers.Add(time_created_column); + safe_active_comparers = _active_comparers; } + return new OrderBookSortingData(safe_active_comparers); + } - public Func get_filter() { - var active_filters = this.OfType().Where(c => c.filter.active.GetValueOrDefault()).Select(c => c.filter).ToArray(); - return active_filters.Length == 0 ? null : new Func(r => active_filters.All(f => f.filter(r))); + public void on_sorting(ICVOrderBookColumn col, bool clear_current_sort) { + col.SortDirection = col.SortDirection.HasValue && col.SortDirection.Value == ListSortDirection.Ascending ? ListSortDirection.Descending : ListSortDirection.Ascending; + if (_active_comparers.Contains(col, EqualityComparer.Create(r => r.key))) { + if (clear_current_sort) _reset_active_comparer(col); + } else { + if (clear_current_sort) _reset_active_comparer(col); + else _active_comparers.Add(col); } + } - public OrderBookSortingData get_sorting_data() { - var desc_parts = new List(); - var comp_builder = new ComparerBuilder(); - // this should be unneccesary, safe_active_comparers is just an extra guard against unexpected results from future code changes - // (get_comparer_data() should NEVER return a null/non-deterministic IComparer, fallback to sorting by Time Created in descending order if necessary) - var safe_active_comparers = _active_comparers.Where(c => c.SortDirection.HasValue).ToList(); - if (safe_active_comparers.Count == 0) { - time_created_column.SortDirection = ListSortDirection.Descending; - _active_comparers.Clear(); - _active_comparers.Add(time_created_column); - safe_active_comparers = _active_comparers; - } - return new OrderBookSortingData(safe_active_comparers); - } + public void Dispose() { + _resources.DisposeAll(true); + foreach (var col in this.OfType()) + (col.filter as IDisposable)?.Dispose(); + Clear(); + } - public void on_sorting(ICVOrderBookColumn col, bool clear_current_sort) { - col.SortDirection = col.SortDirection.HasValue && col.SortDirection.Value == ListSortDirection.Ascending ? ListSortDirection.Descending : ListSortDirection.Ascending; - if (_active_comparers.Contains(col, EqualityComparer.Create(r => r.key))) { - if (clear_current_sort) _reset_active_comparer(col); - } else { - if (clear_current_sort) _reset_active_comparer(col); - else _active_comparers.Add(col); - } - } - - public void Dispose() { - _resources.DisposeAll(true); - foreach (var col in this.OfType()) - (col.filter as IDisposable)?.Dispose(); - Clear(); - } - - /// ONLY supports sorting/filtering behavior for columns that implement . - /// This is because OrderBook, unlike the other windows (as of 10/30/2018), does not use as the sorting/filtering model. - protected override void InsertItem(int index, ColumnBase item) { - if (item is ICVOrderBookColumn col) { - try { - _hook(col); - base.InsertItem(index, item); - } catch { - _unhook(col); - throw; - } - } else { - Log.Ui.warn($"{nameof(OrderBookColumnCollection)} added a column that is not of type {nameof(ICVOrderBookColumn)}"); + /// ONLY supports sorting/filtering behavior for columns that implement . + /// This is because OrderBook, unlike the other windows (as of 10/30/2018), does not use as the sorting/filtering model. + protected override void InsertItem(int index, ColumnBase item) { + if (item is ICVOrderBookColumn col) { + try { + _hook(col); base.InsertItem(index, item); - } - } - - protected override void RemoveItem(int index) { - if (Count > index && this[index] is ICVOrderBookColumn col) + } catch { _unhook(col); - base.RemoveItem(index); - } - protected override void ClearItems() { - var ob_columns = this.OfType().ToList(); - Log.Ui.info($"{nameof(OrderBookColumnCollection)} is unhooking all columns of type {nameof(ICVOrderBookColumn)} ({ob_columns.Count}/{Count})."); - foreach (var col in ob_columns) - _unhook(col); - base.ClearItems(); - } - - void _hook(ICVOrderBookColumn new_item) => new_item.filter.filter_changed += _on_column_filter_changed; - void _unhook(ICVOrderBookColumn old_item) => old_item.filter.filter_changed -= _on_column_filter_changed; - void _on_column_filter_changed() => filter_changed?.Invoke(); - - void _reset_active_comparer(ICVOrderBookColumn column) { - foreach (var col in _active_comparers) { - if (!col.Equals(column)) col.SortDirection = null; + throw; } - _active_comparers.Clear(); - _active_comparers.Add(column); + } else { + Log.Ui.warn($"{nameof(OrderBookColumnCollection)} added a column that is not of type {nameof(ICVOrderBookColumn)}"); + base.InsertItem(index, item); } } + protected override void RemoveItem(int index) { + if (Count > index && this[index] is ICVOrderBookColumn col) + _unhook(col); + base.RemoveItem(index); + } + protected override void ClearItems() { + var ob_columns = this.OfType().ToList(); + Log.Ui.info($"{nameof(OrderBookColumnCollection)} is unhooking all columns of type {nameof(ICVOrderBookColumn)} ({ob_columns.Count}/{Count})."); + foreach (var col in ob_columns) + _unhook(col); + base.ClearItems(); + } + + void _hook(ICVOrderBookColumn new_item) => new_item.filter.filter_changed += _on_column_filter_changed; + void _unhook(ICVOrderBookColumn old_item) => old_item.filter.filter_changed -= _on_column_filter_changed; + void _on_column_filter_changed() => filter_changed?.Invoke(); + + void _reset_active_comparer(ICVOrderBookColumn column) { + foreach (var col in _active_comparers) { + if (!col.Equals(column)) col.SortDirection = null; + } + _active_comparers.Clear(); + _active_comparers.Add(column); + } + static IComparer _wrap_comparer(Func get) => Comparer.Default.wrap(get); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index baf7e0216..6ff4e4e5c 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -25,7 +25,7 @@ using Columns = mbts.spark.OrderBookGridView.ColumnKeys; using TickDisplaySettingsImmutable = bts.api.domain.TickDisplaySettingsImmutable; namespace mbts.spark { - partial class OrderBookRowVM : IEquatable, DIYGrid.IRowVM, IHierarchicalRow, INotifyPropertyChanged { + class OrderBookRowVM : IEquatable, DIYGrid.IRowVM, IHierarchicalRow, INotifyPropertyChanged { public static readonly IComparer key_comparer = Comparer.Default.wrap(r => r.order_key).to_safe(); const string _unknown_security_price_format_string = "0.#########"; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 3ebc03c04..90b0008a3 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -43,7 +43,7 @@ using System.Windows.Input; using Columns = mbts.spark.OrderBookGridView.ColumnKeys; namespace mbts.spark { - partial class OrderBookVM : DisposableViewModelBase, IHandleRowSelection, IHandleGridSorting, IRequestRowSelection { + class OrderBookVM : DisposableViewModelBase, IHandleRowSelection, IHandleGridSorting, IRequestRowSelection { const double _min_right_panel_width = 200, _min_order_params_height = 300, diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs index da4660455..909aa7679 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLVM.cs @@ -852,7 +852,7 @@ namespace bts.shell.pnl { var obvm = orders_source == null ? new OrderBookVM(_bus, null, _orders_model, _position_model, _sec_meta_store, settings_man, true) : new OrderBookVM(_bus, null, _orders_model, _position_model, _sec_meta_store, orders_source, settings_man, true); - foreach (var c in OrderBookVM.OrderBookColumnCollection.editable_columns) + foreach (var c in OrderBookColumnCollection.editable_columns) obvm.columns.Insert(0, c); obvm.load_from(state); return obvm;