From eade3d0ee3bd89e335edced07a9ece6bfaeb08fc Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 24 Jan 2022 18:18:35 -0500 Subject: [PATCH] fix: Use consistent window-type ids for saving/loading vs wins Bugs (fixed): The vol surface, and exp params windows aren't restored with workspace --- .../AnalyticsExpirationParametersWindow.cs | 4 ++-- src/client/spark/AW2/VolSurfaceModule.cs | 9 ++------- src/client/spark/AW2/VolSurfaceWindow.cs | 5 +++-- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersWindow.cs b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersWindow.cs index 1ba56c348..f60471d99 100644 --- a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersWindow.cs +++ b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersWindow.cs @@ -8,7 +8,7 @@ using System.Windows; class AnalyticsExpirationParametersWindow : SparkWindow { - const string _window_type = nameof(AnalyticsExpirationParametersWindow); + public const string WINDOW_TYPE = "Analytics Expiration Parameters"; readonly Lazy _model; readonly Lazy _vm; @@ -29,7 +29,7 @@ }); } - public override string window_type => _window_type; + public override string window_type => WINDOW_TYPE; public override AnalyticsExpirationParametersSettings SaveState => _vm.IsValueCreated ? _vm.Value.get_state() : null; diff --git a/src/client/spark/AW2/VolSurfaceModule.cs b/src/client/spark/AW2/VolSurfaceModule.cs index 2528f828a..995ce13f3 100644 --- a/src/client/spark/AW2/VolSurfaceModule.cs +++ b/src/client/spark/AW2/VolSurfaceModule.cs @@ -7,7 +7,6 @@ namespace mbts.spark { using mbts.analytics; using mbts.ui; - using mbts.ui.controls; using mbts.ui.shell; using System; @@ -24,10 +23,6 @@ namespace mbts.spark { [Export(typeof(IShellModule))] class VolSurfaceModule : ViewModelBase, IShellModule, IShellModuleViewFactory { - public const string ANALYTICS_EXPIRATION_PARAMETERS_HEADER = "Analytics Expiration Parameters"; - public const string MAIN_WINDOW_HEADER = "Main Window"; - public const string DETAILED_GRID_HEADER = "Detailed Grid"; - readonly IBus _bus; readonly IWindowManager _wm; readonly VolSurfaceWindowFactory _vol_surface_window_factory; @@ -94,8 +89,8 @@ namespace mbts.spark { IShellWindowFactory _window_factory_for_header(string header) => header switch { - MAIN_WINDOW_HEADER => _vol_surface_window_factory, - ANALYTICS_EXPIRATION_PARAMETERS_HEADER => _exp_params_window_factory, + VolSurfaceWindow.WINDOW_TYPE => _vol_surface_window_factory, + AnalyticsExpirationParametersWindow.WINDOW_TYPE => _exp_params_window_factory, _ => null, }; diff --git a/src/client/spark/AW2/VolSurfaceWindow.cs b/src/client/spark/AW2/VolSurfaceWindow.cs index 480f431a1..0e94aa9f1 100644 --- a/src/client/spark/AW2/VolSurfaceWindow.cs +++ b/src/client/spark/AW2/VolSurfaceWindow.cs @@ -6,13 +6,14 @@ using mbts.ui; using mbts.ui.extensions; using mbts.ui.shell; - using mbts.ui.utility; using System; using System.Windows; using System.Windows.Controls; class VolSurfaceWindow : SparkWindow, ISharedWindow { + public const string WINDOW_TYPE = "VolSurface"; + readonly VolSurfaceWindowSettings _startup_data; readonly IWindowManager _window_manager; @@ -36,7 +37,7 @@ public int vs_id => _startup_data.id; public string vs_name { get; } - static string _window_type => "VolSurface"; + static string _window_type => WINDOW_TYPE; public override VolSurfaceWindowSettings SaveState => _vm?.get_startup_data(); public override UIElement Content => _dummy_view;