diff --git a/src/client/spark/Modules/Market/MarketShellModule.cs b/src/client/spark/Modules/Market/MarketShellModule.cs index 6dac509c3..ad95c0472 100644 --- a/src/client/spark/Modules/Market/MarketShellModule.cs +++ b/src/client/spark/Modules/Market/MarketShellModule.cs @@ -19,7 +19,7 @@ namespace bts.shell { [ImportingConstructor] public MarketShellModule(IBus bus, MDConsumer consumer, UserSettingsHub settings_hub, OrdersModel orders_model, [Import("username")]string user_name) { - _tsf = new TimeAndSalesWindowFactory(this, bus, consumer); + _tsf = new TimeAndSalesWindowFactory(this, bus, consumer, settings_hub); _mvf = new MarketViewWindowFactory(this, bus, settings_hub, orders_model); } diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs index 31bcd653b..0c2359009 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs @@ -23,11 +23,11 @@ namespace mbts.spark { IWindowSettingsManager _settings_manager; - public MarketViewVM(IBus bus, IObservable owner_title, OrdersModel orders_model, IObservable state, IWindowSettingsManager settings_manager ) - : this(bus, owner_title, orders_model, state, state.SelectManyInSeries(s => s.security_criteria.subscribe_md(bus)), settings_manager) { } + public MarketViewVM(IBus bus, OrdersModel orders_model, IObservable state, IWindowSettingsManager settings_manager ) + : this(bus, orders_model, state, state.SelectManyInSeries(s => s.security_criteria.subscribe_md(bus)), settings_manager) { } // securities_connectable should NOT be connected already. - MarketViewVM(IBus bus, IObservable owner_title, OrdersModel orders_model, IObservable state, IConnectableObservable> securities_connectable, IWindowSettingsManager settings_manager) + MarketViewVM(IBus bus, OrdersModel orders_model, IObservable state, IConnectableObservable> securities_connectable, IWindowSettingsManager settings_manager) : base(RXCollection.Create(securities_connectable, SecurityDataHelper.EqualityComparer.MDComparer), null) { _bus = bus; _orders_model = orders_model; @@ -95,19 +95,27 @@ namespace mbts.spark { return mb; } // - var col_settings_flags = EnumHelper.get_values().ToDictionary( - c => c.ToString(), c => GridColumnSettingsFeatureFlags.None); // make font-color immutable for Side, Size, (the font-color rule is hard-coded: MarketData.bid for Buy orders, MarketData.ask for Sells) - foreach (var c in new[] { Columns.Bid, Columns.Ask, Columns.BidSize, Columns.AskSize, Columns.WorkingAsks, Columns.WorkingBids }) { - col_settings_flags[c.ToString()] = GridColumnSettingsFeatureFlags.ImmutableFontColor; - } - grid_settings_manager = new SimpleGridSettingsManager(owner_title, _settings_manager.subscribe_current(), rows_view, columns, col_settings_flags); + var col_settings_flags = new Dictionary { + { Columns.Bid.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor }, + { Columns.Ask.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor }, + { Columns.BidSize.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor }, + { Columns.AskSize.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor }, + { Columns.WorkingAsks.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor }, + { Columns.WorkingBids.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor } + }; + grid_settings_manager = new SimpleGridSettingsManager(columns, col_settings_flags); + // 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(UserSettings.factory_defaults.market_view_grid_defaults); // _resources.AddRange( state.OnDispatcher().Subscribe(s => { using (rows_view.DeferRefresh()) { - grid_settings_manager.load_from(settings_manager.current_settings()); - rows_view.SetSortingCriteria(s.grid?.sorting_criterion ?? Enumerable.Empty()); + if (s.grid != null) { + // this means we are not using defaults, + // Note: settings_manager in turn notifies grid_settings_manager of this update + _settings_manager.instance_settings = s.grid; + } if (s.filters is FilterStates filters) { security_filter.load_state(filters.security); bid_price_filter.load_state(filters.bid_price); @@ -126,12 +134,14 @@ namespace mbts.spark { volume_filter.load_state(filters.volume); security_key_filter.load_state(filters.security_key); } + rows_view.set_sort_descriptions(s.sorting_criterion, columns); } }), DataGridFilterHelper.hook_filters(rows_view, security_filter, bid_price_filter, bid_size_filter, ask_price_filter, ask_size_filter, last_price_filter, last_size_filter, day_change_filter, settlement_filter, session_low_filter, session_high_filter, position_filter, working_bid_volume_filter, working_ask_volume_filter, volume_filter, security_key_filter), securities_connectable.Connect(), + settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager), WorkLoop.Start("MarketView", _refresh) ); } diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs index 7b635c82e..404b6a696 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs @@ -6,6 +6,7 @@ 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; @@ -18,7 +19,7 @@ namespace mbts.spark { const string _window_type = "MarketView", _thread_id = "MarketView", _window_type_display_name = "Market View"; readonly OrdersModel _orders_model; readonly AllowOnce _init_guard = new AllowOnce("MarketView"); - readonly WindowSettingsManager _settings_manager; + readonly IWindowSettingsManager _settings_manager; MarketViewVM _vm; MarketViewView _view; MarketViewWindowFactory.StartupData _state; @@ -38,7 +39,9 @@ namespace mbts.spark { public override string window_type => _window_type; public override UIElement Content => _view; public override IEnumerable Commands => _commands; - public override MarketViewWindowFactory.StartupData SaveState => _state = new MarketViewWindowFactory.StartupData(_state.security_criteria, _vm.get_filter_states(), _vm.grid_settings_manager.create()); + public override MarketViewWindowFactory.StartupData SaveState => + _state = new MarketViewWindowFactory.StartupData(_state.security_criteria, _vm.get_filter_states(), _vm.grid_settings_manager.create(), _vm.rows_view.get_sorting_criteria(_vm.columns)); + public override double MinWidth => 1035 + SPARK_MENU_COLLAPSED_WIDTH + LAUNCHER_BUTTON_BORDER_WIDTH; public string thread_id => _thread_id; @@ -46,11 +49,9 @@ namespace mbts.spark { _init_guard.check_access(); Log.notnull(_state); var state_src = Observable.FromEvent, MarketViewWindowFactory.StartupData>(cb => _state_changed += cb, cb => _state_changed -= cb).StartWith(_state); - _vm = new MarketViewVM(_bus, this.observe_title(), _orders_model, state_src, _settings_manager); + _vm = new MarketViewVM(_bus, _orders_model, state_src, _settings_manager); _view = new MarketViewView { DataContext = _vm }; var update_securities_cmd = SparkCommands.change_securities_callback(_window_type_display_name); - - _commands = new List { SparkCommands.ShowLadders.complete(_vm.selected_security_mds_observable(), smds => smds.Count > 0), SparkCommands.ShowOrderTicketFromSecurity.complete(_vm.current_security_md, md => md.HasValue, ObjectHelper.ValueOrDefault), @@ -63,8 +64,14 @@ namespace mbts.spark { SparkCommands.ShowSyntheticCreate.complete(_vm.selected_securities_observable(), secs => secs.Count > 0 && secs.Count <= 24, secs => new SecurityCriteria(secs)), SparkCommands.change_securities_command(() => (update_securities_cmd, _state.security_criteria)), // wrap the grid settings view factory in a dialogCommand here since the vm is destroyed/recreated when the security criteria changes - SparkCommands.window_settings_command(new DialogCommand(() => _vm.grid_settings_manager.view_factory())) - + SparkCommands.window_settings_command(new DialogCommand(() => { + var vm = new WindowSettingsDialogVM( + _settings_manager, s => s.market_view_grid_defaults, UserSettings.FileExtensions.GRID, () => new SimpleGridSettingsVM(this.observe_title())); + // TODO: bind to main window's Title + var dialog = new SimpleGridSettingsDialog { Title = "Market View Grid Settings", DataContext = vm }; + vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog); + return dialog; + })) }; _subscriptions = _bus.subscribe(update_securities_cmd.tag).OnDispatcher().Subscribe(c => _state_changed?.Invoke(_state = new MarketViewWindowFactory.StartupData(c, _vm.get_filter_states(), _vm.grid_settings_manager.create()))); @@ -76,4 +83,4 @@ namespace mbts.spark { Commands.OfType().DisposeAll(); } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs index a7f0e8093..19d3f0b6a 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs @@ -48,8 +48,8 @@ namespace bts.shell { [ProtoMember(1)] public readonly SecurityCriteria security_criteria; - //[ProtoMember(2)] (THIS HAS BEEN USED in previous versions, please don't remove comment) - //public readonly List sorting_criteria; + [ProtoMember(2)] + List _sorting_criteria; [ProtoMember(3)] public readonly FilterStates filters; [ProtoMember(4)] @@ -60,14 +60,17 @@ namespace bts.shell { public StartupData(SecurityCriteria security_criteria) : this (security_criteria, new FilterStates()) { } - public StartupData(SecurityCriteria security_criteria, FilterStates filters, GridSettings grid = default) { + public StartupData(SecurityCriteria security_criteria, FilterStates filters, GridSettings grid = default, List sorting_criterion = null) { this.security_criteria = security_criteria; this.filters = filters; this.grid = grid; + _sorting_criterion = sorting_criterion; } public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.sorting_criterion); + public IReadOnlyList sorting_criterion => _sorting_criterion ?? (_sorting_criterion = new List()); + public static StartupData Default(SecurityCriteria security_criteria) => new StartupData(security_criteria, new FilterStates(), DefaultGridSettings); diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs index ad22739b2..61d6f3f80 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs @@ -14,14 +14,17 @@ using System.Windows.Input; using System.Windows.Media; using static bts.shell.TimeAndSalesWindowFactory; using static mbts.ui.controls.DIYGrid; +using mbts.persist; +using mbts.ui.settings; +using System.Reactive.Linq; namespace mbts.spark { class TimeAndSalesVM : SecurityGrid { readonly IBus _bus; readonly TimeAndSalesModel _model; - public TimeAndSalesVM(IBus bus, IObservable owner_title, TimeAndSalesModel model, StartupData startup_data) - : base(RXCollection.CreateBuffer(model.trades, 1000), startup_data.grid?.sorting_criterion ?? Enumerable.Empty()) { + public TimeAndSalesVM(IBus bus, IWindowSettingsManager settings_manager, TimeAndSalesModel model, StartupData startup_data) + : base(RXCollection.CreateBuffer(model.trades, 1000), Enumerable.Empty()) { _bus = bus; _model = model; show_ladder = DelegateCommandParamObserver.Create(current_row_observable, r => _show_ladder_async(r).ignore(), r => r != null); @@ -36,34 +39,34 @@ namespace mbts.spark { security_key_filter.load_state(filters.security_key); } // Columns - add_column(TimeAndSalesView.Columns.Security, DefaultColumnHeaders.Security, DefaultColumnWidths.Security, security_filter, DataGridFilterKnownTemplates.Regex); - add_column(TimeAndSalesView.Columns.Time, DefaultColumnHeaders.Time, DefaultColumnWidths.Time, time_filter, DataGridFilterKnownTemplates.TimeFilter); - add_column(TimeAndSalesView.Columns.Price, DefaultColumnHeaders.Price, DefaultColumnWidths.Price, price_filter, DataGridFilterKnownTemplates.DoubleMinMax, System.Windows.HorizontalAlignment.Right); - add_column(TimeAndSalesView.Columns.Size, DefaultColumnHeaders.Size, DefaultColumnWidths.Size, size_filter, DataGridFilterKnownTemplates.UIntMinMax, System.Windows.HorizontalAlignment.Right); - add_column(TimeAndSalesView.Columns.Aggressor, DefaultColumnHeaders.Aggressor, DefaultColumnWidths.Aggressor, aggressor_filter, DataGridFilterKnownTemplates.EnumValues); - add_column(TimeAndSalesView.Columns.TradeKey, DefaultColumnHeaders.TradeKey, DefaultColumnWidths.TradeKey, trade_key_filter, DataGridFilterKnownTemplates.Regex); - add_column(TimeAndSalesView.Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, DefaultColumnWidths.SecurityKey, security_key_filter, DataGridFilterKnownTemplates.Regex); - void add_column(TimeAndSalesView.Columns col_key, string header, double width, IDataGridColumnFilter filter, string filter_template, System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) => + add_column(TimeAndSalesView.Columns.Security, DefaultColumnHeaders.Security, DefaultColumnWidths.Security, nameof(Row.security), security_filter, DataGridFilterKnownTemplates.Regex); + add_column(TimeAndSalesView.Columns.Time, DefaultColumnHeaders.Time, DefaultColumnWidths.Time, nameof(Row.time), time_filter, DataGridFilterKnownTemplates.TimeFilter); + add_column(TimeAndSalesView.Columns.Price, DefaultColumnHeaders.Price, DefaultColumnWidths.Price, nameof(Row.price), price_filter, DataGridFilterKnownTemplates.DoubleMinMax, System.Windows.HorizontalAlignment.Right); + add_column(TimeAndSalesView.Columns.Size, DefaultColumnHeaders.Size, DefaultColumnWidths.Size, nameof(Row.size), size_filter, DataGridFilterKnownTemplates.UIntMinMax, System.Windows.HorizontalAlignment.Right); + add_column(TimeAndSalesView.Columns.Aggressor, DefaultColumnHeaders.Aggressor, DefaultColumnWidths.Aggressor, nameof(Row.aggressor_side), aggressor_filter, DataGridFilterKnownTemplates.EnumValues); + add_column(TimeAndSalesView.Columns.TradeKey, DefaultColumnHeaders.TradeKey, DefaultColumnWidths.TradeKey, nameof(Row.trade_key), trade_key_filter, DataGridFilterKnownTemplates.Regex); + add_column(TimeAndSalesView.Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, DefaultColumnWidths.SecurityKey, nameof(Row.security_key), security_key_filter, DataGridFilterKnownTemplates.Regex); + void add_column(TimeAndSalesView.Columns col_key, string header, double width, string sort_member_path, IDataGridColumnFilter filter, string filter_template, System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) => columns.Add(new TimeAndSalesColumn( col_key , (r) => _get_aggressor_brush(r) , filter , filter_template ) - { Header = header, Width = width, horizontal_alignment = h_alignment } + { Header = header, Width = width, sort_member_path = sort_member_path, horizontal_alignment = h_alignment } ); // be sure to load GridSettings AFTER the columns collection has been populated, the grid settings manager looks columns by id to apply the appropriate settings, // if the collection is not populated, the column settings will not be applied - grid_settings_manager = new SimpleGridSettingsManager(owner_title, null, rows_view, columns); + grid_settings_manager = new SimpleGridSettingsManager(columns); grid_settings_manager.load_from(startup_data.grid); _resources.AddRange( show_ladder, DataGridFilterHelper.hook_filters( - rows_view, time_filter, security_filter, price_filter, size_filter, aggressor_filter, trade_key_filter, security_key_filter - ) + rows_view, time_filter, security_filter, price_filter, size_filter, aggressor_filter, trade_key_filter, security_key_filter), + settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager) ); - grid_settings_manager.load_from(startup_data.grid); + rows_view.set_sort_descriptions(startup_data.sorting_criterion, columns); } public ObservableCollection columns { get; } = new ObservableCollection(); @@ -71,7 +74,7 @@ namespace mbts.spark { public SimpleGridSettingsManager grid_settings_manager { get; } public StartupData create() => - new StartupData(_model.security_criteria, _get_filter_states(), grid_settings_manager.create()); + new StartupData(_model.security_criteria, _get_filter_states(), grid_settings_manager.create(), rows_view.get_sorting_criteria(columns)); private Brush _get_aggressor_brush(Row r) { BTSColor c; diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index 879ac6cab..e2d2330ac 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -3,8 +3,11 @@ using bts.api; using bts.shell; using bts.spark; using mbts.co2; +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; @@ -20,6 +23,7 @@ namespace mbts.spark { const string _window_type = "TimeAndSales", _window_type_display_name = "Time And Sales"; readonly MDConsumer _consumer; readonly TimeAndSalesWindowFactory _factory; + readonly IWindowSettingsManager _settings_manager; SingleValuePump _vm; TimeAndSalesModel _model; StartupData _state; @@ -27,12 +31,13 @@ namespace mbts.spark { SparkCommand[] _commands; IDisposable _subscriptions; - public TimeAndSalesWindow(TimeAndSalesWindowFactory factory, IBus bus, MDConsumer consumer, StartupData state, ImageSource icon) + public TimeAndSalesWindow(TimeAndSalesWindowFactory factory, IBus bus, MDConsumer consumer, StartupData state, ImageSource icon, IWindowSettingsManager settings_manager) : base("Time And Sales", bus, factory, SparkCommands.ShowTimeAndSales.icon) { Log.assert(state != null); _consumer = consumer; _factory = factory; _state = state; + _settings_manager = settings_manager; Icon.Freeze(); } @@ -68,7 +73,14 @@ namespace mbts.spark { SparkCommands.ShowMarketView.complete(selected_secs_source, always_true, secs => secs.Count > 0 ? new SecurityCriteria(secs) : _state.security_criteria), SparkCommands.change_securities_command(() => (update_securities_cmd, _state.security_criteria)), // wrap the grid settings view factory in a dialogCommand here since the vm is destroyed/recreated when the security criteria changes - SparkCommands.window_settings_command(new DialogCommand(() => _vm.value.grid_settings_manager.view_factory())) + SparkCommands.window_settings_command(new DialogCommand(() => { + var vm = new WindowSettingsDialogVM( + _settings_manager, s => s.market_view_grid_defaults, UserSettings.FileExtensions.GRID, () => new SimpleGridSettingsVM(this.observe_title())); + // TODO: bind to main window's Title + var dialog = new SimpleGridSettingsDialog { Title = "Time and Sales Grid Settings", DataContext = vm }; + vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog); + return dialog; + })) }; _subscriptions = Disposable.Create( _bus.subscribe(update_securities_cmd.tag).OnDispatcher().Subscribe(update_criteria), @@ -100,7 +112,7 @@ namespace mbts.spark { Disposable.dispose(ref _model); _model = new TimeAndSalesModel(_bus, _consumer, _state.security_criteria); // the previous _vm.value is automatically disposed when _vm.value is set - no need to dispose it here - _vm.value = new TimeAndSalesVM(_bus, this.observe_title(), _model, _state); + _vm.value = new TimeAndSalesVM(_bus, _settings_manager, _model, _state); if (_view == null) _view = new TimeAndSalesView(); _view.DataContext = _vm.value; diff --git a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs index 17cbe946a..26d9a00b2 100644 --- a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs +++ b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs @@ -2,6 +2,7 @@ using bts.spark; using mbts; using mbts.co2; +using mbts.persist; using mbts.spark; using mbts.spark.filters; using mbts.ui; @@ -9,6 +10,7 @@ using mbts.ui.settings; using ProtoBuf; using System; using System.Collections.Generic; +using System.Linq; using System.Reactive.Linq; using System.Threading.Tasks; using static mbts.ui.controls.DIYGrid; @@ -18,11 +20,13 @@ namespace bts.shell { class TimeAndSalesWindowFactory : ShellWindowFactory { readonly IBus _bus; readonly MDConsumer _consumer; + readonly UserSettingsHub _settings_hub; IReadOnlyDictionary _securities = new Dictionary(); - public TimeAndSalesWindowFactory(IShellModule module, IBus bus, MDConsumer consumer) : base(module, "TimeAndSales") { + public TimeAndSalesWindowFactory(IShellModule module, IBus bus, MDConsumer consumer, UserSettingsHub settings_hub) : base(module, "TimeAndSales") { _bus = bus; _consumer = consumer; + _settings_hub = settings_hub; _dispose = Disposable.Create( bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s), @@ -33,7 +37,8 @@ namespace bts.shell { public static string col_id(Columns col) => col.ToString(); public override Task load(StartupData state) => - Task.FromResult(new TimeAndSalesWindow(this, _bus, _consumer, state, SparkCommands.PickTimeAndSales.icon)); + Task.FromResult(new TimeAndSalesWindow(this, _bus, _consumer, state, SparkCommands.PickTimeAndSales.icon, + new WindowSettingsManager(_settings_hub, state.grid, s => s.time_and_sales, (s, g) => s.with(time_and_sales:g)))); public async void show(SecurityCriteria criteria) { var w = await load(new StartupData(criteria)); @@ -44,8 +49,8 @@ namespace bts.shell { public class StartupData { [ProtoMember(1)] public readonly SecurityCriteria security_criteria; - //[ProtoMember(2)] (THIS HAS BEEN USED in previous versions, please don't remove comment) - //public readonly List sorting_criteria; + [ProtoMember(2)] + List _sorting_criterion; [ProtoMember(3)] public FilterStates filters; [ProtoMember(4)] @@ -56,19 +61,22 @@ namespace bts.shell { public StartupData(SecurityCriteria security_criteria) : this(security_criteria, new FilterStates()) { } - public StartupData(SecurityCriteria security_criteria, FilterStates filters, GridSettings grid = default) { + public StartupData(SecurityCriteria security_criteria, FilterStates filters, GridSettings grid = default, List sorting_criterion = null) { this.security_criteria = security_criteria; this.filters = filters; this.grid = grid; + _sorting_criterion = sorting_criterion; } + public List sorting_criterion => _sorting_criterion ?? (_sorting_criterion = new List()); + public static StartupData Default(SecurityCriteria security_criteria) => - new StartupData(security_criteria, new FilterStates(), GridSettings.Default.with(DefaultColumns.all, DefaultColumns.sorting_criterion)); + new StartupData(security_criteria, new FilterStates(), sorting_criterion:DefaultColumns.sorting_criterion.ToList()); public StartupData with(SecurityCriteria security_criteria) => new StartupData(security_criteria, filters, grid); - static class DefaultColumns { + public static class DefaultColumns { public static GridColumnSettings security => new GridColumnSettings(col_id(Columns.Security), DefaultColumnHeaders.Security, width: DefaultColumnWidths.Security); public static GridColumnSettings time => new GridColumnSettings(col_id(Columns.Time), DefaultColumnHeaders.Time, width: DefaultColumnWidths.Time); public static GridColumnSettings price => new GridColumnSettings(col_id(Columns.Price), DefaultColumnHeaders.Price, width: DefaultColumnWidths.Price); diff --git a/src/client/spark/core/ShellInterface/UserSettings/UserSettings.cs b/src/client/spark/core/ShellInterface/UserSettings/UserSettings.cs index 6aedd3a8e..9eb9b9e5a 100644 --- a/src/client/spark/core/ShellInterface/UserSettings/UserSettings.cs +++ b/src/client/spark/core/ShellInterface/UserSettings/UserSettings.cs @@ -25,22 +25,28 @@ namespace mbts.spark { [ProtoMember(5)] GridSettings _market_view_grid_defaults; + [ProtoMember(6)] + GridSettings _time_and_sales; public UserSettings() { } public LadderSettings ladder => _ladder ?? (_ladder = LadderSettings.Default); public NotificationSettings notification => _notification ?? (_notification = NotificationSettings.Default); public GridSettings market_view_grid_defaults => _market_view_grid_defaults ?? (_market_view_grid_defaults = bts.shell.MarketViewWindowFactory.StartupData.DefaultGridSettings); + public GridSettings time_and_sales => _time_and_sales ?? (_time_and_sales = GridSettings.Default.with(bts.shell.TimeAndSalesWindowFactory.StartupData.DefaultColumns.all)); - public UserSettings with(LadderSettings ladder = null, NotificationSettings notification = null, GridSettings provided_market_view_gridsettings = null) => + public UserSettings with(LadderSettings ladder = null, NotificationSettings notification = null, GridSettings provided_market_view_gridsettings = null, GridSettings time_and_sales = null) => new UserSettings { _ladder = ladder ?? _ladder, _notification = notification ?? _notification, - _market_view_grid_defaults = provided_market_view_gridsettings ?? _market_view_grid_defaults + _market_view_grid_defaults = provided_market_view_gridsettings ?? _market_view_grid_defaults, + _time_and_sales = time_and_sales ?? _time_and_sales }; public static class FileExtensions { - public const string LADDER = "ladder"; + public const string + LADDER = "ladder", + GRID = "grid"; } } diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettings.cs b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettings.cs index 5be7c36a5..fffee8e28 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettings.cs +++ b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettings.cs @@ -1,7 +1,9 @@ using bts.proto; +using bts.utils; using mbts.ui.controls; using mbts.ui.converters; using ProtoBuf; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Windows; @@ -10,7 +12,7 @@ using System.Windows.Media; namespace mbts.ui.settings { [ProtoContract] - class GridSettings { + class GridSettings : IEquatable { const string _default_font_family = "Segoe UI"; const double _default_font_size = 11; const uint _default_font_color = 0; @@ -94,6 +96,7 @@ namespace mbts.ui.settings { public FontWeight font_weight => FontWeight.FromOpenTypeWeight(_font_weight); public ColorOpacityProto selection_highlight => _selection_highlight; public IReadOnlyList columns => _columns; + [Obsolete] // TODO: remove sorting_criterion from GridSettings entirely. This should be part of IShellWindow's StartupData, since it is an instance-specific setting, and prob not part of the shared defaults public IReadOnlyList sorting_criterion => _sorting_criterion; public static GridSettings get_default() => @@ -110,5 +113,32 @@ namespace mbts.ui.settings { sorting_criterion ?? _sorting_criterion); public GridSettings clone() => with(); + + public bool Equals(GridSettings other) => + other != null && + font_family == other.font_family && + font_size == other.font_size && + font_weight == other.font_weight && + font_color == other.font_color && + selection_highlight == other.selection_highlight && + EqualityComparer.safe_sequence_equals(columns, other.columns) && +#pragma warning disable CS0612 // Type or member is obsolete + EqualityComparer.safe_sequence_equals(sorting_criterion, other.sorting_criterion); +#pragma warning restore CS0612 // Type or member is obsolete + + public override bool Equals(object obj) => + Equals(obj as GridSettings); + + public override int GetHashCode() => + EqualityComparer.aggregate_hash( + font_family.GetHashCode(), + font_size.GetHashCode(), + font_weight.GetHashCode(), + font_color.GetHashCode(), + selection_highlight.GetHashCode(), + EqualityComparer.safe_aggregate_hash(columns), +#pragma warning disable CS0612 // Type or member is obsolete + EqualityComparer.safe_aggregate_hash(sorting_criterion)); +#pragma warning restore CS0612 // Type or member is obsolete } } \ No newline at end of file diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsManager.cs b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsManager.cs index e20622836..01cf24d39 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsManager.cs +++ b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsManager.cs @@ -119,7 +119,9 @@ namespace mbts.ui { _grid_settings.set(grid); foreach (ColumnBase col in _columns) col.set_fallback_font_params(new FontFamily(grid.font_family), grid.font_size, grid.font_color.rgb_color(), grid.font_weight); +#pragma warning disable CS0612 // Type or member is obsolete _rows_view.set_sort_descriptions(grid.sorting_criterion, _columns); +#pragma warning restore CS0612 // Type or member is obsolete _predicate_animations_data = value.predicate_animations_data; _animation_defs.clear(); foreach (var pa in _predicate_animations_data) { diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml new file mode 100644 index 000000000..b1ff52313 --- /dev/null +++ b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Use Default + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml.cs b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml.cs new file mode 100644 index 000000000..19904f46f --- /dev/null +++ b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsDialog.xaml.cs @@ -0,0 +1,13 @@ +using System.Windows; + +namespace mbts.ui.spark { + /// + /// Interaction logic for SimpleGridSettingsDialog.xaml + /// + public partial class SimpleGridSettingsDialog : Window { + public SimpleGridSettingsDialog() => + InitializeComponent(); + + public const string ResetToFactoryKey = "Reset", CopyFromOtherKey = "Copy"; + } +} \ No newline at end of file diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsManager.cs b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsManager.cs index fd269052c..4dd73a1c0 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsManager.cs +++ b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsManager.cs @@ -1,11 +1,8 @@ -using bts.api; -using bts.proto; -using bts.shell; +using bts.proto; +using mbts.persist; using mbts.spark; using mbts.ui.settings; using mbts.ui.shell; -using mbts.ui.spark; -using mbts.ui.utility; using mbts.utils; using System; using System.Collections.Generic; @@ -18,8 +15,7 @@ using System.Windows.Media; using static mbts.ui.controls.DIYGrid; namespace mbts.ui { - class SimpleGridSettingsManager : DisposableViewModelBase { - readonly ICollectionView _rows_view; + class SimpleGridSettingsManager : ViewModelBase, IObserver { readonly ObservableCollection _columns; readonly Property _grid_settings; readonly DelegateProperty _font_family; @@ -27,17 +23,11 @@ namespace mbts.ui { readonly DelegateProperty _font_size; readonly DelegateProperty _font_color, _selection_highlight; readonly IReadOnlyDictionary _column_flags; - readonly IObservable _owner_title; - public SimpleGridSettingsManager( - IObservable owner_title, IObservable settings_source, ICollectionView rows_view, ObservableCollection columns) : - this(owner_title, settings_source, rows_view, columns, new Dictionary()) { } + public SimpleGridSettingsManager(ObservableCollection columns) + : this(columns, new Dictionary()) { } - public SimpleGridSettingsManager( - IObservable owner_title, IObservable settings_source, ICollectionView rows_view, ObservableCollection columns, IReadOnlyDictionary column_flags) { - // - _owner_title = owner_title; - _rows_view = rows_view; + public SimpleGridSettingsManager(ObservableCollection columns, IReadOnlyDictionary column_flags) { _columns = columns; _column_flags = column_flags.ToDictionary(kv => kv.Key, kv => ImmutableColumnSettingStore.create(kv.Value)); _grid_settings = backing(nameof(grid_settings), GridSettings.Default); @@ -46,25 +36,6 @@ namespace mbts.ui { _font_size = backing(nameof(font_size), () => grid_settings.font_size, nameof(font_size)); _font_color = backing(nameof(font_color), () => grid_settings.font_color.rgb_solid_brush().frozen(), nameof(grid_settings)); _selection_highlight = backing(nameof(selection_highlight), () => grid_settings.selection_highlight.to_brush().frozen(), nameof(grid_settings)); - - if (settings_source != null) { - _dispose = settings_source.OnDispatcher().Subscribe(on_settings_changed); - } - - void on_settings_changed(GridSettings grid) { - if (grid.columns != null) { - var cols_with_applied_flags = grid.columns.ToList(); - for (int i = 0; i < cols_with_applied_flags.Count; i++) { - if (_column_flags.TryGetValue(cols_with_applied_flags[i].id, out ImmutableColumnSettingStore store)) { - cols_with_applied_flags[i] = store.apply(cols_with_applied_flags[i]); - } - } - grid = grid.with(cols_with_applied_flags); - } - // IMPORTANT: don't overwrite current sorting - grid = grid.with(sorting_criterion: _rows_view.get_sorting_criteria(_columns)); - _load_from_core(grid, false); - } } public GridSettings grid_settings => _grid_settings.Value; @@ -74,37 +45,6 @@ namespace mbts.ui { public SolidColorBrush font_color => _font_color.Value; public SolidColorBrush selection_highlight => _selection_highlight.Value; - public Window view_factory() { - var vm = new SimpleGridSettingsVM(_owner_title); - // need to refresh before launching the settings-view bc users can chanve some grid-column-settings properties directly from the grid (e.g. width, is_collapsed, etc.) - _grid_settings.set(grid_settings.with(_columns.Select(c => c.create()))); - vm.load_from(grid_settings); - if (_column_flags != null) { - foreach (var col in vm.columns) { - if (_column_flags.TryGetValue(col.id, out ImmutableColumnSettingStore s)) - col.apply_flags(s.flags); - } - } - var window = new GridSettingsDialog { DataContext = vm }; - vm.committed += () => { - var grid = vm.create(); - if (grid.columns != null) { - var cols_with_applied_flags = grid.columns.ToList(); - for (int i = 0; i < cols_with_applied_flags.Count; i++) { - if (_column_flags.TryGetValue(cols_with_applied_flags[i].id, out ImmutableColumnSettingStore store)) { - cols_with_applied_flags[i] = store.apply(cols_with_applied_flags[i]); - } - } - grid = grid.with(cols_with_applied_flags); - } - // IMPORTANT: don't overwrite current sorting - grid = grid.with(sorting_criterion: _rows_view.get_sorting_criteria(_columns)); - _load_from_core(grid, false); - }; - vm.RequestClose += (s, e) => WindowUtilities.force_close(window); - return window; - } - public GridSettings create() { // IMPORTANT: don't overwrite current sorting _grid_settings.set(grid_settings.with(_columns.Select(c => { @@ -112,19 +52,33 @@ namespace mbts.ui { if (_column_flags.TryGetValue(c.id, out ImmutableColumnSettingStore store)) col_settings = store.apply(col_settings); return col_settings; - }), _rows_view.get_sorting_criteria(_columns))); + }))); return grid_settings; } public void load_from(GridSettings grid) => _load_from_core(grid, true); + void IObserver.OnCompleted() { } + void IObserver.OnError(Exception error) { } + void IObserver.OnNext(GridSettings grid) { + if (grid.columns != null) { + var cols_with_applied_flags = grid.columns.ToList(); + for (int i = 0; i < cols_with_applied_flags.Count; i++) { + if (_column_flags.TryGetValue(cols_with_applied_flags[i].id, out ImmutableColumnSettingStore store)) { + cols_with_applied_flags[i] = store.apply(cols_with_applied_flags[i]); + } + } + grid = grid.with(cols_with_applied_flags); + } + _load_from_core(grid, false); + } + void _load_from_core(GridSettings grid, bool reset_immutable_flag_stores) { grid = grid ?? GridSettings.Default; _grid_settings.set(grid); foreach (ColumnBase col in _columns) col.set_fallback_font_params(new FontFamily(grid.font_family), grid.font_size, grid.font_color.rgb_color(), grid.font_weight); - _rows_view.set_sort_descriptions(grid.sorting_criterion, _columns); // ** in the unfortunate event that we botch backwards compatability, and the columns don't bear a 1:1 relationship with the column-settings // don't add insult to injury by crashing ** if (grid_settings.columns != null) { @@ -218,4 +172,4 @@ namespace mbts.ui { } } } -} \ No newline at end of file +} diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsVM.cs b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsVM.cs index b46a2653f..aff6a61b4 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsVM.cs +++ b/src/client/spark/view/Controls/DIYGrid/Settings/SimpleGridSettingsVM.cs @@ -24,7 +24,7 @@ namespace mbts.spark { void apply_flags(GridColumnSettingsFeatureFlags flags); } - partial class SimpleGridSettingsVM : DisposableViewModelBase, IValueFactory { + partial class SimpleGridSettingsVM : DisposableViewModelBase, IValueFactory, IWindowSettingsVM { readonly Property _current_column; readonly Property _font_family; readonly Property _font_weight; @@ -33,7 +33,6 @@ namespace mbts.spark { readonly Property _show_predicate_animations, _show_cell_predicate_animations; public SimpleGridSettingsVM(IObservable owner_title) { - // _owner_title = backing(nameof(owner_title), owner_title); _font_family = backing(nameof(font_family), TextUtils.StandardFontFamily); _font_size = backing(nameof(font_size), FontSizes.Small); @@ -87,5 +86,8 @@ namespace mbts.spark { curr_column = columns.FirstOrDefault(); _current_column.set(curr_column); } + + void IWindowSettingsVM.load(GridSettings value) => load_from(value); + GridSettings IWindowSettingsVM.get_result() => create(); } } \ No newline at end of file diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index 3bc639b4a..998491700 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -64,7 +64,7 @@ namespace mbts.spark { show_book_command = new DelegateCommand(_show_book); show_ticket_command = new DelegateCommand(_show_ticket); settings_command = new DialogCommand(() => { - var vm = new WindowSettingsDialogVM(settings_manager, s => s.ladder, UserSettings.FileExtensions.LADDER); + var vm = new WindowSettingsDialogVM(settings_manager, s => s.ladder, UserSettings.FileExtensions.LADDER, () => new LadderSettingsVM()); var dialog = new ui.spark.LadderSettingsDialog { DataContext = vm, Title = $"Ladder Settings - '{security}'" diff --git a/src/client/spark/view/Spark/Utilities/WindowSettingsDialogVM.cs b/src/client/spark/view/Spark/Utilities/WindowSettingsDialogVM.cs index ccc6a5bf1..4e8d388ea 100644 --- a/src/client/spark/view/Spark/Utilities/WindowSettingsDialogVM.cs +++ b/src/client/spark/view/Spark/Utilities/WindowSettingsDialogVM.cs @@ -11,18 +11,18 @@ namespace mbts.spark { T get_result(); } - class WindowSettingsDialogVM : ViewModelBase, IRequestViewClose where T : class, IEquatable where TVM : IWindowSettingsVM, new() { + class WindowSettingsDialogVM : ViewModelBase, IRequestViewClose where T : class, IEquatable where TVM : IWindowSettingsVM { readonly Property _default_tab_selected, _use_default; readonly DialogSkirtItem _sync_to_factory_item, _sync_to_default_item, _sync_to_instance_item, _ok_item, _apply_item, _cancel_item; readonly DelegateProperty> _left_skirt_items; - public WindowSettingsDialogVM(IWindowSettingsManager settings_manager, Func get_factory_settings, string settings_file_ext) { + public WindowSettingsDialogVM(IWindowSettingsManager settings_manager, Func get_factory_settings, string settings_file_ext, Func vm_factory) { var settings = settings_manager.current_settings(); _default_tab_selected = backing(nameof(default_tab_selected), settings_manager.instance_settings == null); _use_default = backing(nameof(use_default), default_tab_selected); - default_vm = new TVM(); + default_vm = vm_factory(); default_vm.load(settings_manager.default_settings); - instance_vm = new TVM(); + instance_vm = vm_factory(); instance_vm.load(settings_manager.current_settings()); // items const string import_group = "i", export_group = "e";