diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 08d6036fe..9544b1f33 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -58,13 +58,14 @@ namespace mbts.spark { SecurityHelper.Comparer.InstanceImmutable ))); // symbol - Add(symbol_column = new SimpleTextColumn( + Add(symbol_column = new SimpleTextColumn( Columns.Symbol, DefaultColumnHeaders.Symbol, nameof(OrderBookRowVM.symbol), r => r.symbol.store, DefaultColumnWidths.Symbol, - new RegexFilterVM( + DiscreteValuesFilterVM.Create( + mbts.co2.UserSymbol.get_all().Select(u => u.symbol).Distinct().ToList(), r => r.symbol.value, value_path(nameof(OrderBookRowVM.symbol)) ), @@ -216,7 +217,7 @@ namespace mbts.spark { DataGridFilterKnownTemplates.Regex)); string value_path(string cell_name) => - string.Join(".", cell_name, nameof(IOrderBookCell.value)); //uint is an arbitrary 'T', just want to get compile check on 'value' path. + string.Join(".", cell_name, nameof(OrderBookRowVM.IOrderBookCell.value)); //uint is an arbitrary 'T', just want to get compile check on 'value' path. } List> _active_filters = new List>(0); @@ -224,7 +225,7 @@ namespace mbts.spark { public event Action filter_changed; public SecurityColumn security_column { get; } - public SimpleTextColumn symbol_column { get; } + public SimpleTextColumn symbol_column { get; } public TimeCreatedColumn time_created_column { get; } public LastChangeTimeColumn last_change_column { get; } public SimpleTextColumn user_column { get; } @@ -267,7 +268,7 @@ namespace mbts.spark { exchange_message_regex = last_message_column.filter.get_state(), last_change = last_change_column.filter.get_state(), security_criteria = security_column.filter.get_state(), - symbol = symbol_column.filter.get_state() + symbols = symbol_column.filter.get_state() }; public void load_from(FilterStates fs) { @@ -276,7 +277,7 @@ namespace mbts.spark { c.filter.filter_changed -= _set_active_filters; // security_column.filter.load_state(fs.security_criteria); - symbol_column.filter.load_state(fs.symbol); + symbol_column.filter.load_state(fs.symbols); time_created_column.filter.load_state(fs.time_created); user_column.filter.load_state(fs.users); account_column.filter.load_state(fs.accounts); @@ -573,4 +574,4 @@ namespace mbts.spark { public static BindingBase get_font_weight_binding() => new Binding(nameof(OrderBookRowVM.is_child)) { Converter = _font_weight_converter }; } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index f7e4910b3..ccc45e954 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -211,6 +211,7 @@ namespace mbts.spark { yield return _price_store; yield return _avg_price_store; yield return _last_price_store; + yield return _symbol_store; } } @@ -382,4 +383,4 @@ namespace mbts.spark { return updated; } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs index 5dd80eca7..c3037472b 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs @@ -169,7 +169,7 @@ namespace bts.shell { [ProtoMember(19)] public api.orderman.OrderSubType[] order_sub_types; [ProtoMember(20)] - public string symbol; + public string[] symbols; } } } \ No newline at end of file