From 860bda388fb2e85650ead8a67b9e262a0061d9d8 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 19 Oct 2019 16:31:57 -0500 Subject: [PATCH] ensure latest column settings retrieved from GridSettingsManager --- src/client/spark/Modules/Trading/Fills/FillsVM.cs | 2 +- .../spark/Modules/Trading/OrderBook/OrderBookVM.cs | 2 +- .../OrderBook/Settings/OrderBookGridSettingsManager.cs | 2 +- .../Controls/DIYGrid/Settings/GridSettingsManager.cs | 10 ++++++++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index d8745ed03..caa8ed9d4 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -205,7 +205,7 @@ namespace mbts.spark { if (_settings_manager.instance_settings == null) return null; else - return grid_settings_manager.grid_settings; + return grid_settings_manager.create(); } public FillsFilterStates get_filters() => diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 497449a59..d977eaa56 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -696,7 +696,7 @@ namespace mbts.spark { new OrderBookFillsGridSettings { sorting_criterion = fills_vm.get_sorting_criterion().ToList(), filters = fills_vm.get_filters(), - general = fills_vm.grid_settings_manager.grid_settings + general = fills_vm.grid_settings_manager.create() }; static OrderRecordTuplePredicate.PredicateTypeOneofCase _corresponding_predicate_type(Columns col) { diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookGridSettingsManager.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookGridSettingsManager.cs index 9a4ebcb45..35896324a 100644 --- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookGridSettingsManager.cs +++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookGridSettingsManager.cs @@ -78,7 +78,7 @@ namespace bts.shell.orderbook { public OrderBookGridSettings create(IEnumerable sorting_criterion) => new OrderBookGridSettings( - core_manager.grid_settings, + core_manager.create(), _predicate_animations.ToList()) { algo_tree_display_mode = _algo_tree_display_mode }; diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsManager.cs b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsManager.cs index bad31654a..a43425433 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsManager.cs +++ b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsManager.cs @@ -1,3 +1,4 @@ +using bts; using bts.utils; using mbts.spark; using mbts.ui.settings; @@ -44,6 +45,15 @@ namespace mbts.ui { public SolidColorBrush selection_highlight => _selection_highlight.Value; public SolidColorBrush background_color => _background_color.Value; + public GridSettings create() { + try { + _grid_settings.set(grid_settings.with(columns: _columns.Select(c => c.create()))); + } catch (Exception ex) { + Log.Ui.warn($"Error refreshing grid settings (may be benign, if caused by accessing a ColumnBase property after window closed): {ex}."); + } + return grid_settings; + } + public GridSettingsVM create_vm() => new GridSettingsVM(_column_flags?.ToDictionary(kv => kv.Key, kv => kv.Value.flags));