diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs index 484a9f3b3..39d1eb40f 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs @@ -3,11 +3,11 @@ using bts.shell; using bts.spark; using mbts.ui; using mbts.ui.spark; +using mbts.utils; using System; using System.Collections.Generic; using System.Linq; using System.Reactive.Linq; -using System.Reactive.Subjects; using System.Threading.Tasks; using System.Windows; using System.Windows.Media; @@ -17,8 +17,7 @@ namespace mbts.spark class MarketViewWindow : SparkWindow { MarketViewWindowFactory.StartupData _state; - MarketViewVM _vm; - ReplaySubject _vm_subject = new ReplaySubject(1); + StateSubject _vm = new StateSubject(); MarketViewModel _model; MarketViewView _view; MarketViewWindowFactory _factory; @@ -39,24 +38,19 @@ namespace mbts.spark _criteria_callback_command = SparkCommand.create("Update Market View", SparkCommands.ShowMarketView.icon, _updated_security_criteria_tag); Commands = new SparkCommand[] { SparkCommand.create("Update Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (_criteria_callback_command, _state.security_criteria)), - // Ladder - SparkCommands.ShowLadder.complete(_vm_subject.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), + SparkCommands.ShowLadder.complete(_vm.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), // TODO: ShowLinkedLadder - // OrderTicket - SparkCommands.ShowOrderTicket.complete(_vm_subject.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), - // MarketView - SparkCommands.ShowTimeAndSales.complete(_vm_subject.SelectMany(vm => vm.current_security_observable), s => s.HasValue, s => new SecurityCriteria(s.Value)), + SparkCommands.ShowOrderTicket.complete(_vm.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), + // TODO: ShowLinkedOrderTicket + SparkCommands.ShowFills.complete(_vm.SelectMany(vm => vm.current_security_observable), s => s.HasValue, s => new SecurityCriteria(s.Value)), + SparkCommands.ShowTimeAndSales.complete(_vm.SelectMany(vm => vm.current_security_observable), s => s.HasValue, s => new SecurityCriteria(s.Value)), // SpreadMatrix ?? // SyntheticCreate - // SyntheticStrategy SparkCommands.ShowSyntheticSpreads, // ModifyOrder - await orders // CancelOrdersRoot ? - // CancelBuyOrders SparkCommands.CancelBuyOrders, - // CancelSellOrders SparkCommands.CancelSellOrders, - // CancelOrders SparkCommands.CancelOrders, }; _subscriptions = Disposable.Create( @@ -69,22 +63,24 @@ namespace mbts.spark _state = state; var securities = await state.security_criteria.securities(_bus); _model = new MarketViewModel(_bus, securities); - _vm_subject.OnNext(_vm = new MarketViewVM(_bus, _model, state.sorting_criteria, state.filters)); + _vm.Current()?.Dispose(); + _vm.OnNext(new MarketViewVM(_bus, _model, state.sorting_criteria, state.filters)); if (_view == null) { - _view = new MarketViewView { DataContext = _vm }; + _view = new MarketViewView { DataContext = _vm.Current() }; } else { - _view.DataContext = _vm; + _view.DataContext = _vm.Current(); } } - public void update_criteria(SecurityCriteria c) => initialize(new MarketViewWindowFactory.StartupData(c, _vm.rows_view.GetSortingCriteria(), _vm.get_filter_states())).ignore(); + public void update_criteria(SecurityCriteria c) => initialize(new MarketViewWindowFactory.StartupData(c, _vm.Current().rows_view.GetSortingCriteria(), _vm.Current().get_filter_states())).ignore(); public override UIElement Content => _view; public override IEnumerable Commands { get; } - public override MarketViewWindowFactory.StartupData SaveState => _state = new MarketViewWindowFactory.StartupData(_state.security_criteria, _vm.rows_view.GetSortingCriteria(), _vm.get_filter_states()); + public override MarketViewWindowFactory.StartupData SaveState => _state = new MarketViewWindowFactory.StartupData(_state.security_criteria, _vm.Current().rows_view.GetSortingCriteria(), _vm.Current().get_filter_states()); public override void Dispose() { Disposable.dispose(ref _subscriptions); + _vm.Current()?.Dispose(); foreach (var c in Commands.OfType()) c.Dispose(); } } diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index 8e9b2ecd0..4f2be9689 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -4,23 +4,21 @@ using bts.spark; using mbts.co2; using mbts.ui; using mbts.ui.spark; +using mbts.utils; using System; using System.Collections.Generic; using System.Linq; using System.Reactive.Linq; -using System.Reactive.Subjects; using System.Threading.Tasks; using System.Windows; using System.Windows.Media; namespace mbts.spark { - internal class TimeAndSalesWindow : SparkWindow { + class TimeAndSalesWindow : SparkWindow { TimeAndSalesStartupData _state; MDConsumer _consumer; - - TimeAndSalesVM _vm; - ReplaySubject _vm_subject = new ReplaySubject(1); + StateSubject _vm = new StateSubject(); TimeAndSalesModel _model; TimeAndSalesView _view; TimeAndSalesWindowFactory _factory; @@ -49,25 +47,19 @@ namespace mbts.spark Commands = new SparkCommand[] { SparkCommand.create("Update Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (_criteria_callback_command, _state.security_criteria)), - // Ladder - SparkCommands.ShowLadder.complete(_vm_subject.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), + SparkCommands.ShowLadder.complete(_vm.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), // TODO: ShowLinkedLadder - // OrderTicket - SparkCommands.ShowOrderTicket.complete(_vm_subject.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), - //SparkCommands.ShowLinkedOrderTicket.complete(/*todo*/), - // MarketView - SparkCommands.ShowMarketView.complete(_vm_subject.SelectMany(vm => vm.current_security_observable), s => s.HasValue, s => new SecurityCriteria(s.Value)), + SparkCommands.ShowOrderTicket.complete(_vm.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), + // TODO: ShowLinkedOrderTicket + SparkCommands.ShowFills.complete(_vm.SelectMany(vm => vm.current_security_observable), s => s.HasValue, s => new SecurityCriteria(s.Value)), + SparkCommands.ShowMarketView.complete(_vm.SelectMany(vm => vm.current_security_observable), s => s.HasValue, s => new SecurityCriteria(s.Value)), // SpreadMatrix ?? // SyntheticCreate - // SyntheticStrategy SparkCommands.ShowSyntheticSpreads, // ModifyOrder - await orders // CancelOrdersRoot ? - // CancelBuyOrders SparkCommands.CancelBuyOrders, - // CancelSellOrders SparkCommands.CancelSellOrders, - // CancelOrders SparkCommands.CancelOrders, }; } @@ -77,25 +69,25 @@ namespace mbts.spark _state = state; var securities = await state.security_criteria.securities(_bus); _model = new TimeAndSalesModel(_consumer, securities.ToList()); - Disposable.dispose(ref _vm); - _vm_subject.OnNext(_vm = new TimeAndSalesVM(_model, state.sort_criteria)); + _vm.Current()?.Dispose(); + _vm.OnNext(new TimeAndSalesVM(_model, state.sort_criteria)); if (_view == null) { - _view = new TimeAndSalesView(_vm); + _view = new TimeAndSalesView(_vm.Current()); } else { - _view.DataContext = _vm; + _view.DataContext = _vm.Current(); } } public void update_criteria(SecurityCriteria c) { - initialize(new TimeAndSalesStartupData(c, _vm.rows_view.GetSortingCriteria())).ignore(); + initialize(new TimeAndSalesStartupData(c, _vm.Current().rows_view.GetSortingCriteria())).ignore(); } public override UIElement Content => _view; SecurityMD? current_security { get { - var security = _vm.current_security; + var security = _vm.Current().current_security; if (security.HasValue) { if (_md.TryGetValue(security.Value.Id, out SecurityMD md)) { return md; @@ -116,14 +108,15 @@ namespace mbts.spark get { _state = new TimeAndSalesStartupData( _state.security_criteria, - _vm.rows_view.GetSortingCriteria()); + _vm.Current().rows_view.GetSortingCriteria()); return _state; } } public override void Dispose() { Disposable.dispose(ref _subscriptions); - Disposable.dispose(ref _vm); + _vm.Current()?.Dispose(); + foreach (var c in Commands.OfType()) c.Dispose(); } } } \ No newline at end of file diff --git a/src/client/spark/core/utils/StatePublisher.cs b/src/client/spark/core/utils/StatePublisher.cs index d47538e06..39bf844d7 100644 --- a/src/client/spark/core/utils/StatePublisher.cs +++ b/src/client/spark/core/utils/StatePublisher.cs @@ -5,11 +5,17 @@ using System.Reactive.Subjects; namespace mbts.utils { /// - /// Subscribes to the source and stores the latest valule internally. All subscription sequences begin with the latest value. + /// Represents an object that subscribes to an observable sequence. + /// Each notification is broadcasted to all subscribed observers. + /// The most recent notification is broadcasted to observers upon subscription. /// - /// + /// The type of elements in the observable sequence. public class StatePublisher : IObservable, IDisposable { + /// + /// Creates a StatePublisher. + /// + /// public StatePublisher(IObservable source) { _publisher = source.Select(val => { lock (_lock) { @@ -30,6 +36,8 @@ namespace mbts.utils lock(_lock) return (_value_initialized ? _publisher.StartWith(_last_value) : _publisher).Subscribe(observer); } + public T Current() => _last_value; + public void Dispose() { _connection.Dispose(); } diff --git a/src/client/spark/core/utils/StateSubject.cs b/src/client/spark/core/utils/StateSubject.cs index 5ab4ce783..ec7c073c1 100644 --- a/src/client/spark/core/utils/StateSubject.cs +++ b/src/client/spark/core/utils/StateSubject.cs @@ -3,8 +3,17 @@ using System.Reactive.Subjects; namespace mbts.utils { + /// + /// Represents an object that is both an observable sequence as well as an observer. + /// Each notification is broadcasted to all subscribed observers. + /// The most recent notification is broadcasted to subscribers upon subscription. + /// + /// The type of elements processed by the subject. public class StateSubject : ISubject, IDisposable { + /// + /// Creates a StateSubject. + /// public StateSubject() { _publisher = new StatePublisher(_subject); } @@ -19,6 +28,8 @@ namespace mbts.utils public IDisposable Subscribe(IObserver observer) { return _publisher.Subscribe(observer); } #endregion + public T Current() => _publisher.Current(); + public void Dispose() { _subject.OnCompleted(); _publisher.Dispose();