diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 15cb06622..e5b42555a 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.4.0 +### User Visible Settings + - In the ladder, changed the last trade column to accumulate successive trades at the same price + - Fixed a bug in the order book where the right side ladder would display the top leve order's security rather then current row's + + ## 2.3.0 ### User Visible Changes - Introduced multiple settings profiles for the ladder diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVMContainer.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVMContainer.cs new file mode 100644 index 000000000..dadd8123d --- /dev/null +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVMContainer.cs @@ -0,0 +1,58 @@ +using bts.api; +using bts.api.orderman; +using mbts.ui.shell; +using System; +using System.Collections.Generic; +using System.Reactive.Linq; + +namespace mbts.spark { + class LadderVMContainer : ViewModelBase, IDisposable { + readonly IBus _bus; + readonly OrdersModel _model; + LadderVM _value; + SecurityMD? _security_md; + HashSet _selected_order_tree = new HashSet(); + + public LadderVMContainer(IBus bus, OrdersModel model) { + _bus = bus; + _model = model; + } + + public SecurityMD? security_md { + get => _security_md; + set { + if (_security_md != value) { + _security_md = value; + _reset_ladder_vm(); + RaisePropertyChanged(nameof(security_md), nameof(LadderVMContainer.value)); + } + } + } + public LadderVM value => _value; + + public void Dispose() { + if (_value != null) { + _value.Dispose(); + _value = null; + RaisePropertyChanged(nameof(value)); + } + } + + public void set_orders(IEnumerable orders) { + _selected_order_tree = new HashSet(orders); + _reset_ladder_vm(); + } + + void _reset_ladder_vm() { + if (_value == null && !_security_md.HasValue) + return; + Disposable.replace(ref _value, + _security_md.HasValue ? + LadderVM.create_readonly(_bus, + new LadderModel(security_md.Value, _model, _model.mbo_service, + new Func(osec => _selected_order_tree.Contains(osec.order.Key))), + Observable.Return(LadderSettings.Default)) : null); + RaisePropertyChanged(nameof(value)); + } + } +} \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderTactileAdorner.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderTactileAdorner.cs index f8cbef51c..0bf368501 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderTactileAdorner.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderTactileAdorner.cs @@ -152,20 +152,21 @@ namespace mbts.spark { // When middle click over bid or ask columns: // Non-parameterizalbe order: change cursor to No indicating sending an order is not possible // Parameterizable order: if qty is null/0, flash and No cursor - var pos = e.GetPosition(_host); - var column_type = _host._column_for_point(pos).column_type; - var selected_algo_can_expand = _host._vm.order_properties_vm?.selected_algo_definition?.algo_root?.can_expand ?? true; - if (e.MiddleButton == MouseButtonState.Pressed && - (column_type == LadderGridHost.ColumnType.Bid || column_type == LadderGridHost.ColumnType.Ask)) { - if (!selected_algo_can_expand) { - _host.Cursor = Cursors.No; - } - if (selected_algo_can_expand && (_host._vm.size_calculator.value ?? 0) == 0) { - _host._vm.size_calculator.flash_error(); - _host.Cursor = Cursors.No; + if (_host._vm != null) { + var pos = e.GetPosition(_host); + var column_type = _host._column_for_point(pos).column_type; + var selected_algo_can_expand = _host._vm.order_properties_vm?.selected_algo_definition?.algo_root?.can_expand ?? true; + if (e.MiddleButton == MouseButtonState.Pressed && + (column_type == LadderGridHost.ColumnType.Bid || column_type == LadderGridHost.ColumnType.Ask)) { + if (!selected_algo_can_expand) { + _host.Cursor = Cursors.No; + } + if (selected_algo_can_expand && (_host._vm.size_calculator.value ?? 0) == 0) { + _host._vm.size_calculator.flash_error(); + _host.Cursor = Cursors.No; + } } } - _is_mouse_down = true; InvalidateVisual(); } diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 6bc3e2b02..940d5cf30 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -47,6 +47,7 @@ namespace mbts.spark { readonly IWindowSettingsManager _settings_manager; readonly IWindowSettingsManager _fills_settings_manager = new WindowSettingsManager.DisconnectedImpl(FillsSettings.MiniGridSettings, FillsSettings.MiniGridSettings); readonly SelectedOrderParamsMon _selected_params_mon; + readonly SelectedSecurityMon _selected_security_mon = new SelectedSecurityMon(); readonly RightPanelModel _right_panel = new RightPanelModel(); OrderBookFillsGridSettings _cached_fills_settings = OrderBookStartupData.DefaultFillsGrid; double @@ -78,6 +79,7 @@ namespace mbts.spark { _bus = bus; _model = model; _selected_params_mon = new SelectedOrderParamsMon(model.dynamic_helper); + ladder_vm = new LadderVMContainer(bus, model); order_mod_vm = new OrderParamsVM(this, AlgoDefinitionVM.create(model, OrderDataHelper.Defaults.AlgoData(), editing_permissions: AlgoEditingPermissions.AllowEditValues)); order_mod_vm.algo_vm.editing_permissions_mask = AlgoEditingPermissions.None; order_mod_vm.algo_vm.algo_root = null; @@ -177,6 +179,11 @@ namespace mbts.spark { if (ch.newval && fills_height < _min_fills_height) fills_height = _min_fills_height; }), + _selected_security_mon.subscribe_security_md().OnDispatcher().Subscribe(smd => ladder_vm.security_md = smd), + _subscribe_throttled_selected_rows().OnDispatcher().Subscribe(_ => { + var hierarchical_order_keys = new HashSet(selected_hierarchical_rows.Select(r => r.order_key)); + ladder_vm.set_orders(hierarchical_order_keys); + }), _selected_params_mon.subscribe_all_active().Subscribe(on_all_selected_orders_active_changed), _selected_params_mon.subscribe_security_plurality().Subscribe(p => { security_plurality = p; @@ -218,7 +225,10 @@ namespace mbts.spark { order_mod_vm.algo_vm.connect_data(Observable.Return(model)), order_mod_vm.algo_vm.connect_data(_selected_params_mon.subscribe_spreader_security()), order_mod_vm.algo_vm, - bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(_selected_params_mon.on_security_md_map), + bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(md_map => { + _selected_security_mon.set_security_map(md_map); + _selected_params_mon.on_security_md_map(md_map); + }), attach_vm, _show_fills.observe_current(true) .Subscribe(is_visible => { @@ -440,6 +450,7 @@ namespace mbts.spark { request_selection?.Invoke((_row_collection, _all_rows_selected)); } } + public LadderVMContainer ladder_vm { get; } public IObservable subscribe_show_fills() => _show_fills.observe_current(true); public IObservable subscribe_show_ladder() => _show_ladder.observe_current(true); @@ -451,6 +462,7 @@ namespace mbts.spark { if (e.RemovedItems != null) { foreach (var row_vm in e.RemovedItems.OfType()) { row_vm.is_selected = false; + _selected_security_mon.Remove(row_vm.security); _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); @@ -460,6 +472,7 @@ namespace mbts.spark { foreach (var row_vm in e.AddedItems.OfType()) { var root = _get_root(row_vm.order_tuple); row_vm.is_selected = true; + _selected_security_mon.Add(row_vm.security); 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)); @@ -793,8 +806,6 @@ namespace mbts.spark { AlgoParamPermissions _price_permissions = AlgoParamPermissions.ReadOnly | AlgoParamPermissions.Write, _size_permissions = AlgoParamPermissions.ReadOnly | AlgoParamPermissions.Write; - HashSet _selected_order_tree = new HashSet(); - LadderVM _ladder_vm; SecurityMD? _security_md; public OrderParamsVM(OrderBookVM owner) @@ -845,13 +856,7 @@ namespace mbts.spark { appended_param_rows.insert_front(new AlgoParamRowVM(root, _price_param, null, AlgoParamTemplateKeys.Price)); } }), - ObservableAutoWrapper.connect_item_hooks(param_rows, dirty_params_mon.join), - owner._subscribe_throttled_selected_rows().OnDispatcher().Subscribe(_ => { - _selected_order_tree = new HashSet(_owner.selected_hierarchical_rows.Select(r => r.order_key)); - _reset_ladder_vm(); - })) { - () => Disposable.dispose(ref _ladder_vm) - }; + ObservableAutoWrapper.connect_item_hooks(param_rows, dirty_params_mon.join)); // payup methods void payup_bid(int ticks) => payup(bbo.bid, -ticks); void payup_ask(int ticks) => payup(bbo.ask, ticks); @@ -879,8 +884,7 @@ namespace mbts.spark { get => _security_md; set { if (Set(ref _security_md, value)) { - _reset_ladder_vm(); - RaisePropertyChanged(nameof(security), nameof(spec), nameof(ladder_vm)); + RaisePropertyChanged(nameof(security), nameof(spec)); bbo.security_md = value; _payup_bid_cmd.RaiseCanExecuteChanged(); _payup_ask_cmd.RaiseCanExecuteChanged(); @@ -904,7 +908,6 @@ namespace mbts.spark { } public AlgoDefinitionVM algo_vm { get; } public IReadOnlyObservableCollection param_rows { get; } - public LadderVM ladder_vm => _ladder_vm; public BBOVM bbo { get; } public ICommand send_order { get; } public ICommand payup_bid_cmd => _payup_bid_cmd; @@ -939,17 +942,6 @@ namespace mbts.spark { public IObservable subscribe_is_dirty() => _is_dirty.observe_current(true); - void _reset_ladder_vm() { - if (_ladder_vm == null && !_security_md.HasValue) - return; - Disposable.replace(ref _ladder_vm, - _security_md.HasValue ? - LadderVM.create_readonly(_owner._bus, - new LadderModel(security_md.Value, _owner._model, _owner._model.mbo_service, - new Func(osec => _selected_order_tree.Contains(osec.order.Key))), - Observable.Return(LadderSettings.Default)) : null); - RaisePropertyChanged(nameof(ladder_vm)); - } void _assign_param_permissions(IAlgoParamVM param, ref AlgoParamPermissions permissions_backing, AlgoParamPermissions permissions) { if (permissions_backing != permissions) { permissions_backing = permissions; @@ -996,6 +988,42 @@ namespace mbts.spark { EqualityComparer.aggregate_hash((int)algo_tree_display_mode, column_filters?.GetHashCode() ?? 0); } + class SelectedSecurityMon { + readonly CommonValueMonitor _security_mon = new CommonValueMonitor(); + IReadOnlyDictionary _security_md_map = DictionaryHelper.empty(); + + public SecurityImmutable? security => _security_mon.common_value; + public SecurityMD? security_md => security is SecurityImmutable sec && _security_md_map.TryGetValue(sec.Id, out SecurityMD smd) ? smd : (SecurityMD?)null; + + event Action _security_md_map_changed; + + public void Add(SecurityImmutable? security) => _security_mon.add(security); + public void Remove(SecurityImmutable? security) => _security_mon.remove(security); + + public void set_security_map(IReadOnlyDictionary value) { + _security_md_map = value; + _security_md_map_changed?.Invoke(); + } + + public IObservable subscribe_security_md() => + Observable.Create(o => { + SecurityMD? last_value = security_md; + o.OnNext(last_value); + _security_mon.common_value_changed += on_common_sec_changed; + _security_md_map_changed += refresh; + return Disposable.Create(() => { + _security_mon.common_value_changed -= on_common_sec_changed; + _security_md_map_changed -= refresh; + }); + void on_common_sec_changed(SecurityImmutable? _) => refresh(); + void refresh() { + var curr = security_md; + if (curr != last_value) + o.OnNext(last_value = curr); + } + }); + } + /// /// Monitors selected rows, and determines whether or not they are all active-orders, with common parameters. /// diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml index a57e16bfe..2dd432656 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml @@ -554,7 +554,7 @@ BorderThickness="0,1,0,0" ResizeBehavior="PreviousAndNext" /> - + (cdata().last_trade.load()); + if (current.int_price() == price.int_price() && agside == cdata().last_side) { + cdata().last_trade.store(PriceSize { price.int_price(), price.size() + current.size() }, time); + } + else { + cdata().last_trade.store(price,time); + cdata().last_side = agside; + } cdata().last_trade_time = tradetime; cdata().total_volume = volume; diff --git a/src/lib/md/Shm/MDStructure.h b/src/lib/md/Shm/MDStructure.h index 67b88b7ea..dd5dbb6b5 100644 --- a/src/lib/md/Shm/MDStructure.h +++ b/src/lib/md/Shm/MDStructure.h @@ -214,6 +214,7 @@ struct ColdEntry { last_trade(), total_volume(0), last_trade_time(), + last_side(co2::AggressorSide::AGGRESSOR_SIDE_NONE), misc(), deleted(false) { @@ -229,6 +230,7 @@ struct ColdEntry { AtomicPriceSize last_trade; size_t total_volume; datetime::LLDateTime last_trade_time; + co2::AggressorSide last_side; MiscData misc; diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index e12c685e9..7bc50d309 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources algo/AlgoDefinitionServiceServer.cpp;cmds/AdminReport.cpp;cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/KeyCode.cpp;cmds/Md.cpp;cmds/PrintHedgeOrders.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;main.cpp;md/ChannelVolume.cpp;md/MarketDataAuxiliaryServiceServer.cpp;md/VolumeAtPriceState.cpp;md/platforms/IMDPlatform.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/ice_onixs/ICEListener.cpp;md/platforms/ice_onixs/ICEMain.cpp;md/platforms/ice_onixs/tests/ice_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/PositionServiceServer.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;user/AdminServiceServer.cpp;user/AuthServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file