diff --git a/src/client/spark/Modules/Spreader/SpreaderShellModule.cs b/src/client/spark/Modules/Spreader/SpreaderShellModule.cs index f44246cee..6e347c348 100644 --- a/src/client/spark/Modules/Spreader/SpreaderShellModule.cs +++ b/src/client/spark/Modules/Spreader/SpreaderShellModule.cs @@ -1,6 +1,7 @@ using bts.api; using bts.spark; using mbts; +using mbts.persist; using mbts.spark; using mbts.ui; using mbts.ui.shell; @@ -18,8 +19,8 @@ namespace bts.shell LatencyReportWindowFactory _lrwf; [ImportingConstructor] - public SpreaderShellModule(IBus bus, OrdersModel orders_model) { - _smwf = new SyntheticManagementWindowFactory(this, bus, orders_model); + public SpreaderShellModule(IBus bus, UserSettingsHub settings_hub, OrdersModel orders_model) { + _smwf = new SyntheticManagementWindowFactory(this, bus, settings_hub, orders_model); _lrwf = new LatencyReportWindowFactory(this, bus); } diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs index f9f2b5105..6a08c6f42 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs +++ b/src/client/spark/Modules/Spreader/SyntheticManagementWindow.cs @@ -2,8 +2,11 @@ using bts.api; using bts.shell; using bts.spark; +using mbts.persist; using mbts.ui; +using mbts.ui.settings; using mbts.ui.spark; +using mbts.ui.utility; using mbts.utils; using System; using System.Collections.Generic; @@ -21,14 +24,15 @@ namespace mbts.spark { SyntheticManagementView _view; IDisposable _subscriptions; IReadOnlyList _commands; + readonly IWindowSettingsManager _settings_manager; - public SyntheticManagementWindow(SyntheticManagementWindowFactory factory, IBus bus, OrdersModel orders_model, StartupData state) + public SyntheticManagementWindow(SyntheticManagementWindowFactory factory, IBus bus, OrdersModel orders_model, StartupData state, WindowSettingsManager settings_manager) : base("Synthetic Management", bus, factory, SparkCommands.ShowSyntheticManagement.icon) { _orders_model = orders_model; _state = state; + _settings_manager = settings_manager; Icon.Freeze(); - } public void thread_init() { @@ -56,7 +60,24 @@ namespace mbts.spark { filters = new OrderBookWindowFactory.FilterStates { security_criteria = new SecurityCriteria(_vm.value.row_vms.Select(r => r.security)) } - }) + } + ), SparkCommands.window_settings_command(new DialogCommand(() => { + var vm = new WindowSettingsDialogVM( + _settings_manager, + us => us.synthetic_management_grid, + UserSettings.FileExtensions.GRID, + s => _vm.value.grid_settings_manager.create_vm( + // we need to get the most up to date GridSettings when launching b/c users may + // have changed some settings on the grid directly, like column widths. + s.with(_vm.value.columns.Select( c => c.create())), + this.observe_title() + ) + ); + // TODO: bind to main window's Title + var dialog = new SimpleGridSettingsDialog { Title = "Synthetic Management Grid Settings", DataContext = vm }; + vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog); + return dialog; + })) }; _subscriptions = Disposable.Create( @@ -75,10 +96,7 @@ namespace mbts.spark { (SecurityImmutable, ExecutionStrategyImmutable) select_row_strategy_tuple(RowStrategy? rs) => rs.HasValue ? (rs.Value.security, rs.Value.strategy) : default; bool can_execute(RowModificationParams? rmp) => rmp.HasValue && !rmp.Value.has_working_orders; - - - - _vm.value = new SyntheticManagementDialogVM(_bus, _orders_model, _state.sorting_criteria, _state.filters ?? new FilterStates()); + _vm.value = new SyntheticManagementDialogVM(_bus, _orders_model, _settings_manager, _state.sorting_criteria, _state.filters ?? new FilterStates()); if (_view == null) _view = new SyntheticManagementView { DataContext = _vm.value }; else _view.DataContext = _vm.value; } @@ -86,7 +104,7 @@ namespace mbts.spark { public override string window_type => _window_type; public override UIElement Content => _view; public override IEnumerable Commands => _commands; - public override StartupData SaveState => _state = new StartupData(_vm.value.rows_view.GetSortingCriteria(), _vm.value.get_filter_states()); + public override StartupData SaveState => _state = _vm.value.create(); public override double MinWidth => 700; public override void Dispose() { diff --git a/src/client/spark/Modules/Spreader/SyntheticManagementWindowFactory.cs b/src/client/spark/Modules/Spreader/SyntheticManagementWindowFactory.cs index 69870a6f1..ac37786c7 100644 --- a/src/client/spark/Modules/Spreader/SyntheticManagementWindowFactory.cs +++ b/src/client/spark/Modules/Spreader/SyntheticManagementWindowFactory.cs @@ -1,30 +1,46 @@ using bts.api; +using mbts.persist; using mbts.spark; using mbts.spark.filters; using mbts.ui; +using mbts.ui.settings; using ProtoBuf; using System; using System.Collections.Generic; using System.Reactive.Linq; using System.Threading.Tasks; +using static mbts.ui.controls.DIYGrid; +using static mbts.ui.spark.SyntheticManagementView; namespace bts.shell { class SyntheticManagementWindowFactory : ShellWindowFactory { readonly IBus _bus; readonly OrdersModel _orders_model; + readonly UserSettingsHub _settings_hub; - public SyntheticManagementWindowFactory(SpreaderShellModule module, IBus bus, OrdersModel orders_model) : base(module, "SyntheticManagement") { + public SyntheticManagementWindowFactory(SpreaderShellModule module, IBus bus, UserSettingsHub settings_hub, OrdersModel orders_model) : base(module, "SyntheticManagement") { _bus = bus; _orders_model = orders_model; + _settings_hub = settings_hub; _dispose = bus.subscribe(SparkTags.ShowSyntheticManagementTag).OnDispatcher().Subscribe(show); } + public static string col_id(Columns col) => col.ToString(); + public override Task load(StartupData state) => - Task.FromResult(new SyntheticManagementWindow(this, _bus, _orders_model, state)); + Task.FromResult(_create(state)); public async void show(SparkTags.Nothing nothing) => _bus.post(SparkTags.ShowWindow, await load(new StartupData())); + IShellWindow _create(StartupData state) { + var settings_manager = new WindowSettingsManager(_settings_hub, + state.grid, + get: us => us.synthetic_management_grid, + set: (us, gs) => us.with(provided_market_view_gridsettings: gs)); + return new SyntheticManagementWindow(this, _bus, _orders_model, state, settings_manager); + } + [ProtoContract] public class StartupData { public const int Version = 1; @@ -33,11 +49,41 @@ namespace bts.shell { public readonly List sorting_criteria; [ProtoMember(2)] public readonly FilterStates filters; + [ProtoMember(3)] + public readonly GridSettings grid; - public StartupData() : this(new List(), null) { } - public StartupData(List sorting_criteria, FilterStates filters) { + public StartupData() : this(new List(), null, null) { } + public StartupData(List sorting_criteria, FilterStates filters, GridSettings grid = default) { this.sorting_criteria = sorting_criteria; this.filters = filters; + this.grid = grid; + } + + public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion); + + static class DefaultColumns { + public static GridColumnSettings name => new GridColumnSettings(col_id(Columns.Name), DefaultColumnHeaders.Name, width: DefaultColumnWidths.Security); + public static GridColumnSettings description => new GridColumnSettings(col_id(Columns.Description), DefaultColumnHeaders.Description, width: DefaultColumnWidths.Description); + public static GridColumnSettings n_legs => new GridColumnSettings(col_id(Columns.n_legs), DefaultColumnHeaders.N_Legs, width: DefaultColumnWidths.Size); + public static GridColumnSettings n_working_orders => new GridColumnSettings(col_id(Columns.n_working_orders), DefaultColumnHeaders.N_Working_Orders, width: DefaultColumnWidths.Size); + public static GridColumnSettings security_key => new GridColumnSettings(col_id(Columns.SecurityKey), DefaultColumnHeaders.SecurityKey, width: DefaultColumnWidths.SecurityKey); + + public static IEnumerable default_sorting_criterion { + get { + yield return new SortingCriteria(name.id, true); + } + } + + public static IEnumerable all { + get { + yield return name; + yield return description; + yield return n_legs; + yield return n_working_orders; + yield return security_key; + } + } + } } diff --git a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs index b55579e39..d7494f0d2 100644 --- a/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs +++ b/src/client/spark/Modules/Spreader/VM/SyntheticManagementDialogVM.cs @@ -1,9 +1,11 @@ using bts.api; using bts.shell; using bts.spark; +using mbts.persist; using mbts.spark.filters; using mbts.ui; using mbts.ui.controls; +using mbts.ui.settings; using System; using System.Collections.Generic; using System.Collections.ObjectModel; @@ -19,9 +21,11 @@ namespace mbts.spark { class SyntheticManagementDialogVM : SecurityMDGrid { readonly IBus _bus; readonly OrdersModel _orders_model; + IWindowSettingsManager _settings_manager; - public SyntheticManagementDialogVM(IBus bus, OrdersModel orders_model) : this(bus, orders_model, null, null) { } - public SyntheticManagementDialogVM(IBus bus, OrdersModel orders_model, IReadOnlyCollection sorting, FilterStates filters) + + public SyntheticManagementDialogVM(IBus bus, OrdersModel orders_model, IWindowSettingsManager settings_manager) : this(bus, orders_model, settings_manager, null, null) { } + public SyntheticManagementDialogVM(IBus bus, OrdersModel orders_model, IWindowSettingsManager settings_manager, IReadOnlyCollection sorting, FilterStates filters) : base(orders_model.spreader.strategy_tuple.Select(map => map.Values), sorting) { _bus = bus; _orders_model = orders_model; @@ -33,18 +37,20 @@ namespace mbts.spark { n_working_orders_filter.load_state(filters.n_working_orders); security_key_filter.load_state(filters.security_key); } + _settings_manager = settings_manager; // columns - add_col(Columns.Name, "Name", r => r.name, nameof(Row.name), name_filter, DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.Security); - add_col(Columns.Description, "Description", r => r.description, nameof(Row.description), description_filter, DataGridFilterKnownTemplates.Regex, 200); - add_col(Columns.n_legs, "# Legs", r => r.n_legs.ToString(), nameof(Row.n_legs), n_legs_filter, DataGridFilterKnownTemplates.IntMinMax, DefaultColumnWidths.Size); + add_col(Columns.Name, DefaultColumnHeaders.Name, r => r.name, nameof(Row.name), name_filter, DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.Security); + add_col(Columns.Description, DefaultColumnHeaders.Description, r => r.description, nameof(Row.description), description_filter, DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.Description); + add_col(Columns.n_legs, DefaultColumnHeaders.N_Legs, r => r.n_legs.ToString(), nameof(Row.n_legs), n_legs_filter, DataGridFilterKnownTemplates.IntMinMax, DefaultColumnWidths.Size); columns.Add(new HyperlinkElementColumn( Columns.n_working_orders, new Binding(nameof(Row.n_working_orders)), new Binding(nameof(Row.show_order_book)), n_working_orders_filter, DataGridFilterKnownTemplates.UIntMinMax) { - Header = "# Working Orders", - Width = DefaultColumnWidths.Price + id = col_id(Columns.n_working_orders), + Header = DefaultColumnHeaders.N_Working_Orders, + Width = DefaultColumnWidths.Size } ); add_col(Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, r => r.security_key.ToString(), nameof(Row.security_key), security_key_filter, DataGridFilterKnownTemplates.Regex, DefaultColumnWidths.SecurityKey); @@ -52,12 +58,20 @@ namespace mbts.spark { // void add_col(Columns col_key, string header, Func get_text, string prop, IDataGridColumnFilter filter, string filter_template, double width) => columns.Add(new RenderTextColumn(col_key, get_text, filter, filter_template) { + id = col_id(col_key), Header = header, sort_member_path = prop, Width = width }); // - _dispose = DataGridFilterHelper.hook_filters(rows_view, create_time_filter, name_filter, description_filter, n_legs_filter, n_working_orders_filter, security_key_filter); + grid_settings_manager = new SimpleGridSettingsManager(columns, new Dictionary { }, row_vms); + // this will initialize the immutable properties that correspond to the col_settings_flags above (e.g. Bid/Ask font_color_override, etc.) + grid_settings_manager.load_from(settings_manager.current_settings()); + + _resources.AddRange( + DataGridFilterHelper.hook_filters(rows_view, create_time_filter, name_filter, description_filter, n_legs_filter, n_working_orders_filter, security_key_filter), + settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager) + ); } protected override Row row_factory((ExecutionStrategyImmutable? strategy, SecurityMD md) row_model) => @@ -66,6 +80,18 @@ namespace mbts.spark { protected override void on_row_removed(Row row) => row.Dispose(); public ObservableCollection columns { get; } = new ObservableCollection(); + public SimpleGridSettingsManager grid_settings_manager { get; } + + public GridSettings get_grid_save_state() { + if (_settings_manager.instance_settings == null) + return null; + else + return grid_settings_manager.create(); + } + + public StartupData create() => + new StartupData(rows_view.get_sorting_criteria(columns), _get_filter_states(), get_grid_save_state()); + #region Filters public IDataGridColumnPersistentFilter create_time_filter { get; } = new TimeFilterVM(r => r.create_time, nameof(Row.create_time)); @@ -75,7 +101,7 @@ namespace mbts.spark { public IDataGridColumnPersistentFilter n_working_orders_filter { get; } = new UIntMinMax(r => r.n_working_orders, nameof(Row.n_legs)); public IDataGridColumnPersistentFilter security_key_filter { get; } = new RegexFilterVM(r => r.security_key.ToString(), nameof(Row.security_key)); - public FilterStates get_filter_states() => + FilterStates _get_filter_states() => new FilterStates { description = description_filter.get_state(), create_time = create_time_filter.get_state(), diff --git a/src/client/spark/Spark.csproj b/src/client/spark/Spark.csproj index 76a20bc1a..b6f3b57a2 100644 --- a/src/client/spark/Spark.csproj +++ b/src/client/spark/Spark.csproj @@ -75,6 +75,11 @@ Code + + + MSBuild:Compile + + diff --git a/src/client/spark/core/ShellInterface/UserSettings/UserSettings.cs b/src/client/spark/core/ShellInterface/UserSettings/UserSettings.cs index bb0f5aca6..9122ec794 100644 --- a/src/client/spark/core/ShellInterface/UserSettings/UserSettings.cs +++ b/src/client/spark/core/ShellInterface/UserSettings/UserSettings.cs @@ -16,7 +16,8 @@ namespace mbts.spark { _notification = NotificationSettings.Default, _market_view_grid = bts.shell.MarketViewWindowFactory.StartupData.DefaultGridSettings, _fills_grid = bts.shell.FillsWindowFactory.StartupData.DefaultGridSettings, - _time_and_sales_grid = bts.shell.TimeAndSalesWindowFactory.StartupData.DefaultGridSettings + _time_and_sales_grid = bts.shell.TimeAndSalesWindowFactory.StartupData.DefaultGridSettings, + _synthetic_management_grid = bts.shell.SyntheticManagementWindowFactory.StartupData.DefaultGridSettings }; [ProtoMember(1)] @@ -31,6 +32,8 @@ namespace mbts.spark { GridSettings _time_and_sales_grid; [ProtoMember(7)] GridSettings _fills_grid; + [ProtoMember(8)] + GridSettings _synthetic_management_grid; public UserSettings() { } @@ -39,18 +42,21 @@ namespace mbts.spark { public GridSettings market_view_grid => _market_view_grid ?? (_market_view_grid = bts.shell.MarketViewWindowFactory.StartupData.DefaultGridSettings); public GridSettings time_and_sales_grid => _time_and_sales_grid ?? (_time_and_sales_grid = GridSettings.Default.with(bts.shell.TimeAndSalesWindowFactory.StartupData.DefaultColumns.all)); public GridSettings fills_grid => _fills_grid ?? (_fills_grid = bts.shell.FillsWindowFactory.StartupData.DefaultGridSettings); + public GridSettings synthetic_management_grid => _synthetic_management_grid ?? (_synthetic_management_grid = bts.shell.SyntheticManagementWindowFactory.StartupData.DefaultGridSettings); public UserSettings with(LadderSettings ladder = null, NotificationSettings notification = null, GridSettings provided_market_view_gridsettings = null, GridSettings time_and_sales = null, - GridSettings provided_fills_gridsettings = null) => + GridSettings provided_fills_gridsettings = null, + GridSettings provided_synthetic_management_gridsettings = null) => new UserSettings { _ladder = ladder ?? _ladder, _notification = notification ?? _notification, _market_view_grid = provided_market_view_gridsettings ?? _market_view_grid, _time_and_sales_grid = time_and_sales ?? _time_and_sales_grid, - _fills_grid = provided_fills_gridsettings ?? _fills_grid + _fills_grid = provided_fills_gridsettings ?? _fills_grid, + _synthetic_management_grid = provided_synthetic_management_gridsettings ?? _synthetic_management_grid, }; public static class FileExtensions { diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index 5c85cacd8..d3826b2e4 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -33,7 +33,8 @@ namespace mbts.ui.controls { User = 53, Aggressor = 80, Volume = 64, - FillKind = 70; + FillKind = 70, + Description = 300; } public static class DefaultColumnHeaders { @@ -65,7 +66,11 @@ namespace mbts.ui.controls { DayChange = "Change", SessionLow = "Low", SessionHigh = "High", - FillKind = "Fill Kind"; + FillKind = "Fill Kind", + Name = "Name", + Description = "Description", + N_Legs = "# Legs", + N_Working_Orders = "# Working Orders"; } public interface IKeyedColumn {