diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 2ff25a0d8..76daca299 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -34,7 +34,7 @@ namespace mbts.spark { // This interface is used to hide ColumnBase.SortDirection, and offer a SortDirection member that does NOT require a DependencyProperty lookup. interface ICVOrderBookColumn : IKeyedColumn, IGridColumn { ListSortDirection? SortDirection { get; set; } - IDataGridColumnFilter filter { get; } + IDataGridColumnFilter filter { get; } IComparer comparer { get; } } @@ -70,7 +70,7 @@ namespace mbts.spark { public OrderBookColumnCollection(IBus bus, OrdersModel model, IObservable<(IEnumerable added, IEnumerable removed)> order_securities) { // security Add(security_column = new SecurityColumn( - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( order_securities, ort => ort.security ?? SecurityDataHelper.Defaults.SecurityImmutable, SecurityCriteria.from_securities, @@ -85,7 +85,7 @@ namespace mbts.spark { DefaultColumnHeaders.Symbol, r => r.symbol, DefaultColumnWidths.Symbol, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( mbts.co2.UserSymbol.get_all().Select(u => u.symbol).Distinct().ToList(), ort => ort.security?.Symbol ?? string.Empty, nameof(OrderBookRowVM.symbol) @@ -98,7 +98,7 @@ namespace mbts.spark { "Time", r => r.time_created_text, DefaultColumnWidths.Time, - new TimeFilterVM( + new TimeFilterVM( ort => ort.order.created(), nameof(OrderBookRowVM.time_created)), DataGridFilterKnownTemplates.TimeFilter, @@ -109,7 +109,7 @@ namespace mbts.spark { "Last Change", r => r.last_change_text, DefaultColumnWidths.Time, - new TimeFilterVM( + new TimeFilterVM( ort => ort.order.last_change(), nameof(OrderBookRowVM.last_change)), DataGridFilterKnownTemplates.TimeFilter, @@ -120,7 +120,7 @@ namespace mbts.spark { DefaultColumnHeaders.User, r => r.user, DefaultColumnWidths.User, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( model.factory.subscribe_users().Select(d => d.Values), ort => ort.order.user(), nameof(OrderBookRowVM.user)), @@ -132,7 +132,7 @@ namespace mbts.spark { DefaultColumnHeaders.Account, r => r.account, DefaultColumnWidths.Account, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( model.factory.subscribe_accounts().Select(d => d.Values), ort => ort.order.account(), vals => vals.ToArray(), @@ -146,7 +146,7 @@ namespace mbts.spark { DefaultColumnHeaders.Exchange, r => r.exchange.ToString(), DefaultColumnWidths.Exchange, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( EnumHelper.get_values_except(Venue.Unset).ToList(), ort => ort.security.exchange_or_default(), nameof(OrderBookRowVM.exchange)), @@ -158,7 +158,7 @@ namespace mbts.spark { DefaultColumnHeaders.TimeInForce, r => r.time_in_force.ToString(), DefaultColumnWidths.TimeInForce, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( EnumHelper.get_values().ToList(), ort => ort.order.time_in_force(), nameof(OrderBookRowVM.time_in_force)), @@ -174,7 +174,7 @@ namespace mbts.spark { nameof(OrderBookRowVM.badge_fill), nameof(OrderBookRowVM.display_name), _wrap_comparer(r => r.order_type), - DiscreteValuesFilterVM.CreateTableUpdate( + DiscreteValuesFilterVM.CreateTableUpdate( o => new AlgoDataVM(o.algo.GetValueOrDefault()), 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)); @@ -186,7 +186,7 @@ namespace mbts.spark { nameof(OrderBookRowVM.root_algo_badge_fill), nameof(OrderBookRowVM.root_algo_display_name), _wrap_comparer(r => r.order_tuple.root_algo.value.CustomCase), - DiscreteValuesFilterVM.CreateTableUpdate( + DiscreteValuesFilterVM.CreateTableUpdate( o => new AlgoDataVM(o.root_algo), vm => AlgoID.from_algo_key(vm.data.key), out var root_algo_type_observer, out var root_algo_type_items_view), DefaultColumnHeaders.RootAlgoType)); @@ -199,7 +199,7 @@ namespace mbts.spark { "Sub Type", r => r.order_sub_type_text, 80, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( EnumHelper.get_values().ToList(), ort => ort.order.sub_type(), nameof(OrderBookRowVM.order_sub_type)), @@ -207,27 +207,27 @@ namespace mbts.spark { _wrap_comparer(r => r.order_sub_type))); // side Add(side_column = new SideColumn( - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( new[] { Side.Buy, Side.Sell }, - ort=> ort.order.side(), + ort => ort.order.side(), nameof(OrderBookRowVM.side)))); // quantity Add(qty_column = new SizeColumn( - new UIntMinMax(ort => ort.order.quantity(), nameof(OrderBookRowVM.quantity)))); + new UIntMinMax(ort => ort.order.quantity(), nameof(OrderBookRowVM.quantity)))); // 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 UIntMinMax(ort => ort.order.filled(), nameof(OrderBookRowVM.filled_quantity)))); + new UIntMinMax(ort => ort.order.filled(), nameof(OrderBookRowVM.filled_quantity)))); // price Add(price_column = new SimpleTextColumn( Columns.Price, "Price", r => r.price_text, DefaultColumnWidths.Price, - new PriceMinMax( + new PriceMinMax( ort => ort.order.price(), nameof(OrderBookRowVM.price)), DataGridFilterKnownTemplates.DoubleMinMax, @@ -243,7 +243,7 @@ namespace mbts.spark { "Avg Price", r => r.avg_price_text, DefaultColumnWidths.Price, - new PriceMinMax( + new PriceMinMax( ort => ort.order.avg_price(), nameof(OrderBookRowVM.avg_price)), DataGridFilterKnownTemplates.DoubleMinMax, @@ -254,18 +254,21 @@ namespace mbts.spark { "Last Filled", r => r.last_price_text, DefaultColumnWidths.Price, - new PriceMinMax( + new PriceMinMax( ort => ort.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.piq ?? uint.MaxValue, nameof(OrderBookRowVM.piq)))); // status Add(status_column = new SimpleTextColumn( Columns.Status, "Status", r => r.status.ToString(), 80, - DiscreteValuesFilterVM.Create( + DiscreteValuesFilterVM.Create( EnumHelper.get_values().ToList(), ort => ort.order.status(), nameof(OrderBookRowVM.status)), @@ -273,7 +276,7 @@ namespace mbts.spark { _wrap_comparer(r => r.status))); // last message Add(last_message_column = new OrderBookLastMessageColumn( - new RegexFilterVM( + new RegexFilterVM( ort => ort.order.last_msg(), nameof(OrderBookRowVM.last_msg)))); // security key @@ -282,7 +285,7 @@ namespace mbts.spark { DefaultColumnHeaders.SecurityKey, r => r.security_key.ToString(), DefaultColumnWidths.SecurityKey, - new RegexFilterVM( + new RegexFilterVM( ort => ort.order.security_key().ToString(), nameof(OrderBookRowVM.security_key)), DataGridFilterKnownTemplates.Regex, @@ -293,7 +296,7 @@ namespace mbts.spark { DefaultColumnHeaders.OrderKey, r => r.order_key.ToString(), DefaultColumnWidths.OrderKey, - new RegexFilterVM( + new RegexFilterVM( ort => ort.order.Key.ToString(), nameof(OrderBookRowVM.order_key)), DataGridFilterKnownTemplates.Regex, @@ -304,7 +307,7 @@ namespace mbts.spark { "Parent Key", r => r.parent_order_key.ToString(), DefaultColumnWidths.ParentKey, - new RegexFilterVM( + new RegexFilterVM( ort => ort.order.ParentKey.ToString(), nameof(OrderBookRowVM.parent_order_key)), DataGridFilterKnownTemplates.Regex, @@ -315,7 +318,7 @@ namespace mbts.spark { DefaultColumnHeaders.AttachedTargetOrderKey, r => r.order.attached_target_order_key().ToString(), DefaultColumnWidths.AttachedTargetOrderKey, - new RegexFilterVM( + new RegexFilterVM( ort => ort.order.attached_target_order_key().ToString(), nameof(OrderBookRowVM.parent_order_key)), DataGridFilterKnownTemplates.Regex, @@ -348,6 +351,7 @@ namespace mbts.spark { 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 FilterStates create_filter_states() => new FilterStates { @@ -372,7 +376,8 @@ namespace mbts.spark { 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() + symbols = symbol_column.filter.get_state(), + piq = piq_column.filter.get_state() }; public (FilterStates filters, IReadOnlyList sorting) create() => @@ -402,6 +407,7 @@ namespace mbts.spark { 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) @@ -422,9 +428,9 @@ namespace mbts.spark { } } - public Func get_filter() { + 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))); + return active_filters.Length == 0 ? null : new Func(r => active_filters.All(f => f.filter(r))); } public OrderBookSortingData get_sorting_data() { @@ -525,7 +531,7 @@ namespace mbts.spark { GlyphContext _root_glyph_context, _child_glyph_context; protected OrderbookColumnBase(Columns col_key, string header, Func get_text, double width, - IDataGridColumnPersistentFilter filter, string filter_template, IComparer comparer) : base(col_key) { + IDataGridColumnPersistentFilter filter, string filter_template, IComparer comparer) : base(col_key) { id = key.ToString(); Width = width; Header = header; @@ -542,10 +548,10 @@ namespace mbts.spark { } } - public IDataGridColumnPersistentFilter filter { get; } + public IDataGridColumnPersistentFilter filter { get; } public IComparer comparer { get; } - IDataGridColumnFilter ICVOrderBookColumn.filter => filter; + IDataGridColumnFilter ICVOrderBookColumn.filter => filter; IDataGridColumnFilter IFilterableColumn.filter => filter; string IFilterableColumn.filter_template => _filter_template; ListSortDirection? ICVOrderBookColumn.SortDirection { get => _cached_sort_direction; set => SortDirection = value; } @@ -559,7 +565,7 @@ namespace mbts.spark { public class SimpleTextColumn : OrderbookColumnBase, IRenderColumn { public SimpleTextColumn(Columns key, string header, Func get_text, double width, - IDataGridColumnPersistentFilter filter, string filter_template, IComparer comparer) + IDataGridColumnPersistentFilter filter, string filter_template, IComparer comparer) : base(key, header, get_text, width, filter, filter_template, comparer) { } public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => @@ -569,7 +575,7 @@ namespace mbts.spark { #region Explicit Column Defs public class SideColumn : OrderbookColumnBase, IRenderColumn { - public SideColumn(IDataGridColumnPersistentFilter filter) + public SideColumn(IDataGridColumnPersistentFilter filter) : base(Columns.Side, "B/S", r => r.side.ToString(), DefaultColumnWidths.Side, filter, DataGridFilterKnownTemplates.EnumValues, _wrap_comparer(r => r.side)) { } public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => @@ -578,7 +584,7 @@ namespace mbts.spark { } public class SizeColumn : OrderbookColumnBase, IRenderColumn { - public SizeColumn(IDataGridColumnPersistentFilter filter) + public SizeColumn(IDataGridColumnPersistentFilter filter) : base(Columns.Size, "Qty", r => r.quantity.ToString(), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax, _wrap_comparer(r => r.quantity)) { } public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => @@ -587,7 +593,7 @@ namespace mbts.spark { } public class FilledColumn : OrderbookColumnBase, IRenderColumn { - public FilledColumn(IDataGridColumnPersistentFilter filter) + public FilledColumn(IDataGridColumnPersistentFilter filter) : base(Columns.Filled, "Filled Qty", r => r.filled_quantity.ToString(), DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax, _wrap_comparer(r => r.filled_quantity)) { } public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => @@ -599,7 +605,7 @@ namespace mbts.spark { readonly BindingBase _foreground_binding; ListSortDirection? _cached_sort_direction; - public OrderBookOrderTypeColumn(Columns key, string badge_fill_binding_path, string display_name_binding_path, IComparer row_comparer, IDataGridColumnPersistentFilter filter, string header = DefaultColumnHeaders.OrderType) + public OrderBookOrderTypeColumn(Columns key, string badge_fill_binding_path, string display_name_binding_path, IComparer row_comparer, IDataGridColumnPersistentFilter filter, string header = DefaultColumnHeaders.OrderType) : base(key, new Binding(badge_fill_binding_path), new Binding(display_name_binding_path), filter, header) { id = key.ToString(); this.filter = filter; @@ -609,11 +615,11 @@ namespace mbts.spark { this.comparer = row_comparer; } - public new IDataGridColumnPersistentFilter filter { get; } + public new IDataGridColumnPersistentFilter filter { get; } public override string filter_template => DataGridFilterKnownTemplates.AlgoType; public IComparer comparer { get; } - IDataGridColumnFilter ICVOrderBookColumn.filter => filter; + IDataGridColumnFilter ICVOrderBookColumn.filter => filter; ListSortDirection? ICVOrderBookColumn.SortDirection { get => _cached_sort_direction; set => SortDirection = value; } public override FrameworkElement view_factory() { @@ -631,7 +637,7 @@ namespace mbts.spark { public class OrderBookLastMessageColumn : TextColumn, ICVOrderBookColumn { ListSortDirection? _cached_sort_direction; - public OrderBookLastMessageColumn(IDataGridColumnPersistentFilter filter) + public OrderBookLastMessageColumn(IDataGridColumnPersistentFilter filter) : base(Columns.LastMessage, new Binding(nameof(OrderBookRowVM.last_msg)), filter, DataGridFilterKnownTemplates.Regex) { id = key.ToString(); this.filter = filter; @@ -640,10 +646,10 @@ namespace mbts.spark { tooltip_binding = new Binding(nameof(OrderBookRowVM.last_msg)); } - public new IDataGridColumnPersistentFilter filter { get; } + public new IDataGridColumnPersistentFilter filter { get; } public IComparer comparer => _wrap_comparer(r => r.last_msg); - IDataGridColumnFilter ICVOrderBookColumn.filter => filter; + IDataGridColumnFilter ICVOrderBookColumn.filter => filter; ListSortDirection? ICVOrderBookColumn.SortDirection { get => _cached_sort_direction; set => SortDirection = value; } protected override void OnSortDirectionChanged(ListSortDirection? new_value) { @@ -652,6 +658,15 @@ namespace mbts.spark { } } + public class PiqColumn : OrderbookColumnBase, IRenderColumn { + public PiqColumn(IDataGridColumnPersistentFilter filter) + : base(Columns.Piq, "PIQ", r => r.piq_text, DefaultColumnWidths.Size, filter, DataGridFilterKnownTemplates.UIntMinMax, _wrap_comparer(r => r.piq)) { } + + public void draw(OrderBookRowVM row, DrawingContext dc, ColumnGeometry position, double row_height) => + CellRender.draw_text(dc, _get_glyph_context(row), font_size, row.piq_text, position, row_height, + RenderUtils.get_foreground(row, font_brush), null, HorizontalAlignment.Right, VerticalAlignment.Center, DefaultCellPadding); + } + public class SecurityColumn : FrameworkElementColumnBase, ICVOrderBookColumn, IFilterableColumn { readonly BindingBase _font_weight_binding = RenderUtils.get_font_weight_binding(), _foreground_binding; readonly IValueConverter _expander_visiblilty_converter = new ui.converters.BooleanToVisibilityConverter { VisibilityForFalse = Visibility.Hidden }; @@ -659,7 +674,7 @@ namespace mbts.spark { ListSortDirection? _cached_sort_direction; - public SecurityColumn(IDataGridColumnPersistentFilter filter) : base(Columns.Security) { + public SecurityColumn(IDataGridColumnPersistentFilter filter) : base(Columns.Security) { id = key.ToString(); this.filter = filter; _foreground_binding = RenderUtils.get_foreground_binding(this); @@ -668,10 +683,10 @@ namespace mbts.spark { _cached_sort_direction = SortDirection; } - public IDataGridColumnPersistentFilter filter { get; } + public IDataGridColumnPersistentFilter filter { get; } public IComparer comparer => _wrap_comparer(r => r.security, SecurityHelper.Comparer.InstanceImmutable.to_nullable()); - IDataGridColumnFilter ICVOrderBookColumn.filter => filter; + IDataGridColumnFilter ICVOrderBookColumn.filter => filter; IDataGridColumnFilter IFilterableColumn.filter => filter; string IFilterableColumn.filter_template => DataGridFilterKnownTemplates.DiscreteValues; ListSortDirection? ICVOrderBookColumn.SortDirection { get => _cached_sort_direction; set => SortDirection = value; } diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 813658f40..e9a7d3b6b 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -14,7 +14,7 @@ using System.Windows.Media; using Columns = mbts.spark.OrderBookGridView.ColumnKeys; namespace mbts.spark { - partial class OrderBookRowVM : IEquatable, DIYGrid.IRowVM, IHierarchicalRow, INotifyPropertyChanged { + partial class OrderBookRowVM : IEquatable, DIYGrid.IRowVM, IHierarchicalRow, INotifyPropertyChanged { const string _unknown_security_price_format_string = "0.#########"; const int _unknown_security_price_num_fractional_digits = 9; readonly OrderBookVM _owner; @@ -28,7 +28,7 @@ namespace mbts.spark { uint _prospective_quantity; double _prospective_price; - public OrderBookRowVM(OrderBookVM owner, OrderSecurityAlgoMeta order_tuple, bool is_expanded) { + public OrderBookRowVM(OrderBookVM owner, OrderSecurity order_tuple, bool is_expanded) { _owner = owner; this.order_tuple = order_tuple; is_visible = !is_child; @@ -43,19 +43,19 @@ namespace mbts.spark { //// when the OrderBookVM.selected_order_changes, this emulates the selected //// order changing since the current_row setter invokes the selected_order_changed //// handler - public IObservable subscribe_data() { - return Observable.FromEvent( + public IObservable subscribe_data() { + return Observable.FromEvent( cb => () => cb(order_tuple), cb => invalidated += cb, cb => invalidated -= cb); } public event Action invalidated; - public event Action<(OrderSecurityAlgoMeta oldval, OrderSecurityAlgoMeta newval)> updated; + public event Action<(OrderSecurity oldval, OrderSecurity newval)> updated; public event PropertyChangedEventHandler PropertyChanged; // Core - public OrderSecurityAlgoMeta order_tuple { get; private set; } + public OrderSecurity order_tuple { get; private set; } public OrderRecordImmutable order => order_tuple.order; public OrderMetadata order_metadata => _owner.get_metadata(this); public Brush badge_fill => _badge_fill ?? (_badge_fill = OrderUtils.badge_fill(order_tuple.meta, order_metadata)); @@ -91,6 +91,8 @@ namespace mbts.spark { public uint quantity => order.quantity(); public uint filled_quantity => order.filled(); public string last_msg => order.last_msg(); + public uint piq => order_tuple.piq ?? uint.MaxValue; + public string piq_text => piq == uint.MaxValue ? string.Empty : piq.ToString(); public bool is_non_terminal => order.is_non_terminal(); public bool is_attachable { get => _is_attachable; set => SetVisual(ref _is_attachable, value); } public bool is_detachable { get => _is_detachable; set => SetVisual(ref _is_detachable, value); } @@ -214,7 +216,7 @@ namespace mbts.spark { bool IHierarchicalRow.is_parent => is_parent; bool IHierarchicalRow.is_expanded => is_expanded; int IHierarchicalRow.depth_level => depth_level; - OrderSecurityAlgoMeta IHierarchicalRow.value => order_tuple; + OrderSecurity IHierarchicalRow.value => order_tuple; void IHierarchicalRow.on_is_parent_changed(bool is_parent) => this.is_parent = is_parent; /// Do NOT actually call the setter (it has side effects) - the row collection calls this method when the row is expanded/collapsed by some **external means, outside of this class. @@ -226,7 +228,7 @@ namespace mbts.spark { /// void IHierarchicalRow.on_is_expanded_changed(bool is_expanded) => Set(ref _is_expanded, is_expanded, nameof(is_expanded)); void IHierarchicalRow.on_depth_level_changed(int depth_level) => this.depth_level = depth_level; - void IHierarchicalRow.on_value_changed(OrderSecurityAlgoMeta value) => update(value); + void IHierarchicalRow.on_value_changed(OrderSecurity value) => update(value); #endregion private void _unselect_me() { @@ -244,7 +246,7 @@ namespace mbts.spark { internal void expand_internal() => Set(ref _is_expanded, true, nameof(is_expanded)); internal void collapse_internal() => Set(ref _is_expanded, false, nameof(is_expanded)); - public void update(OrderSecurityAlgoMeta order_tuple) { + public void update(OrderSecurity order_tuple) { Log.assert(order_tuple.order.Key == this.order.Key, "OrderBookRowVM: update_order was called with an order with the wrong key."); // _show_order_modify_cmd is lazy (instantiated in the default_command getter); it might be null, don't not force instantiation bool? could_modify_execute = _show_order_modify_cmd?.CanExecute(null); @@ -314,6 +316,9 @@ namespace mbts.spark { // this will update the cancel column in the mini ob cancel_command.TryRaiseCanExecuteChanged(); } + if ((Columns.Piq & dirty) != 0) { + RaisePropertyChanged(nameof(piq), nameof(piq_text)); + } // always refresh attach and detach b/c // conditionally raise invalidated if ((dirty & ViewRefresh.invalidate_mask) != 0) @@ -374,13 +379,14 @@ namespace mbts.spark { Columns.Status | Columns.ParentKey | Columns.AttachedTargetOrderKey | - Columns.LastMessage, + Columns.LastMessage | + Columns.Piq, filled_status_desc_mask = Columns.Filled | Columns.AvgFilled | Columns.Status; - public static Columns get_dirty_cells(OrderSecurityAlgoMeta oldval, OrderSecurityAlgoMeta newval) { + public static Columns get_dirty_cells(OrderSecurity oldval, OrderSecurity newval) { var dirty = (Columns)0; if (oldval.security != newval.security) dirty |= Columns.Security; @@ -404,6 +410,9 @@ namespace mbts.spark { dirty |= Columns.Status; if (oldval.order.last_msg() != newval.order.last_msg()) dirty |= Columns.LastMessage; + if (oldval.piq != newval.piq) { + dirty |= Columns.Piq; + } return dirty; } } diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index f7ec72163..cff54d5c4 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -42,7 +42,7 @@ namespace mbts.spark { readonly OrdersModel _model; readonly Property _current_row; readonly DelegateProperty _show_order_params, _show_ladder, _show_fills, _can_attach_selected_orders, _can_detach_selected_orders; - readonly OperableHierarchicalCollection _row_collection; + readonly OperableHierarchicalCollection _row_collection; readonly OrderBookColumnCollection _columns; readonly IWindowSettingsManager _settings_manager; readonly IWindowSettingsManager _fills_settings_manager = new WindowSettingsManager.DisconnectedImpl(FillsWindowFactory.StartupData.MiniGridSettings, FillsWindowFactory.StartupData.MiniGridSettings); @@ -58,7 +58,7 @@ namespace mbts.spark { _show_right_panel = OrderBookStartupData.Default.show_right_panel, _is_attaching_orders, _is_row_collection_populated; - IReadOnlyDictionary _cached_orders = DictionaryHelper.empty(); + IReadOnlyDictionary _cached_orders = DictionaryHelper.empty(); IReadOnlyDictionary _cached_attachable = DictionaryHelper.empty(), _cached_detachable = DictionaryHelper.empty(); HashSet _attachable_selected_orders = new HashSet(), @@ -98,7 +98,7 @@ namespace mbts.spark { _columns = new OrderBookColumnCollection(bus, model, model.on_order_securities.Select(x => (x.added.Values, x.removed.Values))); // we use an ObservableAppendCollection b/c the mini-ob needs a cancel column at the front columns = new ObservableAppendCollection(_columns); - _row_collection = new OperableHierarchicalCollection( + _row_collection = new OperableHierarchicalCollection( o => new OrderBookRowVM(this, o, rows_are_initially_expanded) { is_attachable = _cached_attachable.TryGetValue(o.order.Key, out bool ia) && ia, is_detachable = _cached_detachable.TryGetValue(o.order.Key, out bool id) @@ -147,6 +147,8 @@ namespace mbts.spark { IDisposable attach_vm_hooks = null; begin_attaching += on_begin_attaching; end_attaching += on_end_attaching; + // switch between orders and/or orders w/ piq + var orders_source = OrdersModel.piq_enabled ? model.on_order_tuples_with_root_and_piq : model.on_order_tuples_with_root; concat_disposable( connect_order_mod_vm(), _can_attach_selected_orders.observe_current().Subscribe(send_attached_orders_async_cmd, begin_attach_cmd), @@ -168,7 +170,7 @@ namespace mbts.spark { security_plurality = p; RaisePropertyChanged(nameof(security_plurality)); }), - model.on_order_tuples_with_root.OnDispatcher().Subscribe(t => { + orders_source.OnDispatcher().Subscribe(t => { _cached_orders = t.state; _row_collection.update(t.added, t.changed, t.removed.Select(o => o.order.Key)); }), @@ -543,7 +545,7 @@ namespace mbts.spark { public void begin_attach_algos() => is_attaching_orders = true; - public bool try_get_parent(OrderBookRowVM row, out OrderSecurityAlgoMeta parent) => + public bool try_get_parent(OrderBookRowVM row, out OrderSecurity parent) => _cached_orders.TryGetValue(row.parent_order_key, out parent); public OrderRecordImmutable get_root(OrderRecordImmutable r) { @@ -556,7 +558,7 @@ namespace mbts.spark { internal void detach_orders(OrderBookRowVM order) => _detach_orders_async(new[] { order }).ignore(); - public OrderSecurityAlgoMeta get_ordersecurityalgometa(OrderRecordImmutable order) { + public OrderSecurity get_ordersecurityalgometa(OrderRecordImmutable order) { _cached_orders.TryGetValue(order.Key, out var osam); return osam; } @@ -907,7 +909,7 @@ namespace mbts.spark { this.column_filters = column_filters; } - public Func build_predicate() { + public Func build_predicate() { var pred = column_filters.build_predicate(); if (algo_tree_display_mode == AlgoTreeDisplayMode.RootAndLeafNodes) { if (pred == null) { @@ -916,7 +918,7 @@ namespace mbts.spark { var col_pred = pred; pred = o => tree_disp_pred(o) && col_pred(o); } - bool tree_disp_pred(OrderSecurityAlgoMeta o) => + bool tree_disp_pred(OrderSecurity o) => !o.order.has_parent() || o.order.is_exchange_order() || o.order.order_type() == CustomOrderDefinition.CustomOneofCase.Spreader; @@ -951,7 +953,7 @@ namespace mbts.spark { readonly CommonValueMonitor _size_mon = new CommonValueMonitor(); readonly CommonValueMonitor _account_mon = new CommonValueMonitor(); readonly CommonValueMonitor _all_active_mon = new CommonValueMonitor(); - readonly CommonValueMonitorMultiplexor _group_mon = new CommonValueMonitorMultiplexor(); + readonly CommonValueMonitorMultiplexor _group_mon = new CommonValueMonitorMultiplexor(); readonly DynamicOrderHelper _dyn_helper; IReadOnlyDictionary _security_md_map = DictionaryHelper.empty(); @@ -1020,22 +1022,22 @@ namespace mbts.spark { _security_md_map_changed?.Invoke(); } - void _on_row_updated((OrderSecurityAlgoMeta oldval, OrderSecurityAlgoMeta newval) ch) { + void _on_row_updated((OrderSecurity oldval, OrderSecurity newval) ch) { using (begin_udpate()) { _group_mon.remove(ch.oldval); _group_mon.add(ch.newval); } } - static SecurityImmutable? _get_spreader_sec(OrderSecurityAlgoMeta osam) => + static SecurityImmutable? _get_spreader_sec(OrderSecurity osam) => OrderDataHelper.enumerate_algo_hierarchy(osam.order.Def.CustomDef.CloneToMutable()) .Any(algo => algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Spreader) ? osam.security : null; - AlgoSecurityKey _algo_key(OrderSecurityAlgoMeta osam) => + AlgoSecurityKey _algo_key(OrderSecurity osam) => new AlgoSecurityKey(osam.order.Def.CustomDef, _get_spreader_sec(osam), AlgoStructureSerializer.structure_key(osam.order.Def.CustomDef, _dyn_helper.dynamic_type_index)); - SecurityMD? _get_sec_md(OrderSecurityAlgoMeta osam) => + SecurityMD? _get_sec_md(OrderSecurity osam) => osam.security.HasValue && _security_md_map.TryGetValue(osam.security.Value.Id, out SecurityMD smd) ? smd : (SecurityMD?)null; struct AlgoSecurityKey { diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs index 2e210f265..7f2a070c2 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookFilterStates.cs @@ -60,7 +60,9 @@ namespace bts.shell.orderbook { [ProtoMember(21)] public string parent_key_regex; [ProtoMember(22)] - public string attached_target_order_key_regex; + public string attached_target_order_key_regex; + [ProtoMember(25)] + public UIntMinMaxState piq; public bool Equals(FilterStates other) => other != null && @@ -85,7 +87,8 @@ namespace bts.shell.orderbook { exchange_message_regex == other.exchange_message_regex && last_change.Equals(other.last_change) && EqualityComparer.safe_sequence_equals(order_sub_types, other.order_sub_types) && - EqualityComparer.safe_sequence_equals(symbols, other.symbols); + EqualityComparer.safe_sequence_equals(symbols, other.symbols) && + piq.safe_equals(other.piq); public override bool Equals(object obj) => Equals(obj as FilterStates); @@ -112,12 +115,13 @@ namespace bts.shell.orderbook { exchange_message_regex?.GetHashCode() ?? 0, last_change.GetHashCode(), EqualityComparer.safe_aggregate_hash(order_sub_types), - EqualityComparer.safe_aggregate_hash(symbols)); + EqualityComparer.safe_aggregate_hash(symbols), + piq?.GetHashCode() ?? 0); } static class FilterStatesExtensions { - public static Func build_predicate(this FilterStates fs) { - var predicates = new List>(); + public static Func build_predicate(this FilterStates fs) { + var predicates = new List>(); // security if (fs.security_criteria?.is_defined() ?? false) predicates.Add(o => o.security.HasValue && ContractPickerModel.security_in_criteria(fs.security_criteria, o.security.Value)); @@ -146,35 +150,36 @@ namespace bts.shell.orderbook { add_numeric(fs.qty_filled, o => o.order.filled()); add_numeric(fs.avg_price, o => o.order.avg_price()); add_numeric(fs.last_price, o => o.order.last_price()); - return predicates.Count == 0 ? null : new Func(o => predicates.All(p => p(o))); + add_numeric(fs.piq, o => o.piq ?? uint.MaxValue); + return predicates.Count == 0 ? null : new Func(o => predicates.All(p => p(o))); // local methods (impl) - void add_regex(string str, Func selector) { + void add_regex(string str, Func selector) { var regex = RegexFilterUtils.build_regex(str); if (regex == null) return; predicates.Add(impl); - bool impl(OrderSecurityAlgoMeta o) => regex.IsMatch(selector(o) ?? string.Empty); + bool impl(OrderSecurity o) => regex.IsMatch(selector(o) ?? string.Empty); } - void add_time_filter(TimeFilterTuple t, Func selector) { + void add_time_filter(TimeFilterTuple t, Func selector) { if (!t.is_active) return; var dt_pred = TimeFilterUtils.build_predicate(t); predicates.Add(impl); - bool impl(OrderSecurityAlgoMeta o) => dt_pred(selector(o)); + bool impl(OrderSecurity o) => dt_pred(selector(o)); } - void add_discrete_values(T[] values, Func selector) { + void add_discrete_values(T[] values, Func selector) { if (values.is_null_or_empty()) return; if (values.Length < 16) { predicates.Add(impl); - bool impl(OrderSecurityAlgoMeta o) => values.Contains(selector(o)); + bool impl(OrderSecurity o) => values.Contains(selector(o)); } else { var set = new HashSet(values); predicates.Add(impl); - bool impl(OrderSecurityAlgoMeta o) => set.Contains(selector(o)); + bool impl(OrderSecurity o) => set.Contains(selector(o)); } } - void add_numeric(IMinMaxState value, Func selector) where T : struct, IComparable { + void add_numeric(IMinMaxState value, Func selector) where T : struct, IComparable { if (value == null) return; if (value.minimum.active) { @@ -182,18 +187,18 @@ namespace bts.shell.orderbook { if (value.maximum.active) { var max = value.maximum.value.Value; predicates.Add(impl); - bool impl(OrderSecurityAlgoMeta o) { + bool impl(OrderSecurity o) { var v = selector(o); return min.CompareTo(v) <= 0 && max.CompareTo(v) >= 0; } } else { predicates.Add(impl); - bool impl(OrderSecurityAlgoMeta o) => min.CompareTo(selector(o)) <= 0; + bool impl(OrderSecurity o) => min.CompareTo(selector(o)) <= 0; } } else if (value.maximum.active) { var max = value.maximum.value.Value; predicates.Add(impl); - bool impl(OrderSecurityAlgoMeta o) => max.CompareTo(selector(o)) >= 0; + bool impl(OrderSecurity o) => max.CompareTo(selector(o)) >= 0; } } } diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs index b243c4d16..5c5caa779 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs @@ -165,6 +165,7 @@ namespace bts.shell.orderbook { 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.Size, horizontal_alignment: HorizontalAlignment.Right); public static IEnumerable sorting_criterion { get { @@ -188,6 +189,7 @@ namespace bts.shell.orderbook { yield return side; yield return quantity; yield return price; + yield return piq; yield return filled_quantity; yield return avg_price; yield return last_price; 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 e718abc21..2f996e32f 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs @@ -49,7 +49,8 @@ namespace mbts.spark { Detach = 1 << 26, Update = 1 << 27, Commit = 1 << 28, - RootAlgoType = 1 << 29 + RootAlgoType = 1 << 29, + Piq = 1 << 30 } public OrderBookGridView() { diff --git a/src/client/spark/Orders/FillTuple.cs b/src/client/spark/Orders/FillTuple.cs index 77b0e846e..bfcd80a5c 100644 --- a/src/client/spark/Orders/FillTuple.cs +++ b/src/client/spark/Orders/FillTuple.cs @@ -14,10 +14,10 @@ namespace mbts.spark { public readonly AlgoData? algo; public readonly AlgoDefinitionMetadata? algo_meta; - public FillTuple((SecurityImmutable? sec, FillImmutable val) fill, OrderSecurityAlgoMeta? order_tuple) { + public FillTuple((SecurityImmutable? sec, FillImmutable val) fill, OrderSecurity? order_tuple) { this.fill = fill.val; this.security = fill.sec; - if (order_tuple is OrderSecurityAlgoMeta osam) { + if (order_tuple is OrderSecurity osam) { order = osam.order; algo = osam.algo; algo_meta = osam.meta; diff --git a/src/client/spark/Orders/OrderSecurity.cs b/src/client/spark/Orders/OrderSecurity.cs index 25d4443c6..06ebce996 100644 --- a/src/client/spark/Orders/OrderSecurity.cs +++ b/src/client/spark/Orders/OrderSecurity.cs @@ -3,13 +3,15 @@ using mbts.spark; using System; namespace bts.api.orderman { - readonly struct OrderSecurity: IEquatable { + readonly struct OrderSecurity : IEquatable { public OrderSecurity(SecurityImmutable? sec, OrderRecordImmutable order) { this.security = sec; this.order = order; piq = null; algo = null; meta = null; + root_algo = new AlgoData(order.Def.CustomDef); + root_meta = null; } public OrderSecurity((SecurityImmutable? sec, OrderRecordImmutable order) t) { security = t.sec; @@ -17,6 +19,8 @@ namespace bts.api.orderman { piq = null; algo = null; meta = null; + root_algo = new AlgoData(order.Def.CustomDef); + root_meta = null; } public OrderSecurity(SecurityImmutable? sec, OrderRecordImmutable order, uint? piq) { this.security = sec; @@ -24,6 +28,8 @@ namespace bts.api.orderman { this.piq = piq; algo = null; meta = null; + root_algo = new AlgoData(order.Def.CustomDef); + root_meta = null; } public OrderSecurity(SecurityImmutable? sec, OrderRecordImmutable order, uint? piq, AlgoData? algo, AlgoDefinitionMetadata? meta) { this.security = sec; @@ -31,24 +37,55 @@ namespace bts.api.orderman { this.piq = piq; this.algo = algo; this.meta = meta; + root_algo = new AlgoData(order.Def.CustomDef); + root_meta = null; } - //public OrderSecurity(OrderSecurity t) { - // security = t.security; - // order = t.order; - // piq = t.piq; - //} + public OrderSecurity(SecurityImmutable? sec, OrderRecordImmutable order, uint? piq, AlgoData? algo, AlgoDefinitionMetadata? meta, AlgoData? rootalgo = null, AlgoDefinitionMetadata? rootmeta = null) { + this.security = sec; + this.order = order; + this.piq = piq; + this.algo = algo; + this.meta = meta; + if (rootalgo.HasValue) { + this.root_algo = rootalgo.Value; + this.root_meta = rootmeta; + } else { + this.root_algo = algo ?? new AlgoData(order.Def.CustomDef); + this.root_meta = meta; + } + } + public static implicit operator OrderSecurity(ValueTuple x) => new OrderSecurity(x); public SecurityImmutable? security { get; } public OrderRecordImmutable order { get; } public uint? piq { get; } public AlgoData? algo { get; } public AlgoDefinitionMetadata? meta { get; } + public AlgoData root_algo { get; } + public AlgoDefinitionMetadata? root_meta { get; } + public OrderSecurity with(AlgoData? root_algo, AlgoDefinitionMetadata? root_meta = null) => + new OrderSecurity(security, order, piq, algo, meta, root_algo, root_meta); - public override bool Equals(object obj) => (obj is OrderSecurity os) && Equals(os); - public bool Equals(OrderSecurity other) => order.Equals(other.order) && security == other.security && piq == other.piq; - public override int GetHashCode() => (security, order, piq).GetHashCode(); + public bool Equals(OrderSecurity other) => + order == other.order && + security == other.security && + piq == other.piq && + algo == other.algo && + meta == other.meta && + root_algo == other.root_algo; + + public override bool Equals(object obj) => EqualityComparer.equals_obj(this, obj); + + public override int GetHashCode() => + EqualityComparer.aggregate_hash( + order.GetHashCode(), + security?.GetHashCode() ?? 0, + piq?.GetHashCode() ?? 0, + algo?.GetHashCode() ?? 0, + meta?.GetHashCode() ?? 0, + root_algo.GetHashCode()); public static bool operator == (OrderSecurity left, OrderSecurity right) => left.Equals(right); public static bool operator != (OrderSecurity left, OrderSecurity right) => !left.Equals(right); diff --git a/src/client/spark/Orders/OrderUtils.cs b/src/client/spark/Orders/OrderUtils.cs index a9fdf3862..aa1a68d1b 100644 --- a/src/client/spark/Orders/OrderUtils.cs +++ b/src/client/spark/Orders/OrderUtils.cs @@ -156,6 +156,8 @@ namespace mbts.spark { public static string display_name(this OrderSecurityAlgoMeta order_tuple) => display_name(order_tuple.order, order_tuple.algo); + public static string display_name(this OrderSecurity order_tuple) => + display_name(order_tuple.order, order_tuple.algo); public static string display_name(OrderRecordImmutable order, AlgoData? algo) { if (algo.HasValue) { diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 9904c5e69..5b6811339 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -26,6 +26,7 @@ namespace mbts.spark { [Export] class OrdersModel : IDisposable { public readonly MarketDataAuxiliaryModel md_auxiliary_model; + public static readonly bool piq_enabled = Configuration.get().enabled; readonly IBus _bus; readonly OrderFactory _factory; @@ -40,7 +41,6 @@ namespace mbts.spark { readonly TableUpdateDemuxer _security_working_orders_with_piq_demuxer; readonly TableUpdateDemuxer<(SecurityImmutable?, PositionUnitImmutable), int, uint> _security_positions_demuxer; IDisposable _dispose; - static readonly bool _piq_enabled = Configuration.get().enabled; [ImportingConstructor] OrdersModel(IBus bus, OrderFactory factory, OrderService service, PositionService position_service, MBOService mbo_service, @@ -97,14 +97,13 @@ namespace mbts.spark { t => t.order.Key, am => am.algo.key, t => new AlgoKey(new bts.persist.algo.AlgoPersistedKey(t.order.algo_template_key())), - (os, okey, am, mkey) => new OrderSecurityAlgoMeta(os.order, os.sec, am.algo, am.meta), - (os, okey, mkey) => new OrderSecurityAlgoMeta(os.order, os.sec, null, null), + (os, okey, am, mkey) => new OrderSecurity(os.sec, os.order, null, am.algo, am.meta), + (os, okey, mkey) => new OrderSecurity(os.sec, os.order, null, null, null), ot => ot.order.Key); on_order_tuples = order_secs_algo_meta_join.Cache(); - // need to bring back the config key check on_order_tuples_with_piq = on_order_tuples.LeftJoin< - OrderSecurityAlgoMeta, + OrderSecurity, OrderPIQImmutable, OrderSecurity, uint @@ -121,6 +120,12 @@ namespace mbts.spark { o => o.order.ParentKey, (osam, root_osam) => osam.with(root_osam.algo ?? new AlgoData(root_osam.order.Def.CustomDef), root_osam.meta) ).Cache(); + // order tuples with root and piq + on_order_tuples_with_root_and_piq = on_order_tuples_with_piq.RootDependent( + o => o.order.Key, + o => o.order.ParentKey, + (osam, root_osam) => osam.with(root_osam.algo ?? new AlgoData(root_osam.order.Def.CustomDef), root_osam.meta) + ).Cache(); // fills var on_fills = _service.subscribei_fills() @@ -193,8 +198,9 @@ namespace mbts.spark { public DynamicOrderHelper dynamic_helper => _dynamic_helper; public IObservable on_orders { get; } public IObservable on_order_tuples_with_piq { get; } - public IObservable> on_order_tuples { get; } - public IObservable> on_order_tuples_with_root { get; } + public IObservable> on_order_tuples { get; } + public IObservable> on_order_tuples_with_root { get; } + public IObservable> on_order_tuples_with_root_and_piq { get; } public IObservable, uint>> on_orders_can_detach { get; } public IObservable, uint>> on_orders_can_attach { get; } public IObservable> on_order_securities { get; }