From ac76462f7e8932ef39ce276dcfc27d91c2d2f36c Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 17 May 2019 19:01:46 -0500 Subject: [PATCH] DiscreteValuesFilterVM.CreateTableUpdate - removed unused 'row_key' param --- .../spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 2 -- .../DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 85f7222d4..2ff25a0d8 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -176,7 +176,6 @@ namespace mbts.spark { _wrap_comparer(r => r.order_type), DiscreteValuesFilterVM.CreateTableUpdate( o => new AlgoDataVM(o.algo.GetValueOrDefault()), - o => AlgoID.from_order_def(o.order.Def), vm => AlgoID.from_algo_key(vm.data.key), out var order_type_filter_observer, out var order_type_items_view))); _resources.Add(algo_items_source.Subscribe(order_type_filter_observer)); order_type_items_view.CustomSort = algo_items_comp; @@ -189,7 +188,6 @@ namespace mbts.spark { _wrap_comparer(r => r.order_tuple.root_algo.value.CustomCase), DiscreteValuesFilterVM.CreateTableUpdate( o => new AlgoDataVM(o.root_algo), - o => AlgoID.from_algo_key(o.root_algo.key), vm => AlgoID.from_algo_key(vm.data.key), out var root_algo_type_observer, out var root_algo_type_items_view), DefaultColumnHeaders.RootAlgoType)); _resources.Add(algo_items_source.Subscribe(root_algo_type_observer)); diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs index 3658c5413..b00374fa1 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs @@ -63,8 +63,8 @@ namespace mbts.spark.filters { ) => new DynamicItemsFilter(items, get_row_val, get_state, load_state, prop_name, equality_comparer ?? EqualityComparer.Default, comparer); public static IDataGridColumnPersistentFilter CreateTableUpdate( - Func factory, Func row_key, Func key, out IObserver> items_observer, out ListCollectionView items_view) where TKey : struct, IEquatable { - var filter = new TableUpdateItemsFilter(factory, row_key, key, keys => keys, keys => keys.ToArray()); + Func factory, Func key, out IObserver> items_observer, out ListCollectionView items_view) where TKey : struct, IEquatable { + var filter = new TableUpdateItemsFilter(factory, key, keys => keys, keys => keys.ToArray()); items_observer = filter; items_view = filter.items_view; return filter; @@ -255,17 +255,15 @@ namespace mbts.spark.filters { readonly KeyedMultiSelector _selection_model; readonly Func _key; readonly Func _factory; - readonly Func _row_key; readonly Func> _load_state; readonly Func, TState> _get_state; readonly IEqualityComparer _comparer; readonly HashSet _selected_keys = new HashSet(), _desired_keys = new HashSet(); ListCollectionView _items_view; - public TableUpdateItemsFilter(Func factory, Func row_key, Func key, Func> load_state, Func, TState> get_state) + public TableUpdateItemsFilter(Func factory, Func key, Func> load_state, Func, TState> get_state) : base(factory, null) { _factory = factory; - _row_key = row_key; _key = key; _load_state = load_state; _get_state = get_state;