diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs index 78a3cbeee..f15304af5 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs @@ -1,6 +1,7 @@ using bts.api; using bts.shell; using bts.spark; +using mbts.config; using mbts.ui; using mbts.ui.spark; using mbts.utils; @@ -11,10 +12,8 @@ using System.Reactive.Linq; using System.Windows; using System.Windows.Media; -namespace mbts.spark -{ - class MarketViewWindow : SparkWindow - { +namespace mbts.spark { + class MarketViewWindow : SparkWindow { readonly MarketViewWindowFactory _factory; readonly OrdersModel _orders_model; @@ -29,9 +28,13 @@ namespace mbts.spark _orders_model = orders_model; ITag _updated_security_criteria_tag = new SparkTags.SparkTag("MarketView Callback"); _criteria_callback_command = SparkCommand.create("Update Market View", SparkCommands.ShowMarketView.icon, _updated_security_criteria_tag); + SparkCommand show_ladder_command; + if (Configuration.get().enabled) + show_ladder_command = SparkCommands.ShowLadders.complete(_vm.observable.SelectMany(vm => vm.selected_security_mds_observable()), smds => smds.Count > 0); + else show_ladder_command = SparkCommands.ShowLadder.complete(_vm.observable.SelectMany(vm => vm.current_security_md), md => md.HasValue, ObjectHelper.ValueOrDefault); Commands = new SparkCommand[] { SparkCommand.create("Change Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (_criteria_callback_command, _state.security_criteria)), - SparkCommands.ShowLadder.complete(_vm.observable.SelectMany(vm => vm.current_security_md), md => md.HasValue, ObjectHelper.ValueOrDefault), + show_ladder_command, // TODO: ShowLinkedLadder SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.observable.SelectMany(vm => vm.current_security_md), md => md.HasValue, ObjectHelper.ValueOrDefault), // TODO: ShowLinkedOrderTicket diff --git a/src/client/spark/Modules/Trading/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/LadderWindowFactory.cs index 8bfe1babb..759ea4b10 100644 --- a/src/client/spark/Modules/Trading/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/LadderWindowFactory.cs @@ -6,7 +6,6 @@ using mbts.ui; using ProtoBuf; using System; using System.Collections.Generic; -using System.Linq; using System.Reactive.Linq; using System.Threading; using System.Threading.Tasks; @@ -24,11 +23,14 @@ namespace bts.shell { _bus = bus; _wm = wm; _orders_model = orders_model; - _dispose = Disposable.Create( + var subs = new List { bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s), bus.subscribe(SparkTags.ShowLadderTag).ObserveOnDispatcher().Subscribe(show_window) //bus.subscribe(SparkTags.ShowLinkedLadder).ObserveOnDispatcher().Subscribe(show_linked) - ); + }; + if (Configuration.get().enabled) + subs.Add(bus.subscribe(SparkTags.ShowLaddersTag).ObserveOnDispatcher().Subscribe(smds => smds.ForEach(show_window))); + _dispose = Disposable.Create(subs.ToArray()); } public async override Task load(LadderSaveState state) { diff --git a/src/client/spark/core/Bus/SparkCommands.cs b/src/client/spark/core/Bus/SparkCommands.cs index a928b81f4..092af18c4 100644 --- a/src/client/spark/core/Bus/SparkCommands.cs +++ b/src/client/spark/core/Bus/SparkCommands.cs @@ -33,6 +33,10 @@ namespace bts.spark public static PartialCommand ShowLadder => SparkCommand.create("Ladder", Icons.Ladder, SparkTags.ShowLadderTag); + + public static PartialCommand> ShowLadders => + SparkCommand.create("Ladder", Icons.Ladder, SparkTags.ShowLaddersTag); + public static PartialCommand> ShowLinkedLadder => SparkCommand.create("Linked Ladder", Icons.Ladder, SparkTags.ShowLinkedLadder); public static SparkCommand PickLadder => diff --git a/src/client/spark/core/Bus/SparkTags.cs b/src/client/spark/core/Bus/SparkTags.cs index 16df10329..69ed65f47 100644 --- a/src/client/spark/core/Bus/SparkTags.cs +++ b/src/client/spark/core/Bus/SparkTags.cs @@ -49,6 +49,11 @@ namespace mbts.spark #region Spark Window public static ITag ShowFillsTag { get; } = new SparkTag(nameof(ShowFillsTag)); public static ITag ShowLadderTag { get; } = new SparkTag("Show Ladder"); + // [John]I added the 'ShowLaddersTag' to ease the pain of performance testing the Ladder, and figure this could become a permanent fixture + // (for now, there is a config LaddersSpawnMultiple in Toggles.conf that, if true, will tell the LadderWindowFactory to subscribe to both ShowLadder and ShowLadders, otherwise just ShowLadder). + // Note: I decided to use IReadOnlyList rather than SecurityCriteria, bc I don't imagine we will need the list of SecurityMDs to be IObservable. + // Even if this behavior is desired, the caller should be the one to observe the criteria, and simply post each result to the bus. + public static ITag> ShowLaddersTag { get; } = new SparkTag>(nameof(ShowLaddersTag)); public static ITag> ShowLinkedLadder { get; } = new SparkTag>("Linked Ladder"); public static ITag ShowMarketViewTag { get; } = new SparkTag("Show MarketView"); public static ITag ShowOrderBookTag { get; } = new SparkTag(nameof(ShowOrderBookTag)); diff --git a/src/client/spark/view/Spark/Grid/SecurityGrid.cs b/src/client/spark/view/Spark/Grid/SecurityGrid.cs index d2c43580d..b690b88ca 100644 --- a/src/client/spark/view/Spark/Grid/SecurityGrid.cs +++ b/src/client/spark/view/Spark/Grid/SecurityGrid.cs @@ -121,5 +121,9 @@ namespace mbts.spark public static IObservable> selected_securities_observable(this SecurityGridBase security_grid) where TRow : class, ISecurityRow => security_grid.selected_securities.ObserveSelf(); + + public static IObservable> selected_security_mds_observable(this SecurityMDGrid security_md_grid) + where TRow : class, ISecurityMDRow => + security_md_grid.selected_rows.ObserveSelf(true).Select(rows => rows.Select(r => r.md).ToReadOnlyList()); } } \ No newline at end of file diff --git a/src/lib/config/protos/toggles.proto b/src/lib/config/protos/toggles.proto index 9a9ce627c..d4a4eaa3a 100644 --- a/src/lib/config/protos/toggles.proto +++ b/src/lib/config/protos/toggles.proto @@ -12,3 +12,6 @@ message LaddersOnThreads { optional bool enabled = 1 [default = true]; } +message LaddersSpawnMany { + optional bool enabled = 1 [default = false]; +} \ No newline at end of file