From 3d96bc98e26e322cbcf7b00ce5a4fe583bc2271b Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 26 Apr 2019 21:16:38 -0500 Subject: [PATCH] SPARK-2234 / SPARK-2332 ladder - toggle conf to display algo params in a grid (like orderbook) --- .../Trading/Ladder/LadderWindowFactory.cs | 4 +- .../spark/Orders/OrderPropertiesEditorVM.cs | 29 +++++++++- .../Controls/Order/AlgoTemplateToolBar.xaml | 3 +- .../Order/OrderDetailsPopupControl.xaml | 58 +++++++++++++++++-- .../Order/OrderDetailsPopupControl.xaml.cs | 18 ++++-- src/lib/config/protos/UI.proto | 1 + 6 files changed, 100 insertions(+), 13 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs index b36af3813..976816d1c 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs @@ -63,6 +63,7 @@ namespace bts.shell { init.use_defaults |= state_settings == null; var vm = LadderVM.create(_bus, model, settings_manager, init); vm.order_properties_vm.open_algo_popup_on_select = _ladder_conf.open_algo_popup_on_select; + vm.order_properties_vm.use_algo_param_grid = _ladder_conf.use_algo_param_grid; var lv = new LadderView(vm); foreach (var kv in AlgoStudioModelUtils.get_dynamic_resources(vm.model.order_gateway.algo_model.ui_configuration)) lv.Resources[kv.Key] = kv.Value; @@ -137,12 +138,13 @@ namespace bts.shell { readonly struct LadderConfig { public readonly uint max_open_ladders; - public readonly bool ladders_on_threads, open_algo_popup_on_select; + public readonly bool ladders_on_threads, open_algo_popup_on_select, use_algo_param_grid; public readonly TimeSpan security_timeout; public LadderConfig(bts.config.LadderKnobs knobs, bool ladders_on_threads) { max_open_ladders = knobs.max_open_ladders; open_algo_popup_on_select = knobs.open_algo_popup_on_select; + use_algo_param_grid = knobs.use_algo_param_grid; security_timeout = TimeSpan.FromSeconds(Math.Max(15, knobs.security_timeout_secs)); this.ladders_on_threads = ladders_on_threads; } diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index c1680844f..d8ef108ad 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -63,10 +63,12 @@ namespace mbts.spark { readonly TableUpdateBuffer _definitions_buffer = new TableUpdateBuffer(d => d.key); readonly EditableCollectionModel _algo_template_collection_model; readonly ObservableKeyedCollection _favorite_templates = new ObservableKeyedCollection(tvm => tvm.key); + readonly ObservableAggregateCollection _algo_param_rows = new ObservableAggregateCollection(); IReadOnlyDictionary _algo_metadata = DictionaryHelper.empty(); - IReadOnlyDictionary _favorite_algos_index = DictionaryHelper.empty(); + IReadOnlyDictionary _favorite_algos_index = DictionaryHelper.empty(); + IDisposable _algo_param_rows_hook; int _favorite_algos_column_count; - bool _open_algo_popup_on_select; + bool _open_algo_popup_on_select, _use_algo_param_grid; public OrderPropertiesEditorVM(OrdersModel model, IObservable security_md_source, IObservable order_properties) { _model = model; @@ -207,7 +209,10 @@ namespace mbts.spark { d.selected_format = fmt; }), vm), true)) { - () => Disposable.dispose(ref _template_collection_sync) + () => { + Disposable.dispose(ref _template_collection_sync); + Disposable.dispose(ref _algo_param_rows_hook); + } }; async Task save_template_async(AlgoDefinitionTemplateVM template) { using (_preserve_selection_by_index()) @@ -238,8 +243,11 @@ namespace mbts.spark { IDisposable _template_collection_sync; void _selected_algo_definition_Changed(AlgoDefinitionVM old_value, AlgoDefinitionVM new_value, SelectionReason reason) { Disposable.dispose(ref _template_collection_sync); + Disposable.dispose(ref _algo_param_rows_hook); if (new_value != null) { _template_collection_sync = ObservableAutoWrapper.connect_two_way(new_value.templates_with_custom, algo_templates); + if (use_algo_param_grid) + _algo_param_rows_hook = _connect_algo_param_rows(new_value, _algo_param_rows); if (reason != SelectionReason.Explicit) _selected_algo_stack.Push(new_value.key); } else { @@ -267,9 +275,21 @@ namespace mbts.spark { public TimeInForce selected_time_in_force { get => _time_in_force.selected_item; set => _time_in_force.selected_item = value; } public CustomOrderDefinitionImmutable? definition => selected_algo_template?.algo_root?.definition; public int favorite_algos_column_count { get => _favorite_algos_column_count; private set => Set(ref _favorite_algos_column_count, value); } + public bool use_algo_param_grid { + get => _use_algo_param_grid; + set { + if (_use_algo_param_grid != value) { + _use_algo_param_grid = value; + if (value) { + Disposable.replace(ref _algo_param_rows_hook, _connect_algo_param_rows(selected_algo_definition, _algo_param_rows)); + } else Disposable.dispose(ref _algo_param_rows_hook); + } + } + } // items sources public ObservableCollection algo_definitions => _algo_definitions; public ObservableCollection algo_templates { get; } = new ObservableCollection(); + public IReadOnlyObservableCollection algo_param_rows => _algo_param_rows; public ICollectionView algo_definitions_view => _algo_definitions_view; public ICollectionView favorite_algo_definitions_view => _favorite_algo_definitions_view; public ICollectionView algo_templates_view { get; } @@ -388,6 +408,9 @@ namespace mbts.spark { favorite_algos_column_count = value.column_count; } + static IDisposable _connect_algo_param_rows(AlgoDefinitionVM def, ObservableAggregateCollection rows) => + AlgoParamRowsHelper.connect(def, rows, false); + int? _get_favorite_algo_index(AlgoKey key) => key.mode == AlgoKey.Mode.Persisted && _favorite_algos_index.TryGetValue(key, out int i) ? i : (int?)null; diff --git a/src/client/spark/view/Controls/Order/AlgoTemplateToolBar.xaml b/src/client/spark/view/Controls/Order/AlgoTemplateToolBar.xaml index ea5f8bebe..7fcacffcc 100644 --- a/src/client/spark/view/Controls/Order/AlgoTemplateToolBar.xaml +++ b/src/client/spark/view/Controls/Order/AlgoTemplateToolBar.xaml @@ -141,6 +141,7 @@ Margin="4,0,0,0" MinWidth="100" Text="{Binding Definition.name, RelativeSource={RelativeSource TemplatedParent}}" + Visibility="Collapsed" > @@ -352,4 +353,4 @@ - \ No newline at end of file + diff --git a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml index d5e6e4ae8..9473276e0 100644 --- a/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml +++ b/src/client/spark/view/Controls/Order/OrderDetailsPopupControl.xaml @@ -4,6 +4,7 @@ xmlns:sp="clr-namespace:mbts.spark" 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:uag="clr-namespace:mbts.ui.spark.algo" xmlns:sys="clr-namespace:System;assembly=mscorlib" @@ -31,8 +32,27 @@ - - + + + + + + + + + + + + + + + + +