diff --git a/src/client/spark/AW2/ViewModel/VolSurfaceVM.cs b/src/client/spark/AW2/ViewModel/VolSurfaceVM.cs index 1ef389cb2..a7d319ede 100644 --- a/src/client/spark/AW2/ViewModel/VolSurfaceVM.cs +++ b/src/client/spark/AW2/ViewModel/VolSurfaceVM.cs @@ -121,21 +121,24 @@ namespace mbts.spark { if (settings == null) { return null; } - // return new VolSurfaceAdvancedSettingsEditor { - // DataContext = new VolSurfaceAdvancedSettingsEditorVM( - // VolSurfaceUtilityFunctions.clone_proto(settings.advanced_settings), - // settings.core_settings.vol_surface_name, - // advanced_settings => { - // var current_settings = _get_volsurface_settings(); - // if (current_settings == null) BTSMessageBox.Show("Error changing settings", "VS Settings", System.Windows.MessageBoxButton.OK, System.Windows.MessageBoxImage.Error, true, true, true); - // else { - // current_settings.advanced_settings = advanced_settings; - // _model.set_candidate_settings(current_settings); - // } - // } - // ) - // }; - return null; + var vm = new VolSurfaceAdvancedSettingsEditorVM( + VolSurfaceUtilityFunctions.clone_proto(settings.advanced_settings), + settings.core_settings.vol_surface_name); + vm.request_commit += commit_advanced_settings; + return new VolSurfaceAdvancedSettingsEditor { + DataContext = vm + }; + + async void commit_advanced_settings(VolSurfaceAdvancedSettings value) { + var current_settings = await _get_volsurface_settings(); + if (current_settings == null) { + BTSMessageBox.Show("Error changing settings", "VS Settings"); + } + else { + current_settings.advanced_settings = value; + _model.set_candidate_settings(current_settings); + } + } } Window? mk_grid_settings_win() { diff --git a/src/client/spark/Analytics/Core/Settings/VolSurfaceAdvancedSettings.cs b/src/client/spark/Analytics/Core/Settings/VolSurfaceAdvancedSettings.cs index a74ff0e3f..775d6d77d 100644 --- a/src/client/spark/Analytics/Core/Settings/VolSurfaceAdvancedSettings.cs +++ b/src/client/spark/Analytics/Core/Settings/VolSurfaceAdvancedSettings.cs @@ -9,26 +9,34 @@ namespace mbts.analytics [ProtoBuf.ProtoContract(Name = "VolSurfaceAdvancedSettings")] public class VolSurfaceAdvancedSettings { + public static VolSurfaceAdvancedSettings Default => + new() { + number_of_cashed_saved_days = double.NaN, + precomputed_theo_handles = new(0), + theo_handle_measure = VolSurfaceEnums.GeneralChangeMeasure.Absolute, + precomputed_slide_handles = new(0), + slide_handle_measure = VolSurfaceEnums.GeneralChangeMeasure.Percentage, + publish_from_client = false, + publish_from_client_user = string.Empty, + strike_normalization_axis = VolSurfaceEnums.VolCurveStrikeAxis.RawStrike, + }; + [ProtoBuf.ProtoMember(1)] - [System.ComponentModel.DefaultValue(Double.NaN)] public double number_of_cashed_saved_days; [ProtoBuf.ProtoMember(10)] public List precomputed_theo_handles; [ProtoBuf.ProtoMember(15)] - [System.ComponentModel.DefaultValue(VolSurfaceEnums.GeneralChangeMeasure.Absolute)] public VolSurfaceEnums.GeneralChangeMeasure theo_handle_measure; [ProtoBuf.ProtoMember(20)] public List precomputed_slide_handles; [ProtoBuf.ProtoMember(25)] - [System.ComponentModel.DefaultValue(VolSurfaceEnums.GeneralChangeMeasure.Percentage)] public VolSurfaceEnums.GeneralChangeMeasure slide_handle_measure; [ProtoBuf.ProtoMember(30)] - //[System.ComponentModel.DefaultValue(false)] public bool publish_from_client; [ProtoBuf.ProtoMember(40)] @@ -38,5 +46,11 @@ namespace mbts.analytics [ProtoBuf.ProtoMember(50)] [System.ComponentModel.DefaultValue(VolSurfaceEnums.VolCurveStrikeAxis.RawStrike)] public VolSurfaceEnums.VolCurveStrikeAxis strike_normalization_axis; + + public void ensure_no_nulls() { + precomputed_theo_handles ??= new(0); + precomputed_slide_handles ??= new(0); + publish_from_client_user ??= string.Empty; + } } } diff --git a/src/client/spark/Analytics/Core/Settings/VolSurfaceSettings.cs b/src/client/spark/Analytics/Core/Settings/VolSurfaceSettings.cs index 63e588aa1..c5c356f3d 100644 --- a/src/client/spark/Analytics/Core/Settings/VolSurfaceSettings.cs +++ b/src/client/spark/Analytics/Core/Settings/VolSurfaceSettings.cs @@ -25,7 +25,8 @@ namespace mbts.analytics { volpath_settings = new(), safety_limits = new(), }, - polynomial_model_settings = new() + polynomial_model_settings = new(), + advanced_settings = VolSurfaceAdvancedSettings.Default }; [ProtoMember(10)] @@ -79,6 +80,8 @@ namespace mbts.analytics { if (core_settings.time_settings == null) { core_settings.time_settings = new VolSurfaceTimeSettings(); } + advanced_settings ??= VolSurfaceAdvancedSettings.Default; + advanced_settings.ensure_no_nulls(); return this; } } diff --git a/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceAdvancedSettingsEditor.xaml b/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceAdvancedSettingsEditor.xaml new file mode 100644 index 000000000..90661428f --- /dev/null +++ b/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceAdvancedSettingsEditor.xaml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceAdvancedSettingsEditor.xaml.cs b/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceAdvancedSettingsEditor.xaml.cs new file mode 100644 index 000000000..446990222 --- /dev/null +++ b/src/client/spark/Modules/Analytics/VolSurface/View/VolSurfaceAdvancedSettingsEditor.xaml.cs @@ -0,0 +1,11 @@ +namespace mbts.ui.shell { + using System.Windows; + + /// + /// Interaction logic for VolSurfaceAdvancedSettingsEditor.xaml + /// + partial class VolSurfaceAdvancedSettingsEditor : Window { + public VolSurfaceAdvancedSettingsEditor() => + InitializeComponent(); + } +}