From c0d1e91a8a36e417ba6b84cbde3573565cb0f273 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 1 Dec 2017 15:28:13 -0500 Subject: [PATCH] Change PickOne to take SecurityMD so downstream doesn't have to do the lookup --- src/client/spark/Bus/SparkTags.cs | 4 ++-- src/client/spark/Daemons/SecurityPickerDaemon.cs | 2 +- src/client/spark/Modules/Trading/LadderWindowFactory.cs | 8 ++++---- src/client/spark/Spark.csproj | 1 + src/client/spark/mspark/MarketView/MarketViewModel.cs | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/client/spark/Bus/SparkTags.cs b/src/client/spark/Bus/SparkTags.cs index 0362a1346..6ce6567e3 100644 --- a/src/client/spark/Bus/SparkTags.cs +++ b/src/client/spark/Bus/SparkTags.cs @@ -24,7 +24,7 @@ namespace mbts.spark { #region Show Window public static ITag ShowAuditLogsTag { get; } = new SparkTag(nameof(ShowAuditLogsTag)); public static ITag ShowFillsTag { get; } = new SparkTag(nameof(ShowFillsTag)); - public static ITag ShowLadderTag { get; } = new SparkTag("Show Ladder"); + public static ITag ShowLadderTag { get; } = new SparkTag("Show Ladder"); 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)); @@ -49,7 +49,7 @@ namespace mbts.spark { public static ITag ShowWindow { get; } = new SparkTag("Show Window"); public static ITag> ShowPickMultiple { get; } = new SparkTag>("PickN"); - public static ITag> ShowPickOne { get; } = new SparkTag>("Pick1"); + public static ITag> ShowPickOne { get; } = new SparkTag>("Pick1"); public static ITag Support { get; } = new SparkTag(nameof(Support)); public static ITag About { get; } = new SparkTag("About"); diff --git a/src/client/spark/Daemons/SecurityPickerDaemon.cs b/src/client/spark/Daemons/SecurityPickerDaemon.cs index dd3c638ca..c05533b09 100644 --- a/src/client/spark/Daemons/SecurityPickerDaemon.cs +++ b/src/client/spark/Daemons/SecurityPickerDaemon.cs @@ -24,7 +24,7 @@ namespace bts { ); } - void show_pick_one(ITag next) { + void show_pick_one(ITag next) { // todo //_bus.post(next, 0); } diff --git a/src/client/spark/Modules/Trading/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/LadderWindowFactory.cs index d397348de..02a078cf6 100644 --- a/src/client/spark/Modules/Trading/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/LadderWindowFactory.cs @@ -25,7 +25,7 @@ namespace bts.shell { _dispose = Disposable.Create( bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s), - //bus.subscribe(SparkTags.ShowLadderTag).ObserveOnDispatcher().Subscribe(show_window), + bus.subscribe(SparkTags.ShowLadderTag).ObserveOnDispatcher().Subscribe(show_window), bus.subscribe(SparkTags.ShowLinkedLadder).ObserveOnDispatcher().Subscribe(show_linked) ); } @@ -48,9 +48,9 @@ namespace bts.shell { return ShellWindow.create(_module, md.security.ToString(), view, vm, s => save(state, s), Icons.Depth); } - private void show_window(SecurityCriteria md) { - //var window = create_ladder_window(md); - //_wm.Windows.Add(window); + private void show_window(SecurityMD md) { + var window = create_ladder_window(md); + _wm.Windows.Add(window); } private void show_linked(IObservable keystream) { var orders = new DemoOrdersModel(_bus); diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj index 366292a59..9c5c0190f 100644 --- a/src/client/spark/Spark.csproj +++ b/src/client/spark/Spark.csproj @@ -56,6 +56,7 @@ + diff --git a/src/client/spark/mspark/MarketView/MarketViewModel.cs b/src/client/spark/mspark/MarketView/MarketViewModel.cs index d66844583..2f2f25b75 100644 --- a/src/client/spark/mspark/MarketView/MarketViewModel.cs +++ b/src/client/spark/mspark/MarketView/MarketViewModel.cs @@ -34,7 +34,7 @@ namespace mbts.spark public DemoOrdersModel orders_model => _orders_model; public IObservable security_position(security_key key) { return _positions_demuxer.subscribe(key).DistinctUntilChanged(); } - public void show_ladder(SecurityMD security) { _bus.post(ShowLadderTag, security.security.Id); } + public void show_ladder(SecurityMD security) { _bus.post(ShowLadderTag, security); } public void show_order_modify(Order order) { _bus.post(ShowOrderModifyTag, new ShowOrderModifyMessage(order)); } public void show_order_ticket(Order order) { _orders_model.show_order_ticket(order); } public void set_securities(IEnumerable securities) { _securities_subject.OnNext(new HashSet(securities.Select(s => s.Id))); }