diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 523ea62c8..841e32391 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -1,6 +1,7 @@ using bts.api; using bts.api.core; using bts.api.orderman; +using bts.collections; using bts.spark; using bts.utils; using mbts.collections; @@ -14,7 +15,6 @@ using mbts.ui.shell; using mbts.ui.utility; using mbts.utils; using System; -using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Collections.Specialized; @@ -34,7 +34,7 @@ using OrderType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase; namespace mbts.spark { class FillsVM : DisposableViewModelBase, IHandleGridSorting { readonly OrdersModel _model; - readonly RXOperableCollection _rows; + readonly OperableCollection _rows; readonly DIYGridSortManager _sort_manager; readonly IDIYGridFiltersManager _filters_manager; readonly ObservableKeyedCollection _columns = new ObservableKeyedCollection(_col_key); @@ -87,7 +87,7 @@ namespace mbts.spark { add_col(Columns.OrderKey, DefaultColumnHeaders.OrderKey, r => r.order_key.ToString(), new RegexFilterVM(r => r.fill.OrderKey.ToString()), DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.OrderKey); add_col(Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, r => r.security_key.ToString(), new RegexFilterVM(r => r.fill.SecurityKey.ToString()), DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.SecurityKey); /// Rows - _rows = new RXOperableCollection( + _rows = new OperableCollection( (ft, fk) => new Row(ft, model), ft => ft.fill.FillKey, new ComparerBuilder(new[] { diff --git a/src/client/spark/view/Utility/RXCollection.cs b/src/client/spark/view/Utility/RXCollection.cs index cadd11e2e..f5d8f76b1 100644 --- a/src/client/spark/view/Utility/RXCollection.cs +++ b/src/client/spark/view/Utility/RXCollection.cs @@ -1,6 +1,4 @@ -using bts.api.core; -using bts.collections; -using bts.utils; +using bts.collections; using mbts.utils; using System; using System.Collections; @@ -125,69 +123,4 @@ namespace mbts.ui.utility { } } } - - class RXOperableCollection : ObservableCollection where TKey : IEquatable { - readonly Func _factory; - readonly Func _key; - readonly IEqualityComparer _eq_comparer; - IReadOnlyDictionary _map = DictionaryHelper.empty(); - - SortedList _sorted_items; - Func _filter; - IComparer _comparer; - - public RXOperableCollection(Func factory, Func key, IComparer comparer) { - _factory = factory; - _key = key; - _eq_comparer = EqualityComparer.Create(key); - _comparer = comparer; - _sorted_items = new SortedList(comparer ?? throw new ArgumentNullException(nameof(comparer))); - } - - public IComparer comparer { get => _comparer; set => _set_comparer(value); } - public Func filter { get => _filter; set => _set_filter(value); } - - public void reset(IComparer comparer, Func filter) { - _filter = filter; - _comparer = comparer; - _reset(new SortedList(filter == null ? _map.Values : _map.Values.Where(filter), comparer)); - } - - public void update(TableUpdate table) { - _map = table.state; - IEnumerable added, removed; - if (filter == null) { - added = table.added.Concat(table.changed); - removed = table.removed.Concat(table.changes.Select(ch => ch.Old)); - } else { - added = table.added.Where(filter).Concat(table.changed.Where(filter)); - removed = table.removed.Where(filter).Concat(table.changes.Select(ch => ch.Old).Where(filter)); - } - foreach (var v in removed) { - _sorted_items.Remove(v, out int? old_pos); - // don't bother checking 'old_pos.HasValue' - removes should always be successful (if not, an exception should be thrown anyways bc the situation is untenable). - RemoveAt(old_pos.Value); - } - foreach (var v in added) { - _sorted_items.Add(v, out int new_pos); - Insert(new_pos, _factory(v, _key(v))); - } - } - - void _set_comparer(IComparer new_comp) { - _comparer = new_comp ?? throw new ArgumentNullException(nameof(new_comp)); - _reset(new SortedList(_sorted_items, new_comp)); - } - - void _set_filter(Func filter) { - _filter = filter; - _reset(new SortedList(filter == null ? _map.Values : _map.Values.Where(filter), comparer)); - } - - void _reset(SortedList new_sorted_items) { - var changes = Diff.diff(_sorted_items, new_sorted_items, _eq_comparer).ToList(); - _sorted_items = new_sorted_items; - Diff.apply_diff(this, _sorted_items, changes, m => _factory(m, _key(m))); - } - } -} +} \ No newline at end of file diff --git a/src/client/spark_core/Collections/Operable/OperableCollection.cs b/src/client/spark_core/Collections/Operable/OperableCollection.cs new file mode 100644 index 000000000..badb05afd --- /dev/null +++ b/src/client/spark_core/Collections/Operable/OperableCollection.cs @@ -0,0 +1,73 @@ +using bts.api.core; +using bts.utils; +using System; +using System.Collections.Generic; +using System.Collections.ObjectModel; +using System.Linq; + +namespace bts.collections { + class OperableCollection : ObservableCollection where TKey : IEquatable { + readonly Func _factory; + readonly Func _key; + readonly IEqualityComparer _eq_comparer; + IReadOnlyDictionary _map = DictionaryHelper.empty(); + + SortedList _sorted_items; + Func _filter; + IComparer _comparer; + + public OperableCollection(Func factory, Func key, IComparer comparer) { + _factory = factory; + _key = key; + _eq_comparer = EqualityComparer.Create(key); + _comparer = comparer; + _sorted_items = new SortedList(comparer ?? throw new ArgumentNullException(nameof(comparer))); + } + + public IComparer comparer { get => _comparer; set => _set_comparer(value); } + public Func filter { get => _filter; set => _set_filter(value); } + + public void reset(IComparer comparer, Func filter) { + _filter = filter; + _comparer = comparer; + _reset(new SortedList(filter == null ? _map.Values : _map.Values.Where(filter), comparer)); + } + + public void update(TableUpdate table) { + _map = table.state; + IEnumerable added, removed; + if (filter == null) { + added = table.added.Concat(table.changed); + removed = table.removed.Concat(table.changes.Select(ch => ch.Old)); + } else { + added = table.added.Where(filter).Concat(table.changed.Where(filter)); + removed = table.removed.Where(filter).Concat(table.changes.Select(ch => ch.Old).Where(filter)); + } + foreach (var v in removed) { + _sorted_items.Remove(v, out int? old_pos); + // don't bother checking 'old_pos.HasValue' - removes should always be successful (if not, an exception should be thrown anyways bc the situation is untenable). + RemoveAt(old_pos.Value); + } + foreach (var v in added) { + _sorted_items.Add(v, out int new_pos); + Insert(new_pos, _factory(v, _key(v))); + } + } + + void _set_comparer(IComparer new_comp) { + _comparer = new_comp ?? throw new ArgumentNullException(nameof(new_comp)); + _reset(new SortedList(_sorted_items, new_comp)); + } + + void _set_filter(Func filter) { + _filter = filter; + _reset(new SortedList(filter == null ? _map.Values : _map.Values.Where(filter), comparer)); + } + + void _reset(SortedList new_sorted_items) { + var changes = Diff.diff(_sorted_items, new_sorted_items, _eq_comparer).ToList(); + _sorted_items = new_sorted_items; + Diff.apply_diff(this, _sorted_items, changes, m => _factory(m, _key(m))); + } + } +} \ No newline at end of file