diff --git a/src/client/spark/Modules/Market/MarketShellModule.cs b/src/client/spark/Modules/Market/MarketShellModule.cs index dc62e82f7..9497a7d37 100644 --- a/src/client/spark/Modules/Market/MarketShellModule.cs +++ b/src/client/spark/Modules/Market/MarketShellModule.cs @@ -23,7 +23,7 @@ namespace bts.shell [ImportingConstructor] public MarketShellModule(IBus bus, SecuritySource ssrc, IWindowManager wm, [Import("username")]string user_name) { - _tsf = new TimeAndSalesWindowFactory(this, bus, ssrc); + _tsf = new TimeAndSalesWindowFactory(this, bus); _mvf = new MarketWindowFactory(this, bus, ssrc, wm); } diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs index afd061e14..b1c42ee54 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs @@ -17,25 +17,26 @@ using System.Linq; using System.Reactive.Linq; using System.Windows.Controls; using System.Windows.Data; -using static mbts.ui.spark.TimeAndSalesView; namespace mbts.spark { - internal class TimeAndSalesVM : IDisposable + class TimeAndSalesVM : IDisposable { - public TimeAndSalesVM(IBus bus, IReadOnlyCollection securities, SecuritySource ssrc, IReadOnlyCollection sorting_criteria = null) { - _bus = bus; - _ssrc = ssrc; - _resources.Add(_model = new TimeAndSalesModel(bus, securities)); + public enum Columns { TradeTime, Security, Price, Size, OrderType } + + public TimeAndSalesVM(TimeAndSalesModel model, IReadOnlyCollection sorting_criteria) { + _model = model; _rows = new ObservableAutoWrapper>(_trades, tup => new Row(tup.Item1, tup.Item2)); _rows.ViewDestroyed += r => r.Dispose(); - _resources.Add(Disposable.Create(() => _rows.Clear())); + _dispose.Add(Disposable.Create(() => _rows.Clear())); rows_view = CollectionViewSource.GetDefaultView(_rows); - if (sorting_criteria != null) rows_view.SortDescriptions.AddRange(sorting_criteria.Select(sc => sc.to_sort_description())); - else rows_view.SortDescriptions.Add(new SortDescription(nameof(Row.trade_time), ListSortDirection.Descending)); - _resources.Add(_context_menu = new ContextMenuVM(_context_menu_item_factory)); - _resources.Add(_model.orders_model.on_orderbook().ObserveOnDispatcher().Subscribe(ob => _order_book = ob)); - _resources.Add(_model.trades.ObserveOnDispatcher().Subscribe(ts => { + if (sorting_criteria != null && sorting_criteria.Any()) { + rows_view.SortDescriptions.AddRange(sorting_criteria.Select(sc => sc.to_sort_description())); + } + else { + rows_view.SortDescriptions.Add(new SortDescription(nameof(Row.trade_time), ListSortDirection.Descending)); + } + _dispose.Add(_model.trades.ObserveOnDispatcher().Subscribe(ts => { if (ts.Count >= 1000) { _trades.Clear(); for (int i = ts.Count - 1000; i < ts.Count; i++) _trades.Add(ts[i]); @@ -46,48 +47,22 @@ namespace mbts.spark _trades.AddRange(ts); } })); - _resources.Add(_current_cell); + _dispose.Add(_current_cell); } - private readonly IBus _bus; - readonly SecuritySource _ssrc; private readonly TimeAndSalesModel _model; private readonly ObservableCollection> _trades = new ObservableCollection>(); private readonly ObservableAutoWrapper> _rows; - private readonly ContextMenuVM _context_menu; private readonly ColdObseravbleProperty _current_cell = new ColdObseravbleProperty(); - private IList _resources = new List(); - private IOrderBook _order_book = new OrderBook(); - - private IEnumerable _context_menu_item_factory() { - yield return MenuItemVM.Create(new ModifySecuritySelectionMenuItem(new HashSet(_rows.Select(r => r.security.value)), _ssrc, _model.set_securities)); - if (current_cell != null && current_cell.Column != null && current_cell.Item != null && !current_cell.Item.Equals(System.Windows.DependencyProperty.UnsetValue)) { - var securities = _rows.Where(r => r.is_selected).Select(r => r.security.value).ToList(); - yield return MenuItemVM.Create(new LadderMenuItem(_bus), securities); - yield return MenuItemVM.Create(new LinkedLadderMenuItem(_bus, _get_current_security_observable().ToSecurityMD(_bus))); - yield return MenuItemVM.Create(new OrderTicketMenuItem(_model.orders_model), securities); - yield return MenuItemVM.Create(new LinkedOrderTicketMenuItem(_bus, _get_current_security_observable().Select(OrderDataHelper.Defaults.Order))); - yield return MenuItemVM.Create(new MarketViewMenuItem(_bus), securities); - yield return MenuItemVM.Create(new SpreadMatrixMenuItem(_bus), securities); - yield return MenuItemVM.Create(new SyntheticCreateMenuItem(_bus), securities); - yield return MenuItemVM.Create(new SyntheticStrategyMenuItem(_bus), securities); - yield return MenuItemVM.Create(new ModifyOrderRootMenuItem(_model.orders_model, _order_book.get_active_orders_for_security(securities).Select(e => e.order()).ToList()), securities); - yield return MenuItemVM.Create(new CancelOrderRootMenuItem(_model.orders_model, _order_book.get_active_orders_for_security(securities).Select(e => e.order()).ToList()), securities); - yield return MenuItemVM.Create(new CancelBuyOrdersMenuItem(_model.orders_model), securities); - yield return MenuItemVM.Create(new CancelSellOrdersMenuItem(_model.orders_model), securities); - yield return MenuItemVM.Create(new CancelOrdersMenuItem(_model.orders_model), securities); - } - } + private IList _dispose = new List(); private IObservable _get_current_security_observable() { return _current_cell.Select(_get_security).DistinctUntilChanged(); } private static SecurityImmutable _get_security(DataGridCellInfo cell) { return ((Row)cell.Item).security.value; } public ICollectionView rows_view { get; private set; } public DataGridCellInfo current_cell { get => _current_cell.Value; set => _current_cell.set(value); } - public ContextMenuVM context_menu => _context_menu; - public StartupData get_startup_data() { return new StartupData(_model.securities, rows_view.SortDescriptions.Select(sd => new SortingCriteria(sd)).ToArray()); } - public void Dispose() { Disposable.dispose(_resources); } + public void Dispose() { Disposable.dispose(_dispose); } private class Row : GridRowViewModelBase { public Row(SecurityImmutable security, TradeMessage trade) { @@ -105,18 +80,5 @@ namespace mbts.spark public SelectableViewModelBase order_type { get; } } - [ProtoContract] - public class StartupData { - public const int Version = 1; - public StartupData() { } - public StartupData(IEnumerable securities, SortingCriteria[] sorting_criteria) { - if (securities != null) this.securities = securities.Select(s => ((IImmutableMessage)s).ToByteArray()).ToArray(); - this.sorting_criteria = sorting_criteria; - } - [ProtoMember(1)] - public byte[][] securities; - [ProtoMember(2)] - public SortingCriteria[] sorting_criteria; - } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml index 0a1bf38ba..13149977a 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml @@ -18,7 +18,7 @@