diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs index caf24e126..421faf5a1 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs @@ -54,6 +54,7 @@ namespace mbts.spark } protected override Row row_factory(SecurityMD row_model) => new Row(this, _model, row_model, _model.security_position(row_model.security.Id)); + protected override IEnumerable get_default_sorting() { yield return new SortingCriteria(nameof(Row.security), true); } #region Filters public IDataGridColumnPersistentFilter security_filter { get; } diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs index 484a9f3b3..99b529125 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; @@ -16,9 +16,9 @@ namespace mbts.spark { class MarketViewWindow : SparkWindow { + readonly StateSubject _vm = new StateSubject(); + MarketViewWindowFactory.StartupData _state; - MarketViewVM _vm; - ReplaySubject _vm_subject = new ReplaySubject(1); MarketViewModel _model; MarketViewView _view; MarketViewWindowFactory _factory; @@ -39,24 +39,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 +64,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/MarketView/MarketViewWindowFactory.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs index 974dfac44..eea7f2785 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs @@ -40,9 +40,9 @@ namespace bts.shell public class StartupData { public const int Version = 1; public StartupData() { } - public StartupData(SecurityCriteria securities) : this (securities, new List(), null) { } - public StartupData(SecurityCriteria securities, List sorting_criteria, FilterStates filters) { - this.security_criteria = securities; + public StartupData(SecurityCriteria security_criteria) : this (security_criteria, new List(), null) { } + public StartupData(SecurityCriteria security_criteria, List sorting_criteria, FilterStates filters) { + this.security_criteria = security_criteria; this.sorting_criteria = sorting_criteria; this.filters = filters; } diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs index c559ce3a5..48ea15e19 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs @@ -5,6 +5,8 @@ using mbts.ui; using mbts.ui.utility; using System; using System.Collections.Generic; +using static bts.shell.TimeAndSalesWindowFactory; +using static mbts.spark.DataGridColumnFilters; namespace mbts.spark { @@ -12,22 +14,50 @@ namespace mbts.spark { public enum Columns { TradeTime, Security, Price, Size, OrderType } - public TimeAndSalesVM(TimeAndSalesModel model, IReadOnlyCollection sorting_criteria) : base(new RXCircularCollection(model.trades, 1000), sorting_criteria) { } + public TimeAndSalesVM(IBus bus, TimeAndSalesModel model, IReadOnlyCollection sorting_criteria, FilterStates filters) : base(new RXCircularCollection(model.trades, 1000), sorting_criteria) { + security_filter = new DiscreteValues(_rows_vm, r => r.security, secs => new SecurityCriteria(secs), sc => sc.securities(bus), nameof(Row.security)); + order_type_filter = new DiscreteValues(_rows_vm, r => r.order_type, nameof(Row.order_type)); + if (filters != null) { + time_filter.load_state(filters.time); + security_filter.load_state(filters.security); + price_filter.load_state(filters.price); + size_filter.load_state(filters.size); + order_type_filter.load_state(filters.order_type); + } + _resources.Add(hook_filters(rows_view, time_filter, security_filter, price_filter, size_filter, order_type_filter)); + } protected override Row row_factory(TradeInfo row_model) => new Row(row_model.security, row_model.trade); - protected override IEnumerable get_default_sorting() { yield return new SortingCriteria(nameof(Row.trade_time), false); } + protected override IEnumerable get_default_sorting() { yield return new SortingCriteria(nameof(Row.time), false); } + + #region Filters + public IDataGridColumnPersistentFilter time_filter { get; } = new Time(r => r.time, nameof(Row.time)); + public IDataGridColumnPersistentFilter security_filter { get; } + public IDataGridColumnPersistentFilter price_filter { get; } = new DoubleMinMax(r => r.price, nameof(Row.price)); + public IDataGridColumnPersistentFilter size_filter { get; } = new UIntMinMax(r => r.size, nameof(Row.size)); + public IDataGridColumnPersistentFilter order_type_filter { get; } + + public FilterStates get_filter_states() => + new FilterStates { + time = time_filter.get_state(), + security = security_filter.get_state(), + price = price_filter.get_state(), + size = size_filter.get_state(), + order_type = order_type_filter.get_state() + }; + #endregion public class Row : SecurityRow { public Row(SecurityImmutable security, TradeMessageImmutable trade) : base(security) { - quantity = trade.Size; + time = trade.Time.lldatetime(); price = trade.Mantissa * Math.Pow(10, trade.Exponent); - trade_time = trade.Time.lldatetime(); + size = trade.Size; order_type = Order.AlgoOrderTypeOneofCase.None; } - public uint quantity { get; } + public DateTime time { get; } public double price { get; } - public DateTime trade_time { get; } + public uint size { get; } public Order.AlgoOrderTypeOneofCase order_type { get; } } } diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml index 8b29ec8b0..86281c1b8 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml @@ -1,22 +1,35 @@  + + + - - - - + + + @@ -24,8 +37,14 @@ - - + + diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs index 2d3e5f9b8..c2434cc48 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs @@ -5,6 +5,7 @@ namespace mbts.ui.spark { public partial class TimeAndSalesView : UserControl { + public enum Columns { Time, Security, Price, Size, OrderType } internal TimeAndSalesView(TimeAndSalesVM vm) { InitializeComponent(); diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index 8e9b2ecd0..ea3feb3bb 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -4,23 +4,22 @@ 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 { - TimeAndSalesStartupData _state; - MDConsumer _consumer; + class TimeAndSalesWindow : SparkWindow { + readonly StateSubject _vm = new StateSubject(); - TimeAndSalesVM _vm; - ReplaySubject _vm_subject = new ReplaySubject(1); + TimeAndSalesWindowFactory.StartupData _state; + MDConsumer _consumer; TimeAndSalesModel _model; TimeAndSalesView _view; TimeAndSalesWindowFactory _factory; @@ -30,7 +29,7 @@ namespace mbts.spark PartialCommand _criteria_callback_command; - public static async Task create(TimeAndSalesWindowFactory factory, IBus bus, MDConsumer consumer, TimeAndSalesStartupData state, ImageSource icon) { + public static async Task create(TimeAndSalesWindowFactory factory, IBus bus, MDConsumer consumer, TimeAndSalesWindowFactory.StartupData state, ImageSource icon) { var window = new TimeAndSalesWindow(factory, bus, consumer, icon); await window.initialize(state); return window; @@ -49,81 +48,48 @@ 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, }; } - public async Task initialize(TimeAndSalesStartupData state) { + public async Task initialize(TimeAndSalesWindowFactory.StartupData state) { Logger.notnull(state); _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(_bus, _model, state.sorting_criteria, state.filters)); 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(); - } + public void update_criteria(SecurityCriteria c) => initialize(new TimeAndSalesWindowFactory.StartupData(c, _vm.Current().rows_view.GetSortingCriteria(), _vm.Current().get_filter_states())).ignore(); public override UIElement Content => _view; - - SecurityMD? current_security { - get { - var security = _vm.current_security; - if (security.HasValue) { - if (_md.TryGetValue(security.Value.Id, out SecurityMD md)) { - return md; - } - } - return null; - } - } - IEnumerable selected_securities() { - // todo - how to get extended selection? - var s = current_security; - if (s.HasValue) yield return s.Value.security; - } - public override IEnumerable Commands { get; } - - public override TimeAndSalesStartupData SaveState { - get { - _state = new TimeAndSalesStartupData( - _state.security_criteria, - _vm.rows_view.GetSortingCriteria()); - return _state; - } - } + public override TimeAndSalesWindowFactory.StartupData SaveState => _state = new TimeAndSalesWindowFactory.StartupData(_state.security_criteria, _vm.Current().rows_view.GetSortingCriteria(), _vm.Current().get_filter_states()); 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/Modules/Market/TimeAndSalesWindowFactory.cs b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs index 48f03dcc6..457a05f4b 100644 --- a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs +++ b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs @@ -6,13 +6,14 @@ using mbts; using System; using System.Reactive.Linq; using System.Collections.Generic; -using System.Linq; using ProtoBuf; using bts.spark; using mbts.co2; +using static mbts.spark.DataGridColumnFilters; namespace bts.shell { - class TimeAndSalesWindowFactory : ShellWindowFactory { + class TimeAndSalesWindowFactory : ShellWindowFactory + { readonly IBus _bus; readonly MDConsumer _consumer; IReadOnlyDictionary _securities = new Dictionary(); @@ -26,37 +27,51 @@ namespace bts.shell { bus.subscribe(SparkTags.ShowTimeAndSalesTag).ObserveOnDispatcher().Subscribe(show) ); } - public override async Task load(TimeAndSalesStartupData state) { + public override async Task load(StartupData state) { return await TimeAndSalesWindow.create(this, _bus, _consumer, state, SparkCommands.PickTimeAndSales.icon); } public async void show(SecurityCriteria criteria) { - var w = await load(new TimeAndSalesStartupData(criteria)); + var w = await load(new StartupData(criteria)); _bus.post(SparkTags.ShowWindow, w); } - } + [ProtoContract] + public class StartupData { + [ProtoMember(100)] + public readonly SecurityCriteria security_criteria; + [ProtoMember(200)] + public readonly List sorting_criteria; + [ProtoMember(300)] + public FilterStates filters; - [ProtoContract] - class TimeAndSalesStartupData { - [ProtoMember(100)] - public readonly SecurityCriteria security_criteria; - [ProtoMember(200)] - public readonly List sort_criteria; + //[ProtoMember(300)] + //public readonly bool show_menu_text; - //[ProtoMember(300)] - //public readonly bool show_menu_text; - - private TimeAndSalesStartupData() {}//for ptorobuf - public TimeAndSalesStartupData(SecurityCriteria securityCrit, List sortCrit) { - security_criteria = securityCrit; - sort_criteria = sortCrit; - } - public TimeAndSalesStartupData(SecurityCriteria securityCrit) { - security_criteria = securityCrit; - sort_criteria = new List(); + private StartupData() { }//for ptorobuf + public StartupData(SecurityCriteria security_criteria, List sorting_criteria, FilterStates filters) { + this.security_criteria = security_criteria; + this.sorting_criteria = sorting_criteria; + this.filters = filters; + } + public StartupData(SecurityCriteria security_criteria) { + this.security_criteria = security_criteria; + sorting_criteria = new List(); + } } + [ProtoContract] + public class FilterStates { + [ProtoMember(1)] + public TimeFilterState time; + [ProtoMember(2)] + public SecurityCriteria security; + [ProtoMember(3)] + public DoubleMinMaxState price; + [ProtoMember(4)] + public UIntMinMaxState size; + [ProtoMember(5)] + public Order.AlgoOrderTypeOneofCase[] order_type; + } } - } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 3afb8d280..5abb11998 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -1,114 +1,145 @@ using bts.api; -using bts.shell; using bts.spark; -using Google.Protobuf; -using mbts.spark.menu_items; -using mbts.spark.utilities; using mbts.ui; -using mbts.ui.shell; -using mbts.ui.spark; -using mbts.ui.utility; -using ProtoBuf; using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.ComponentModel; -using System.IO; using System.Linq; using System.Reactive.Linq; -using System.Windows.Data; +using static bts.shell.FillsWindowFactory; +using static mbts.spark.DataGridColumnFilters; +using static mbts.ui.spark.FillsView; namespace mbts.spark { - internal class FillsVM : DisposableViewModelBase + class FillsVM : SecurityGrid { - public FillsVM(FillsWindowFactory factory, IBus bus, DemoOrdersModel model, SecuritySource ssrc, IEnumerable securities, IEnumerable sorting_criteria = null) { - _bus = bus; + static IObservable> _row_models(DemoOrdersModel model, IReadOnlyCollection securities) => + model.on_orderbook().Buffer(TimeSpan.FromSeconds(1)).Where(obs => obs.Count > 0).Select(obs => obs[obs.Count - 1]).Select(ob => { + var map = ob.get_fill_tuple_sec_map(); + if (securities.Count == 0) return map.SelectMany(kv => kv.Value); + else { + var sec_keys = securities.Select(s => s.Id).ToList(); + return map.Where(kv => sec_keys.Contains(kv.Key)).SelectMany(kv => kv.Value); + } + }); + + public FillsVM(IBus bus, DemoOrdersModel model, IReadOnlyCollection securities, IReadOnlyCollection sorting_criteria, FilterStates filters) + : base(_row_models(model, securities), sorting_criteria) { _model = model; - _factory = factory; - _securities = new HashSet(securities ?? Enumerable.Empty()); - _rows = new ObservableAutoWrapper(_fills, f => new Row(f, _model)); - 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.fill_time), ListSortDirection.Descending)); - _dispose = Disposable.Create( - _context_menu = new ContextMenuVM(_context_menu_item_factory), - _model.on_orderbook().Buffer(TimeSpan.FromSeconds(1)).Where(obs => obs.Count > 0).Select(obs => obs[obs.Count - 1]).ObserveOnDispatcher().Subscribe(ob => { _order_book = ob; _update(); }) - ); - modify_security_selection = new DialogCommand(() => new SecuritySelectorDialog { - DataContext = new SecuritySelectorDialogVM("Fills", _securities.ToArray(), - secs => { - _securities = new HashSet(secs); - _update(); - }, ssrc) - }, () => true, true, -12, -30); - } - - private readonly IBus _bus; - private readonly FillsWindowFactory _factory; - private readonly DemoOrdersModel _model; - private readonly ObservableCollection _fills = new ObservableCollection(); - private readonly ObservableAutoWrapper _rows; - private HashSet _securities; - private IOrderBook _order_book = new OrderBook(); - private List _update_log = new List(); - private ContextMenuVM _context_menu; - - private void _update() { - var map = _order_book.get_fill_tuple_sec_map(); - if (_securities.Count == 0) _fills.sync_with(map.SelectMany(kv => kv.Value)); - else { - var sec_keys = _securities.Select(s => s.Id).ToList(); - _fills.sync_with(map.Where(kv => sec_keys.Contains(kv.Key)).SelectMany(kv => kv.Value)); + order_time_filter = new Time(r => r.order_time, nameof(Row.order_time)); + fill_time_filter = new Time(r => r.fill_time, nameof(Row.fill_time)); + time_in_force_filter = new DiscreteValues(_rows_vm, r => r.time_in_force, nameof(Row.time_in_force)); + order_type_filter = new DiscreteValues(_rows_vm, r => r.order_type, nameof(Row.order_type)); + account_filter = new DiscreteValues(_rows_vm, r => r.account, nameof(Row.account)); + user_filter = new DiscreteValues(_rows_vm, r => r.user, nameof(Row.user)); + exchange_filter = new DiscreteValues(_rows_vm, r => r.exchange, nameof(Row.exchange)); + security_filter = new DiscreteValues(_rows_vm, r => r.security, secs => new SecurityCriteria(secs), c => c.securities(bus), nameof(Row.security)); + side_filter = new DiscreteValues(_rows_vm, r => r.side, nameof(Row.side)); + price_filter = new DoubleMinMax(r => r.price, nameof(Row.price)); + size_filter = new UIntMinMax(r => r.size, nameof(Row.size)); + fill_percentage_filter = new DoubleMinMax(r => r.fill_percentage, nameof(Row.fill_percentage)); + order_percentage_filter = new DoubleMinMax(r => r.order_percentage, nameof(Row.order_percentage)); + order_status_filter = new DiscreteValues(_rows_vm, r => r.order_status, nameof(Row.order_status)); + bts_fill_id_filter = new RegexFinder(r => r.bts_fill_id, nameof(Row.bts_fill_id)); + bts_order_id_filter = new RegexFinder(r => r.bts_order_id, nameof(Row.bts_order_id)); + exch_order_id_filter = new RegexFinder(r => r.exch_order_id, nameof(Row.exch_order_id)); + if (filters != null) { + order_time_filter.load_state(filters.order_time); + fill_time_filter.load_state(filters.fill_time); + time_in_force_filter.load_state(filters.time_in_force); + order_type_filter.load_state(filters.order_type); + account_filter.load_state(filters.account); + user_filter.load_state(filters.user); + exchange_filter.load_state(filters.exchange); + security_filter.load_state(filters.security); + side_filter.load_state(filters.side); + price_filter.load_state(filters.price); + size_filter.load_state(filters.size); + fill_percentage_filter.load_state(filters.fill_percentage); + order_percentage_filter.load_state(filters.order_percentage); + order_status_filter.load_state(filters.order_status); + bts_fill_id_filter.load_state(filters.bts_fill_id); + bts_order_id_filter.load_state(filters.bts_order_id); + exch_order_id_filter.load_state(filters.exch_order_id); } - } - private IEnumerable _context_menu_item_factory() { - var selected_rows = _rows.Where(r => r.is_selected); - var securities = new HashSet(selected_rows.Select(r => r.security.value)); - yield return MenuItemVM.Create(new LadderMenuItem(_bus), securities); - yield return MenuItemVM.Create(new OrderTicketMenuItem(_model), securities); - 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, new HashSet(selected_rows.Select(r => r.entry.order()))), securities); - yield return MenuItemVM.Create(new CancelOrderRootMenuItem(_model, new HashSet(selected_rows.Where(r => r.entry.status() != OrderStatus.Types.Status.Canceled).Select(r => r.entry.order()))), securities); - yield return MenuItemVM.Create(new CancelBuyOrdersMenuItem(_model), securities); - yield return MenuItemVM.Create(new CancelSellOrdersMenuItem(_model), securities); - yield return MenuItemVM.Create(new CancelOrdersMenuItem(_model), securities); + _resources.Add(hook_filters(rows_view, + order_time_filter, fill_time_filter, time_in_force_filter, order_type_filter, account_filter, user_filter, exchange_filter, security_filter, side_filter, + price_filter, size_filter, fill_percentage_filter, order_percentage_filter, order_status_filter, bts_fill_id_filter, bts_order_id_filter, exch_order_id_filter + )); } - public IDialogCommand modify_security_selection { get; } - public ICollectionView rows_view { get; private set; } - public ContextMenuVM context_menu => _context_menu; + readonly DemoOrdersModel _model; - public void get_state(Stream save_here) { - _factory.save(new StartupData(_securities, rows_view.SortDescriptions.Select(sd => new SortingCriteria(sd)).ToArray()), save_here); - } + public IDataGridColumnPersistentFilter order_time_filter { get; } + public IDataGridColumnPersistentFilter fill_time_filter { get; } + public IDataGridColumnPersistentFilter time_in_force_filter { get; } + public IDataGridColumnPersistentFilter order_type_filter { get; } + public IDataGridColumnPersistentFilter account_filter { get; } + public IDataGridColumnPersistentFilter user_filter { get; } + public IDataGridColumnPersistentFilter exchange_filter { get; } + public IDataGridColumnPersistentFilter security_filter { get; } + public IDataGridColumnPersistentFilter side_filter { get; } + public IDataGridColumnPersistentFilter price_filter { get; } + public IDataGridColumnPersistentFilter size_filter { get; } + public IDataGridColumnPersistentFilter fill_percentage_filter { get; } + public IDataGridColumnPersistentFilter order_percentage_filter { get; } + public IDataGridColumnPersistentFilter order_status_filter { get; } + public IDataGridColumnPersistentFilter bts_fill_id_filter { get; } + public IDataGridColumnPersistentFilter bts_order_id_filter { get; } + public IDataGridColumnPersistentFilter exch_order_id_filter { get; } - private class Row { - public Row(FillTuple fill, DemoOrdersModel model) { + public FilterStates get_filters() => + new FilterStates { + order_time = order_time_filter.get_state(), + fill_time = fill_time_filter.get_state(), + time_in_force = time_in_force_filter.get_state(), + order_type = order_type_filter.get_state(), + account = account_filter.get_state(), + user = user_filter.get_state(), + exchange = exchange_filter.get_state(), + security = security_filter.get_state(), + side = side_filter.get_state(), + price = price_filter.get_state(), + size = size_filter.get_state(), + fill_percentage = fill_percentage_filter.get_state(), + order_percentage = order_percentage_filter.get_state(), + order_status = order_status_filter.get_state(), + bts_fill_id = bts_fill_id_filter.get_state(), + bts_order_id = bts_order_id_filter.get_state(), + exch_order_id = exch_order_id_filter.get_state() + }; + + protected override Row row_factory(FillTuple row_model) => new Row(row_model, _model); + + protected override IEnumerable get_default_sorting() { yield return new SortingCriteria(nameof(Row.fill_time), false); } + + public class Row : SecurityRow + { + public Row(FillTuple fill, DemoOrdersModel model) : base(fill.Fill.Order.Security) { _fill = fill.Fill; _entry = fill.OrderBookEntry; _model = model; - security = new SelectableViewModelBase(_fill.Order.Security, SecurityDataHelper.Comparer.Instance); uint aggr_fills = 0; foreach (var f in _entry.Fills) if (f.Timestamp <= _fill.Timestamp) aggr_fills += f.Size; order_percentage = (double)aggr_fills / (double)_fill.Order.Size; } - private readonly DemoOrdersModel _model; - private readonly DemoFill _fill; - private readonly OrderBookEntry _entry; + + readonly DemoOrdersModel _model; + readonly DemoFill _fill; + readonly OrderBookEntry _entry; + public OrderBookEntry entry => _entry; public DateTime order_time => _entry.order().Timestamp.lldatetime(); public DateTime fill_time => _fill.Timestamp.lldatetime(); public Order.Types.TimeInForce time_in_force => _fill.Order.TimeInForce; - public Order.AlgoOrderTypeOneofCase algo_type => _fill.Order.AlgoOrderTypeCase; + public Order.AlgoOrderTypeOneofCase order_type => _fill.Order.AlgoOrderTypeCase; public OrderMetadata order_metadata => _model.get_metadata(_fill.Order.AlgoOrderTypeCase); public string account => _fill.Order.Account; public string user => _fill.Order.User; public Venue exchange => _fill.Order.Security.Exchange; - public SelectableViewModelBase security { get; } public Side side => _fill.Order.Side; public double price => _fill.Price; public uint size => _fill.Size; @@ -119,21 +150,6 @@ namespace mbts.spark public string bts_fill_id => _fill.Id.Id; public string bts_order_id => _fill.Order.Id.Id; public string exch_order_id => "None because this is a simulation."; - public bool is_selected { get; set; } - } - - [ProtoContract] - public class StartupData { - public const int Version = 1; - public StartupData() { } - public StartupData(IReadOnlyCollection 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/Trading/Fills/FillsView.xaml b/src/client/spark/Modules/Trading/Fills/FillsView.xaml index d953549f6..d18ca89d5 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml @@ -1,68 +1,112 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs index 3da6755f9..513c2924f 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs @@ -7,8 +7,37 @@ namespace mbts.ui.spark /// public partial class FillsView : UserControl { + public enum Columns { OrderTime, FillTime, User, Account, Exchange, Security, TimeInForce, AlgoType, Side, Price, Size, FillPercentage, OrderPercentage, OrderStatus, BTSFillID, BTSOrderID, ExchangeOrderID } + public FillsView() { InitializeComponent(); } } + + /* + + + + + + + + + + + + + + + + + + + + + + + + + */ } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs new file mode 100644 index 000000000..a25610250 --- /dev/null +++ b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs @@ -0,0 +1,97 @@ +using bts.api; +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.Threading.Tasks; +using System.Windows; +using System.Windows.Media; + +namespace mbts.spark +{ + class FillsWindow : SparkWindow + { + readonly StateSubject _vm = new StateSubject(); + + FillsWindowFactory.StartupData _state; + FillsView _view; + FillsWindowFactory _factory; + + IDisposable _subscriptions; + IReadOnlyDictionary _md = new Dictionary(); + + PartialCommand _criteria_callback_command; + + public static async Task create(FillsWindowFactory factory, IBus bus, FillsWindowFactory.StartupData state, ImageSource icon) { + var window = new FillsWindow(factory, bus, icon); + await window.initialize(state); + return window; + } + + FillsWindow(FillsWindowFactory factory, IBus bus, ImageSource icon) : base("Fills", bus, factory, SparkCommands.ShowFills.icon) { + _factory = factory; + + ITag _updated_security_criteria_tag = new SparkTags.SparkTag("Fills Callback"); + _criteria_callback_command = SparkCommand.create("Update Fills", SparkCommands.ShowFills.icon, _updated_security_criteria_tag); + + Commands = new SparkCommand[] { + SparkCommand.create("Update Securities", Icons.Admin, SparkTags.ShowAndEditPickMultiple, () => (_criteria_callback_command, _state.security_criteria)), + SparkCommands.ShowLadder.complete(_vm.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), + // TODO: ShowLinkedLadder + SparkCommands.ShowOrderTicket.complete(_vm.SelectMany(vm => vm.current_security_md_observable(_md)), md => md.HasValue, md => md.Value), + // TODO: ShowLinkedOrderTicket + SparkCommands.ShowTimeAndSales.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 + SparkCommands.ShowSyntheticSpreads, + // ModifyOrder - await orders + // CancelOrdersRoot ? + SparkCommands.CancelBuyOrders, + SparkCommands.CancelSellOrders, + SparkCommands.CancelOrders, + }; + + _subscriptions = Disposable.Create( + _bus.subscribe(_updated_security_criteria_tag).ObserveOnDispatcher().Subscribe(update_criteria), + _bus.subscribe(SparkTags.SecuritiesTag).Subscribe(md => _md = md)); + } + + public async Task initialize(FillsWindowFactory.StartupData state) { + Logger.notnull(state); + _state = state; + var securities = await state.security_criteria.securities(_bus); + _vm.Current()?.Dispose(); + _vm.OnNext(new FillsVM(_bus, new DemoOrdersModel(_bus), securities.ToList(), state.sorting_criteria, state.filters)); + if (_view == null) _view = new FillsView { DataContext = _vm.Current() }; + else _view.DataContext = _vm.Current(); + } + + public void update_criteria(SecurityCriteria c) => initialize(new FillsWindowFactory.StartupData(c, _vm.Current().rows_view.GetSortingCriteria(), _vm.Current().get_filters())).ignore(); + + public override UIElement Content => _view; + + SecurityMD? current_security { + get { + var security = _vm.Current().current_security; + if (security.HasValue && _md.TryGetValue(security.Value.Id, out SecurityMD md)) return md; + else return null; + } + } + + public override IEnumerable Commands { get; } + + public override FillsWindowFactory.StartupData SaveState => _state = new FillsWindowFactory.StartupData(_state.security_criteria, _vm.Current().rows_view.GetSortingCriteria(), _vm.Current().get_filters()); + + public override void Dispose() { + Disposable.dispose(ref _subscriptions); + _vm.Current()?.Dispose(); + foreach (var c in Commands.OfType()) c.Dispose(); + } + } +} \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs index 245bffb58..b20aae422 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs @@ -1,39 +1,97 @@ using bts.api; +using bts.spark; +using mbts; using mbts.spark; using mbts.ui; -using mbts.ui.spark; +using ProtoBuf; using System; using System.Collections.Generic; -using System.Linq; using System.Reactive.Linq; using System.Threading.Tasks; -using static mbts.ui.shell.ProtoBufSerializationHelper; +using static mbts.spark.DataGridColumnFilters; -namespace bts.shell { - internal class FillsWindowFactory : ShellWindowFactory { - readonly IBus _bus; - readonly SecuritySource _ssrc; +namespace bts.shell +{ + class FillsWindowFactory : ShellWindowFactory + { + IBus _bus; + IWindowManager _wm; + IReadOnlyDictionary _securities = new Dictionary(); - public FillsWindowFactory(IShellModule owner, IBus bus, SecuritySource ssrc) : base(owner, "Fills") { + public FillsWindowFactory(TradingShellModule module, IBus bus, IWindowManager wm) : base(module, "Fills") { _bus = bus; - _ssrc = ssrc; - _dispose = _bus.subscribe(SparkTags.ShowFillsTag).Subscribe(show_fills_window); + _wm = wm; + _dispose = Disposable.Create( + bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s), + bus.subscribe(SparkTags.ShowFillsTag).ObserveOnDispatcher().Subscribe(show) + ); } - - void show_fills_window(SecurityCriteria secs) { - } - IShellWindow create_fills_window(IEnumerable secs, IEnumerable sort) { - var vm = new FillsVM(this, _bus, new DemoOrdersModel(_bus), _ssrc, secs, sort); - var view = new FillsView { DataContext = vm, Width = 1024, Height = 800 }; - return ShellWindow.create(module, "Fills", view, vm.get_state, Icons.Ticket); - } - IShellWindow create_fills_window(FillsVM.StartupData startup_data) { - return create_fills_window(startup_data.securities?.Select(x => (SecurityImmutable)deserialize(x)).ToList(), startup_data.sorting_criteria); + public override async Task load(StartupData state) { + return await FillsWindow.create(this, _bus, state, SparkCommands.PickFills.icon); } - public override Task load(FillsVM.StartupData state) { - return Task.FromResult(create_fills_window(state)); + public async void show(SecurityCriteria criteria) { + var w = await load(new StartupData(criteria)); + _bus.post(SparkTags.ShowWindow, w); + } + + [ProtoContract] + public class StartupData + { + public const int Version = 1; + public StartupData() { } + public StartupData(SecurityCriteria securities) : this(securities, null, null) { } + public StartupData(SecurityCriteria securities, List sorting_criteria, FilterStates filters) { + this.security_criteria = securities; + this.sorting_criteria = sorting_criteria; + this.filters = filters; + } + [ProtoMember(1)] + public SecurityCriteria security_criteria; + [ProtoMember(2)] + public List sorting_criteria; + [ProtoMember(3)] + public FilterStates filters; + } + + [ProtoContract] + public class FilterStates + { + [ProtoMember(1)] + public TimeFilterState order_time; + [ProtoMember(2)] + public TimeFilterState fill_time; + [ProtoMember(3)] + public Order.Types.TimeInForce[] time_in_force; + [ProtoMember(4)] + public Order.AlgoOrderTypeOneofCase[] order_type; + [ProtoMember(5)] + public string[] account; + [ProtoMember(6)] + public string[] user; + [ProtoMember(7)] + public Venue[] exchange; + [ProtoMember(8)] + public SecurityCriteria security; + [ProtoMember(9)] + public Side[] side; + [ProtoMember(10)] + public DoubleMinMaxState price; + [ProtoMember(11)] + public UIntMinMaxState size; + [ProtoMember(12)] + public DoubleMinMaxState fill_percentage; + [ProtoMember(13)] + public DoubleMinMaxState order_percentage; + [ProtoMember(14)] + public OrderStatus.Types.Status[] order_status; + [ProtoMember(15)] + public string bts_fill_id; + [ProtoMember(16)] + public string bts_order_id; + [ProtoMember(17)] + public string exch_order_id; } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/TradingShellModule.cs b/src/client/spark/Modules/Trading/TradingShellModule.cs index 135868333..b6e20fdac 100644 --- a/src/client/spark/Modules/Trading/TradingShellModule.cs +++ b/src/client/spark/Modules/Trading/TradingShellModule.cs @@ -27,7 +27,7 @@ namespace bts.shell { public TradingShellModule(IBus bus, IWindowManager wm, SecuritySource ssrc, OrdersModel orders_model) { _lwf = new LadderWindowFactory(this, bus, wm); _obwf = new OrderBookWindowFactory(this, bus, orders_model); - _fwf = new FillsWindowFactory(this, bus, ssrc); + _fwf = new FillsWindowFactory(this, bus, wm); _plwf = new PositionWindowFactory(this, bus); _order_tickets = new ShowOrderTicketHandler(bus); } diff --git a/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs b/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs index fe758d00c..1c827f2d2 100644 --- a/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/GenericCollectionExtensions.cs @@ -9,26 +9,24 @@ namespace System.Collections.Generic public static class EnumerableExtensions { #region Ordered - public static IOrderedEnumerable Ordered(this IEnumerable enumerable) { - return enumerable.OrderBy(t => t); - } + public static IOrderedEnumerable Ordered(this IEnumerable enumerable) => + enumerable.OrderBy(t => t); - public static IEnumerable Ordered(this IEnumerable enumerable, Func compare) { - return enumerable.Ordered(Comparer.Create(new Comparison(compare))); - } + public static IEnumerable Ordered(this IEnumerable enumerable, Func compare) => + enumerable.Ordered(Comparer.Create(new Comparison(compare))); - public static IEnumerable Ordered(this IEnumerable enumerable, IComparer comparer) { - return enumerable.OrderBy(t => t, comparer); - } + public static IEnumerable Ordered(this IEnumerable enumerable, IComparer comparer) => + enumerable.OrderBy(t => t, comparer); #endregion - public static IEnumerable DistinctOn(this IEnumerable enumerable, Func key_selector) { - return enumerable.Distinct(EqualityComparer.Create((x, y) => key_selector(x).Equals(key_selector(y)), x => key_selector(x).GetHashCode())); - } + public static IEnumerable DistinctOn(this IEnumerable enumerable, Func key_selector) => + enumerable.Distinct(EqualityComparer.Create((x, y) => key_selector(x).Equals(key_selector(y)), x => key_selector(x).GetHashCode())); - public static IEnumerable Intersect(this IEnumerable enumerable, IEnumerable intersection, Func key_selector) { - return enumerable.Where(t => intersection.Contains(key_selector(t))); - } + public static IEnumerable Intersect(this IEnumerable enumerable, IEnumerable intersection, Func key_selector) => + enumerable.Where(t => intersection.Contains(key_selector(t))); + + public static T[] ToLArray(this IEnumerable enumerable) => + enumerable.ToList().ToArray(); } public static class CollectionExtensions @@ -80,9 +78,8 @@ namespace System.Collections.Generic public static class ListExtensions { #region InserSorted - public static void InsertSorted(this IList list, T item) { + public static void InsertSorted(this IList list, T item) => list.InsertSorted(item, Comparer.Default); - } public static void InsertSorted(this IList list, T item, IComparer comparer) { for (int i = 0; i < list.Count; i++) @@ -140,9 +137,9 @@ namespace System.Collections.ObjectModel return to_remove.Count; } - public static void ReflectChange(this ObservableCollection target, IEnumerable source, Func create_item, NotifyCollectionChangedEventArgs e) { + public static void ReflectChange(this ObservableCollection target, IEnumerable source, Func create_item, NotifyCollectionChangedEventArgs e) => ReflectChange(target, source, create_item, null, e); - } + public static void ReflectChange(this ObservableCollection target, IEnumerable source, Func create_item, Action item_destroyed, NotifyCollectionChangedEventArgs e) { try { switch (e.Action) { @@ -219,18 +216,15 @@ namespace mbts.collections.extensions public static class DictionaryExtensions { #region GetValueOrDefault - public static TValue GetValueOrDefault(this IReadOnlyDictionary dictionary, TKey key) { - return dictionary.TryGetValue(key, out TValue result) ? result : default(TValue); - } + public static TValue GetValueOrDefault(this IReadOnlyDictionary dictionary, TKey key) => + dictionary.TryGetValue(key, out TValue result) ? result : default(TValue); - public static TValue GetValueOrDefault(this IDictionary dictionary, TKey key) { - return dictionary.TryGetValue(key, out TValue result) ? result : default(TValue); - } + public static TValue GetValueOrDefault(this IDictionary dictionary, TKey key) => + dictionary.TryGetValue(key, out TValue result) ? result : default(TValue); #endregion - public static TValue GetValue(this IDictionary dictionary, TKey key, TValue error_val) { - return dictionary.TryGetValue(key, out TValue result) ? result : error_val; - } + public static TValue GetValue(this IDictionary dictionary, TKey key, TValue error_val) => + dictionary.TryGetValue(key, out TValue result) ? result : error_val; public static void AddOrUpdate(this IDictionary dictionary, TKey key, Action update_existing, Func create_new) { if (dictionary.TryGetValue(key, out TValue curr)) update_existing(curr); 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(); diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/IDataGridColumnFilter.cs b/src/client/spark/view/Controls/DataGridEx/Filters/IDataGridColumnFilter.cs index c2108f1c3..6da0c411a 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/IDataGridColumnFilter.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/IDataGridColumnFilter.cs @@ -277,11 +277,9 @@ namespace mbts.spark #region Time public class Time : FilterBase { - public Time(Func get_row_val, string prop_name) : base(get_row_val, prop_name) { - _time_filter = backing(nameof(time_filter), TimeFilter.get_default()); - } + public Time(Func get_row_val, string prop_name) : base(get_row_val, prop_name) { } - readonly Property _time_filter; + TimeFilter _time_filter = TimeFilter.get_default(); protected override bool _get_active() => time_filter.filter_mode != TimeFilter.Mode.Off; protected override bool _filter(DateTime value) { @@ -292,15 +290,18 @@ namespace mbts.spark } } public override void load_state(TimeFilterState state) { - time_filter = new TimeFilter(state.mode, state.time); - _raise_filter_changed(); + if (state != null) { + time_filter = new TimeFilter(state.mode, state.time); + _raise_filter_changed(); + RaisePropertyChanged(nameof(time_filter)); + } } public override TimeFilterState get_state() { return new TimeFilterState { mode = time_filter.filter_mode, time = time_filter.date_time }; } public TimeFilter time_filter { - get => _time_filter.Value; + get => _time_filter; set { - _time_filter.Value = value; + _time_filter = value ?? TimeFilter.get_default(); _raise_filter_changed(); } } @@ -344,14 +345,16 @@ namespace mbts.spark protected override bool _get_active() => _selected_items.Count > 0; protected override bool _filter(TValue value) => selected_items.Contains(value); public override async void load_state(TState state) { - _selected_items.CollectionChanged -= _selected_items_CollectionChanged; - int n_tries = 0; - var e_items = await _load_state(state); - var l_items = e_items.ToList(); - while (!l_items.All(items.Contains) && ++n_tries < 50) await Task.Delay(100); - _selected_items.sync_with(l_items); - _raise_filter_changed(); - _selected_items.CollectionChanged += _selected_items_CollectionChanged; + if (state != null) { + _selected_items.CollectionChanged -= _selected_items_CollectionChanged; + int n_tries = 0; + var e_items = await _load_state(state); + var l_items = e_items.ToList(); + while (!l_items.All(items.Contains) && ++n_tries < 50) await Task.Delay(100); + _selected_items.sync_with(l_items); + _raise_filter_changed(); + _selected_items.CollectionChanged += _selected_items_CollectionChanged; + } } public override TState get_state() { return _get_state(_selected_items); } @@ -361,8 +364,8 @@ namespace mbts.spark public class DiscreteValues : DiscreteValues { - public DiscreteValues(ObservableCollection rows, Func get_row_val, string prop_name) : base(rows, get_row_val, v => v.ToArray(), v => v, prop_name) { } - public DiscreteValues(ObservableCollection rows, Func get_row_val, string prop_name, IEqualityComparer equality_comparer) : base(rows, get_row_val, v => v.ToArray(), v => v, prop_name, equality_comparer) { } + public DiscreteValues(ObservableCollection rows, Func get_row_val, string prop_name) : base(rows, get_row_val, v => v.ToLArray(), v => v, prop_name) { } + public DiscreteValues(ObservableCollection rows, Func get_row_val, string prop_name, IEqualityComparer equality_comparer) : base(rows, get_row_val, v => v.ToLArray(), v => v, prop_name, equality_comparer) { } } #endregion diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml b/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml index 56ad9e23e..c43063ed7 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml +++ b/src/client/spark/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml @@ -38,4 +38,10 @@ + + + + + + \ No newline at end of file diff --git a/src/client/spark/view/Converters/EnumStringConverters/EnumCaseStringConverter.cs b/src/client/spark/view/Converters/EnumStringConverters/EnumCaseStringConverter.cs index 6954c53fd..b267e2d86 100644 --- a/src/client/spark/view/Converters/EnumStringConverters/EnumCaseStringConverter.cs +++ b/src/client/spark/view/Converters/EnumStringConverters/EnumCaseStringConverter.cs @@ -14,7 +14,7 @@ namespace mbts.ui.converters if (value is T) t = (T)value; string raw_str = t.ToString(); - return raw_str.Substring(0, 1) + new String(raw_str.Skip(1).Select(Char.ToLower).ToArray()); + return raw_str.Substring(0, 1) + new String(raw_str.Skip(1).Select(Char.ToLower).ToLArray()); } public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) { diff --git a/src/client/spark/view/Spark/Utilities/SecurityDataHelper.cs b/src/client/spark/view/Spark/Utilities/SecurityDataHelper.cs index 3119c69cf..b0c7b2644 100644 --- a/src/client/spark/view/Spark/Utilities/SecurityDataHelper.cs +++ b/src/client/spark/view/Spark/Utilities/SecurityDataHelper.cs @@ -17,8 +17,8 @@ namespace mbts.spark if (y == null) return 1; if (x.ContractCase == ContractOneofCase.Future) return y.ContractCase == ContractOneofCase.Future ? Compare(x.Symbol, x.Future, y.Symbol, y.Future) : -1; if (y.ContractCase == ContractOneofCase.Future) return 1; - var xlegs = SecurityHelper.get_flat_future_legs(x).ToArray(); - var ylegs = SecurityHelper.get_flat_future_legs(y).ToArray(); + var xlegs = SecurityHelper.get_flat_future_legs(x).ToLArray(); + var ylegs = SecurityHelper.get_flat_future_legs(y).ToLArray(); int max = Math.Min(xlegs.Length, ylegs.Length); for (int i = 0; i < max; i++) { int rv = Compare(xlegs[i].Item2, xlegs[i].Item3, ylegs[i].Item2, ylegs[i].Item3);