add/implement LaddersSpawnMany to toggles.proto, defaults to false
This commit is contained in:
1 parent
38e8c9a0c8
commit
8388768edc
6 files changed
+29
-8
No files matched your search
@@ -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<MarketViewWindowFactory.StartupData>
|
||||
{
|
||||
namespace mbts.spark {
|
||||
class MarketViewWindow : SparkWindow<MarketViewWindowFactory.StartupData> {
|
||||
readonly MarketViewWindowFactory _factory;
|
||||
readonly OrdersModel _orders_model;
|
||||
|
||||
@@ -29,9 +28,13 @@ namespace mbts.spark
|
||||
_orders_model = orders_model;
|
||||
ITag<SecurityCriteria> _updated_security_criteria_tag = new SparkTags.SparkTag<SecurityCriteria>("MarketView Callback");
|
||||
_criteria_callback_command = SparkCommand.create("Update Market View", SparkCommands.ShowMarketView.icon, _updated_security_criteria_tag);
|
||||
SparkCommand show_ladder_command;
|
||||
if (Configuration.get<bts.config.toggles.LaddersSpawnMany>().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
|
||||
|
||||
@@ -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<IDisposable> {
|
||||
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<bts.config.toggles.LaddersSpawnMany>().enabled)
|
||||
subs.Add(bus.subscribe(SparkTags.ShowLaddersTag).ObserveOnDispatcher().Subscribe(smds => smds.ForEach(show_window)));
|
||||
_dispose = Disposable.Create(subs.ToArray());
|
||||
}
|
||||
|
||||
public async override Task<IShellWindow> load(LadderSaveState state) {
|
||||
|
||||
@@ -33,6 +33,10 @@ namespace bts.spark
|
||||
|
||||
public static PartialCommand<SecurityMD> ShowLadder =>
|
||||
SparkCommand.create("Ladder", Icons.Ladder, SparkTags.ShowLadderTag);
|
||||
|
||||
public static PartialCommand<IReadOnlyList<SecurityMD>> ShowLadders =>
|
||||
SparkCommand.create("Ladder", Icons.Ladder, SparkTags.ShowLaddersTag);
|
||||
|
||||
public static PartialCommand<IObservable<SecurityMD>> ShowLinkedLadder =>
|
||||
SparkCommand.create("Linked Ladder", Icons.Ladder, SparkTags.ShowLinkedLadder);
|
||||
public static SparkCommand PickLadder =>
|
||||
|
||||
@@ -49,6 +49,11 @@ namespace mbts.spark
|
||||
#region Spark Window
|
||||
public static ITag<FillsWindowFactory.StartupData> ShowFillsTag { get; } = new SparkTag<FillsWindowFactory.StartupData>(nameof(ShowFillsTag));
|
||||
public static ITag<SecurityMD> ShowLadderTag { get; } = new SparkTag<SecurityMD>("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<SecurityMD> 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<IReadOnlyList<SecurityMD>> ShowLaddersTag { get; } = new SparkTag<IReadOnlyList<SecurityMD>>(nameof(ShowLaddersTag));
|
||||
public static ITag<IObservable<SecurityMD>> ShowLinkedLadder { get; } = new SparkTag<IObservable<SecurityMD>>("Linked Ladder");
|
||||
public static ITag<SecurityCriteria> ShowMarketViewTag { get; } = new SparkTag<SecurityCriteria>("Show MarketView");
|
||||
public static ITag<OrderBookWindowFactory.OrderBookStartupData> ShowOrderBookTag { get; } = new SparkTag<OrderBookWindowFactory.OrderBookStartupData>(nameof(ShowOrderBookTag));
|
||||
|
||||
@@ -121,5 +121,9 @@ namespace mbts.spark
|
||||
public static IObservable<IReadOnlyList<SecurityImmutable>> selected_securities_observable<TRow, TRowModel>(this SecurityGridBase<TRow, TRowModel> security_grid)
|
||||
where TRow : class, ISecurityRow =>
|
||||
security_grid.selected_securities.ObserveSelf();
|
||||
|
||||
public static IObservable<IReadOnlyList<SecurityMD>> selected_security_mds_observable<TRow, TRowModel>(this SecurityMDGrid<TRow, TRowModel> security_md_grid)
|
||||
where TRow : class, ISecurityMDRow =>
|
||||
security_md_grid.selected_rows.ObserveSelf(true).Select(rows => rows.Select(r => r.md).ToReadOnlyList());
|
||||
}
|
||||
}
|
||||
@@ -12,3 +12,6 @@ message LaddersOnThreads {
|
||||
optional bool enabled = 1 [default = true];
|
||||
}
|
||||
|
||||
message LaddersSpawnMany {
|
||||
optional bool enabled = 1 [default = false];
|
||||
}
|
||||
Reference in new issue
Block a user