From fba6bd2d971bcbcf74997ebf5a6378a6d2bf44a1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 19 Oct 2019 14:08:39 -0500 Subject: [PATCH] make fills grid settings pretty --- .../spark/Modules/Trading/Fills/FillsVM.cs | 10 +- .../Modules/Trading/Fills/FillsWindow.cs | 13 +- .../Modules/Trading/OrderBook/OrderBookVM.cs | 12 +- .../DIYGrid/Settings/GridSettingsView.xaml | 901 +----------------- .../Shell/Settings/ShellSettingsDialog.xaml | 24 +- .../Settings/ShellSettingsDialog.xaml.cs | 1 + 6 files changed, 51 insertions(+), 910 deletions(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 75a876716..24a482d64 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -132,7 +132,7 @@ namespace mbts.spark { // rows _rows_manager = DIYGridRowsManager.create(FillsWindow.window_type_name, Columns.FillKey, col_tups, col_tups.WrapSelector(t => (t.col, t.key)), _get_column_comparer, fs => fs.build_predicate()); // grid settings - grid_settings_manager = new SimpleGridSettingsManager(columns, new Dictionary { }, rows); + grid_settings_manager = new GridSettingsManager(columns); // this will initialize the immutable properties that correspond to the col_settings_flags above (e.g. Bid/Ask font_color_override, etc.) if (_settings_manager != null) grid_settings_manager.load_from(_settings_manager.current_settings()); @@ -169,7 +169,7 @@ namespace mbts.spark { _rows_manager.on_settings(fs, s.sorting_criterion); }), model.subscribe_all_algos().SelectKeyValue(AlgoDataVM.from_data, d => AlgoID.from_algo_key(d.data.key)).OnDispatcher().Subscribe(root_algo_type_observer), - settings_manager == null ? Disposable.empty : settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager) + settings_manager == null ? Disposable.empty : settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager.load_from) ); // local methods void add_col(Columns col_key, string header, Func get_text, IDataGridColumnPersistentFilter filter, string filter_template, double width) => @@ -192,13 +192,13 @@ namespace mbts.spark { public ObservableCollection rows { get; } = new ObservableCollection(); public int total_row_count => _total_row_count; - public SimpleGridSettingsManager grid_settings_manager { get; } + public GridSettingsManager grid_settings_manager { get; } public GridSettings get_grid_save_state() { if (_settings_manager.instance_settings == null) return null; else - return grid_settings_manager.create(); + return grid_settings_manager.grid_settings; } public FillsFilterStates get_filters() => @@ -314,4 +314,4 @@ namespace mbts.spark { void IRowVM.raise_invalidated() => invalidated?.Invoke(); } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs index 090fd86b5..16681a59b 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsWindow.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsWindow.cs @@ -61,16 +61,17 @@ namespace mbts.spark { _commands = new List { // 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(() => { - var vm = new ShellSettingsDialogVM( + var vm = new ShellSettingsDialogVM( _settings_manager, us => us.fills_grid, UserSettings.FileExtensions.GRID, - s => _vm.grid_settings_manager.create_vm( + s => { + var gs_vm = _vm.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.columns.Select(c => c.create())) - ) - ); + gs_vm.load(s.with(_vm.columns.Select(c => c.create()))); + return gs_vm; + }); vm.SubscribeDisposed(literal_title_source.OnDispatcher().Subscribe(t => vm.title = t)); var dialog = new ShellSettingsDialog { DataContext = vm }; vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog); @@ -82,7 +83,7 @@ namespace mbts.spark { _state = new FillsSettings(_state.orders, _vm.get_sorting_criterion().ToList(), _vm.get_filters(), - _vm.grid_settings_manager.create() + _vm.grid_settings_manager.grid_settings ) ) ); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 983d4b509..497449a59 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -141,15 +141,17 @@ namespace mbts.spark { toggle_show_fills_cmd = new DelegateCommand(() => show_fills = !show_fills); launch_fills_settings_cmd = concated_disposable(new DialogCommand(() => { const string title = "Order Book 'Mini' Fills Grid"; - var vm = new ShellSettingsDialogVM( + var vm = new ShellSettingsDialogVM( _fills_settings_manager, us => us.fills_grid, UserSettings.FileExtensions.GRID, - s => fills_vm.value.grid_settings_manager.create_vm( + s => { + var gs_vm = fills_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(fills_vm.columns.Select(c => c.create())) - ), + gs_vm.load(s.with(fills_vm.columns.Select(c => c.create()))); + return gs_vm; + }, show_save_as_defaults: false); // TODO: bind to main window's Title var dialog = new ShellSettingsDialog { Title = title, DataContext = vm }; @@ -694,7 +696,7 @@ namespace mbts.spark { new OrderBookFillsGridSettings { sorting_criterion = fills_vm.get_sorting_criterion().ToList(), filters = fills_vm.get_filters(), - general = fills_vm.grid_settings_manager.create() + general = fills_vm.grid_settings_manager.grid_settings }; static OrderRecordTuplePredicate.PredicateTypeOneofCase _corresponding_predicate_type(Columns col) { diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsView.xaml b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsView.xaml index 3d1e9a522..dcf73b4ab 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsView.xaml +++ b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsView.xaml @@ -2,888 +2,39 @@ x:Class="mbts.ui.spark.GridSettingsView" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:proto="clr-namespace:bts.proto" - xmlns:m="clr-namespace:mbts" xmlns:sp="clr-namespace:mbts.spark" - xmlns:shell="clr-namespace:bts.shell" - xmlns:pnl="clr-namespace:bts.shell.pnl" - xmlns:u="clr-namespace:mbts.ui" xmlns:c="clr-namespace:mbts.ui.controls" - xmlns:cv="clr-namespace:mbts.ui.converters" xmlns:usp="clr-namespace:mbts.ui.spark" - xmlns:ut="clr-namespace:mbts.ui.utilities" - xmlns:sys="clr-namespace:System;assembly=mscorlib" + Content="{Binding}" > - - - - - - - - - - - - - 4.0 - 8.0 - 6.0 - 8.0 - 16.0 - 140 - 176 - 70 - 88 - 140 - 60 - 30 - 24 - 142 - 163 - 10,8 - - - - - - - - - - - - - - - - - - - - - - - - - Normal - - - - Italic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -