From d3862bbcb9f88ae75ee3a50af3d9630e6372dcdb Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 16 Oct 2017 14:57:06 -0400 Subject: [PATCH] Time And Sales - translate Synthetic to underlying securities --- .../mspark/Shell/TimeAndSales/TimeAndSalesModel.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/client/spark/mspark/Shell/TimeAndSales/TimeAndSalesModel.cs b/src/client/spark/mspark/Shell/TimeAndSales/TimeAndSalesModel.cs index ae54703aa..2636793c1 100644 --- a/src/client/spark/mspark/Shell/TimeAndSales/TimeAndSalesModel.cs +++ b/src/client/spark/mspark/Shell/TimeAndSales/TimeAndSalesModel.cs @@ -29,14 +29,22 @@ namespace mbts.spark if (ts.Count > 0) _trades.OnNext(ts); } + private static IEnumerable _get_real_securities(Security security) { + if (security.ContractCase == Security.ContractOneofCase.Synthetic) + foreach (var s in security.Synthetic.Legs.Select(l => l.Security).SelectMany(_get_real_securities)) yield return s; + else yield return security; + } + public IObservable>> trades => _trades.AsObservable(); public IReadOnlyCollection securities => _channels.Keys; public OrdersModel orders_model => _orders_model; public void set_securities(IEnumerable securities) { - foreach (var r in _channels.Keys.Except(securities).ToList()) _channels.Remove(r); - foreach (var a in securities.Except(_channels.Keys).ToList()) + var real_secs = securities.SelectMany(_get_real_securities); + foreach (var r in _channels.Keys.Except(real_secs).ToList()) _channels.Remove(r); + foreach (var a in real_secs.Except(_channels.Keys).ToList()) { _channels.Add(a, Co2RelayControl.instance.consumer.get_channel(a.Symbol, a.security_type(), a.Exchange)); + } } public void Dispose() { _work_loop.Dispose(); }