diff --git a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersSettings.cs b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersSettings.cs new file mode 100644 index 000000000..15ebae2ae --- /dev/null +++ b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersSettings.cs @@ -0,0 +1,19 @@ +namespace mbts.spark { + using ProtoBuf; + + [ProtoContract] + class AnalyticsExpirationParametersSettings { + public const int VERSION = 1; + + public static AnalyticsExpirationParametersSettings Default => new(); + + [ProtoMember(10)] + public string[] selected_symbols {get;set;} + + [ProtoMember(20)] + public bool auto_copy_rates_is_checked {get;set;} + + [ProtoMember(30)] + public bool auto_copy_rolls_is_checked {get;set;} + } +} diff --git a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersVM.cs b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersVM.cs index 7cc124e47..d91d0c95e 100644 --- a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersVM.cs +++ b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersVM.cs @@ -9,15 +9,12 @@ using mbts.ui.utility; using mbts.utils; - using ProtoBuf; - using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; using System.Reactive.Linq; - using System.Runtime.CompilerServices; using System.Threading.Tasks; using System.Windows.Input; @@ -28,15 +25,8 @@ bool _auto_copy_rolls_is_checked; bool _auto_copy_rates_is_checked; - // IRaiseCanExecuteChangedCommand _copy_roll_schedule_to_selection; - // IRaiseCanExecuteChangedCommand _copy_roll_target_to_selection; - // IRaiseCanExecuteChangedCommand _copy_settlement_price_to_selection; - // IRaiseCanExecuteChangedCommand _copy_delta_beta_to_selection; - // IRaiseCanExecuteChangedCommand _copy_vega_beta_to_selection; - // IRaiseCanExecuteChangedCommand _smart_copy_roll_target; - // IRaiseCanExecuteChangedCommand _smart_copy_riskless_rate; - public AnalyticsExpirationParametersVM(IBus bus, AnalyticsParametersUIModel model, StartupData startup_data) { + public AnalyticsExpirationParametersVM(IBus bus, AnalyticsParametersUIModel model, AnalyticsExpirationParametersSettings startup_data) { _bus = bus ?? throw new ArgumentNullException(nameof(bus)); _model = model ?? throw new ArgumentNullException(nameof(model)); non_options_with_empty = new ObservableAggregateCollection( @@ -50,7 +40,6 @@ auto_copy_rates_is_checked = startup_data.auto_copy_rates_is_checked; } - dialog_skirt_items.Add(new DialogSkirtItem("Commit", new AsyncCommand(async _ => { var param_map = await _bus.subscribe(SparkTags.ExpirationParametersInputTag) @@ -140,7 +129,7 @@ AnalyticsExpirationParameters _from_row(ExpParamsRow row) => new(row.security, row.driver, row.deliverable.is_empty() ? null : row.deliverable, row.roll_schedule.is_empty() ? null : row.roll_schedule, row.roll_target, row.riskless_rate, row.settlement_price, row.delta_beta, row.vega_beta); - public StartupData get_state() => + public AnalyticsExpirationParametersSettings get_state() => new() { selected_symbols = checked_symbols.Cast().ToArray(), auto_copy_rates_is_checked = auto_copy_rates_is_checked, @@ -153,41 +142,86 @@ public class ExpParamsRow : DisposableViewModelBase, AnalyticsExpirationParametersView.IExpParamsRow { readonly AnalyticsExpirationParameters _original_params; readonly AnalyticsExpirationParametersVM _owner; - readonly Property _roll_schedule; - readonly Property _roll_schedule_dirty; - double _roll_target; - double _riskless_rate; - double _settlement_price; - double _delta_beta; - double _vega_beta; - SecurityExpiration _driver; - SecurityExpiration _deliverable; + readonly Property _driver; + readonly Property _deliverable; + readonly Property _roll_schedule; + readonly Property _roll_target; + readonly Property _riskless_rate; + readonly Property _settlement_price; + readonly Property _delta_beta; + readonly Property _vega_beta; + + readonly Property _driver_dirty; + readonly Property _deliverable_dirty; + readonly Property _roll_schedule_dirty; + readonly Property _roll_target_dirty; + readonly Property _riskless_rate_dirty; + readonly Property _settlement_price_dirty; + readonly Property _delta_beta_dirty; + readonly Property _vega_beta_dirty; + + readonly ObservantCommand _smart_copy_roll_target_cmd; + readonly ObservantCommand _smart_copy_riskless_rate_cmd; + bool _is_last_row_of_month_group; IRaiseCanExecuteChangedCommand _copy_driver_to_selection; IRaiseCanExecuteChangedCommand _copy_deliverable_to_selection; - readonly ObservantCommand _smart_copy_roll_target_cmd; - readonly ObservantCommand _smart_copy_riskless_rate_cmd; public ExpParamsRow(AnalyticsExpirationParameters param, AnalyticsExpirationParametersVM owner) { _original_params = param; _owner = owner; security = param.security; - _driver = param.driver_security; - _deliverable = param.deliverable_security; + + _driver = backing(nameof(driver), param.driver_security); + _deliverable = backing(nameof(deliverable), param.deliverable_security); _roll_schedule = backing(nameof(roll_schedule), param.roll_schedule_expiration); + _roll_target = backing(nameof(roll_target), param.roll_target); + _riskless_rate = backing(nameof(riskless_rate), param.riskless_rate); + _settlement_price = backing(nameof(settlement_price), param.settlement_price); + _delta_beta = backing(nameof(delta_beta), param.delta_beta); + _vega_beta = backing(nameof(vega_beta), param.vega_beta); + + _driver_dirty = backing( + nameof(driver_dirty), + _driver.observe_current(true) + .Select(rs => !rs.Equals(_original_params.driver_security))); + + _deliverable_dirty = backing( + nameof(deliverable_dirty), + _deliverable.observe_current(true) + .Select(rs => !rs.Equals(_original_params.deliverable_security))); + _roll_schedule_dirty = backing( nameof(roll_schedule_dirty), _roll_schedule.observe_current(true) .Select(rs => !rs.Equals(_original_params.roll_schedule_expiration))); - _roll_target = param.roll_target; - _riskless_rate = param.riskless_rate; - _settlement_price = param.settlement_price; - _delta_beta = param.delta_beta; - _vega_beta = param.vega_beta; - _delta_beta = param.delta_beta; - _vega_beta = param.vega_beta; + + _roll_target_dirty = backing( + nameof(roll_target_dirty), + _roll_target.observe_current(true) + .Select(rs => !rs.Equals(_original_params.roll_target))); + + _riskless_rate_dirty = backing( + nameof(riskless_rate_dirty), + _riskless_rate.observe_current(true) + .Select(rs => !rs.Equals(_original_params.riskless_rate))); + + _settlement_price_dirty = backing( + nameof(settlement_price_dirty), + _settlement_price.observe_current(true) + .Select(rs => !rs.Equals(_original_params.settlement_price))); + + _delta_beta_dirty = backing( + nameof(delta_beta_dirty), + _delta_beta.observe_current(true) + .Select(rs => !rs.Equals(_original_params.delta_beta))); + + _vega_beta_dirty = backing( + nameof(vega_beta_dirty), + _vega_beta.observe_current(true) + .Select(rs => !rs.Equals(_original_params.vega_beta))); _smart_copy_roll_target_cmd = new ObservantCommand(_smart_copy_roll_target); _smart_copy_riskless_rate_cmd = new ObservantCommand(_smart_copy_riskless_rate); @@ -200,49 +234,30 @@ } public SecurityExpiration security { get; } - public SecurityExpiration driver { get => _driver; set => Set(ref _driver, value); } - public SecurityExpiration deliverable { get => _deliverable; set => Set(ref _deliverable, value); } - public SecurityExpiration roll_schedule { get => _roll_schedule.Value; set => _roll_schedule.Value = value; } + public SecurityExpiration driver { get => _driver.Value; set => _driver.set(value); } + public SecurityExpiration deliverable { get => _deliverable.Value; set => _deliverable.set(value); } + public SecurityExpiration roll_schedule { get => _roll_schedule.Value; set => _roll_schedule.set(value); } + + public double roll_target { get => _roll_target.Value; set => _roll_target.set(value); } + public double riskless_rate { get => _riskless_rate.Value; set => _riskless_rate.set(value); } + public double settlement_price { get => _settlement_price.Value; set => _settlement_price.set(value); } + public double delta_beta { get => _delta_beta.Value; set => _delta_beta.set(value); } + public double vega_beta { get => _vega_beta.Value; set => _vega_beta.set(value); } + + public bool driver_dirty => _driver_dirty.Value; + public bool deliverable_dirty => _deliverable_dirty.Value; + public bool roll_schedule_dirty => _roll_schedule_dirty.Value; + public bool roll_target_dirty => _roll_target_dirty.Value; + public bool riskless_rate_dirty => _riskless_rate_dirty.Value; + public bool settlement_price_dirty => _settlement_price_dirty.Value; + public bool delta_beta_dirty => _delta_beta_dirty.Value; + public bool vega_beta_dirty => _vega_beta_dirty.Value; public bool is_last_row_of_month_group { get => _is_last_row_of_month_group; set => Set(ref _is_last_row_of_month_group, value); } - public double roll_target { - get => _roll_target; - set => _handle_input(_original_params.roll_target, ref _roll_target, value); - } - - public double riskless_rate { - get => _riskless_rate; - set => _handle_input(_original_params.riskless_rate, ref _riskless_rate, value); - } - - public double settlement_price { - get => _settlement_price; - set => _handle_input(_original_params.settlement_price, ref _settlement_price, value); - } - - public double delta_beta { - get => _delta_beta; - set => _handle_input(_original_params.delta_beta, ref _delta_beta, value); - } - - public double vega_beta { - get => _vega_beta; - set => _handle_input(_original_params.vega_beta, ref _vega_beta, value); - } - - public bool driver_dirty => !_driver.Equals(_original_params.driver_security); - public bool deliverable_dirty => !_deliverable.Equals(_original_params.deliverable_security); - public bool roll_schedule_dirty => !_roll_schedule.Equals(_original_params.roll_schedule_expiration); - public bool roll_target_dirty => !_roll_target.Equals(_original_params.roll_target); - public bool riskless_rate_dirty => !_riskless_rate.Equals(_original_params.riskless_rate); - public bool settlement_price_dirty => !_settlement_price.Equals(_original_params.settlement_price); - public bool delta_beta_dirty => !_delta_beta.Equals(_original_params.delta_beta); - public bool vega_beta_dirty => !_vega_beta.Equals(_original_params.vega_beta); - public ICommand copy_driver_to_selection_cmd => _copy_driver_to_selection ??= new DelegateCommand(_ => { foreach (var r in _get_selected_rows()) { r.driver = driver; @@ -308,24 +323,6 @@ vega_beta = _original_params.vega_beta; } - void _handle_input(double orig, ref double current, double next, [CallerMemberName] string prop = "") { - if (current.Equals(next)) { - return; - } - bool raise_dirty = current.Equals(orig) != next.Equals(orig); - current = next; - RaisePropertyChanged(prop); - if (raise_dirty) { - RaisePropertyChanged(prop + "_dirty"); - } - if (prop == nameof(roll_target) && _smart_copy_roll_target_cmd.CanExecute(null) && _owner.auto_copy_rolls_is_checked) { - _smart_copy_roll_target(); - } - if (prop == nameof(riskless_rate) && _smart_copy_riskless_rate_cmd.CanExecute(null) && _owner.auto_copy_rates_is_checked) { - _smart_copy_riskless_rate(); - } - } - IEnumerable _get_selected_rows() => _owner.selected_rows.OfType().ToList(); @@ -347,19 +344,5 @@ } } } - - [ProtoContract] - public class StartupData { - public const int VERSION = 1; - - [ProtoMember(10)] - public string[] selected_symbols; - - [ProtoMember(20)] - public bool auto_copy_rates_is_checked; - - [ProtoMember(30)] - public bool auto_copy_rolls_is_checked; - } } } diff --git a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml index ceee7bce0..44ddfbfd1 100644 --- a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml +++ b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersView.xaml @@ -134,8 +134,8 @@ ItemsSource="{Binding filtered_for_visible_rows}" AlternatingRowBackground="{u:BTSColor MarketData.driver_background}" VerticalGridLinesBrush="Gray" - EnableRowVirtualization="False" - EnableColumnVirtualization="False" + EnableRowVirtualization="True" + EnableColumnVirtualization="True" CanUserAddRows="False" AutoGenerateColumns="False" CanUserReorderColumns="False" diff --git a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersWindow.cs b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersWindow.cs index 5aced279e..1ba56c348 100644 --- a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersWindow.cs +++ b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersWindow.cs @@ -7,14 +7,14 @@ using System; using System.Windows; - class AnalyticsExpirationParametersWindow : SparkWindow { + class AnalyticsExpirationParametersWindow : SparkWindow { const string _window_type = nameof(AnalyticsExpirationParametersWindow); readonly Lazy _model; readonly Lazy _vm; public AnalyticsExpirationParametersWindow( - IBus bus, AnalyticsExpirationParametersWindowFactory factory, AnalyticsExpirationParametersVM.StartupData startup_data) + IBus bus, AnalyticsExpirationParametersWindowFactory factory, AnalyticsExpirationParametersSettings startup_data) : base("Analytics Exp Params", bus, factory) { _model = new Lazy(() => new AnalyticsParametersUIModel(_bus)); _vm = new Lazy( @@ -31,7 +31,7 @@ public override string window_type => _window_type; - public override AnalyticsExpirationParametersVM.StartupData SaveState => + public override AnalyticsExpirationParametersSettings SaveState => _vm.IsValueCreated ? _vm.Value.get_state() : null; public override UIElement Content => diff --git a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersWindowFactory.cs b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersWindowFactory.cs index 714d57151..d5fb27474 100644 --- a/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersWindowFactory.cs +++ b/src/client/spark/AW2/AnalyticsParameters/AnalyticsExpirationParametersWindowFactory.cs @@ -1,35 +1,30 @@ namespace mbts.spark { using bts.api; using bts.shell; + using bts.spark; using mbts.ui; using System; - using System.Linq; using System.Reactive.Linq; using System.Threading.Tasks; - class AnalyticsExpirationParametersWindowFactory : ShellWindowFactory { + class AnalyticsExpirationParametersWindowFactory : ShellWindowFactory { readonly IBus _bus; public AnalyticsExpirationParametersWindowFactory(IShellModule module, IBus bus) - : base(module, "Analytics Exp Params") { + : base(module, SparkCommands.show_vol_surface.title) { _bus = bus; _dispose = bus.subscribe(SparkTags.show_analytics_exp_params).OnDispatcher().Subscribe(_show); } - public override Task load(AnalyticsExpirationParametersVM.StartupData state) => + public override Task load(AnalyticsExpirationParametersSettings state) => Task.FromResult(_create(state)); - void _show(SparkTags.Nothing _) => - _bus.post(SparkTags.ShowWindow, _create(new AnalyticsExpirationParametersVM.StartupData())); + void _show(AnalyticsExpirationParametersSettings _) => + _bus.post(SparkTags.ShowWindow, _create(new())); - void _show(SecurityCriteria security_criteria) => - _bus.post(SparkTags.ShowWindow, _create(new AnalyticsExpirationParametersVM.StartupData { - selected_symbols = (security_criteria?.clauses?.FirstOrDefault())?.symbols ?? Array.Empty() - })); - - IShellWindow _create(AnalyticsExpirationParametersVM.StartupData startup_data) => + IShellWindow _create(AnalyticsExpirationParametersSettings startup_data) => new AnalyticsExpirationParametersWindow(_bus, this, startup_data); } } diff --git a/src/client/spark/AW2/VolSurfaceModule.cs b/src/client/spark/AW2/VolSurfaceModule.cs index 01a08a25d..2528f828a 100644 --- a/src/client/spark/AW2/VolSurfaceModule.cs +++ b/src/client/spark/AW2/VolSurfaceModule.cs @@ -1,6 +1,8 @@ namespace mbts.spark { + using bts; using bts.api; using bts.collections; + using bts.shell; using bts.spark; using mbts.analytics; @@ -22,6 +24,10 @@ 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; @@ -43,25 +49,21 @@ namespace mbts.spark { public enum WindowType { Main, Heatmap } - public static string ANALYTICS_EXPIRATION_PARAMETERS_HEADER => "Analytics Expiration Parameters"; - public static string MAIN_WINDOW_HEADER => "Main Window"; - public static string DETAILED_GRID_HEADER => "Detailed Grid"; - public string name => "Pricing"; public ImageSource icon => Icons.vol_surface; public int priority => 20; public IEnumerable actions { get { - yield return SparkCommands.pick_analytics_exp_params; + yield return _launch_exp_params_view_spark_cmd; } } public ICommand launch_exp_params_view_cmd => - SparkCommands.pick_analytics_exp_params.ICommand(_bus); - // new DelegateCommand(() => _bus.post(SparkTags.show_analytics_exp_params, null)); - // await _wm.add(new AnalyticsExpirationParametersEditorWindow( - // _bus, _exp_params_window_factory, new AnalyticsExpirationParametersEditorVM.StartupData()))); + _launch_exp_params_view_spark_cmd.ICommand(_bus); + + static SparkCommand _launch_exp_params_view_spark_cmd => + SparkCommands.show_analytics_exp_params().complete(AnalyticsExpirationParametersSettings.Default); public ObservableCollection current_vol_surfaces { get; } = new(); @@ -77,21 +79,26 @@ namespace mbts.spark { public Task create(Stream load_stream) { if (!ProtoBufSerializationHelper.try_deserialize(load_stream, out ShellSerializationHeader header)) { + Log.Ui.error($"Failed to deserialize {nameof(ShellSerializationHeader)}"); return Task.FromResult(null); } - - if (header.name == MAIN_WINDOW_HEADER) { - return _vol_surface_window_factory.load_window(load_stream, header.version); - } else if (header.name == ANALYTICS_EXPIRATION_PARAMETERS_HEADER && - ProtoBufSerializationHelper.try_deserialize(load_stream, out AnalyticsExpirationParametersVM.StartupData startup_data)) { - return Task.FromResult(new AnalyticsExpirationParametersWindow(_bus, _exp_params_window_factory, startup_data)); + var wf = _window_factory_for_header(header.name); + if (wf is null) { + return Task.FromResult(null); } - return Task.FromResult(null); + return wf.load_window(load_stream, header.version); } public void Dispose() => Disposable.dispose(ref _subscriptions); + IShellWindowFactory _window_factory_for_header(string header) => + header switch { + MAIN_WINDOW_HEADER => _vol_surface_window_factory, + ANALYTICS_EXPIRATION_PARAMETERS_HEADER => _exp_params_window_factory, + _ => null, + }; + void _create_new_vol_surface() { if (string.IsNullOrWhiteSpace(_new_vol_surface_name)) { return; diff --git a/src/client/spark/core/Bus/SparkCommands.cs b/src/client/spark/core/Bus/SparkCommands.cs index 65bf0d15c..f979396d7 100644 --- a/src/client/spark/core/Bus/SparkCommands.cs +++ b/src/client/spark/core/Bus/SparkCommands.cs @@ -125,11 +125,12 @@ namespace bts.spark { public static PartialCommand show_vol_surface => SparkCommand.create("Vol Surface", Icons.vol_surface, SparkTags.ShowVolSurface); - public static PartialCommand show_analytics_exp_params => + public static PartialCommand show_analytics_exp_params() => SparkCommand.create("Analytics Exp Params", Icons.Abacus, SparkTags.show_analytics_exp_params); - public static SparkCommand pick_analytics_exp_params => - SparkCommand.create("Analytics Exp Params", Icons.Abacus, SparkTags.ShowPickMultiple, show_analytics_exp_params); + public static SparkCommand show_analytics_exp_params( + AnalyticsExpirationParametersSettings settings) => show_analytics_exp_params().complete(settings); + // Orders public static PartialCommand> CancelSelectedOrders => SparkCommand.create("Cancel Selected", Icons.CancelSelected, SparkTags.CancelOrders); diff --git a/src/client/spark/core/Bus/SparkTags.cs b/src/client/spark/core/Bus/SparkTags.cs index 5ed21e430..7a09a0c23 100644 --- a/src/client/spark/core/Bus/SparkTags.cs +++ b/src/client/spark/core/Bus/SparkTags.cs @@ -1,22 +1,22 @@ using bts.api; +using bts.api.analytics; using bts.api.orderman; using bts.shell; using bts.shell.fills; using bts.shell.manual_fills; using bts.spark; +using mbts.analytics; +using mbts.spark.filters; using mbts.ui; using mbts.ui.controls; +using mbts.ui.converters; using System; using System.Collections.Generic; using System.Collections.Immutable; -using System.Threading.Tasks; -using bts.api.analytics; -using mbts.analytics; -using mbts.ui.converters; -using mbts.spark.filters; using System.Diagnostics; +using System.Threading.Tasks; namespace mbts.spark { @@ -103,7 +103,7 @@ namespace mbts.spark { } // Publisher: SingleVolSurfaceNonVolDataSource public static ITag VolSurfaceContractsTag(int vs_id) { - return new KeyedSparkTag(vs_id, "VolSurfaceStrikeMap" ); + return new KeyedSparkTag(vs_id, "VolSurfaceStrikeMap"); } // Publisher: VolSurfaceVM public static ITag CreateHeatmapTag { get; } = new SparkTag("CreateHeatmapTag"); @@ -304,8 +304,8 @@ namespace mbts.spark { public static ITag ShowVolSurface { get; } = new SparkTag(nameof(ShowVolSurface)); - public static ITag show_analytics_exp_params { get; } = - new SparkTag("Show Analytics Exp Params"); + public static ITag show_analytics_exp_params { get; } = + new SparkTag("Show Analytics Exp Params"); #endregion public static ITag> SyntheticDeleteTag { get; } = new SparkTag>(nameof(SyntheticDeleteTag)); diff --git a/src/client/spark/core/ShellInterface/IShellWindowFactory.cs b/src/client/spark/core/ShellInterface/IShellWindowFactory.cs index 076566514..df6f80468 100644 --- a/src/client/spark/core/ShellInterface/IShellWindowFactory.cs +++ b/src/client/spark/core/ShellInterface/IShellWindowFactory.cs @@ -21,12 +21,15 @@ namespace bts.shell { } abstract class ShellWindowFactory : IShellWindowFactory, ISaveWindow { - public ShellWindowFactory(IShellModule owner, string name, int version = 1) { + public ShellWindowFactory(IShellModule owner, string name, int version = 1, string display_name = null) { this.name = name; + this.display_name = display_name ?? name; this.version = version; module = owner; } + public string name { get; } + public string display_name { get; } public virtual int version { get; } public IShellModule module { get; }