From fb314f0eb19b72e573dc32398e2db2bbd3b82f66 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 5 Jun 2019 14:01:47 -0500 Subject: [PATCH 01/59] SPARK-2491 - mass cancel --- .../Trading/Ladder/VM/LadderOrderVM.cs | 1 + .../Trading/OrderBook/OrderBookColumns.cs | 22 +++++++++++++++++++ .../Trading/OrderBook/OrderBookRowVM.cs | 6 ++++- .../Modules/Trading/OrderBook/OrderBookVM.cs | 9 ++++++-- .../OrderBook/View/OrderBookGridView.xaml.cs | 3 ++- 5 files changed, 37 insertions(+), 4 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs index 51e162565..c0bbe5c18 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs @@ -335,6 +335,7 @@ namespace mbts.spark { } 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 OrderBookVM.CheckColumn(nameof(OrderBookRowVM.is_checked))); 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 76daca299..6eaa6d6c1 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -724,6 +724,28 @@ namespace mbts.spark { } } + public class CheckColumn : FrameworkElementColumnBase { + readonly BindingBase _checked_binding; + public CheckColumn(string checked_property) : base(Columns.Check) { + id = key.ToString(); + Width = 30; + _checked_binding = new Binding(checked_property); + } + + public override FrameworkElement view_factory() { + var grid = new Grid() { + HorizontalAlignment = HorizontalAlignment.Center, + VerticalAlignment = VerticalAlignment.Center, + }; + var cb = new CheckBox(); + cb.Name = "check_col"; + cb.SetBinding(CheckBox.IsCheckedProperty, _checked_binding); + + grid.Children.Add(cb); + return grid; + } + } + public class CancelColumn : FrameworkElementColumnBase { readonly BindingBase _command_binding; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index e9a7d3b6b..24c36ca91 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -21,7 +21,7 @@ namespace mbts.spark { Color? _root_algo_badge_color_backing; Brush _badge_fill, _root_algo_badge_fill; IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd, _detach_command, _attach_command, _update_command, _modify_order_quantity_andor_price, _revert_prospective_order_quantity_andor_price; - bool _is_parent, _is_expanded, _is_selected, _is_attachable, _is_detachable; + bool _is_parent, _is_expanded, _is_selected, _is_attachable, _is_detachable, _is_checked; int _depth_level; SecurityImmutable? _security => order_tuple.security; // for mini-ob @@ -138,6 +138,10 @@ namespace mbts.spark { } public bool is_qty_dirty => this.prospective_quantity != this.quantity; public bool is_price_dirty => this.prospective_price != this.price; + public bool is_checked { + get => _is_checked; + set => Set(ref _is_checked, value); + } // Commands public ICommand toggle_command => _toggle_expanded_cmd ?? ( diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index cff54d5c4..7957d9541 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -572,8 +572,13 @@ namespace mbts.spark { internal void show_order_modify(OrderBookRowVM row) => _bus.post(SparkTags.ShowModifyOrderTag, row.order_key); - internal void cancel_order(OrderBookRowVM row) => - _bus.post(SparkTags.CancelOrders, new List { row.order_key }); + internal void cancel_order(OrderBookRowVM row) { + if (row.is_checked) { + rows.Where(r => r.is_checked).ForEach((checked_row) => _bus.post(SparkTags.CancelOrders, new List { checked_row.order_key })); + } else { + _bus.post(SparkTags.CancelOrders, new List { row.order_key }); + } + } internal void modify_order_quantity(OrderBookRowVM row, uint size) => _bus.post(SparkTags.UpdateOrder, (row.order_key, row.price, size)); 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 2f996e32f..2f6d21923 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs @@ -50,7 +50,8 @@ namespace mbts.spark { Update = 1 << 27, Commit = 1 << 28, RootAlgoType = 1 << 29, - Piq = 1 << 30 + Piq = 1 << 30, + Check = 1 << 31 } public OrderBookGridView() { From dcd8984b33e918a03e41ce7f16b5bdf4d88dceab Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 6 Jun 2019 12:35:09 -0500 Subject: [PATCH 02/59] SPARK-2489 / SPARK-2494 rename 'Column Settings' tab 'Ladder Columns' --- .../spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index ca4691070..3fd7dcb94 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -141,8 +141,8 @@ - - + + From a38a6057e07aa7798dba39b9764c7a1198c6b8d7 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 6 Jun 2019 13:32:48 -0500 Subject: [PATCH 03/59] part of SPARK-2485 - mini ob only shows exchange orders + spreader rows --- .../spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs | 6 ++++++ .../spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs | 4 +++- src/client/spark/Orders/OrderDataHelper.cs | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs index 98c414a46..f063fb01c 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoKey.cs @@ -3,6 +3,7 @@ using bts.persist.algo; using bts.utils; using ProtoBuf; using System; +using System.Linq; namespace mbts.spark { [ProtoContract] @@ -14,6 +15,11 @@ namespace mbts.spark { [ProtoMember(3)] readonly uint? _persisted_key; + public static readonly AlgoID[] exchange_algo_keys = utilities.OrderDataHelper.outright_order_types + .Concat(new CustomOrderDefinition.CustomOneofCase[] { CustomOrderDefinition.CustomOneofCase.Spreader }) + .Select(cooc => new AlgoID(cooc)) + .ToArray(); + public AlgoID(CustomOrderDefinition.CustomOneofCase factory_key) { _factory_key = factory_key; _dynamic_key = null; diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs index c0bbe5c18..cbc33c7b4 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs @@ -1,5 +1,6 @@ using bts.api; using bts.api.orderman; +using mbts.spark.utilities; using mbts.ui; using mbts.ui.shell; using System; @@ -297,7 +298,8 @@ namespace mbts.spark { new bts.shell.orderbook.FilterStates { security_criteria = new SecurityCriteria(_owner.security), price = price_filter, - statuses = new[] { OrderStatus.Working } + statuses = new[] { OrderStatus.Working }, + order_types = AlgoID.exchange_algo_keys }, bts.shell.orderbook.OrderBookStartupData.default_mini_grid, use_defaults: false diff --git a/src/client/spark/Orders/OrderDataHelper.cs b/src/client/spark/Orders/OrderDataHelper.cs index 96acc2caa..0fa0730a0 100644 --- a/src/client/spark/Orders/OrderDataHelper.cs +++ b/src/client/spark/Orders/OrderDataHelper.cs @@ -622,6 +622,13 @@ namespace mbts.spark.utilities { CustomOrderDefinition.CustomOneofCase.Join, CustomOrderDefinition.CustomOneofCase.Cover, CustomOrderDefinition.CustomOneofCase.Top + }, + outright_order_types = new[] { + CustomOrderDefinition.CustomOneofCase.Market, + CustomOrderDefinition.CustomOneofCase.Limit, + CustomOrderDefinition.CustomOneofCase.Stop, + CustomOrderDefinition.CustomOneofCase.StopLimit, + CustomOrderDefinition.CustomOneofCase.GlbxIceberg, }; public static readonly CustomOrderDefinition.CustomOneofCase[] all_order_types = exchange_order_types.Union(spreader_order_types).ToArray(); From 570f85377ae1072732d3da056e6e7e696645a7ab Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 6 Jun 2019 14:00:06 -0500 Subject: [PATCH 04/59] part of SPARK-2485 - miniob - update buttons not visible unless leaf under control of an algo --- .../Modules/Trading/OrderBook/OrderBookColumns.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 6eaa6d6c1..2b9e28a09 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -992,9 +992,9 @@ namespace mbts.spark { public override FrameworkElement view_factory() { var popup = new System.Windows.Controls.Primitives.Popup(); - #region Attach Button + #region Update Button - // create the attach button and assign the menu to it + // create the update button and assign the menu to it var update_button = new Button() { Name = "update_button", Content = "···", @@ -1017,6 +1017,14 @@ namespace mbts.spark { row_vm_update_command_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(MiniOrderBookRowView), 1); update_button.SetBinding(Button.CommandProperty, row_vm_update_command_binding); + // update button is only visible for orders under the control of an algo + var update_button_visibility_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookRowVM.root_algo_order_type))) { + Converter = ValueConverter.create(ord_type => utilities.OrderDataHelper.outright_order_types.Contains(ord_type) ? Visibility.Hidden : Visibility.Visible) + }; + update_button_visibility_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(MiniOrderBookRowView), 1); + update_button.SetBinding(Button.VisibilityProperty, update_button_visibility_binding); + + #endregion #region OrderParamsPanel From 3f245cd88674530a5703467be28d181f2e001a0c Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 6 Jun 2019 14:20:00 -0500 Subject: [PATCH 05/59] SPARK-2497 - mini ob mass detach --- .../spark/Modules/Trading/OrderBook/OrderBookVM.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 7957d9541..0a9759524 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -555,8 +555,15 @@ namespace mbts.spark { return r; } - internal void detach_orders(OrderBookRowVM order) => - _detach_orders_async(new[] { order }).ignore(); + internal void detach_orders(OrderBookRowVM order) { + if (order.is_checked) { + var detach_candidates = rows.Where(r => r.is_checked); + _detach_orders_async(detach_candidates).ignore(); + detach_candidates.ForEach((row_vm) => row_vm.is_checked = false); + } else { + _detach_orders_async(new[] { order }).ignore(); + } + } public OrderSecurity get_ordersecurityalgometa(OrderRecordImmutable order) { _cached_orders.TryGetValue(order.Key, out var osam); From 040960d33bca6e8c4c57e9c2233d73936c46ec5d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 6 Jun 2019 19:31:36 -0500 Subject: [PATCH 06/59] SPARK-2489 / SPARK-2495 merge 'Volume Display' tab into the 'Ladder Columns' tab --- .../Trading/Ladder/VM/LadderSettingsVM.cs | 30 +- .../Ladder/View/LadderSettingsView.xaml | 676 +++++++++++------- .../Ladder/View/LadderSettingsView.xaml.cs | 9 +- 3 files changed, 433 insertions(+), 282 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index 7a379e0f5..6712731b0 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -30,8 +30,8 @@ namespace mbts.spark { _bid = new LadderColumnSettingsVM("Bid"), _price = new LadderColumnSettingsVM("Price"), _ask = new LadderColumnSettingsVM("Ask"), - _last = new LadderColumnSettingsVM("Last", true), - _piq = new LadderColumnSettingsVM("PIQ", true); + _last = new LadderColumnSettingsVM("Last", LadderSettingsView.LastColumnTemplateKey, true), + _piq = new LadderColumnSettingsVM("PIQ", can_toggle_show: true); VolumeColumnVM _volume = new VolumeColumnVM(); LadderMarketBreakLineVM _bid_mkt_line = new LadderMarketBreakLineVM("Bid"), @@ -323,11 +323,12 @@ namespace mbts.spark { readonly DelegateProperty _font_weight; readonly DelegateProperty _font_display_name; readonly Property _show; - readonly bool _can_toggle_visibility; + readonly string _template_key; - public LadderColumnSettingsVM(string name, bool can_toggle_visibility = false) { + public LadderColumnSettingsVM(string name, string template_key = null, bool can_toggle_show = false) { this.name = name; - _can_toggle_visibility = can_toggle_visibility; + _template_key = template_key; + this.can_toggle_show = can_toggle_show; foreground_palettes = new ObservableCollection(ColorPalette.all_presets().Select(p => new ColorPaletteVM(p))); background_palettes = new ObservableCollection(ColorPalette.all_presets().Select(p => new ColorPaletteVM(p))); _show = backing(nameof(show), true); @@ -340,8 +341,14 @@ namespace mbts.spark { _font_display_name = backing(nameof(font_display_name), () => TextUtils.display_name(font_family, font_weight, font_size), nameof(font_family), nameof(font_weight), nameof(font_size)); _font_size.Changed += (oldval, newval) => font_size_changed?.Invoke(oldval, newval); + toggle_show_details_cmd = new DelegateCommand(() => { + show_details = !show_details; + RaisePropertyChanged(nameof(show_details)); + }); } + public event Action font_size_changed; + public string name { get; } public Typeface typeface { get => _typeface.Value; set => _typeface.Value = value; } public FontFamily font_family => _font_family.Value; @@ -350,14 +357,17 @@ namespace mbts.spark { public double font_size { get => _font_size.Value; set => _font_size.Value = value; } public uint width { get; set; } public bool show { get => _show.Value; set => _show.Value = value; } + public bool can_toggle_show { get; } + public bool show_details { get; private set; } public Color foreground { get => _foreground.Value; set => _foreground.Value = value; } public Color background { get => _background.Value; set => _background.Value = value; } public ObservableCollection foreground_palettes { get; } public ObservableCollection background_palettes { get; } - public event Action font_size_changed; - public virtual string sample_text => "999-56789.01234"; - string ITemplateSelectorKey.key => _can_toggle_visibility ? ui.spark.LadderSettingsView.ColumnVisibilityToggleTemplateKey : null; + + public ICommand toggle_show_details_cmd { get; } + + string ITemplateSelectorKey.key => _template_key; public void assign_from(LadderColumnSettings settings) { typeface = new Typeface( @@ -395,7 +405,7 @@ namespace mbts.spark { public Brush badge_border { get; } = new SolidColorBrush(BTSColors.MarketData.ask); public Brush badge_background { get; } = Brushes.White; - string ITemplateSelectorKey.key => ui.spark.LadderSettingsView.OrdersColumnSampleTemplateKey; + string ITemplateSelectorKey.key => ui.spark.LadderSettingsView.OrdersColumnTemplateKey; } public class LadderMarketBreakLineVM : ViewModelBase { @@ -463,7 +473,7 @@ namespace mbts.spark { } } - public LadderColumnSettingsVM general { get; } = new LadderColumnSettingsVM("Volume", true); + public LadderColumnSettingsVM general { get; } = new LadderColumnSettingsVM("Volume", LadderSettingsView.VolumeColumnTemplateKey, true); public VolumeAtPriceAnimationVM buy { get; } public VolumeAtPriceAnimationVM sell { get; } public VolumeAtPriceAnimationVM passive { get; } diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index 3fd7dcb94..1aa1c1b1f 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -3,6 +3,7 @@ x:ClassModifier="internal" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:ice="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" xmlns:sp="clr-namespace:mbts.spark" xmlns:u="clr-namespace:mbts.ui" xmlns:c="clr-namespace:mbts.ui.controls" @@ -22,9 +23,24 @@ 6 8 24 + + 57 + 70 + 81 + 160 + 153 + + + LightGray + Black + + + + + @@ -40,71 +56,369 @@ - + + + + + + - + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -134,7 +448,7 @@ Alternate Order Qty - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -470,141 +741,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml.cs index da00027a1..c42bbbaa0 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml.cs @@ -10,10 +10,15 @@ namespace mbts.ui.spark { /// partial class LadderSettingsView : UserControl { public const string - OrdersColumnSampleTemplateKey = nameof(OrdersColumnSampleTemplateKey), - ColumnVisibilityToggleTemplateKey = nameof(ColumnVisibilityToggleTemplateKey), + OrdersColumnTemplateKey = nameof(OrdersColumnTemplateKey), + VolumeColumnTemplateKey = nameof(VolumeColumnTemplateKey), + LastColumnTemplateKey = nameof(LastColumnTemplateKey), FavoriteAlgoAddButtonTemplateKey = nameof(FavoriteAlgoAddButtonTemplateKey); + public static readonly IMultiValueConverter LadderColumnToggleShowToolTipConverter = + ValueConverter.create((can_toggle_show, show, col_name) => + can_toggle_show ? $"{(show ? "Hide" : "Show")} {col_name}" : $"{col_name} cannot be {(show ? "hidden" : "shown")}."); + public LadderSettingsView() => InitializeComponent(); From 4b2f39c536a53a8c5a9b0048aadeab694bc54923 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 6 Jun 2019 22:42:55 -0500 Subject: [PATCH 07/59] LadderSettingsView - drop 'Show/Hide' from 'Advanced' hyperlinks --- .../Modules/Trading/Ladder/View/LadderSettingsView.xaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index 1aa1c1b1f..b1da2aa83 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -39,8 +39,6 @@ - - @@ -261,7 +259,7 @@ - + (Advanced) @@ -315,7 +313,7 @@ - + (Advanced) From 31fe708907392aa5a7e3e9a73b08a83f62e497f2 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 6 Jun 2019 23:17:09 -0500 Subject: [PATCH 08/59] touch up LadderSettingsView --- .../Ladder/View/LadderSettingsView.xaml | 134 +++++++++--------- 1 file changed, 70 insertions(+), 64 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index b1da2aa83..4cfc9e879 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -36,8 +36,10 @@ LightGray Black + Navy + @@ -64,9 +66,14 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 1518906b7f988bb29716182c230cd0be2cf9cc18 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 6 Jun 2019 23:21:51 -0500 Subject: [PATCH 09/59] SPARK-2489 / SPARK-2498 remove 'Order Badge Style' option --- .../Trading/Ladder/View/LadderSettingsView.xaml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index 4cfc9e879..a9657a093 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -436,12 +436,6 @@ - - - - - - @@ -450,13 +444,9 @@ - Order Badge Style - - - Alternate Order Qty - - - + Alternate Order Qty + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + + + - - - - - - Show Price in Net Change - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + - + + + + + + + + + + + + + - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + Show Price in Net Change + + + + + + + + + + + - - + - + + + + + + + + + + + + + + + + - + - + + + + + + - - + + + - - - 'Single Click' Quantity - - - Hint: right click on a bid/ask cell to submit orders with this quantity. - - - - - - - - - - - - - - - - - Number of Columns - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 'Single Click' Quantity + + + Hint: right click on a bid/ask cell to submit orders with this quantity. + + + + + + + + + + + + + + + + + Number of Columns + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 16eeddec7dd459425db2781a96e9c85d3c19f624 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 7 Jun 2019 16:10:17 -0500 Subject: [PATCH 17/59] OperableHierarchicalCollectionModel - fixing get_parent --- .../Hierarchical/OperableHierarchicalCollectionModel.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/client/spark_core/Collections/Operable/Hierarchical/OperableHierarchicalCollectionModel.cs b/src/client/spark_core/Collections/Operable/Hierarchical/OperableHierarchicalCollectionModel.cs index 3dd046b8d..28c795387 100644 --- a/src/client/spark_core/Collections/Operable/Hierarchical/OperableHierarchicalCollectionModel.cs +++ b/src/client/spark_core/Collections/Operable/Hierarchical/OperableHierarchicalCollectionModel.cs @@ -65,8 +65,12 @@ namespace bts.collections { return false; } - public TRow get_parent(TKey key) => - _tree.TryGetNode(key, out var n) ? n.value : default; + public TRow get_parent(TKey key) { + if (try_get_row(key, out TRow r)) { + return _tree.GetParent(r).value; + } + return default; + } public IEnumerable get_descendent_rows(TKey key) { if (_tree.TryGetNode(key, out var n)) { From c5f7ee0ed3d48dfd03c013dcab037d897a1185ca Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 7 Jun 2019 16:16:27 -0500 Subject: [PATCH 18/59] reassigning the miniob update button to the update_command property so select the row if it's not already selected --- .../spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index a9eab87a9..0ac341136 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -1013,9 +1013,9 @@ namespace mbts.spark { // kept in sync between those controls via a PlacementTarget.DataContext binding update_button.SetBinding(Button.DataContextProperty, orderbook_vm_datacontext_binding); - //var row_vm_update_command_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookRowVM.update_command))); - //row_vm_update_command_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(MiniOrderBookRowView), 1); - //update_button.SetBinding(Button.CommandProperty, row_vm_update_command_binding); + var row_vm_update_command_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookRowVM.update_command))); + row_vm_update_command_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(MiniOrderBookRowView), 1); + update_button.SetBinding(Button.CommandProperty, row_vm_update_command_binding); // update button is only visible for orders under the control of an algo var update_button_visibility_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookRowVM.root_algo_order_type))) { From 6756b23104b513d1a4dcff1d52f342959033373e Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 7 Jun 2019 16:17:42 -0500 Subject: [PATCH 19/59] miniob - attach and update select the row if they're not already selected --- .../Trading/OrderBook/OrderBookRowVM.cs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 53bf811a8..2f767c6d2 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -20,7 +20,7 @@ namespace mbts.spark { readonly OrderBookVM _owner; Color? _root_algo_badge_color_backing; Brush _badge_fill, _root_algo_badge_fill; - IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd, _detach_command, _attach_command, /*_update_command,*/ _modify_order_quantity_andor_price, _revert_prospective_order_quantity_andor_price; + IRaiseCanExecuteChangedCommand _show_order_modify_cmd, _toggle_expanded_cmd, _cancel_cmd, _detach_command, _attach_command, _update_command, _modify_order_quantity_andor_price, _revert_prospective_order_quantity_andor_price; bool _is_parent, _is_expanded, _is_selected, _is_attachable, _is_detachable; int _depth_level; SecurityImmutable? _security => order_tuple.security; @@ -190,16 +190,20 @@ namespace mbts.spark { public ICommand attach_command => _attach_command ?? ( _attach_command = new DelegateCommand(() => { // the _select me will trigger the OBVM.attach_vm to get primed - //_select_me(); + if (!is_selected) { + _select_me(); + } _owner.begin_attach_algos(); }) ); - //public ICommand update_command => _update_command ?? ( - // _update_command = new DelegateCommand(() => { - // _select_me(); - // }) - //); + public ICommand update_command => _update_command ?? ( + _update_command = new DelegateCommand(() => { + if (!is_selected) { + _select_me(); + } + }) + ); // private props Color _root_algo_badge_color { From 370b4bcde93e3aea8ab7881ba8f061d32e909b13 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 7 Jun 2019 16:19:16 -0500 Subject: [PATCH 20/59] coording root row with selected params mon --- .../Modules/Trading/OrderBook/OrderBookVM.cs | 34 +++++++++++++------ 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index d2a32fa53..d308b5075 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -430,16 +430,20 @@ namespace mbts.spark { using (_selected_params_mon.begin_udpate()) { if (e.RemovedItems != null) { foreach (var row_vm in e.RemovedItems.OfType()) { + var root_row_vm = get_root(row_vm); row_vm.is_selected = false; - _selected_params_mon.on_row_unselected(row_vm); + root_row_vm.is_selected = false; + _selected_params_mon.on_row_unselected(root_row_vm); _attachable_selected_orders.Remove(row_vm.order_key); _detachable_selected_orders.Remove(row_vm.order_key); } } if (e.AddedItems != null) { foreach (var row_vm in e.AddedItems.OfType()) { + var root_row_vm = get_root(row_vm); row_vm.is_selected = true; - _selected_params_mon.on_row_selected(row_vm); + root_row_vm.is_selected = true; + _selected_params_mon.on_row_selected(root_row_vm); if (row_vm.is_attachable) _attachable_selected_orders.Add(row_vm.order_key); if (row_vm.is_detachable) @@ -548,13 +552,23 @@ namespace mbts.spark { 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) { - while (r.ParentKey != 0 && _cached_orders.TryGetValue(r.ParentKey, out var parent_osam)) { - r = parent_osam.order; + public OrderBookRowVM get_root(OrderBookRowVM r) { + while (r.order.ParentKey != 0 ) { + var parent = get_parent(r); + if (parent != null) { + r = parent; + } } return r; } + public OrderSecurity get_root(OrderSecurity os) { + while (os.order.ParentKey != 0 && _cached_orders.TryGetValue(os.order.ParentKey, out var parent_osam)) { + os = parent_osam; + } + return os; + } + internal void detach_orders(OrderBookRowVM order) { if (order.is_selected) { var detach_candidates = rows.Where(r => r.is_selected); @@ -624,9 +638,9 @@ namespace mbts.spark { } } - async Task _modify_selected_orders_async() => await _modify_orders_async(selected_rows); + async Task _modify_selected_orders_async() => await _modify_orders_async(selected_rows.Select(r => get_root(r.order_tuple))); - async Task _modify_orders_async(IEnumerable modify_candidates) { + async Task _modify_orders_async(IEnumerable modify_candidates) { double? price = DoubleHelper.nan_nullable(order_mod_vm.price); uint? size = order_mod_vm.size; if (order_mod_vm.algo_vm.algo_root is IAlgoVM mod_algo_vm) { @@ -640,15 +654,15 @@ namespace mbts.spark { // ---- var update_params = modify_candidates.Select(update_params_factory).ToList(); await Task.WhenAll(update_params.Select(t => _model.update_order(t.order, new_price: price, new_size: size, new_algo: t.new_algo))); - (OrderRecordImmutable order, CustomOrderDefinitionImmutable? new_algo) update_params_factory(OrderBookRowVM row) { - var mod_algo = row.order.Def.CustomDef.CloneToMutable(); + (OrderRecordImmutable order, CustomOrderDefinitionImmutable? new_algo) update_params_factory(OrderSecurity os) { + var mod_algo = os.order.Def.CustomDef.CloneToMutable(); if (mod_algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Composite) { mod_algo_vm.assign_to(mod_algo.Composite.Definition); } else { mod_algo_vm.assign_to(mod_algo); } var mod_algoi = new CustomOrderDefinitionImmutable(mod_algo); - return (row.order, OrderDataHelper.EqualsHelpers.equals(row.order.Def.CustomDef, mod_algoi) ? (CustomOrderDefinitionImmutable?)null : mod_algoi); + return (os.order, OrderDataHelper.EqualsHelpers.equals(os.order.Def.CustomDef, mod_algoi) ? (CustomOrderDefinitionImmutable?)null : mod_algoi); } } else await Task.WhenAll(modify_candidates.Select(r => _model.update_order(r.order, price))); } From ac60a1447eec8318252303c7ae7c625dd6231408 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 10 Jun 2019 11:32:35 -0500 Subject: [PATCH 21/59] stack FillsView.Columns enum values vertically (easier to merge column changes) --- .../Modules/Trading/Fills/FillsView.xaml.cs | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs index 55fb8fe2e..ac6e2d71a 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs @@ -7,7 +7,22 @@ namespace mbts.ui.spark { /// Interaction logic for FillsView.xaml /// partial class FillsView : UserControl { - public enum Columns { FillTime, User, Account, Exchange, Security, TimeInForce, OrderType, Side, Price, Size, FillKind, FillKey, OrderKey, SecurityKey } + public enum Columns { + FillTime, + User, + Account, + Exchange, + Security, + TimeInForce, + OrderType, + Side, + Price, + Size, + FillKind, + FillKey, + OrderKey, + SecurityKey + } public FillsView() => InitializeComponent(); From 0bc24fa7b7839c7466c0d722844d83c7fd62b2e5 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 10 Jun 2019 11:48:09 -0500 Subject: [PATCH 22/59] SPARK-2508 Fills - add 'Symbol' column --- src/client/spark/Modules/Trading/Fills/FillsVM.cs | 9 +++++++++ src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs | 1 + .../Modules/Trading/Fills/Settings/FillsFilterStates.cs | 5 +++++ .../Modules/Trading/Fills/Settings/FillsSettings.cs | 2 ++ 4 files changed, 17 insertions(+) diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index b4c64bf6a..87c6ee4d3 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -61,6 +61,14 @@ namespace mbts.spark { equality_comparer: SecurityDataHelper.EqualityComparer.IDComparer, comparer: Comparer.Default ), DataGridFilterKnownTemplates.DiscreteValues, DefaultColumnWidths.Security); + // symbol + add_col(Columns.Symbol, DefaultColumnHeaders.Symbol, r => r.security.Symbol, + DiscreteValuesFilterVM.Create( + co2.UserSymbol.get_all().Select(u => u.symbol).Distinct().ToList(), + ft => ft.security?.Symbol ?? string.Empty, + nameof(OrderBookRowVM.symbol)), + DataGridFilterKnownTemplates.DiscreteValues, + DefaultColumnWidths.Symbol); // order type var order_type_filter = dv_filter(OrderDataHelper.all_order_types, r => r.order?.order_type() ?? OrderType.None); add_col_expl(Columns.OrderType, @@ -190,6 +198,7 @@ namespace mbts.spark { case Columns.SecurityKey: return wrap(ft => ft.fill.SecurityKey); case Columns.Side: return wrap_default(ft => ft.fill.Side); case Columns.Size: return wrap(ft => ft.fill.LastShares); + case Columns.Symbol: return wrap(ft => ft.security?.Symbol ?? string.Empty); case Columns.TimeInForce: return wrap_default(ft => ft.order?.time_in_force() ?? TimeInForce.Undefined); case Columns.User: return wrap(ft => ft.order?.user() ?? string.Empty); default: goto case Columns.FillTime; diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs index ac6e2d71a..4b74769eb 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs @@ -13,6 +13,7 @@ namespace mbts.ui.spark { Account, Exchange, Security, + Symbol, TimeInForce, OrderType, Side, diff --git a/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs b/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs index 3c59147c6..d981552be 100644 --- a/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs +++ b/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs @@ -66,6 +66,10 @@ namespace bts.shell.fills { [ProtoMember(14)] [DIYGridColumnID(nameof(Columns.FillKind))] public Fill.Types.FillKind[] fill_kind { get; set; } + + [ProtoMember(15)] + [DIYGridColumnID(nameof(Columns.Symbol))] + public string[] symbol { get; set; } } static class FillsFilterStatesExtensions { @@ -86,6 +90,7 @@ namespace bts.shell.fills { pb.add_discrete_values(fs.order_type, ft => ft.order_type()); pb.add_discrete_values(fs.side, ft => ft.fill.Side); pb.add_discrete_values(fs.fill_kind, ft => ft.fill.FillKind); + pb.add_discrete_values(fs.symbol, ft => ft.security?.Symbol ?? string.Empty); // numeric pb.add_numeric(fs.size, ft => ft.fill.LastShares); pb.add_numeric(fs.price, ft => ft.fill.LastPrice); diff --git a/src/client/spark/Modules/Trading/Fills/Settings/FillsSettings.cs b/src/client/spark/Modules/Trading/Fills/Settings/FillsSettings.cs index 18ba73b3c..63ace677e 100644 --- a/src/client/spark/Modules/Trading/Fills/Settings/FillsSettings.cs +++ b/src/client/spark/Modules/Trading/Fills/Settings/FillsSettings.cs @@ -40,6 +40,7 @@ namespace bts.shell.fills { static class DefaultColumns { public static GridColumnSettings security => new GridColumnSettings(col_id(Columns.Security), DefaultColumnHeaders.Security, width: DefaultColumnWidths.Security); + public static GridColumnSettings symbol => new GridColumnSettings(col_id(Columns.Symbol), DefaultColumnHeaders.Symbol, width: DefaultColumnWidths.Symbol); public static GridColumnSettings fill_time => new GridColumnSettings(col_id(Columns.FillTime), DefaultColumnHeaders.FillTime, width: DefaultColumnWidths.Time); public static GridColumnSettings user => new GridColumnSettings(col_id(Columns.User), DefaultColumnHeaders.User, width: DefaultColumnWidths.User); public static GridColumnSettings account => new GridColumnSettings(col_id(Columns.Account), DefaultColumnHeaders.Account, width: DefaultColumnWidths.Account); @@ -62,6 +63,7 @@ namespace bts.shell.fills { public static IEnumerable all { get { yield return security; + yield return symbol; yield return fill_time; yield return user; yield return account; From ecd384501ea7a400969e0c4bd95ff20a12ae3600 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 10 Jun 2019 12:22:05 -0500 Subject: [PATCH 23/59] align LadderSettingsView (content in settings dialog) with hamburger button --- .../Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml index 2a642bccc..d114c1cb1 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml +++ b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml @@ -77,7 +77,7 @@ - + From cd41632b5386a9047e662fb3a686131574cba2a1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 10 Jun 2019 14:27:54 -0500 Subject: [PATCH 24/59] LadderSettingsView - touch up 'Order Quantities' tab --- .../Modules/Trading/Ladder/View/LadderSettingsView.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index 83c508ac3..aa80663e4 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -731,7 +731,7 @@ - + @@ -745,7 +745,7 @@ - + @@ -779,7 +779,7 @@ - 'Single Click' Quantity + 'Single Click' Quantity Hint: right click on a bid/ask cell to submit orders with this quantity. From a0bf7779f5b0bc8df568561a56e00b1adb7c36ff Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 10 Jun 2019 14:35:06 -0500 Subject: [PATCH 25/59] mini ob - changes from John; closer to working but not yet, likely related to mark_commited/revert not getting wired up/called --- .../Modules/Trading/OrderBook/OrderBookVM.cs | 70 ++++++++++--------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index d308b5075..8986731bc 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -430,24 +430,35 @@ namespace mbts.spark { using (_selected_params_mon.begin_udpate()) { if (e.RemovedItems != null) { foreach (var row_vm in e.RemovedItems.OfType()) { - var root_row_vm = get_root(row_vm); row_vm.is_selected = false; - root_row_vm.is_selected = false; - _selected_params_mon.on_row_unselected(root_row_vm); + _selected_params_mon.on_row_unselected(_get_root(row_vm.order_tuple)); _attachable_selected_orders.Remove(row_vm.order_key); _detachable_selected_orders.Remove(row_vm.order_key); } } if (e.AddedItems != null) { foreach (var row_vm in e.AddedItems.OfType()) { - var root_row_vm = get_root(row_vm); + var root = _get_root(row_vm.order_tuple); row_vm.is_selected = true; - root_row_vm.is_selected = true; - _selected_params_mon.on_row_selected(root_row_vm); + row_vm.updated += on_updated; + _selected_params_mon.on_row_selected(root); if (row_vm.is_attachable) _attachable_selected_orders.Add(row_vm.order_key); if (row_vm.is_detachable) _detachable_selected_orders.Add(row_vm.order_key); + void on_updated((OrderSecurity oldval, OrderSecurity newval) change) { + if (!row_vm.is_selected) { + // self destruct + row_vm.updated -= on_updated; + return; + } + var new_root = _get_root(change.newval); + if (!new_root.Equals(root)) { + _selected_params_mon.on_row_unselected(root); + _selected_params_mon.on_row_selected(new_root); + root = new_root; + } + } } } RowSelectionHelper.apply_changes(selected_rows, e); @@ -552,20 +563,15 @@ namespace mbts.spark { public bool try_get_parent(OrderBookRowVM row, out OrderSecurity parent) => _cached_orders.TryGetValue(row.parent_order_key, out parent); - public OrderBookRowVM get_root(OrderBookRowVM r) { - while (r.order.ParentKey != 0 ) { - var parent = get_parent(r); - if (parent != null) { - r = parent; - } - } - return r; + OrderBookRowVM _get_root_row(OrderBookRowVM row) { + while (row.parent_order_key != 0 && _row_collection.get_parent(row.parent_order_key) is OrderBookRowVM prow) + row = prow; + return row; } - public OrderSecurity get_root(OrderSecurity os) { - while (os.order.ParentKey != 0 && _cached_orders.TryGetValue(os.order.ParentKey, out var parent_osam)) { - os = parent_osam; - } + OrderSecurity _get_root(OrderSecurity os) { + while (os.order.ParentKey != 0 && _cached_orders.TryGetValue(os.order.ParentKey, out var pos)) + os = pos; return os; } @@ -638,9 +644,8 @@ namespace mbts.spark { } } - async Task _modify_selected_orders_async() => await _modify_orders_async(selected_rows.Select(r => get_root(r.order_tuple))); - - async Task _modify_orders_async(IEnumerable modify_candidates) { + // Note: modifications are performed on the selected orders' ROOT orders. + async Task _modify_selected_orders_async() { double? price = DoubleHelper.nan_nullable(order_mod_vm.price); uint? size = order_mod_vm.size; if (order_mod_vm.algo_vm.algo_root is IAlgoVM mod_algo_vm) { @@ -652,19 +657,20 @@ namespace mbts.spark { // their values will be cleared (in the param grid gui), and the modifications will not be applied. // FYI this behavior is implemented to support 'partial edits.' (e.g., changing the 'price' for multiple orders that do not have the same 'size'). // ---- - var update_params = modify_candidates.Select(update_params_factory).ToList(); + var update_params = selected_rows.Select(r => update_params_factory(_get_root(r.order_tuple))).ToList(); await Task.WhenAll(update_params.Select(t => _model.update_order(t.order, new_price: price, new_size: size, new_algo: t.new_algo))); - (OrderRecordImmutable order, CustomOrderDefinitionImmutable? new_algo) update_params_factory(OrderSecurity os) { - var mod_algo = os.order.Def.CustomDef.CloneToMutable(); + (OrderRecordImmutable order, CustomOrderDefinitionImmutable? new_algo) update_params_factory(OrderSecurity order_tuple) { + var mod_algo = order_tuple.order.Def.CustomDef.CloneToMutable(); if (mod_algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Composite) { mod_algo_vm.assign_to(mod_algo.Composite.Definition); } else { mod_algo_vm.assign_to(mod_algo); } var mod_algoi = new CustomOrderDefinitionImmutable(mod_algo); - return (os.order, OrderDataHelper.EqualsHelpers.equals(os.order.Def.CustomDef, mod_algoi) ? (CustomOrderDefinitionImmutable?)null : mod_algoi); + return (order_tuple.order, OrderDataHelper.EqualsHelpers.equals(order_tuple.order.Def.CustomDef, mod_algoi) ? (CustomOrderDefinitionImmutable?)null : mod_algoi); } - } else await Task.WhenAll(modify_candidates.Select(r => _model.update_order(r.order, price))); + } else await Task.WhenAll(selected_rows.Select(r => _model.update_order(r.order, price))); + selected_rows.ForEach(r => r.is_selected = false); } IObservable> _subscribe_throttled_selected_rows() => @@ -1035,15 +1041,11 @@ namespace mbts.spark { public IDisposable begin_udpate() => _group_mon.defer_updates(); - public void on_row_selected(OrderBookRowVM row) { - _group_mon.add(row.order_tuple); - row.updated += _on_row_updated; - } + public void on_row_selected(OrderSecurity order_tuple) => + _group_mon.add(order_tuple); - public void on_row_unselected(OrderBookRowVM row) { - _group_mon.remove(row.order_tuple); - row.updated -= _on_row_updated; - } + public void on_row_unselected(OrderSecurity order_tuple) => + _group_mon.remove(order_tuple); public void on_security_md_map(IReadOnlyDictionary security_md_map) { _security_md_map = security_md_map; From ee19f7c7da1e32dce2a52b637d8ec35873f8fd29 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 10 Jun 2019 15:44:00 -0400 Subject: [PATCH 26/59] Updated release notes. --- doc/user/content/release_notes/_index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 21d5272ed..cf891b4cc 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -18,6 +18,8 @@ insert_anchor_links = "right" - Fixed a number of problems with filtering on the Fills form - On the Lean algo, OnToward and Away are now calculated with respect to the opposite inside market at time of the order launch - Iceberg Spreaders with queue holders are not erroneously cancelled after the first fill + - Security symbol added for fills window + ## 2.1.4 ### User Visible Changes - Fixed handling of cancel button in security picker From 1bc451086200ec7f9314d90ab44ef27e1152380d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 10 Jun 2019 15:12:38 -0500 Subject: [PATCH 27/59] LadderSettingsView - touch up 'Market Price And Size Display' tab --- .../Modules/Trading/Ladder/LadderSettings.cs | 10 +- .../Trading/Ladder/VM/LadderSettingsVM.cs | 54 +---- .../Ladder/View/LadderSettingsView.xaml | 197 ++++++++---------- 3 files changed, 99 insertions(+), 162 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs index ce6e4743b..e20468abe 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs @@ -327,7 +327,15 @@ namespace mbts.spark { public enum BadgeStyle { Normal, Alternate } - public enum NetChangeTerms { None, Dollars, Ticks } + // TODO: rename to PriceDisplayFormat (today is merge monday, since this isn't a functional change, it is not worth the potential merge headaches right now) + public enum NetChangeTerms { + [Description("Standard Ticks")] + None, + [Description("Net Change Dollars")] + Dollars, + [Description("Net Change Ticks")] + Ticks + } [ProtoMember(1)] public double row_height { get; set; } diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index 6712731b0..e1c33486b 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -23,6 +23,7 @@ namespace mbts.spark { readonly Property _badge_style; readonly Property _alternate_order_size; readonly DelegateProperty _row_height; + LadderSettings.NetChangeTerms _price_format; Func _get_order_entry_panel_width, _get_zoom_factor; LadderSettings _current; LadderColumnSettingsVM @@ -59,10 +60,6 @@ namespace mbts.spark { _cancel_buys_visibility = new OrderEntryPanelItemVisibilityVM("Cancel Buys"), _cancel_sells_visibility = new OrderEntryPanelItemVisibilityVM("Cancel Sells"), _cancel_all_visibility = new OrderEntryPanelItemVisibilityVM("Cancel All"); - readonly Property - _show_in_net_change, - _show_in_net_change_dollars, - _show_in_net_change_ticks; public LadderSettingsVM(OrdersModel model, bool is_synthetic, Func get_left_panel_width, Func get_zoom_factor) { this.is_synthetic = is_synthetic; @@ -74,10 +71,6 @@ namespace mbts.spark { _alternate_order_size = backing(nameof(alternate_order_size)); _get_order_entry_panel_width = get_left_panel_width; _get_zoom_factor = get_zoom_factor; - _show_in_net_change = backing(nameof(show_in_net_change)); - _show_in_net_change_dollars = backing(nameof(show_in_net_change_dollars)); - _show_in_net_change_ticks = backing(nameof(show_in_net_change_ticks)); - // be sure to initialize backings before this measure_row_height call _row_height = backing(nameof(row_height), () => LadderRender.measure_row_height(get_result())); _orders.font_size_changed += on_font_size_changed; @@ -110,6 +103,8 @@ namespace mbts.spark { } public MarketSizeDisplayVM size_display { get; } = new MarketSizeDisplayVM(); + public LadderSettings.NetChangeTerms price_format { get => _price_format; set => Set(ref _price_format, value); } + public IEnumerable price_format_options => EnumHelper.get_values(); public FavoriteAlgosVM favorite_algos_vm { get; } public double row_height => _row_height.Value; @@ -175,32 +170,6 @@ namespace mbts.spark { } } - public bool show_in_net_change { - get => _show_in_net_change.Value; - set { - // when unchecking, clear out dollars and ticks - if (!value) { - show_in_net_change_dollars = false; - show_in_net_change_ticks = false; - } - // when checking, by defalt check dollars - if (value) { - show_in_net_change_dollars = true; - } - _show_in_net_change.Value = value; - } - } - public bool show_in_net_change_dollars { - get => _show_in_net_change_dollars.Value; - set => _show_in_net_change_dollars.Value = value; - } - - public bool show_in_net_change_ticks { - get => _show_in_net_change_ticks.Value; - set => _show_in_net_change_ticks.Value = value; - } - - public string key => GridSettingsTemplateKeys.Ladder; public void load(LadderSettings settings) { @@ -241,13 +210,11 @@ namespace mbts.spark { _cancel_buys_visibility.show = settings.cancel_buys_visible; _cancel_sells_visibility.show = settings.cancel_sells_visible; _cancel_all_visibility.show = settings.cancel_all_visible; + price_format = settings.net_change; // do not read the order entry panel width here from settings // because it could have changed from the UI // there might be a better way of doing this, like how // does the widths of the ladder grid column pull this off? - show_in_net_change = settings.net_change != LadderSettings.NetChangeTerms.None; - show_in_net_change_dollars = settings.net_change == LadderSettings.NetChangeTerms.Dollars; - show_in_net_change_ticks = settings.net_change == LadderSettings.NetChangeTerms.Ticks; } public LadderSettings get_result() { @@ -291,19 +258,8 @@ namespace mbts.spark { clone.order_entry_panel_initial_width = _get_order_entry_panel_width(); clone.zoom_slider_visible = _zoom_slider_visbility.show; clone.zoom_factor = _get_zoom_factor(); - clone.net_change = _create_net_change_terms(show_in_net_change_dollars, show_in_net_change_ticks); + clone.net_change = price_format; return clone; - - LadderSettings.NetChangeTerms _create_net_change_terms(bool dollars, bool ticks) { - if (dollars) { - return LadderSettings.NetChangeTerms.Dollars; - } - if (ticks) { - return LadderSettings.NetChangeTerms.Ticks; - } - return LadderSettings.NetChangeTerms.None; - } - } public void Dispose() => favorite_algos_vm.Dispose(); diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index aa80663e4..879ac260f 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -607,125 +607,98 @@ - - - - - - - - + - - + - - - - - - Show Price in Net Change - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + From c652032ddfb92bf5117655ce57f1ec8d22940cc9 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 10 Jun 2019 17:27:46 -0400 Subject: [PATCH 28/59] Updated release notes. --- doc/user/content/release_notes/_index.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index cf891b4cc..09b6c5ed3 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -18,7 +18,8 @@ insert_anchor_links = "right" - Fixed a number of problems with filtering on the Fills form - On the Lean algo, OnToward and Away are now calculated with respect to the opposite inside market at time of the order launch - Iceberg Spreaders with queue holders are not erroneously cancelled after the first fill - - Security symbol added for fills window + - Added security symbol column to fills window + - Re-organized ladder settings dialog to make it clearer and easier to use ## 2.1.4 ### User Visible Changes From 93534eb8010d86d62620497bd17147c378083b62 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 11 Jun 2019 10:57:07 -0500 Subject: [PATCH 29/59] changing row selection while in change breaks the main ob --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 8986731bc..9c4dbaa8c 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -670,7 +670,6 @@ namespace mbts.spark { return (order_tuple.order, OrderDataHelper.EqualsHelpers.equals(order_tuple.order.Def.CustomDef, mod_algoi) ? (CustomOrderDefinitionImmutable?)null : mod_algoi); } } else await Task.WhenAll(selected_rows.Select(r => _model.update_order(r.order, price))); - selected_rows.ForEach(r => r.is_selected = false); } IObservable> _subscribe_throttled_selected_rows() => From d64df2718875042f051bf936b5947f356f4ecafd Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 11 Jun 2019 12:27:51 -0500 Subject: [PATCH 30/59] don't change is_selected state here b/c it leads to discrepancies when attaching/updating --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 9c4dbaa8c..bb79529bc 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -579,7 +579,8 @@ namespace mbts.spark { if (order.is_selected) { var detach_candidates = rows.Where(r => r.is_selected); _detach_orders_async(detach_candidates).ignore(); - detach_candidates.ForEach((row_vm) => row_vm.is_selected = false); + // Don't change the is_selecte state here b/c it will cause state issues + // in with the miniob attach param popup } else { _detach_orders_async(new[] { order }).ignore(); } From a7da930e697190ebf6f120c0b91142ffeb3e1d95 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 11 Jun 2019 14:02:23 -0500 Subject: [PATCH 31/59] synchronize selected_rows with _un/select_me() --- src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 2f767c6d2..8c13ef0e6 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -237,11 +237,13 @@ namespace mbts.spark { private void _unselect_me() { this.is_selected = false; + _owner.selected_rows.Remove(this); _owner.current_row = null; } private void _select_me() { this.is_selected = true; + _owner.selected_rows.Add(this); _owner.current_row = this; } From 44e7cfb4a50fa145694a239913ef323e7064384e Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 11 Jun 2019 14:06:08 -0500 Subject: [PATCH 32/59] setting is_selected and clearing selected_rows when update popup closes --- .../spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 0ac341136..66876feab 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -1116,8 +1116,11 @@ namespace mbts.spark { RelativeSource = new RelativeSource(RelativeSourceMode.Self) }); popup.Closed += (s, e) => { - if (popup.try_find_ancestor_of_type(out MiniOrderBookView mini_ob) && mini_ob.DataContext is OrderBookVM ob_vm) + if (popup.try_find_ancestor_of_type(out MiniOrderBookView mini_ob) && mini_ob.DataContext is OrderBookVM ob_vm) { ob_vm.is_attaching_orders = false; + ob_vm.selected_rows.ForEach(r => r.is_selected = false); + ob_vm.selected_rows.Clear(); + } }; var the_whole_thing = new Grid(); From 4854a06edac9dfac442691d57a1b0c590518cc96 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 08:12:48 -0500 Subject: [PATCH 33/59] fix SelectionHighlight databinding expression in mini ob --- .../Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index 6cc0ec713..7450bd576 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -121,7 +121,7 @@ Rows="{Binding rows}" RowStyle="{StaticResource {x:Static sp:MiniOrderBookView.RowStyleKey}}" RowTemplate="{StaticResource {x:Static sp:MiniOrderBookView.RowTemplateKey}}" - SelectionHighlight="{Binding grid_settings_manager.selection_highlight, Mode=OneWay}" + SelectionHighlight="{Binding grid_settings_manager.core_manager.selection_highlight, Mode=OneWay}" RowsHorizontalScrollBarVisibility="Collapsed" RowHeight="20" > From b21cd840c290b4a12fa3c410d16b4c4918c2e946 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 08:23:55 -0500 Subject: [PATCH 34/59] The first time I met the blues, I was losing my SelectionHighlight; too beat down to remove this Setter that was added over many hours of debugging --- .../OrderBook/MiniOrderBook/MiniOrderBookView.xaml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml index 7450bd576..a3c025aa5 100644 --- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml @@ -99,7 +99,16 @@ - + + From 40805be11eb1cd410238be15e8d15283b5a5f40a Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 08:27:39 -0500 Subject: [PATCH 35/59] Bringing back the check column in case of SelectionHighlight shenanigans --- .../Trading/OrderBook/OrderBookColumns.cs | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 66876feab..1f8c4105c 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -724,27 +724,27 @@ namespace mbts.spark { } } - //public class CheckColumn : FrameworkElementColumnBase { - // readonly BindingBase _checked_binding; - // public CheckColumn(string checked_property) : base(Columns.Check) { - // id = key.ToString(); - // Width = 30; - // _checked_binding = new Binding(checked_property); - // } + public class CheckColumn : FrameworkElementColumnBase { + readonly BindingBase _checked_binding; + public CheckColumn(string checked_property) : base(Columns.Check) { + id = key.ToString(); + Width = 30; + _checked_binding = new Binding(checked_property); + } - // public override FrameworkElement view_factory() { - // var grid = new Grid() { - // HorizontalAlignment = HorizontalAlignment.Center, - // VerticalAlignment = VerticalAlignment.Center, - // }; - // var cb = new CheckBox(); - // cb.Name = "check_col"; - // cb.SetBinding(CheckBox.IsCheckedProperty, _checked_binding); + public override FrameworkElement view_factory() { + var grid = new Grid() { + HorizontalAlignment = HorizontalAlignment.Center, + VerticalAlignment = VerticalAlignment.Center, + }; + var cb = new CheckBox(); + cb.Name = "check_col"; + cb.SetBinding(CheckBox.IsCheckedProperty, _checked_binding); - // grid.Children.Add(cb); - // return grid; - // } - //} + grid.Children.Add(cb); + return grid; + } + } public class CancelColumn : FrameworkElementColumnBase { readonly BindingBase _command_binding; From 114c9f3c2791d74eee0f8398daf6ffc76fbfac4d Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 08:28:56 -0500 Subject: [PATCH 36/59] Adding resurrected check column back to mini ob, bound to is_selected --- src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs index 11ad2036e..1de41351e 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderOrderVM.cs @@ -337,7 +337,7 @@ namespace mbts.spark { } 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 OrderBookVM.CheckColumn(nameof(OrderBookRowVM.is_checked))); + obvm.columns.Insert(0, new OrderBookVM.CheckColumn(nameof(OrderBookRowVM.is_selected))); obvm.load_from(state); return obvm; From c2e91b03f62c074b1ef874cf7ec99b3545252be2 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 09:40:35 -0500 Subject: [PATCH 37/59] Adding similar IsSelected setter to main OB just in case ... --- .../Modules/Trading/OrderBook/View/OrderBookGridView.xaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml index b9c7a1421..916c3783e 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml @@ -108,4 +108,9 @@ + + + \ No newline at end of file From e47706eb1b6d0dc0852fc82bf4c890403af38841 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 09:49:00 -0500 Subject: [PATCH 38/59] guaranteeing on_updating is hooked up to only a single callback; this was a major pain to debug, thx john --- .../Modules/Trading/OrderBook/OrderBookVM.cs | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index bb79529bc..3ec1c118a 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -64,6 +64,7 @@ namespace mbts.spark { _attachable_selected_orders = new HashSet(), _detachable_selected_orders = new HashSet(); FilterData _cached_filter_data; + Dictionary _on_updated_single_callback_gatekeeper = new Dictionary(); public OrderBookVM( IObservable owner_title, @@ -440,7 +441,10 @@ namespace mbts.spark { foreach (var row_vm in e.AddedItems.OfType()) { var root = _get_root(row_vm.order_tuple); row_vm.is_selected = true; - row_vm.updated += on_updated; + if (!_on_updated_single_callback_gatekeeper.ContainsKey(row_vm.order_key)) { + row_vm.updated += on_updated; + _on_updated_single_callback_gatekeeper.Add(row_vm.order_key, Disposable.Create(() => row_vm.updated -= on_updated)); + } _selected_params_mon.on_row_selected(root); if (row_vm.is_attachable) _attachable_selected_orders.Add(row_vm.order_key); @@ -449,13 +453,19 @@ namespace mbts.spark { void on_updated((OrderSecurity oldval, OrderSecurity newval) change) { if (!row_vm.is_selected) { // self destruct - row_vm.updated -= on_updated; + if (_on_updated_single_callback_gatekeeper.TryGetValue(row_vm.order_key, out var unsubscribe_updated_disposable)) { + unsubscribe_updated_disposable.Dispose(); + _on_updated_single_callback_gatekeeper.Remove(row_vm.order_key); + } + _selected_params_mon.on_row_unselected(_get_root(row_vm.order_tuple)); return; } var new_root = _get_root(change.newval); if (!new_root.Equals(root)) { - _selected_params_mon.on_row_unselected(root); - _selected_params_mon.on_row_selected(new_root); + // unselect and select in one smooth motion via on_row_updated + // because we thought there may be gremlins afoot when doing + // on_row_unselected and then on_row_selected + _selected_params_mon.on_row_updated((root, new_root)); root = new_root; } } @@ -1052,7 +1062,7 @@ namespace mbts.spark { _security_md_map_changed?.Invoke(); } - void _on_row_updated((OrderSecurity oldval, OrderSecurity newval) ch) { + public void on_row_updated((OrderSecurity oldval, OrderSecurity newval) ch) { using (begin_udpate()) { _group_mon.remove(ch.oldval); _group_mon.add(ch.newval); From b57d6cce85f2cea195776cfeaed3fad0a1aea2b1 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 09:52:22 -0500 Subject: [PATCH 39/59] select/unselect me only needs to manipulate row.is_selected now --- src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 8c13ef0e6..c605a4630 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -237,14 +237,10 @@ namespace mbts.spark { private void _unselect_me() { this.is_selected = false; - _owner.selected_rows.Remove(this); - _owner.current_row = null; } private void _select_me() { this.is_selected = true; - _owner.selected_rows.Add(this); - _owner.current_row = this; } // These fns present a way for the orderbook to avoid noisy, intermittent collection changes during "Expand/Collapse All" ops, From 164c88fa60682e0251c0353b2388160e71286f4b Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 09:56:03 -0500 Subject: [PATCH 40/59] popup debug comments --- src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 1f8c4105c..2afe9f50e 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -879,6 +879,7 @@ namespace mbts.spark { // We take our original ICommand (send_attached) and wrap it in another Command by way of a Converter on the binding, // pure genious! var send_attach_button_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookVM.send_attached_orders_cmd))) { + // set to true for debugging Converter = CommandWithActionWrapper.mk_wrap_converter(() => popup.IsOpen = false) }; send_attach_button_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(Popup), 1); @@ -929,6 +930,7 @@ namespace mbts.spark { #endregion popup.Child = border; + // set to true for debugging popup.StaysOpen = false; popup.PlacementTarget = attach_button; popup.Placement = PlacementMode.Bottom; @@ -1057,6 +1059,7 @@ namespace mbts.spark { // We take our original ICommand (send_attached) and wrap it in another Command by way of a Converter on the binding, // pure genious! var modify_selected_button_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookVM.modify_selected_orders_cmd))) { + // set to true for debugging Converter = CommandWithActionWrapper.mk_wrap_converter(() => popup.IsOpen = false) }; modify_selected_button_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(Popup), 1); From 4b7adbe0c9b2bb2ee4478c81166258ebb9fc7bdb Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 09:59:48 -0500 Subject: [PATCH 41/59] adding tooltip to update button --- src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 2afe9f50e..5a3ca9786 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -1002,7 +1002,8 @@ namespace mbts.spark { Content = "···", Margin = new Thickness(2), VerticalAlignment = VerticalAlignment.Center, - Focusable = false + Focusable = false, + ToolTip = "Update" }; update_button.Click += (s, e) => { popup.IsOpen = !popup.IsOpen; }; From 5c79a08f0ed0a7fa0c90e757556209b45dd5bb4e Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 10:53:15 -0500 Subject: [PATCH 42/59] popup close event no longer messes with selected_rows --- src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 5a3ca9786..aee502117 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -1122,8 +1122,6 @@ namespace mbts.spark { popup.Closed += (s, e) => { if (popup.try_find_ancestor_of_type(out MiniOrderBookView mini_ob) && mini_ob.DataContext is OrderBookVM ob_vm) { ob_vm.is_attaching_orders = false; - ob_vm.selected_rows.ForEach(r => r.is_selected = false); - ob_vm.selected_rows.Clear(); } }; From 4a758c75541af40ae094f3986aa1cba5eed4fcfd Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 10:54:02 -0500 Subject: [PATCH 43/59] misc comment cleanup, line endings or something --- .../Modules/Trading/OrderBook/OrderBookColumns.cs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index aee502117..77a5e18f8 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -851,13 +851,13 @@ namespace mbts.spark { var row_vm_attach_command_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookRowVM.attach_command))); row_vm_attach_command_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(MiniOrderBookRowView), 1); - attach_button.SetBinding(Button.CommandProperty, row_vm_attach_command_binding); + attach_button.SetBinding(Button.CommandProperty, row_vm_attach_command_binding); #region OrderParamsPanel // finally, set the order_params DataContext to that of the ContextMenu var order_params = AlgoEditorGridView.create_attach_view(); var order_params_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookVM.attach_vm))); - order_params_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(Popup), 1); + order_params_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(Popup), 1); order_params.SetBinding(FrameworkElement.DataContextProperty, order_params_binding); order_params.SetBinding(AlgoEditorGridView.AlgoRootsProperty, new Binding(WPFHelper.join_binding_paths(nameof(OrderParamsVM.algo_vm), nameof(AlgoDefinitionVM.algo_roots)))); order_params.SetBinding(AlgoEditorGridView.SelectedAlgoRootProperty, new Binding(WPFHelper.join_binding_paths(nameof(OrderParamsVM.algo_vm), nameof(AlgoDefinitionVM.algo_root)))); @@ -938,7 +938,6 @@ namespace mbts.spark { popup.SetBinding(Popup.DataContextProperty, new Binding("PlacementTarget.DataContext") { RelativeSource = new RelativeSource(RelativeSourceMode.Self) }); - #endregion #region Detach Button @@ -1026,23 +1025,20 @@ namespace mbts.spark { }; update_button_visibility_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(MiniOrderBookRowView), 1); update_button.SetBinding(Button.VisibilityProperty, update_button_visibility_binding); - - #endregion #region OrderParamsPanel - // finally, set the order_params DataContext to that of the ContextMenu var order_params = new AlgoEditorGridView { Margin = new Thickness(6), CanUserChangeAlgoRoot = false, }; - ; var order_params_binding = new Binding(WPFHelper.join_binding_paths("DataContext", nameof(OrderBookVM.order_mod_vm))); order_params_binding.RelativeSource = new RelativeSource(RelativeSourceMode.FindAncestor, typeof(Popup), 1); order_params.SetBinding(FrameworkElement.DataContextProperty, order_params_binding); order_params.SetBinding(AlgoEditorGridView.AlgoRootsProperty, new Binding(WPFHelper.join_binding_paths(nameof(OrderParamsVM.algo_vm), nameof(AlgoDefinitionVM.algo_roots)))); order_params.SetBinding(AlgoEditorGridView.SelectedAlgoRootProperty, new Binding(WPFHelper.join_binding_paths(nameof(OrderParamsVM.algo_vm), nameof(AlgoDefinitionVM.algo_root)))); order_params.SetBinding(AlgoEditorGridView.AlgoParamRowsProperty, new Binding(nameof(OrderParamsVM.param_rows))); + #endregion #region Dialog Skirt From c2f6b0156759936d53284c0f0bfd80da60c858b8 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 10:54:24 -0500 Subject: [PATCH 44/59] debugging comment --- src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs index ac4354874..6ccb3d81c 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderOrdersHost.cs @@ -139,6 +139,7 @@ namespace mbts.spark { // properly Dispose of it later when the popup is closed. DataContext = obvm, Child = view, + // StaysOpen true for debugging StaysOpen = false, PlacementTarget = popup_placement_target, Placement = System.Windows.Controls.Primitives.PlacementMode.Bottom, From 0d020e98212f8720672958f16b84a979c4139d80 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 12 Jun 2019 14:48:36 -0500 Subject: [PATCH 45/59] updating manual test --- testing/manual/orders/mini_ob.txt | 57 +++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/testing/manual/orders/mini_ob.txt b/testing/manual/orders/mini_ob.txt index 1858ef6d3..b2dd6ca8c 100644 --- a/testing/manual/orders/mini_ob.txt +++ b/testing/manual/orders/mini_ob.txt @@ -51,5 +51,62 @@ A(attach)/D(etach) buttons Verify the limit row's D button has now changed to an A Verify the limit row is no longer a child to the IB Verify the IB order is now canceled + +Multi-selection specific tests +------------------------------ + +Prerequisites + Place 10 1-lots at a specific price in the ladder + Have the mini ob open + + Cancel + ------ + Select any 2 rows by however you feel like it - click and drag, ctrl + click, clicking on checkbox column + Note the rows you have chosen, perhaps by time + Click the red cancel icon and the your selected orders should be cancelled + Attach + ------ + Select any 2 rows + Click the attach icon and then OK to attach to an IB + If you're feeling adventurous, attach to a different Algo + The following should happen to your selected rows: + Update buttons should be visible + The black attach icon should change to the red detach icon + The root algo column should reflect IB (the root algo badge as well) + + Detach + ------ + Select the previously attached rows from our prior attach step + Click the detach icon + The following should happen to your selected rows: + Update buttons should disappear + The red detach icon should change to the black attach icon + The root algo column should reflect a standard Limit(the root algo badge as well) + For extra credit, repeat the detach step here but also include some non-attached rows as well + + Update + ------ + Perform the following WITHOUT closing the mini ob: + + Attach an IB with show qty 1 to any 2 rows + Click update (...) button, modify the show quantity to 2, and hit ok + Uncheck one of the selected rows + Hit the update button in the currently selected row and verify the show quantity reads 2, hit cancel + + Uncheck your current row, so there should be no rows currently selected + + Hit the update button in the *other* row and verify the show quantity reads 2 there as well, now change the show quantity to 3 + Uncheck your current row + Hit the update button in the *other* row and verify the show quantity *still* reads 2. + + Check both rows and hit the update button + Show quantity should display as '-' signifying that the 2 rows have differing show quantities + + Uncheck all rows + Select one of the currently IB-controlled rows and a regular limit order and hit the update button + You should see the param popup effectively display as empty as these are incompatible order types selected + Cancel to return back to mini ob + + \ No newline at end of file From 12dd3909bfc32aedaa92d2a3cbf95a8deb015b40 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Thu, 13 Jun 2019 12:49:13 -0400 Subject: [PATCH 46/59] Fix documentation deploy --- doc/user/deploy_to_web.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/user/deploy_to_web.sh b/doc/user/deploy_to_web.sh index 5b6339c66..f80a67ed5 100644 --- a/doc/user/deploy_to_web.sh +++ b/doc/user/deploy_to_web.sh @@ -1,7 +1,6 @@ #/bin/bash #python -m mkdocs build -d site -cp -r ../../src/sdk/doc/* ./content/bts_spark_sdk/Server/ ./run_zola.sh build scp -r ./public bts@bluetradesys.com:/home/bts/doc/ @@ -14,7 +13,3 @@ sudo mv ./public/* /var/www/documentation/ EOF rm -r public -cd ./content/bts_spark_sdk/server/ -find . -not -name '_index.md' -delete -cd ../.. - From 5a54b37af7f8d18781061d7a7d63cab564036731 Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Thu, 13 Jun 2019 13:07:42 -0400 Subject: [PATCH 47/59] Move system requirements to Docs --- .../content/system_requirements/_index.md | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 doc/user/content/system_requirements/_index.md diff --git a/doc/user/content/system_requirements/_index.md b/doc/user/content/system_requirements/_index.md new file mode 100644 index 000000000..d5f9e5ae9 --- /dev/null +++ b/doc/user/content/system_requirements/_index.md @@ -0,0 +1,55 @@ ++++ +title = "System Requirements" +weight = 4 +sort_by = "weight" +insert_anchor_links = "right" ++++ + + +### Minimum Workstation +* New XPS Tower +* 8th Generation Intel® Core™ i7-8700 6-Core Processor (12M Cache, up to 4.6 GHz) +* 16GB, 2666MHz, DDR4 up to 64GB +* Windows 10 Professional 64-bit +* NVIDIA® GeForce® GTX 1070 with 8GB GDDR5 Graphics Memory +* 1 x 2.5" 256GB SATA Solid State Drive + +### Recommended Workstation +* Similar or better than: +* Dell Precision Tower 5820 +* Intel Xeon W-2145 3.7GHz, 4.5GHz Turbo, 8C, 11M Cache, HT, (140W) DDR4-2666 +* Windows 10 Professional 64-bit +* NVIDIA® Quadro® P1000, 4GB, 4 mDP +* 16GB (4x4GB) 2133MHz DDR4 RDIMM ECC +* 2 x 2.5" 256GB SATA Solid State Drive running RAID1 + + +### BTS Recommended Server Specifications +* Dell R640 +* 2x Intel Xeon Gold 6148 2.40GHz 20-Core Processors. For better performance BTS recommends Intel® Xeon® Platinum 8268 2.9G, 24 Core CPU +* 192GB RAM 2666MHz DDR4 +* 3x 480GB SSD RAID 5 HBA Minicard +* iDRAC 9 Enterprise +* Embedded Broadcom NIC +* Solarflare SFN8522-R2 +* Redundant Power Supply + +### BTS Minimum Server Specifications +* Dell R620 +* Chassis with up to 8, 2.5” Hard Drives, up to 2 PCIe Slots (With Optional Riser) +* 2 x Intel® E5-2670 (16 total cores/ 32 total threads) +* 64GB total memory +* RAID 1 for H330/H730/H730P +* PERC H730 RAID Controller, 1GB NV Cache +* 3 x 300GB 10K RPM SATA 6Gbps 2.5in Hot-plug Hard Drive (RAID 5) +* iDRAC8 Enterprise, integrated Dell Remote Access Controller, Enterprise (varies by hosting company) +* Solarflare Ultra SFN7122F Dual-Port 10GbE (10 GB connectivity requirements, copper vs optical, varies by hosting company). +* Dual, Hot-plug, Redundant Power Supply (1+1), 750W +* Performance BIOS Setting +* ReadyRails Sliding Rails Without Cable Management Arm (varies by hosting company) + +### Edge Tablet Requirements +* Similar or better than: +* Microsoft Surface Pro 4 Or Motion R12 +* Intel i7 +* 8 GB DDR4 RAM \ No newline at end of file From e8d799a0f66f8bb204ad8d413aef5d006f751895 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 14 Jun 2019 09:00:17 -0500 Subject: [PATCH 48/59] PR refactoring detach --- .../spark/Modules/Trading/OrderBook/OrderBookVM.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 1bbec8df9..65850bd5c 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -584,14 +584,11 @@ namespace mbts.spark { return os; } - internal void detach_orders(OrderBookRowVM order) { - if (order.is_selected) { - var detach_candidates = rows.Where(r => r.is_selected); - _detach_orders_async(detach_candidates).ignore(); - // Don't change the is_selecte state here b/c it will cause state issues - // in with the miniob attach param popup + internal void detach_orders(OrderBookRowVM row) { + if (row.is_selected) { + _detach_orders_async(selected_rows).ignore(); } else { - _detach_orders_async(new[] { order }).ignore(); + _detach_orders_async(new[] { row }).ignore(); } } From 213fb1de594557e34b1f27cdf6e9c24bc54367ea Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 14 Jun 2019 09:00:30 -0500 Subject: [PATCH 49/59] PR refactoring cancel --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 65850bd5c..e14b4e3d8 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -608,7 +608,7 @@ namespace mbts.spark { internal void cancel_order(OrderBookRowVM row) { if (row.is_selected) { - rows.Where(r => r.is_selected).ForEach((selected_row) => _bus.post(SparkTags.CancelOrders, new List { selected_row.order_key })); + _bus.post(SparkTags.CancelOrders, selected_rows.Select(r => r.order_key).ToList()); } else { _bus.post(SparkTags.CancelOrders, new List { row.order_key }); } From f34f718c721b1a56ad20490ae606f7997c7d4176 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 14 Jun 2019 09:02:24 -0500 Subject: [PATCH 50/59] PR rename on_row_selected --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index e14b4e3d8..e5993412f 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -444,7 +444,7 @@ namespace mbts.spark { row_vm.updated += on_updated; _on_updated_single_callback_gatekeeper.Add(row_vm.order_key, Disposable.Create(() => row_vm.updated -= on_updated)); } - _selected_params_mon.on_row_selected(root); + _selected_params_mon.on_order_selected(root); if (row_vm.is_attachable) _attachable_selected_orders.Add(row_vm.order_key); if (row_vm.is_detachable) @@ -1047,7 +1047,7 @@ namespace mbts.spark { public IDisposable begin_udpate() => _group_mon.defer_updates(); - public void on_row_selected(OrderSecurity order_tuple) => + public void on_order_selected(OrderSecurity order_tuple) => _group_mon.add(order_tuple); public void on_row_unselected(OrderSecurity order_tuple) => From ad0b1756b121fd5ccd95eb690787c0c0be1d4307 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 14 Jun 2019 09:03:07 -0500 Subject: [PATCH 51/59] PR rename on_row_unselected --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index e5993412f..a7808fd64 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -431,7 +431,7 @@ namespace mbts.spark { if (e.RemovedItems != null) { foreach (var row_vm in e.RemovedItems.OfType()) { row_vm.is_selected = false; - _selected_params_mon.on_row_unselected(_get_root(row_vm.order_tuple)); + _selected_params_mon.on_order_unselected(_get_root(row_vm.order_tuple)); _attachable_selected_orders.Remove(row_vm.order_key); _detachable_selected_orders.Remove(row_vm.order_key); } @@ -456,7 +456,7 @@ namespace mbts.spark { unsubscribe_updated_disposable.Dispose(); _on_updated_single_callback_gatekeeper.Remove(row_vm.order_key); } - _selected_params_mon.on_row_unselected(_get_root(row_vm.order_tuple)); + _selected_params_mon.on_order_unselected(_get_root(row_vm.order_tuple)); return; } var new_root = _get_root(change.newval); @@ -1050,7 +1050,7 @@ namespace mbts.spark { public void on_order_selected(OrderSecurity order_tuple) => _group_mon.add(order_tuple); - public void on_row_unselected(OrderSecurity order_tuple) => + public void on_order_unselected(OrderSecurity order_tuple) => _group_mon.remove(order_tuple); public void on_security_md_map(IReadOnlyDictionary security_md_map) { From d678d202c1f03c454df90fa16663cc5a6ee8f44f Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 14 Jun 2019 09:04:09 -0500 Subject: [PATCH 52/59] PR rename on_row_updated --- src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index a7808fd64..bb9da3e0d 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -464,7 +464,7 @@ namespace mbts.spark { // unselect and select in one smooth motion via on_row_updated // because we thought there may be gremlins afoot when doing // on_row_unselected and then on_row_selected - _selected_params_mon.on_row_updated((root, new_root)); + _selected_params_mon.on_order_updated((root, new_root)); root = new_root; } } @@ -1058,7 +1058,7 @@ namespace mbts.spark { _security_md_map_changed?.Invoke(); } - public void on_row_updated((OrderSecurity oldval, OrderSecurity newval) ch) { + public void on_order_updated((OrderSecurity oldval, OrderSecurity newval) ch) { using (begin_udpate()) { _group_mon.remove(ch.oldval); _group_mon.add(ch.newval); From 3dda3e7f758466a6cafdbda5ba720ea6c396d1be Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 14 Jun 2019 10:44:38 -0400 Subject: [PATCH 53/59] Allow cover order to continue even if hedgding child is canceled. --- src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp index 01dff07fb..86f2cf008 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp @@ -134,17 +134,12 @@ void CoverAlgo::on_child_change(OrderKey k, ChildState const &st) { switch (st.status) { case ChildStatus::WORKING: break; + case ChildStatus::CANCELED: case ChildStatus::COMPLETED: if (auto it = std::find(me->hedges.begin(), me->hedges.end(), k); it != me->hedges.end()) me->hedges.erase(it); break; - case ChildStatus::CANCELED: - LOG(OrderMan, Info, "CoverAlgo {}. Hedge was canceled, terminating", - algo().order_key().value()); - me->status = Status::DONE; - algo().terminate_error("Unexpected child cancel"); - break; } } check_terminate(); From ed23bc7e2b30bcd5e573812a3665dd540f347c6c Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 14 Jun 2019 10:50:34 -0400 Subject: [PATCH 54/59] Enhanced the API to allow algos to implement custom cancel handling --- .../orderman/orders/algo/AlgoWrapperOrder.cpp | 18 ++++++++++++++---- src/lib/orderman/orders/algo/IAlgoOrder.h | 8 ++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp index b14e7c7ef..950c619a3 100644 --- a/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp +++ b/src/lib/orderman/orders/algo/AlgoWrapperOrder.cpp @@ -135,9 +135,9 @@ void AlgoWrapperOrder::on_init_new(OrderDefinition const &def, if (can_consume_attachment(me->definition.custom_def().custom_case())) { me->attach_target = OrderKey(me->definition.attach_target_order_key()); me->definition.clear_attach_target_order_key(); - } - else { - terminate(ORDER_STATUS_REJECTED_BY_SPARK, "Algo does not support attachment"); + } else { + terminate(ORDER_STATUS_REJECTED_BY_SPARK, + "Algo does not support attachment"); return; } } @@ -290,9 +290,19 @@ orderman::OrderOpResult AlgoWrapperOrder::on_cancel() { switch (me->status) { case Status::W_ATTACH: - case Status::WORKING: terminate(ORDER_STATUS_CANCELED); break; + case Status::WORKING: + switch (me->algo->on_cancel()) { + case IAlgoOrder::OnCancelResponse::HONOR: + cancel(); + break; + case IAlgoOrder::OnCancelResponse::IGNORE: + LOG(OrderMan,Info,"Algo order with key {} ignored cancel request", + key().value()); + break; + } + break; case Status::COMPLETED: break; case Status::INACTIVE: diff --git a/src/lib/orderman/orders/algo/IAlgoOrder.h b/src/lib/orderman/orders/algo/IAlgoOrder.h index 55f5d7679..3b882b49d 100644 --- a/src/lib/orderman/orders/algo/IAlgoOrder.h +++ b/src/lib/orderman/orders/algo/IAlgoOrder.h @@ -64,6 +64,14 @@ class IAlgoOrder { // implementation should validate the update and either apply it, // if valid or terminate with an error otherwise virtual void do_update(api::orderman::Update const &) {} + + // Override this method to provide custom handling of a cancel + // request. The default behaviour is to cancel both this order and + // recursively any of its children. Algos may override this method + // for example to detach from specific children before canceling or + // to implement custom cleanup behaviour when canceled. + enum class OnCancelResponse {IGNORE, HONOR}; + virtual OnCancelResponse on_cancel() {return OnCancelResponse::HONOR;} }; } // namespace orderman From bc3ab563bf1d5e2ab4c469f2bc3c51bcb0b02dd5 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 14 Jun 2019 10:58:33 -0400 Subject: [PATCH 55/59] Changed Cover to detach its hedges when canceled. --- src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp | 7 +++++++ src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h | 1 + 2 files changed, 8 insertions(+) diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp index 86f2cf008..e96081023 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp @@ -209,5 +209,12 @@ void CoverAlgo::check_terminate() { } } +IAlgoOrder::OnCancelResponse CoverAlgo::on_cancel() +{ + for (auto &k : me->hedges) + algo().detach_child(k); + return IAlgoOrder::OnCancelResponse::HONOR; +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h index 3bedb00e7..203f93e5c 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h @@ -18,6 +18,7 @@ public: void do_launch_attached(IAlgoServices &, OrderKey, ChildState) override; void do_update(api::orderman::Update const &) override; void on_child_change(OrderKey, ChildState const &) override; + IAlgoOrder::OnCancelResponse on_cancel() override; private: struct PImpl; From 66d05c63afa930c101d6490dfb5d43d7330c808b Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 14 Jun 2019 14:25:04 -0400 Subject: [PATCH 56/59] Made cover cancel behaviour parameterizable. This implements the server side only, the UI does not expose this configuration so effectively the behaviour right now is hard-coded until we get around to adding the UI. --- src/lib/api/services/OrderService.proto | 2 ++ .../orders/algo/algo_orders/CoverAlgo.cpp | 31 +++++++++++++------ .../orders/algo/algo_orders/CoverAlgo.h | 2 +- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/lib/api/services/OrderService.proto b/src/lib/api/services/OrderService.proto index 5c03be00b..2470930e5 100644 --- a/src/lib/api/services/OrderService.proto +++ b/src/lib/api/services/OrderService.proto @@ -174,6 +174,8 @@ message CoverOrderDefinition { CustomOrderDefinition hedge = 1; uint32 hedge_ticks = 2; CustomOrderDefinition child = 3; + bool cancel_on_external_hedge_cancel = 4; + bool cancel_hedges_on_cancel = 5; } message OffsetOrderDefinition { uint32 tick_offset_on_deploy = 1; diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp index e96081023..d7dd1a56f 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.cpp @@ -26,6 +26,8 @@ struct CoverAlgo::PImpl { IAlgoServices *algo; OrderKey child_key = null_order_key(); Price price_improvement_delta; + bool cancel_on_external_hedge_cancel = false; + bool cancel_hedges_on_cancel = false; ChildTemplate *child_template = nullptr; ChildTemplate *hedge_template = nullptr; Quantity hedged_fills = Quantity(0); @@ -64,7 +66,7 @@ OrderOpResult CoverAlgo::do_before_launch(IBeforeLaunchAlgoServices &serv) { } init_hedge_template(serv, cover.hedge()); - set_price_improvement_delta(serv, cover); + update_definition(serv, cover); return {}; } @@ -135,10 +137,16 @@ void CoverAlgo::on_child_change(OrderKey k, ChildState const &st) { case ChildStatus::WORKING: break; case ChildStatus::CANCELED: + if (me->cancel_on_external_hedge_cancel) { + LOG(OrderMan, Info, "CoverAlgo {}. Hedge was canceled, terminating", + algo().order_key().value()); + me->status = Status::DONE; + algo().terminate_error("Unexpected child cancel"); + } else + std::remove(me->hedges.begin(), me->hedges.end(), k); + break; case ChildStatus::COMPLETED: - if (auto it = std::find(me->hedges.begin(), me->hedges.end(), k); - it != me->hedges.end()) - me->hedges.erase(it); + std::remove(me->hedges.begin(), me->hedges.end(), k); break; } } @@ -162,7 +170,7 @@ void CoverAlgo::do_update(api::orderman::Update const &update) { // process custom part of the udpate if any if (update.has_custom()) { auto &cover_update = update.custom().cover(); - set_price_improvement_delta(algo(), cover_update); + update_definition(algo(), cover_update); if (cover_update.has_child()) { *child_update.mutable_custom() = cover_update.child(); } @@ -189,11 +197,14 @@ void orderman::CoverAlgo::init_hedge_template( me->hedge_template = &(algo.make_child_template(hedge_def)); } -void CoverAlgo::set_price_improvement_delta( +void CoverAlgo::update_definition( IBeforeLaunchAlgoServices &serv, api::orderman::CoverOrderDefinition const &cover) { me->price_improvement_delta = Price( securities::tick_size(serv.security()).value() * cover.hedge_ticks()); + me->cancel_hedges_on_cancel = cover.cancel_hedges_on_cancel(); + me->cancel_on_external_hedge_cancel = + cover.cancel_on_external_hedge_cancel(); } void CoverAlgo::check_terminate() { @@ -209,10 +220,10 @@ void CoverAlgo::check_terminate() { } } -IAlgoOrder::OnCancelResponse CoverAlgo::on_cancel() -{ - for (auto &k : me->hedges) - algo().detach_child(k); +IAlgoOrder::OnCancelResponse CoverAlgo::on_cancel() { + if (!me->cancel_hedges_on_cancel) + for (auto &k : me->hedges) + algo().detach_child(k); return IAlgoOrder::OnCancelResponse::HONOR; } diff --git a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h index 203f93e5c..24fb06cf5 100644 --- a/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h +++ b/src/lib/orderman/orders/algo/algo_orders/CoverAlgo.h @@ -26,7 +26,7 @@ private: std::unique_ptr me; IAlgoServices &algo() const; void - set_price_improvement_delta(IBeforeLaunchAlgoServices &, + update_definition(IBeforeLaunchAlgoServices &, api::orderman::CoverOrderDefinition const &); void init_hedge_template(IBeforeLaunchAlgoServices &, api::orderman::CustomOrderDefinition const &); From fef5b4edaa47c09dbb0baa628902de66d02c8b75 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 17 Jun 2019 10:42:05 -0400 Subject: [PATCH 57/59] Updated release notes. --- doc/user/content/release_notes/_index.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 09b6c5ed3..d0b293803 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -4,6 +4,12 @@ weight = 3 sort_by = "weight" insert_anchor_links = "right" +++ +## 2.3.0 +### User Visible Changes + - Changed cover order to continue even if hedgding child is canceled and detach from hedges if canceled +### API Changes + - Enhanced the API to allow algos to implement custom cancel handling + ## 2.2.0 ### User Visible Changes - Made our orders easier to spot in MBO display From 0f87973ee24dca701c2dc02a2d57e60dd55207ff Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 17 Jun 2019 10:53:22 -0400 Subject: [PATCH 58/59] Updated release notes. --- doc/user/content/release_notes/_index.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index d0b293803..f2575da24 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -7,6 +7,11 @@ insert_anchor_links = "right" ## 2.3.0 ### User Visible Changes - Changed cover order to continue even if hedgding child is canceled and detach from hedges if canceled + - Streamlined the mini order book as follows: + - We now only show exchange orders + - We now only display update buttons for orders that are under control of an algo with the update applying to the entire algo, not just the exchange order + - We can now select multiple rows to attach, detach, update or cancel multiple orders in a batch + - A checkbox column has been added to make clearer which rows are selected ### API Changes - Enhanced the API to allow algos to implement custom cancel handling From e7286e305da4e0ad86707f55c8faa4a0e6bbbeda Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 17 Jun 2019 10:57:33 -0400 Subject: [PATCH 59/59] Updated release notes. --- doc/user/content/release_notes/_index.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index f2575da24..4dbe96aaf 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -14,6 +14,8 @@ insert_anchor_links = "right" - A checkbox column has been added to make clearer which rows are selected ### API Changes - Enhanced the API to allow algos to implement custom cancel handling +### Internal Changes + - Added system requirements to Spark documentation ## 2.2.0 ### User Visible Changes