diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs index b95459cc6..d566f7441 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs @@ -38,7 +38,6 @@ namespace mbts.spark { price_filter.load_state(filters.price); size_filter.load_state(filters.size); aggressor_filter.load_state(filters.aggressor_sides); - trade_key_filter.load_state(filters.trade_key); security_key_filter.load_state(filters.security_key); } // Columns @@ -47,7 +46,6 @@ namespace mbts.spark { add_column(TimeAndSalesView.Columns.Price, DefaultColumnHeaders.Price, DefaultColumnWidths.Price, nameof(Row.price), price_filter, DataGridFilterKnownTemplates.DoubleMinMax, System.Windows.HorizontalAlignment.Right); add_column(TimeAndSalesView.Columns.Size, DefaultColumnHeaders.Size, DefaultColumnWidths.Size, nameof(Row.size), size_filter, DataGridFilterKnownTemplates.UIntMinMax, System.Windows.HorizontalAlignment.Right); add_column(TimeAndSalesView.Columns.Aggressor, DefaultColumnHeaders.Aggressor, DefaultColumnWidths.Aggressor, nameof(Row.aggressor_side), aggressor_filter, DataGridFilterKnownTemplates.EnumValues); - add_column(TimeAndSalesView.Columns.TradeKey, DefaultColumnHeaders.TradeKey, DefaultColumnWidths.TradeKey, nameof(Row.trade_key), trade_key_filter, DataGridFilterKnownTemplates.Regex); add_column(TimeAndSalesView.Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, DefaultColumnWidths.SecurityKey, nameof(Row.security_key), security_key_filter, DataGridFilterKnownTemplates.Regex); void add_column(TimeAndSalesView.Columns col_key, string header, double width, string sort_member_path, IDataGridColumnFilter filter, string filter_template, System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) => columns.Add(new TimeAndSalesColumn( @@ -66,7 +64,7 @@ namespace mbts.spark { _resources.AddRange( show_ladder, DataGridFilterHelper.hook_filters( - rows_view, time_filter, security_filter, price_filter, size_filter, aggressor_filter, trade_key_filter, security_key_filter), + rows_view, time_filter, security_filter, price_filter, size_filter, aggressor_filter, security_key_filter), settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager) ); rows_view.set_sort_descriptions(startup_data.sorting_criterion, columns); @@ -103,7 +101,6 @@ namespace mbts.spark { public IDataGridColumnPersistentFilter size_filter { get; } = new UIntMinMax(r => r.size, nameof(Row.size)); public IDataGridColumnPersistentFilter aggressor_filter { get; } = DiscreteValuesFilterVM.Create(EnumHelper.get_values().ToArray(), r => r.aggressor_side, nameof(Row.aggressor_side)); public IDataGridColumnPersistentFilter security_key_filter { get; } = new RegexFilterVM(r => r.security_key.ToString(), nameof(Row.security_key)); - public IDataGridColumnPersistentFilter trade_key_filter { get; } = new RegexFilterVM(r => r.trade_key.ToString(), nameof(Row.trade_key)); FilterStates _get_filter_states() => new FilterStates { @@ -111,7 +108,6 @@ 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(), aggressor_sides = aggressor_filter.get_state() }; @@ -175,7 +171,6 @@ namespace mbts.spark { case TimeAndSalesView.Columns.Price: return _price_text; case TimeAndSalesView.Columns.Size: return _size_text; case TimeAndSalesView.Columns.Aggressor: return _aggressor_text; - case TimeAndSalesView.Columns.TradeKey: return _trade_key_text; case TimeAndSalesView.Columns.SecurityKey: return _security_key_text; default: return null; } diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs index fff762c5c..ab066f2dd 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs @@ -7,7 +7,7 @@ namespace mbts.ui.spark { /// Interaction logic for TimeAndSalesView.xaml /// partial class TimeAndSalesView : UserControl { - public enum Columns { Time, Security, Price, Size, OrderType, TradeKey, SecurityKey, Aggressor } + public enum Columns { Time, Security, Price, Size, OrderType, SecurityKey, Aggressor } public TimeAndSalesView() => InitializeComponent(); diff --git a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs index 16b1ba341..a5719bdbc 100644 --- a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs +++ b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs @@ -84,7 +84,6 @@ namespace bts.shell { public static GridColumnSettings price => new GridColumnSettings(col_id(Columns.Price), DefaultColumnHeaders.Price, width: DefaultColumnWidths.Price, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings size => new GridColumnSettings(col_id(Columns.Size), DefaultColumnHeaders.Size, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right); public static GridColumnSettings aggressor => new GridColumnSettings(col_id(Columns.Aggressor), DefaultColumnHeaders.Aggressor, width: DefaultColumnWidths.Aggressor); - public static GridColumnSettings trade_key => new GridColumnSettings(col_id(Columns.TradeKey), DefaultColumnHeaders.TradeKey, width: DefaultColumnWidths.TradeKey); public static GridColumnSettings security_key => new GridColumnSettings(col_id(Columns.SecurityKey), DefaultColumnHeaders.SecurityKey, width: DefaultColumnWidths.SecurityKey); public static IEnumerable default_sorting_criterion { @@ -100,7 +99,6 @@ namespace bts.shell { yield return price; yield return size; yield return aggressor; - yield return trade_key; yield return security_key; } } @@ -117,8 +115,8 @@ namespace bts.shell { public DoubleMinMaxState price; [ProtoMember(4)] public UIntMinMaxState size; - [ProtoMember(5)] - public string trade_key; + // [ProtoMember(5)] + // ProtoMember 5 cannot be used further [ProtoMember(6)] public string security_key; [ProtoMember(7)] diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index 02ff43b49..336861a5c 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -36,7 +36,6 @@ namespace mbts.ui.controls { Symbol = 78, Time = 112, TimeInForce = 47, - TradeKey = 76, User = 53, Aggressor = 80, Volume = 74, @@ -71,7 +70,6 @@ namespace mbts.ui.controls { ImpliedSize = "Qty (I)", Symbol = "Symbol", TimeInForce = "TIF", - TradeKey = "Trade Key", User = "User", Time = "Time", Aggressor = "Aggressor",