diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs index 1d8018789..7dabd0989 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs @@ -1,5 +1,4 @@ using bts.api; -using bts.api.orderman; using bts.co2; using mbts.ui; using mbts.ui.utility; @@ -25,9 +24,10 @@ namespace mbts.spark security_filter.load_state(filters.security); price_filter.load_state(filters.price); size_filter.load_state(filters.size); + trade_key_filter.load_state(filters.trade_key); security_key_filter.load_state(filters.security_key); } - _resources.AddRange(show_ladder, hook_filters(rows_view, time_filter, security_filter, price_filter, size_filter, security_key_filter)); + _resources.AddRange(show_ladder, hook_filters(rows_view, time_filter, security_filter, price_filter, size_filter, trade_key_filter, security_key_filter)); } protected override Row row_factory(TradeInfo row_model) => new Row(this, row_model.security, row_model.trade); @@ -46,6 +46,7 @@ namespace mbts.spark 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 security_key_filter { get; } = new RegexFinder(r => r.security_key.ToString(), nameof(Row.security_key)); + public IDataGridColumnPersistentFilter trade_key_filter { get; } = new RegexFinder(r => r.trade_key.ToString(), nameof(Row.trade_key)); public FilterStates get_filter_states() => new FilterStates { @@ -53,22 +54,31 @@ namespace mbts.spark security = security_filter.get_state(), price = price_filter.get_state(), size = size_filter.get_state(), + trade_key = trade_key_filter.get_state(), security_key = security_key_filter.get_state() }; #endregion - public class Row : SecurityRow { + public class Row : SecurityRow, IEquatable { + readonly uint _trade_key; + public Row(TimeAndSalesVM parent, SecurityImmutable security, TradeMessageImmutable trade) : base(security) { + _trade_key = trade.Key; time = trade.Time.lldatetime(); price = trade.Mantissa * Math.Pow(10, trade.Exponent); size = trade.Size; show_ladder = new DelegateCommand(() => parent._show_ladder_async(this).ignore()); } + public uint trade_key => _trade_key; public DateTime time { get; } public double price { get; } public uint size { get; } public ICommand show_ladder { get; } + + public bool Equals(Row other) => other != null && other._trade_key == _trade_key; + public override bool Equals(object obj) => Equals(obj as Row); + public override int GetHashCode() => _trade_key.GetHashCode(); } } -} +} \ 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 274d99d1a..c306139d0 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml @@ -32,7 +32,7 @@ c:DataGridFilterProperties.Filter="{Binding DataContext.security_filter, Source={u:DirectReference grid}}" c:DataGridFilterProperties.FilterActive="{Binding DataContext.security_filter.active, Source={u:DirectReference grid}}" c:DataGridFilterProperties.FilterTemplate="{StaticResource RegexFinder}"/> - + InitializeComponent(); - DataContext = vm; - } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index b437c1235..57fe51dc0 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -12,10 +12,8 @@ using System.Reactive.Linq; using System.Windows; using System.Windows.Media; -namespace mbts.spark -{ - class TimeAndSalesWindow : SparkWindow - { +namespace mbts.spark { + class TimeAndSalesWindow : SparkWindow { readonly MDConsumer _consumer; readonly TimeAndSalesWindowFactory _factory; @@ -55,7 +53,7 @@ namespace mbts.spark public override UIElement Content => _view; public override IEnumerable Commands { get; } public override TimeAndSalesWindowFactory.StartupData SaveState => _state = new TimeAndSalesWindowFactory.StartupData(_state.security_criteria, _vm.Current.rows_view.GetSortingCriteria(), _vm.Current.get_filter_states()); - public override double MinWidth => 290 + SPARK_MENU_COLLAPSED_WIDTH + LAUNCHER_BUTTON_BORDER_WIDTH; + public override double MinWidth => 444 + SPARK_MENU_COLLAPSED_WIDTH + LAUNCHER_BUTTON_BORDER_WIDTH; public override void Dispose() { Disposable.dispose(ref _subscriptions); @@ -69,7 +67,7 @@ namespace mbts.spark var model = new TimeAndSalesModel(_bus, _consumer, _state.security_criteria); _vm.Push(new TimeAndSalesVM(_bus, model, state.sorting_criteria, state.filters)); if (_view == null) - _view = new TimeAndSalesView(_vm.Current); + _view = new TimeAndSalesView { DataContext = _vm.Current }; else _view.DataContext = _vm.Current; } diff --git a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs index c89ac2e54..09693111f 100644 --- a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs +++ b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs @@ -67,6 +67,8 @@ namespace bts.shell [ProtoMember(4)] public UIntMinMaxState size; [ProtoMember(5)] + public string trade_key; + [ProtoMember(6)] public string security_key; } }