From ffdd0fcff7858b015b04005991d0954a255a7fc6 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 9 Feb 2022 18:37:35 -0500 Subject: [PATCH] fix: Remove item from vis series when removed from series --- src/client/spark/core/Utility/SelectAllToggle.cs | 7 +++++-- .../spark/view/Controls/Graph/SeriesSetVM.cs | 14 +++++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/client/spark/core/Utility/SelectAllToggle.cs b/src/client/spark/core/Utility/SelectAllToggle.cs index 5abace68f..9a2e9a778 100644 --- a/src/client/spark/core/Utility/SelectAllToggle.cs +++ b/src/client/spark/core/Utility/SelectAllToggle.cs @@ -2,9 +2,12 @@ using System; using System.Collections; static class SelectAllToggle { - public static bool? is_all_selected(int num_total, int num_selected) { + public static bool? is_all_selected(int num_total, int num_selected, bool require_valid = false) { if (num_selected > num_total) { - throw new ArgumentException($"{nameof(num_selected)} is greater than {nameof(num_total)}", nameof(num_selected)); + if (require_valid) { + throw new ArgumentException($"{nameof(num_selected)} is greater than {nameof(num_total)}", nameof(num_selected)); + } + return null; } return num_total switch { 0 => null, diff --git a/src/client/spark/view/Controls/Graph/SeriesSetVM.cs b/src/client/spark/view/Controls/Graph/SeriesSetVM.cs index de1e8bc68..ee0eff605 100644 --- a/src/client/spark/view/Controls/Graph/SeriesSetVM.cs +++ b/src/client/spark/view/Controls/Graph/SeriesSetVM.cs @@ -23,12 +23,20 @@ namespace mbts.spark { public SeriesSetVM(object id = null) { this.id = id; _raise_visible_series_changed = new(() => visible_series_changed?.Invoke(_visible_series)); - _dispose = ObservableAutoWrapper.connect_item_hooks(series, s => { + _dispose = ObservableAutoWrapper.connect_item_hooks(series, connect_series); + + IDisposable connect_series(SeriesVM s) { s.is_visible_changed += on_is_visible_changed; if (s.is_visible) { on_is_visible_changed(true); } - return Disposable.Create(() => s.is_visible_changed -= on_is_visible_changed); + return Disposable.Create(() => { + if (s.is_visible) { + on_is_visible_changed(false); + } + s.is_visible_changed -= on_is_visible_changed; + }); + void on_is_visible_changed(bool value) { int count_before = _visible_series.Count; _visible_series = value ? _visible_series.Add(s) : _visible_series.Remove(s); @@ -39,7 +47,7 @@ namespace mbts.spark { RaisePropertyChanged(nameof(is_visible)); } } - }); + } } public event Action> visible_series_changed;