diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index 0813e8011..2cb3efe52 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -204,13 +204,15 @@ namespace mbts.spark { } } - void _show_order_book(Side side) => - _bus.post(SparkTags.ShowOrderBookTag, new bts.shell.orderbook.OrderBookStartupData( - new bts.shell.orderbook.FilterStates { - statuses = new[] { OrderStatus.Working }, - sides = new[] { side }, - security_criteria = new SecurityCriteria(security) - })); + void _show_order_book(Side side) { + var ob_settings = bts.shell.orderbook.OrderBookStartupData.Default; + ob_settings.filters = new bts.shell.orderbook.FilterStates { + statuses = new[] { OrderStatus.Working }, + sides = new[] { side }, + security_criteria = new SecurityCriteria(security) + }; + _bus.post(SparkTags.ShowOrderBookTag, ob_settings); + } void _show_order_ticket(MarketViewView.Columns col) { var order = _orders_model.factory.order(security); diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs index 638226c4d..86d656b3e 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs +++ b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs @@ -68,12 +68,13 @@ namespace mbts.spark { rs => rs.HasValue, select_row_strategy_tuple ), SparkCommands.ShowLadder(SparkCommands.KeyGestures.ShowLadder).complete( vm_connectable_builder.create(vm => vm.current_security_md), md => md.HasValue, ConvertUtils.ValueOrDefault - ), SparkCommands.ShowOrders.complete(() => new bts.shell.orderbook.OrderBookStartupData { - filters = new bts.shell.orderbook.FilterStates { - security_criteria = new SecurityCriteria(_vm.value.row_vms.Select(r => r.security)) - } - } - ), SparkCommands.window_settings_command(new DialogCommand(() => { + ), SparkCommands.ShowOrders.complete(() => { + var ob_settings = bts.shell.orderbook.OrderBookStartupData.Default; + ob_settings.filters = new bts.shell.orderbook.FilterStates { + security_criteria = new SecurityCriteria(_vm.value.row_vms.Select(r => r.security)) + }; + return ob_settings; + }), SparkCommands.window_settings_command(new DialogCommand(() => { var vm = new WindowSettingsDialogVM( _settings_manager, us => us.synthetic_management_grid, diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs index 1d2f24b54..c6dd59102 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs @@ -168,12 +168,13 @@ namespace mbts.spark { void _show_ladder() => _bus.post(SparkTags.ShowLadderTag, md); - void _show_order_book() => - _bus.post(SparkTags.ShowOrderBookTag, new bts.shell.orderbook.OrderBookStartupData { - filters = new bts.shell.orderbook.FilterStates { - security_criteria = new SecurityCriteria(security) - } - }); + void _show_order_book() { + var ob_settings = bts.shell.orderbook.OrderBookStartupData.Default; + ob_settings.filters = new bts.shell.orderbook.FilterStates { + security_criteria = new SecurityCriteria(security) + }; + _bus.post(SparkTags.ShowOrderBookTag, ob_settings); + } } } } diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index 6972c606b..f04b526bf 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -413,12 +413,13 @@ namespace mbts.spark { } - void _show_book() => - _bus.post(SparkTags.ShowOrderBookTag, new bts.shell.orderbook.OrderBookStartupData { - filters = new bts.shell.orderbook.FilterStates { - security_criteria = new SecurityCriteria(security) - } - }); + void _show_book() { + var ob_settings = bts.shell.orderbook.OrderBookStartupData.Default; + ob_settings.filters = new bts.shell.orderbook.FilterStates { + security_criteria = new SecurityCriteria(security) + }; + _bus.post(SparkTags.ShowOrderBookTag, ob_settings); + } void _show_ticket() { if (order_properties_vm != null) diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs index 619b8bf5d..9052022b1 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookSettings.cs @@ -65,6 +65,10 @@ namespace bts.shell.orderbook { [ProtoMember(25)] public bool use_defaults; + /// + /// Please use to get a new instance (the only reason the default constructor still exists is for ProtoBuf deserialization). + /// + [Obsolete] public OrderBookStartupData() { show_right_panel = _default_show_right_panel; show_order_params = _default_show_order_params;