From 69ee85dea9550babfc1205c896a7a14c5a867ce4 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 22 Jul 2019 14:54:13 -0500 Subject: [PATCH 01/27] misc - adding OnDispatcher after discussing with John --- .../AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs index 5f4d64a32..c49712bae 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamRowsHelper.cs @@ -10,7 +10,7 @@ using System.Reactive.Disposables; namespace mbts.spark { static class AlgoParamRowsHelper { public static IDisposable connect(AlgoDefinitionVM algo, ObservableAggregateCollection rows, bool include_algo_type_rows) => - algo == null ? null : new CompositeDisposable(algo.observe_algo_root().SubscribeEach(a => { + algo == null ? null : new CompositeDisposable(algo.observe_algo_root().OnDispatcher().SubscribeEach(a => { rows.clear_collections(); if (a == null) return Disposable.empty; @@ -77,7 +77,7 @@ namespace mbts.spark { include_algo_type_rows ? (ObservableCollection)new ObservableAppendCollection(child_rows, selector_wrapper) : child_rows, - s.subscribe_selected_algo().SubscribeEach(a => { + s.subscribe_selected_algo().OnDispatcher().SubscribeEach(a => { s.value = a; child_rows.clear_collections(); return _wrap_rows(a, selector_wrapper, child_rows, include_algo_type_rows); From dc420a097ad1bde9bc119232821c92f9e80b5048 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 22 Jul 2019 14:55:45 -0500 Subject: [PATCH 02/27] adding stickied_algos ProtoMember for persistence --- .../Modules/Trading/Ladder/LadderSettings.cs | 20 +++++++++++++------ .../Trading/Ladder/VM/LadderSettingsVM.cs | 14 ++++++------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs index 6f2a442c4..a26f626ae 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs @@ -194,20 +194,27 @@ namespace mbts.spark { readonly bts.persist.algo.AlgoPersistedKey[] _favorite_algos; [ProtoMember(2)] public readonly int column_count; + [ProtoMember(3)] + readonly bts.persist.algo.AlgoPersistedKey[] _stickied_algos; - public LadderFavoriteAlgosSettings(AlgoKey[] favorite_algos, int column_count) - : this(ArrayHelper.safe_convert(favorite_algos, k => new bts.persist.algo.AlgoPersistedKey(k.persisted)), column_count) { } + public LadderFavoriteAlgosSettings(AlgoKey[] favorite_algos, int column_count, AlgoKey[] stickied_algos) + : this(ArrayHelper.safe_convert(favorite_algos, k => new bts.persist.algo.AlgoPersistedKey(k.persisted)), + column_count, + ArrayHelper.safe_convert(stickied_algos, k => new bts.persist.algo.AlgoPersistedKey(k.persisted))) { } - LadderFavoriteAlgosSettings(bts.persist.algo.AlgoPersistedKey[] favorite_algos, int column_count) { + LadderFavoriteAlgosSettings(bts.persist.algo.AlgoPersistedKey[] favorite_algos, int column_count, bts.persist.algo.AlgoPersistedKey[] stickied_algos) { _favorite_algos = favorite_algos; this.column_count = column_count; + _stickied_algos = stickied_algos; } public IReadOnlyList favorite_algos => ArrayHelper.safe_convert(_favorite_algos, k => k.to_algo_key()); + public IReadOnlyList stickied_algos => ArrayHelper.safe_convert(_stickied_algos, k => k.to_algo_key()); public bool Equals(LadderFavoriteAlgosSettings other) => column_count == other.column_count && - favorite_algos.SequenceEqual(other.favorite_algos); + favorite_algos.SequenceEqual(other.favorite_algos) && + stickied_algos.SequenceEqual(other.stickied_algos); public override bool Equals(object obj) => EqualityComparer.equals_obj(this, obj); @@ -215,7 +222,8 @@ namespace mbts.spark { public override int GetHashCode() => EqualityComparer.aggregate_hash( column_count, - EqualityComparer.aggregate_hash_limited(favorite_algos)); + EqualityComparer.aggregate_hash_limited(favorite_algos), + EqualityComparer.aggregate_hash_limited(stickied_algos)); public static bool operator ==(LadderFavoriteAlgosSettings a, LadderFavoriteAlgosSettings b) => a.Equals(b); public static bool operator !=(LadderFavoriteAlgosSettings a, LadderFavoriteAlgosSettings b) => !a.Equals(b); @@ -273,7 +281,7 @@ namespace mbts.spark { order_entry_panel_initial_width = _default_order_entry_panel_width; zoom_factor = _default_zoom_factor; use_defaults = true; - favorite_algos = new LadderFavoriteAlgosSettings(null, 2); + favorite_algos = new LadderFavoriteAlgosSettings(null, 2, null); show_warn_on_cross = _default_show_warn_on_cross; } diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index d7847884f..ac3315cc6 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -748,14 +748,14 @@ namespace mbts.spark { } public LadderFavoriteAlgosSettings create() => - new LadderFavoriteAlgosSettings(_raw_items - .Select(fai => fai.algo_definition?.key ?? fai.selector.desired_key) - .Where(k => k.HasValue && k.Value.is_persisted) - .Select(k => k.Value) - .ToArray(), - column_count); + new LadderFavoriteAlgosSettings(_raw_items + .Select(fai => fai.algo_definition?.key ?? fai.selector.desired_key) + .Where(k => k.HasValue && k.Value.is_persisted) + .Select(k => k.Value) + .ToArray(), + column_count); - FavoriteAlgoItem _item_factory() => + FavoriteAlgoItem _item_factory() => new FavoriteAlgoItem(_algo_definitions, new ListCollectionView(_algo_definitions) { CustomSort = AlgoCollectionHelper.algo_definition_vm_comparer.to_non_generic(), Filter = obj => obj is AlgoDefinitionVM vm && vm.key.is_persisted From 44eeff98e7b9fe897fc202267c5d80affb23d1d5 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 22 Jul 2019 14:58:54 -0500 Subject: [PATCH 03/27] adding is_sticky member to which the view will Databind --- .../spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index ac3315cc6..a4f40d9c8 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -777,6 +777,11 @@ namespace mbts.spark { public ICollectionView algo_definitions_view { get; } public AlgoDefinitionVM algo_definition { get => selector.value; set => selector.value = value; } + public bool is_sticky { + get => algo_definition != null ? algo_definition.is_sticky : false; + set => algo_definition.is_sticky = value; + } + class _AddButtonPlaceholderItem : FavoriteAlgoItem, ITemplateSelectorKey { public string key => LadderSettingsView.FavoriteAlgoAddButtonTemplateKey; } From 120b86aaaef5d76266db0a87e274488bc9cfa8ab Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 22 Jul 2019 15:03:46 -0500 Subject: [PATCH 04/27] popuplating stickied algo keys for persistence/restoration state --- .../Trading/Ladder/VM/LadderSettingsVM.cs | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index a4f40d9c8..85fc1bd88 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -748,14 +748,20 @@ namespace mbts.spark { } public LadderFavoriteAlgosSettings create() => - new LadderFavoriteAlgosSettings(_raw_items - .Select(fai => fai.algo_definition?.key ?? fai.selector.desired_key) - .Where(k => k.HasValue && k.Value.is_persisted) - .Select(k => k.Value) - .ToArray(), - column_count); + new LadderFavoriteAlgosSettings(_raw_items + .Select(fai => fai.algo_definition?.key ?? fai.selector.desired_key) + .Where(k => k.HasValue && k.Value.is_persisted) + .Select(k => k.Value) + .ToArray(), + column_count, + _raw_items + .Where(fai => fai.is_sticky) + .Select(fai => fai.algo_definition?.key ?? fai.selector.desired_key) + .Where(k => k.HasValue && k.Value.is_persisted) + .Select(k => k.Value) + .ToArray()); - FavoriteAlgoItem _item_factory() => + FavoriteAlgoItem _item_factory() => new FavoriteAlgoItem(_algo_definitions, new ListCollectionView(_algo_definitions) { CustomSort = AlgoCollectionHelper.algo_definition_vm_comparer.to_non_generic(), Filter = obj => obj is AlgoDefinitionVM vm && vm.key.is_persisted From beb5d855b118cb78d422f9b8f333a4cc5e0b57eb Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 22 Jul 2019 15:07:01 -0500 Subject: [PATCH 05/27] Dispatcher debuggering with John; think does not appear to work since the if condition is never met, but commiting this part of the pair-debugging experience --- .../Trading/Ladder/VM/LadderSettingsVM.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index 85fc1bd88..70bf5e10e 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -2,6 +2,7 @@ using bts.api; using bts.api.orderman; using bts.collections; +using bts.persist.algo; using bts.shell.orderbook; using bts.utils; using mbts.collections; @@ -723,6 +724,8 @@ namespace mbts.spark { readonly IObservableCollection _algo_definitions; readonly ObservableCollection _raw_items = new ObservableCollection(); int _column_count = 2; + HashSet _sticky_algo_keys; + IDisposable sticky_algos_hook; public FavoriteAlgosVM(IObservableCollection algo_definitions) { _algo_definitions = algo_definitions; @@ -745,6 +748,19 @@ namespace mbts.spark { fai.selector.try_select(k); return fai; })); + _sticky_algo_keys = new HashSet(value.stickied_algos.Where(k => k.is_persisted).Select(x=> x.persisted)); + Disposable.replace(ref sticky_algos_hook, + ObservableAutoWrapper.connect_item_actions(_raw_items, (x) => { + // John, this condition is never true + if (x.algo_definition != null && x.algo_definition.key.is_persisted) { + if (_sticky_algo_keys.Remove(x.algo_definition.key.persisted)) { + x.is_sticky = true; + if (_sticky_algo_keys.Count == 0) { + Disposable.dispose(ref sticky_algos_hook); + } + } + } + })); } public LadderFavoriteAlgosSettings create() => From d915e2f064d38f2ff49f5303f52c7f6e8c7955cb Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 22 Jul 2019 15:19:27 -0500 Subject: [PATCH 06/27] setting algo_def_vm.is_sticky via CollectionChanged event (hmm) --- .../Modules/Trading/Ladder/VM/LadderSettingsVM.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index 70bf5e10e..a0531ea13 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -732,6 +732,21 @@ namespace mbts.spark { items = new ObservableAggregateCollection(_raw_items, new ObservableCollection { FavoriteAlgoItem.AddButtonPlaceholderItem }); add_item_cmd = new DelegateCommand(() => _raw_items.Add(_item_factory())); remove_item_cmd = new DelegateCommand(fai => _raw_items.Remove(fai)); + + // It seems the FavoriteAlgoItem.algo_definition is *only* + // populated once items are added to the collection. Hece, we can + // only compare against the persisted key after the collection + // has been modified. + algo_definitions.CollectionChanged += (s, e) => { + if (_sticky_algo_keys != null && e.NewItems != null && e.NewItems is IEnumerable algo_def_vms) { + foreach (var algo_def_vm in algo_def_vms) { + if (algo_def_vm.key.is_persisted && _sticky_algo_keys.Contains(algo_def_vm.key.persisted)) { + algo_def_vm.is_sticky = true; + } + } + } + + }; } public ObservableCollection items { get; } From 7281aa8ff1084999668228b1dadc14c520f44a30 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 22 Jul 2019 15:20:37 -0500 Subject: [PATCH 07/27] adding is_sticky property --- .../Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs | 4 +++- .../spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs index 6c29af115..1de5643d2 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs @@ -36,7 +36,7 @@ namespace mbts.spark { readonly VisualStateModel _edit_pane_vs_model = new VisualStateModel(), _tree_view_vs_model = new VisualStateModel(); readonly EditStack _edit_stack = new EditStack(); readonly VersionContainer _version; - readonly Property _is_expanded, _is_selected; + readonly Property _is_expanded, _is_selected, _is_sticky; readonly Property _algo_root, _visible_algo_root; readonly DelegateProperty _is_favorite, _is_dirty, _can_undo, _can_redo; readonly Property _name, _abbreviation; @@ -79,6 +79,7 @@ namespace mbts.spark { _is_expanded = backing(nameof(is_expanded), true); _is_selected = backing(nameof(is_selected), true); _is_dirty = backing(nameof(is_dirty), () => key.mode == AlgoKey.Mode.Unpersisted || !_committed.HasValue || !_committed.Value.Equals(_version.value)); + _is_sticky = backing(nameof(is_sticky), false); var factory_def_data = def_data.key.mode == AlgoKey.Mode.Factory ? def_data : AlgoData.from_custom_def(def_data.value); _algo_root = backing(nameof(algo_root), _algo_roots.GetOrAdd(factory_def_data.key, _ => OrderTypeVMFactory.create(factory_def_data))); _visible_algo_root = backing(nameof(visible_algo_root)); @@ -186,6 +187,7 @@ namespace mbts.spark { public bool is_expanded { get => _is_expanded.Value; set => _is_expanded.set(value); } public bool is_selected { get => _is_selected.Value; set => _is_selected.set(value); } public bool is_dirty => _is_dirty.Value; + public bool is_sticky { get => _is_sticky.Value; set => _is_sticky.set(value); } public bool is_factory_definition => key.mode == AlgoKey.Mode.Factory; public AlgoDisplayGroup group => key.display_group(); public bool can_redo => _can_redo.Value; diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index a0531ea13..59f922fb7 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -740,7 +740,7 @@ namespace mbts.spark { algo_definitions.CollectionChanged += (s, e) => { if (_sticky_algo_keys != null && e.NewItems != null && e.NewItems is IEnumerable algo_def_vms) { foreach (var algo_def_vm in algo_def_vms) { - if (algo_def_vm.key.is_persisted && _sticky_algo_keys.Contains(algo_def_vm.key.persisted)) { + if (algo_def_vm.key.is_persisted && _sticky_algo_keys.Contains(new AlgoPersistedKey(algo_def_vm.key.persisted))) { algo_def_vm.is_sticky = true; } } @@ -763,12 +763,12 @@ namespace mbts.spark { fai.selector.try_select(k); return fai; })); - _sticky_algo_keys = new HashSet(value.stickied_algos.Where(k => k.is_persisted).Select(x=> x.persisted)); + _sticky_algo_keys = new HashSet(value.stickied_algos.Where(k => k.is_persisted).Select(x => new AlgoPersistedKey(x.persisted))); Disposable.replace(ref sticky_algos_hook, - ObservableAutoWrapper.connect_item_actions(_raw_items, (x) => { + ObservableAutoWrapper.connect_item_actions(_raw_items, x => { // John, this condition is never true if (x.algo_definition != null && x.algo_definition.key.is_persisted) { - if (_sticky_algo_keys.Remove(x.algo_definition.key.persisted)) { + if (_sticky_algo_keys.Remove(new AlgoPersistedKey(x.algo_definition.key.persisted))) { x.is_sticky = true; if (_sticky_algo_keys.Count == 0) { Disposable.dispose(ref sticky_algos_hook); From 7b237fedea884aab28c3a85fa687bf9ae45213d0 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 22 Jul 2019 15:26:16 -0500 Subject: [PATCH 08/27] adding sticky-related bits --- .../spark/Orders/OrderPropertiesEditorVM.cs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index 31ff1fc1b..f30f7beb7 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -277,6 +277,18 @@ namespace mbts.spark { get => _selected_algo_definition.selected_item; set => _selected_algo_definition.selected_item = value; } + + public bool try_get_algo_definition(AlgoKey a, out AlgoDefinitionVM result) => + _algo_definitions.TryGetValue(a, out result); + + public bool try_pop_selected_algo_definition() { + if (_selected_algo_stack.TryPop(out AlgoKey k) && _algo_definitions.TryGetValue(k, out AlgoDefinitionVM vm)) { + _selected_algo_definition.select_explicit(vm); + return true; + } + return false; + } + public AlgoDefinitionVM selected_favorite_algo_definition { get => selected_algo_definition?.is_favorite ?? false ? selected_algo_definition : null; set { @@ -286,7 +298,7 @@ namespace mbts.spark { if (_algo_definitions.TryGetValue(k, out AlgoDefinitionVM vm)) _selected_algo_definition.select_explicit(vm); } - RaisePropertyChanged(); + RaisePropertyChanged(nameof(selected_favorite_algo_definition), nameof(selected_favorite_is_non_sticky)); } } public bool can_expand => selected_algo_definition?.algo_root?.can_expand ?? false; @@ -302,6 +314,8 @@ namespace mbts.spark { } } public bool open_algo_popup_on_select { get => _open_algo_popup_on_select; set => Set(ref _open_algo_popup_on_select, value); } + public bool selected_favorite_is_non_sticky => !selected_favorite_algo_definition?.is_sticky ?? false; + // commands public ICommand save_definition_cmd { get; } public ICommand save_template_cmd { get; } @@ -349,8 +363,10 @@ namespace mbts.spark { public void on_favorite_algos(LadderFavoriteAlgosSettings value) { _favorite_algos_index = value.favorite_algos.Select((v, i) => (v, i)).ToDictionaryCrushed(t => t.v, t => t.i); + var _stickied_algos_index = value.stickied_algos.Select((v, i) => (v,i)).ToDictionaryCrushed(t => t.v, t => t.i); foreach (var d in algo_definitions) { d.favorite_index = _get_favorite_algo_index(d.key); + d.is_sticky = _stickied_algos_index.ContainsKey(d.key); } favorite_algos_column_count = value.column_count; } From 98a9ad3ef207768131a5f7ad24a0f59917a95c75 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 22 Jul 2019 15:28:37 -0500 Subject: [PATCH 09/27] reset order type after non-sticky order entry --- .../spark/Modules/Trading/Ladder/VM/LadderVM.cs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index 506835d9c..f28c6c8c6 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -4,6 +4,7 @@ using bts.shell; using bts.spark; using bts.utils; using mbts.co2; +using mbts.spark.utilities; using mbts.ui; using mbts.ui.shell; using mbts.utils; @@ -412,7 +413,9 @@ namespace mbts.spark { } else { uint size = size_from_alternate ? current_settings.alternate_order_size : (uint)Math.Abs(size_calculator.value ?? 0); + send_order_async(args.side.Value, size, args.price).ignore(); + } } @@ -433,6 +436,14 @@ namespace mbts.spark { await _model.order_gateway.send_order(order, price, size); if (auto_clear) size_calculator.value = 0; + if (order_properties_vm.selected_favorite_is_non_sticky) { + if (!order_properties_vm.try_pop_selected_algo_definition()) { + var key = new AlgoKey(OrderDataHelper.get_default_algo(OrderDataHelper.get_algo_format(security.ContractCase))); + if (order_properties_vm.try_get_algo_definition(key, out var r)) { + order_properties_vm.selected_algo_definition = r; + } + } + } } void _update_header() { From 472c9252f95129e6060080075c2e55b9fdd26f13 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 22 Jul 2019 15:29:17 -0500 Subject: [PATCH 10/27] adding Stay Enabled (sticky) checkbox to Favorites UI --- .../spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml index 67ed2b074..92ab62e4d 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderSettingsView.xaml @@ -805,6 +805,7 @@ + From 472e32f55891e7a25e327fc0bdd8d9224bee7b70 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 22 Jul 2019 15:36:15 -0500 Subject: [PATCH 11/27] removing empty new lines; leftovers from Dispatcher debugging --- src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index f28c6c8c6..d4ac53c1a 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -413,9 +413,7 @@ namespace mbts.spark { } else { uint size = size_from_alternate ? current_settings.alternate_order_size : (uint)Math.Abs(size_calculator.value ?? 0); - send_order_async(args.side.Value, size, args.price).ignore(); - } } From 441d3c886b3255e1072930c0ea04b7131792e03f Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Mon, 22 Jul 2019 15:49:34 -0500 Subject: [PATCH 12/27] fixing improper use of is --- src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index 59f922fb7..969fd6f6f 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -738,7 +738,8 @@ namespace mbts.spark { // only compare against the persisted key after the collection // has been modified. algo_definitions.CollectionChanged += (s, e) => { - if (_sticky_algo_keys != null && e.NewItems != null && e.NewItems is IEnumerable algo_def_vms) { + if (_sticky_algo_keys != null && e.NewItems != null) { + var algo_def_vms = e.NewItems.Cast(); foreach (var algo_def_vm in algo_def_vms) { if (algo_def_vm.key.is_persisted && _sticky_algo_keys.Contains(new AlgoPersistedKey(algo_def_vm.key.persisted))) { algo_def_vm.is_sticky = true; From 8b4d649bd433a13a9f63300da9c6018d6b423827 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 5 Aug 2019 11:38:45 -0500 Subject: [PATCH 13/27] ExecuteAsync should return the Task directly (no need to await internally) --- src/client/spark/view/Extensions/WPFExtensions.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark/view/Extensions/WPFExtensions.cs b/src/client/spark/view/Extensions/WPFExtensions.cs index 01d9e6144..643e20162 100644 --- a/src/client/spark/view/Extensions/WPFExtensions.cs +++ b/src/client/spark/view/Extensions/WPFExtensions.cs @@ -236,12 +236,12 @@ namespace mbts.ui { throw new NotImplementedException("This ICommand does not implement IRaiseCanExecuteChanged"); } - public static async Task ExecuteAsync(this ICommand command, object parameter) { + public static Task ExecuteAsync(this ICommand command, object parameter) { ExceptionAssert.Argument.NotNull(command, nameof(command)); if (command is IAsyncCommand acmd) - await acmd.Execute(parameter); + return acmd.Execute(parameter); else - await Task.Run(() => command.Execute(parameter)); + return Task.Run(() => command.Execute(parameter)); } public static void TryExecuteIfCan(this ICommand command, object parameter) { From 018887980b3ac98ecd1c80cd027df498aa596918 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 5 Aug 2019 12:55:43 -0500 Subject: [PATCH 14/27] LadderSettingsVM 'sticky buttons' impl reacts to FavoriteAlgoItem's value (algo) changes --- .../Trading/Ladder/VM/LadderSettingsVM.cs | 48 ++++++------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs index 969fd6f6f..97db476d3 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs @@ -725,29 +725,14 @@ namespace mbts.spark { readonly ObservableCollection _raw_items = new ObservableCollection(); int _column_count = 2; HashSet _sticky_algo_keys; - IDisposable sticky_algos_hook; + IDisposable _sticky_algos_hook; public FavoriteAlgosVM(IObservableCollection algo_definitions) { _algo_definitions = algo_definitions; items = new ObservableAggregateCollection(_raw_items, new ObservableCollection { FavoriteAlgoItem.AddButtonPlaceholderItem }); add_item_cmd = new DelegateCommand(() => _raw_items.Add(_item_factory())); remove_item_cmd = new DelegateCommand(fai => _raw_items.Remove(fai)); - - // It seems the FavoriteAlgoItem.algo_definition is *only* - // populated once items are added to the collection. Hece, we can - // only compare against the persisted key after the collection - // has been modified. - algo_definitions.CollectionChanged += (s, e) => { - if (_sticky_algo_keys != null && e.NewItems != null) { - var algo_def_vms = e.NewItems.Cast(); - foreach (var algo_def_vm in algo_def_vms) { - if (algo_def_vm.key.is_persisted && _sticky_algo_keys.Contains(new AlgoPersistedKey(algo_def_vm.key.persisted))) { - algo_def_vm.is_sticky = true; - } - } - } - - }; + _dispose = Disposable.Create(() => Disposable.dispose(ref _sticky_algos_hook)); } public ObservableCollection items { get; } @@ -765,18 +750,16 @@ namespace mbts.spark { return fai; })); _sticky_algo_keys = new HashSet(value.stickied_algos.Where(k => k.is_persisted).Select(x => new AlgoPersistedKey(x.persisted))); - Disposable.replace(ref sticky_algos_hook, - ObservableAutoWrapper.connect_item_actions(_raw_items, x => { - // John, this condition is never true - if (x.algo_definition != null && x.algo_definition.key.is_persisted) { - if (_sticky_algo_keys.Remove(new AlgoPersistedKey(x.algo_definition.key.persisted))) { - x.is_sticky = true; - if (_sticky_algo_keys.Count == 0) { - Disposable.dispose(ref sticky_algos_hook); - } - } - } - })); + Disposable.replace(ref _sticky_algos_hook, + ObservableAutoWrapper.connect_item_hooks(_raw_items, x => + x.selector.subscribe_value().Subscribe(algo => { + if (algo != null && + algo.key.is_persisted && + (x.is_sticky = _sticky_algo_keys.Remove(new AlgoPersistedKey(algo.key.persisted))) && + _sticky_algo_keys.Count == 0) + // + Disposable.dispose(ref _sticky_algos_hook); + }))); } public LadderFavoriteAlgosSettings create() => @@ -804,6 +787,7 @@ namespace mbts.spark { public static readonly FavoriteAlgoItem AddButtonPlaceholderItem = new _AddButtonPlaceholderItem(); internal readonly KeyedItemSelector selector; + bool _is_sticky; protected FavoriteAlgoItem() { } @@ -814,11 +798,7 @@ namespace mbts.spark { public ICollectionView algo_definitions_view { get; } public AlgoDefinitionVM algo_definition { get => selector.value; set => selector.value = value; } - - public bool is_sticky { - get => algo_definition != null ? algo_definition.is_sticky : false; - set => algo_definition.is_sticky = value; - } + public bool is_sticky { get => _is_sticky; set => Set(ref _is_sticky, value); } class _AddButtonPlaceholderItem : FavoriteAlgoItem, ITemplateSelectorKey { public string key => LadderSettingsView.FavoriteAlgoAddButtonTemplateKey; From 7b63d951f082f52102007f83b391c846e1b92135 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 5 Aug 2019 14:28:01 -0500 Subject: [PATCH 15/27] ShellSettingsDialogVM profilevm resets 'is_dirty' whenever the internal vm's resultant value equals the target value --- .../Shell/Settings/ShellSettingsDialogVM.cs | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs b/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs index 398d994a4..a85da8c0c 100644 --- a/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs +++ b/src/client/spark/view/Shell/Settings/ShellSettingsDialogVM.cs @@ -136,8 +136,8 @@ namespace mbts.spark { var skip_local = profiles.WrapSkip(1); var skip_local_wrapper = skip_local.WrapSelector( p => new SettingsProfile(p.id, p.name, p.value.create(), p.security_criteria), - ns => new ProfileVM(ns.id, vm_factory(ns.value), ns.name, ns.security_criteria)); - profiles.Add(_local_profile = new ProfileVM(0, vm_factory(init), "Custom", template_key: ShellSettingsDialog.LocalProfileItemTemplateKey)); + ns => new ProfileVM(ns.id, vm_factory(ns.value), ns.name, ns.security_criteria, target_value: ns.value)); + profiles.Add(_local_profile = new ProfileVM(0, vm_factory(init), "Custom", template_key: ShellSettingsDialog.LocalProfileItemTemplateKey, target_value: init)); _selected_profile = backing(nameof(selected_profile), _local_profile); // dialog skirt items _apply_item = new DialogSkirtItem("Apply", new DelegateCommand(apply)); @@ -325,26 +325,37 @@ namespace mbts.spark { // SecurityCriteria _security_criteria; SettingsProfile _committed, _last_result; + T _target_value; string _name, _template_key; bool _is_selected; IDisposable _dispose; - public ProfileVM(uint id, TVM value, string name, SecurityCriteria security_criteria = null, string template_key = null) { + public ProfileVM(uint id, TVM value, string name, SecurityCriteria security_criteria = null, string template_key = null, T target_value = null) { this.id = id; this.value = value; _name = name; _security_criteria = security_criteria; _template_key = template_key; + _target_value = target_value; _committed = _last_result = create(); _is_dirty = backing(nameof(is_dirty), () => !_last_result.Equals(_committed)); _refresh_is_dirty = new DeferrableActionWrapper(_is_dirty.refresh); var sub = value.Subscribe(v => { _last_result = _last_result.with(value: v); _refresh_is_dirty.execute(); + _on_value_changed(); }); _dispose = value is IDisposable d ? Disposable.Create(sub, d) : sub; } + void _on_value_changed() { + if (_target_value != null && is_dirty && _last_result.value.Equals(_target_value)) { + _target_value = null; + _committed = _last_result; + _refresh_is_dirty.execute(); + } + } + public uint id { get; } public TVM value { get; } public string name { @@ -380,21 +391,26 @@ namespace mbts.spark { /// assign directly to , to capture props that aren't visible in the dialog (i.e., props that are manipulated in the main window) _last_result = data; } + _on_value_changed(); } public void load_value_from(T value) { using (_refresh_is_dirty.defer_execution()) this.value.load_from(value); + _on_value_changed(); } public void commit(SettingsProfile data) { using (_refresh_is_dirty.defer_execution()) _load_from(_committed = data); + _on_value_changed(); } public void commit_current() { _committed = _last_result; + _target_value = _committed.value; _refresh_is_dirty.execute(); + _on_value_changed(); } public void revert() { @@ -402,6 +418,7 @@ namespace mbts.spark { _load_from(_committed); _last_result = _committed; } + _on_value_changed(); } public IObservable subscribe_is_dirty() => _is_dirty.observe_current(true); @@ -414,6 +431,7 @@ namespace mbts.spark { public override string ToString() => _name; void _load_from(SettingsProfile data) { + _target_value = data.value; name = data.name; security_criteria = data.security_criteria; value.load_from(data.value); From 5de431f2792387796bfaee98c6fc0223ae9bb7e7 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 5 Aug 2019 15:05:11 -0500 Subject: [PATCH 16/27] make LadderVM.send_order_command an IAsyncCommand --- .../Modules/Trading/Ladder/VM/LadderVM.cs | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index d4ac53c1a..710fe03b8 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -134,7 +134,7 @@ namespace mbts.spark { //_window_height = backing(nameof(window_height), settings_manager.subscribe_current().OnDispatcher().Select(s => s.zoom_factor), (scale) => scale * 600); //_window_width = backing(nameof(window_width), settings_manager.subscribe_current().OnDispatcher().Select(s => s.zoom_factor), (scale) => scale * 420); position_click_command = new DelegateCommand(() => size_calculator.value = DoubleHelper.safe_convert_to_uint(Math.Abs(_show_day_position ? day_position : position))); - send_order_command = new DelegateCommand<(double price, Side? side, MouseButton button)>(send_order); + send_order_command = new AsyncCommand<(double price, Side? side, MouseButton button)>(send_order_async); cancel_command = new AsyncCommand(_model.cancel_orders, true); show_book_command = new DelegateCommand(_show_book); show_ticket_command = new DelegateCommand(_show_ticket); @@ -401,20 +401,19 @@ namespace mbts.spark { settings_invalidated?.Invoke(); } - public void send_order((double price, Side? side, MouseButton button) args) { - if (order_properties_vm == null || args.button == MouseButton.Middle) - return; - var size_from_alternate = args.button == MouseButton.Right; - if (DoubleHelper.IsNaNOrInfinity(args.price) || !args.side.HasValue || HasErrors || order_properties_vm.HasErrors || (size_from_alternate && current_settings.alternate_order_size == 0)) { - return; - } - if (!size_from_alternate && (!size_calculator.value.HasValue || size_calculator.value.Value == 0)) { - size_calculator.flash_error(); - } - else { - uint size = size_from_alternate ? current_settings.alternate_order_size : (uint)Math.Abs(size_calculator.value ?? 0); - send_order_async(args.side.Value, size, args.price).ignore(); + public Task send_order_async((double price, Side? side, MouseButton button) args) { + if (order_properties_vm != null && args.button != MouseButton.Middle) { + var size_from_alternate = args.button == MouseButton.Right; + if (!DoubleHelper.IsNaNOrInfinity(args.price) && args.side.HasValue && !HasErrors && !order_properties_vm.HasErrors && (!size_from_alternate || current_settings.alternate_order_size > 0)) { + if (!size_from_alternate && (!size_calculator.value.HasValue || size_calculator.value.Value == 0)) { + size_calculator.flash_error(); + } else { + uint size = size_from_alternate ? current_settings.alternate_order_size : (uint)Math.Abs(size_calculator.value ?? 0); + return send_order_async(args.side.Value, size, args.price); + } + } } + return Task.CompletedTask; } public async Task send_order_async(Side side, uint size, double price) { From 7b3c4b76bc5efe48c1c81c6c1992f0245c34f4b8 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 5 Aug 2019 15:06:02 -0500 Subject: [PATCH 17/27] LadderVM/OrderPropertiesEditorVM sticky/stack behavior --- .../Trading/AlgoStudio/VM/AlgoDefinitionVM.cs | 4 +--- .../Modules/Trading/Ladder/VM/LadderVM.cs | 18 +++++++++++------- .../spark/Orders/OrderPropertiesEditorVM.cs | 14 ++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs index 1de5643d2..6c29af115 100644 --- a/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs +++ b/src/client/spark/Modules/Trading/AlgoStudio/VM/AlgoDefinitionVM.cs @@ -36,7 +36,7 @@ namespace mbts.spark { readonly VisualStateModel _edit_pane_vs_model = new VisualStateModel(), _tree_view_vs_model = new VisualStateModel(); readonly EditStack _edit_stack = new EditStack(); readonly VersionContainer _version; - readonly Property _is_expanded, _is_selected, _is_sticky; + readonly Property _is_expanded, _is_selected; readonly Property _algo_root, _visible_algo_root; readonly DelegateProperty _is_favorite, _is_dirty, _can_undo, _can_redo; readonly Property _name, _abbreviation; @@ -79,7 +79,6 @@ namespace mbts.spark { _is_expanded = backing(nameof(is_expanded), true); _is_selected = backing(nameof(is_selected), true); _is_dirty = backing(nameof(is_dirty), () => key.mode == AlgoKey.Mode.Unpersisted || !_committed.HasValue || !_committed.Value.Equals(_version.value)); - _is_sticky = backing(nameof(is_sticky), false); var factory_def_data = def_data.key.mode == AlgoKey.Mode.Factory ? def_data : AlgoData.from_custom_def(def_data.value); _algo_root = backing(nameof(algo_root), _algo_roots.GetOrAdd(factory_def_data.key, _ => OrderTypeVMFactory.create(factory_def_data))); _visible_algo_root = backing(nameof(visible_algo_root)); @@ -187,7 +186,6 @@ namespace mbts.spark { public bool is_expanded { get => _is_expanded.Value; set => _is_expanded.set(value); } public bool is_selected { get => _is_selected.Value; set => _is_selected.set(value); } public bool is_dirty => _is_dirty.Value; - public bool is_sticky { get => _is_sticky.Value; set => _is_sticky.set(value); } public bool is_factory_definition => key.mode == AlgoKey.Mode.Factory; public AlgoDisplayGroup group => key.display_group(); public bool can_redo => _can_redo.Value; diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index 710fe03b8..c985e6381 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -1,5 +1,6 @@ using bts.api; using bts.api.orderman; +using bts.collections; using bts.shell; using bts.spark; using bts.utils; @@ -33,6 +34,7 @@ namespace mbts.spark { _show_tif, _show_order_type, _show_size_preset, _show_auto_clear, _show_clear, _show_cancel_buys, _show_cancel_sells, _show_cancel_all, _show_zoom; readonly PropertyAutoWrapper _bid_background, _bid_foreground, _ask_background, _ask_foreground; + readonly HashSet _sticky_algos = new HashSet(); double _position, _day_position; bool _show_account_position, _show_day_position; ulong _misc_time = 0; @@ -224,7 +226,10 @@ namespace mbts.spark { .SelectManyInSeries(a => _model.order_gateway.on_security_positions(security.Id) .Select(table => table.state.Values.FirstOrDefault(pos => pos.Item2.Account == a, tup => tup.Item2, (bts.api.position.PositionUnitImmutable?)null))); return Disposable.Create( - settings.OnDispatcher().Subscribe(s => order_properties_vm.on_favorite_algos(s.favorite_algos)), + settings.OnDispatcher().Subscribe(s => { + _sticky_algos.SetItems(s.favorite_algos.stickied_algos); + order_properties_vm.on_favorite_algos(s.favorite_algos); + }), order_properties_vm, position_src.OnDispatcher().Subscribe(pos => { double total, day; @@ -433,12 +438,11 @@ namespace mbts.spark { await _model.order_gateway.send_order(order, price, size); if (auto_clear) size_calculator.value = 0; - if (order_properties_vm.selected_favorite_is_non_sticky) { - if (!order_properties_vm.try_pop_selected_algo_definition()) { - var key = new AlgoKey(OrderDataHelper.get_default_algo(OrderDataHelper.get_algo_format(security.ContractCase))); - if (order_properties_vm.try_get_algo_definition(key, out var r)) { - order_properties_vm.selected_algo_definition = r; - } + var fav_algo = order_properties_vm.selected_favorite_algo_definition; + if (fav_algo != null && !_sticky_algos.Contains(fav_algo.key) && !order_properties_vm.try_pop_selected_algo_definition()) { + var key = new AlgoKey(OrderDataHelper.get_default_algo(OrderDataHelper.get_algo_format(security.ContractCase))); + if (order_properties_vm.try_get_algo_definition(key, out var r)) { + order_properties_vm.selected_algo_definition = r; } } } diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index f30f7beb7..06e056cef 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -60,6 +60,7 @@ namespace mbts.spark { readonly ListCollectionView _algo_definitions_view, _favorite_algo_definitions_view; readonly TableUpdateBuffer _definitions_buffer = new TableUpdateBuffer(d => d.key); readonly ObservableAggregateCollection _algo_param_rows = new ObservableAggregateCollection(); + readonly HashSet _sticky_algos = new HashSet(); IReadOnlyDictionary _algo_metadata = DictionaryHelper.empty(); IReadOnlyDictionary _favorite_algos_index = DictionaryHelper.empty(); IDisposable _algo_param_rows_hook; @@ -237,11 +238,11 @@ namespace mbts.spark { void _selected_algo_definition_Changed(AlgoDefinitionVM old_value, AlgoDefinitionVM new_value, SelectionReason reason) { Disposable.dispose(ref _algo_param_rows_hook); + if (old_value != null) + _selected_algo_stack.Push(old_value.key); if (new_value != null) { 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); } if (open_algo_popup_on_select) { if (reason == SelectionReason.UserSelectedNewValue && new_value?.algo_root is IAlgoVM ar && ar.can_expand) @@ -298,7 +299,7 @@ namespace mbts.spark { if (_algo_definitions.TryGetValue(k, out AlgoDefinitionVM vm)) _selected_algo_definition.select_explicit(vm); } - RaisePropertyChanged(nameof(selected_favorite_algo_definition), nameof(selected_favorite_is_non_sticky)); + RaisePropertyChanged(); } } public bool can_expand => selected_algo_definition?.algo_root?.can_expand ?? false; @@ -314,8 +315,6 @@ namespace mbts.spark { } } public bool open_algo_popup_on_select { get => _open_algo_popup_on_select; set => Set(ref _open_algo_popup_on_select, value); } - public bool selected_favorite_is_non_sticky => !selected_favorite_algo_definition?.is_sticky ?? false; - // commands public ICommand save_definition_cmd { get; } public ICommand save_template_cmd { get; } @@ -363,12 +362,11 @@ namespace mbts.spark { public void on_favorite_algos(LadderFavoriteAlgosSettings value) { _favorite_algos_index = value.favorite_algos.Select((v, i) => (v, i)).ToDictionaryCrushed(t => t.v, t => t.i); - var _stickied_algos_index = value.stickied_algos.Select((v, i) => (v,i)).ToDictionaryCrushed(t => t.v, t => t.i); foreach (var d in algo_definitions) { d.favorite_index = _get_favorite_algo_index(d.key); - d.is_sticky = _stickied_algos_index.ContainsKey(d.key); } favorite_algos_column_count = value.column_count; + RaisePropertyChanged(nameof(selected_favorite_algo_definition)); } static IDisposable _connect_algo_param_rows(AlgoDefinitionVM def, ObservableAggregateCollection rows) => @@ -387,4 +385,4 @@ namespace mbts.spark { algo_definitions_view.Refresh(); } } -} +} \ No newline at end of file From d064af817c57abd773de912217101dcc345a7aec Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 5 Aug 2019 15:51:21 -0500 Subject: [PATCH 18/27] remove unreferenced '_sticky_algos' field --- src/client/spark/Orders/OrderPropertiesEditorVM.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index 06e056cef..4fe0a40fb 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -60,7 +60,6 @@ namespace mbts.spark { readonly ListCollectionView _algo_definitions_view, _favorite_algo_definitions_view; readonly TableUpdateBuffer _definitions_buffer = new TableUpdateBuffer(d => d.key); readonly ObservableAggregateCollection _algo_param_rows = new ObservableAggregateCollection(); - readonly HashSet _sticky_algos = new HashSet(); IReadOnlyDictionary _algo_metadata = DictionaryHelper.empty(); IReadOnlyDictionary _favorite_algos_index = DictionaryHelper.empty(); IDisposable _algo_param_rows_hook; From bf8df1d396d7020d5f2bbbcce9741acdbc7bf4b9 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 6 Aug 2019 10:24:59 -0500 Subject: [PATCH 19/27] always push Limit onto the algo stack; henceforth known as the anchor --- src/client/spark/Orders/OrderPropertiesEditorVM.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Orders/OrderPropertiesEditorVM.cs b/src/client/spark/Orders/OrderPropertiesEditorVM.cs index 4fe0a40fb..e5a90d0e1 100644 --- a/src/client/spark/Orders/OrderPropertiesEditorVM.cs +++ b/src/client/spark/Orders/OrderPropertiesEditorVM.cs @@ -60,6 +60,7 @@ namespace mbts.spark { readonly ListCollectionView _algo_definitions_view, _favorite_algo_definitions_view; readonly TableUpdateBuffer _definitions_buffer = new TableUpdateBuffer(d => d.key); readonly ObservableAggregateCollection _algo_param_rows = new ObservableAggregateCollection(); + readonly AlgoDefinitionVM the_anchor_algo_def_vm; IReadOnlyDictionary _algo_metadata = DictionaryHelper.empty(); IReadOnlyDictionary _favorite_algos_index = DictionaryHelper.empty(); IDisposable _algo_param_rows_hook; @@ -68,6 +69,7 @@ namespace mbts.spark { public OrderPropertiesEditorVM(OrdersModel model, IObservable security_md_source, IObservable order_properties) { _model = model; + the_anchor_algo_def_vm = AlgoDefinitionVM.create(_model, OrderDataHelper.Defaults.AlgoData(CustomOrderDefinition.CustomOneofCase.Limit)); var security_source = security_md_source.Select(smd => smd.security); _security = backing(nameof(security), security_source, SecurityDataHelper.Defaults.SecurityImmutable); security_source = _security.observe_current(true); @@ -238,7 +240,11 @@ namespace mbts.spark { void _selected_algo_definition_Changed(AlgoDefinitionVM old_value, AlgoDefinitionVM new_value, SelectionReason reason) { Disposable.dispose(ref _algo_param_rows_hook); if (old_value != null) - _selected_algo_stack.Push(old_value.key); + // Taha feels that we should always revert to a Limit order either when the user explicity unchecks a sticky button + // or when a non-sticky button is pressed. Rather than completely remove the stack at this time (b/c it may be come + // back in the future), let's just always push a specfic def_vm.key onto it [Limit] ;) + //_selected_algo_stack.Push(old_value.key); + _selected_algo_stack.Push(the_anchor_algo_def_vm.key); if (new_value != null) { if (use_algo_param_grid) _algo_param_rows_hook = _connect_algo_param_rows(new_value, _algo_param_rows); From 4ff1be11e25f867320c4d12093deea55bdef86b8 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 6 Aug 2019 14:32:32 -0500 Subject: [PATCH 20/27] making login view a little wider and shorter so that error state doesn't look as bad --- src/client/spark/view/Shell/Login/LoginView.xaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/spark/view/Shell/Login/LoginView.xaml b/src/client/spark/view/Shell/Login/LoginView.xaml index 741efc3fb..9461e25ad 100644 --- a/src/client/spark/view/Shell/Login/LoginView.xaml +++ b/src/client/spark/view/Shell/Login/LoginView.xaml @@ -10,8 +10,8 @@ xmlns:autocomplete="clr-namespace:WPFTextBoxAutoComplete;assembly=WPFTextBoxAutoComplete" xmlns:sys="clr-namespace:System;assembly=mscorlib" x:Name="_login_view" - Width="460" - Height="254" + Width="520" + Height="230" WindowStyle="None" ResizeMode="NoResize" WindowStartupLocation="CenterScreen" @@ -27,7 +27,7 @@ - 40 + 10 10 22 @@ -206,7 +206,7 @@ x:Name="_error_control" Grid.Column="1" VerticalAlignment="Center" - HorizontalAlignment="Center" + HorizontalAlignment="Left" Visibility="Hidden" Opacity="0" > @@ -251,10 +251,10 @@ - - From 5a36af1ed87e57c4380d3290bc4c796783d08973 Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 8 Aug 2019 10:54:39 -0400 Subject: [PATCH 21/27] more 2.8 release notes --- doc/user/content/release_notes/_index.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md index 323f05d0f..668dbca15 100644 --- a/doc/user/content/release_notes/_index.md +++ b/doc/user/content/release_notes/_index.md @@ -14,6 +14,8 @@ insert_anchor_links = "right" - Fixed a bug that cause cause a failure on startup if the user loaded a workspace with a Ladder that had a dynamic order type selected by default + - Increased width of login panel to better show login error messages + - Added optional 'Maker/Taker' pricing to Spreader algo ### Internal changes - Made it easier to generate simple UI's for new order types ### API Changes @@ -362,7 +364,8 @@ insert_anchor_links = "right" - The zoom slider can be enabled from Ladder Form -> Settings button -> Left Pane tab -> check Zoom Slider checkbox - The zoom functionality can also be performed via hotkey and mouse wheel combinations - Zoom In = CTRL + Mouse wheel up - - Zoom Out = CTRL + Mouse wheel down + - Zoom Out = CTRL + Mouse wheel down + - Reset zoom = CTRL + Mouse wheel click or double click on the zoom slider ### Exchange simulator - Improved the exchange simulator to track real market data more closely From 23bb8720524da65d49a3aaa9d3cd7e7e6d98643e Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 8 Aug 2019 12:09:48 -0400 Subject: [PATCH 22/27] fix non-dynamic and non-generic tooltips --- .../Order/AlgoContentTemplateSelector.xaml | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml index d07248c08..656513fc3 100644 --- a/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml +++ b/src/client/spark/view/Controls/Order/AlgoContentTemplateSelector.xaml @@ -687,7 +687,10 @@ - Tick Offset + + Tick Offset + + - Max Show Quantity + + Max Show Quantity + + @@ -944,7 +950,10 @@ - Show Quantity + + Show Quantity + + - Expose Quantity + + Expose Quantity + + - Max Order Quantity + + + Max Order Quantity + + Date: Thu, 8 Aug 2019 13:01:19 -0500 Subject: [PATCH 23/27] provide upgrade mechanism when loading IShellWindow --- src/client/spark/core/ShellInterface/IShellWindowFactory.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/spark/core/ShellInterface/IShellWindowFactory.cs b/src/client/spark/core/ShellInterface/IShellWindowFactory.cs index c5ceff2c4..f29218124 100644 --- a/src/client/spark/core/ShellInterface/IShellWindowFactory.cs +++ b/src/client/spark/core/ShellInterface/IShellWindowFactory.cs @@ -34,13 +34,14 @@ namespace bts.shell { Disposable.dispose(ref _dispose); } public abstract Task load(T state); + protected virtual Task try_upgrade_state(Stream load_stream, int version) => null; public Task load_window(Stream load_stream, int version) { if (version == this.version) { var t = ProtoBuf.Serializer.DeserializeWithLengthPrefix(load_stream, ProtoBuf.PrefixStyle.Fixed32); return load(t); } - return null; + return try_upgrade_state(load_stream, version); } public void save(T data, Stream output) { var header = new ShellSerializationHeader() { From 89a4f9264a528d0c4e62310e80db60fb63cf9bb7 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 8 Aug 2019 13:03:26 -0500 Subject: [PATCH 24/27] LadderSaveState now at version 2; implementing upgrade mechanism for migrating existing favorite algos to stickied algos --- .../Modules/Trading/Ladder/LadderWindowFactory.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs index 3ab614a21..0b5030b0b 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs @@ -11,6 +11,7 @@ using ProtoBuf; using System; using System.Collections.Generic; using System.Collections.Immutable; +using System.IO; using System.Linq; using System.Reactive.Linq; using System.Reactive.Subjects; @@ -22,6 +23,7 @@ using LadderSettings = mbts.spark.LadderSettings; namespace bts.shell { class LadderWindowFactory : ShellWindowFactory { const string _window_type = "ladder"; + const int _version_where_stickied_algos_introduced = 2; readonly LadderConfig _ladder_conf; readonly IBus _bus; readonly IWindowManager _wm; @@ -38,7 +40,7 @@ namespace bts.shell { OrdersModel orders_model, MBOService mbo) - : base(owner, "SparkLadder") { + : base(owner, "SparkLadder", 2) { _bus = bus; _wm = wm; _settings_hub = settings_hub; @@ -60,6 +62,16 @@ namespace bts.shell { return null; } + protected override Task try_upgrade_state(Stream load_stream, int version) { + var state = ProtoBuf.Serializer.DeserializeWithLengthPrefix(load_stream, ProtoBuf.PrefixStyle.Fixed32); + if (version < _version_where_stickied_algos_introduced) { + // We want to assign any existing favorite algos to stickied algos upon setting upgrade + var favorite_algos_array = state.settings.favorite_algos.favorite_algos.ToArray(); + state.settings.favorite_algos = new LadderFavoriteAlgosSettings(favorite_algos_array, state.settings.favorite_algos.column_count, favorite_algos_array); + } + return load(state); + } + LadderSaveState _get_state(LadderVM vm, uint id) { LadderSettings s = vm.get_save_state(); if (id != 0) { From 50768750d6c34f530ce230caf3b2df2bf372046b Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 8 Aug 2019 16:14:49 -0400 Subject: [PATCH 25/27] removing duplicate mark down describing algos --- src/sdk/README.md | 5 ----- src/sdk/doc/algos.md | 46 -------------------------------------------- 2 files changed, 51 deletions(-) delete mode 100644 src/sdk/doc/algos.md diff --git a/src/sdk/README.md b/src/sdk/README.md index 809037be5..13aacec16 100644 --- a/src/sdk/README.md +++ b/src/sdk/README.md @@ -150,11 +150,6 @@ In gdb: ``` (gdb) break order_plugin_example.cpp:366 ``` - -#### In Depth Algo Descriptions - - * [Spark Algo Descriptions](doc/algos.md) - * Send us an email for help: api_support@bluetradesys.com #### Spark windows client * Download spark windows executable here: diff --git a/src/sdk/doc/algos.md b/src/sdk/doc/algos.md deleted file mode 100644 index 7ec2f9517..000000000 --- a/src/sdk/doc/algos.md +++ /dev/null @@ -1,46 +0,0 @@ -+++ -title = "BTS Basic Algos" -weight = 3 -sort_by = "weight" -insert_anchor_links = "right" -+++ - - -## Lean - -The goal of the lean order is to watch the opposite-inside market size and cross when that size goes below the threshold (this also implies a cross if that size goes to zero and the market trades away from you) If the market trades toward you, you can opt into several different behaviors - -##### Parameters - * Cross Thresh - size thresh in absolute or ratio terms - * Max Chase Ticks - max levels to pay up, in ticks - - -## Join -The goal of the join order is to watch the opposite-inside market and join when the market flips (that is, when the best offer becomes the best bid) and has at least threshold size. - -##### Parameters - * Join Thresh - size thresh in absolute or ratio terms - - -## Top - -The goal of the top order is to not trade by yourself, but the intent at the time of order entry is to get filled.If the order is on the market (say current bid price) AND the quantity on that bid price is below top thresh then cancel the order else remain working. - -##### Parameters - * Top Thresh - size thresh in absolute or ratio terms - - -## Cover -A Cover order’s purpose is to fire a hedge order (of any type) in response to fills from it’s child order on the opposite side of the market N ticks away - -##### Parameters - * Profit Ticks - ticks above or below fill price to place profit / cover order - - -## OCO -An OCO order creates a relationship between a child order and a 'stop' or 'other' order such that when one of these is cancelled, both cancel, or when one is filled, the other order's size is debited in the amount of the fill. - -Composing this order with Cover simulates scalping functionality - -##### Parameters - * Stop Ticks - ticks below or above main order to place stop / other order \ No newline at end of file From 52d30249feedaac63a8cf9b980df709c749b5173 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 12 Aug 2019 13:52:39 -0400 Subject: [PATCH 26/27] Allow empty updates in ApiServer --- src/lib/api/core/ApiServerInterop.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/lib/api/core/ApiServerInterop.cpp b/src/lib/api/core/ApiServerInterop.cpp index 8b57c72dd..46a224b4e 100644 --- a/src/lib/api/core/ApiServerInterop.cpp +++ b/src/lib/api/core/ApiServerInterop.cpp @@ -59,18 +59,16 @@ CAPI TableHandle api_server_create_table(ApiServerCore* pserver, const char* met } CAPI void api_server_update_table(TableHandle htable, StreamUpdate* raw_changes, int change_count) { - if (change_count > 0) { - bts_assert(htable); - qbus::TablePublisher* ptable = reinterpret_cast(htable); - std::vector changes(change_count); - for (int x = 0; x < change_count; ++x) { - StreamUpdate& ch = raw_changes[x]; - std::string buffer(ch.buffer, ch.buffer_len); - qbus::RecordPtr record = std::make_shared(std::move(buffer)); - changes[x] = qbus::Change((qbus::Change::Type)ch.type, qbus::RecordKey(ch.key), record); - } - ptable->publish(std::move(changes)); + bts_assert(htable); + qbus::TablePublisher* ptable = reinterpret_cast(htable); + std::vector changes(change_count); + for (int x = 0; x < change_count; ++x) { + StreamUpdate& ch = raw_changes[x]; + std::string buffer(ch.buffer, ch.buffer_len); + qbus::RecordPtr record = std::make_shared(std::move(buffer)); + changes[x] = qbus::Change((qbus::Change::Type)ch.type, qbus::RecordKey(ch.key), record); } + ptable->publish(std::move(changes)); } CAPI void api_server_destroy_table(qbus::TablePublisher* ptable) { From 4801a1697726e516ad084bb026733e47f65176a7 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Mon, 12 Aug 2019 14:15:09 -0400 Subject: [PATCH 27/27] Re-enable api unit tests --- src/client/spark_test/api/ApiTests.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/client/spark_test/api/ApiTests.cs b/src/client/spark_test/api/ApiTests.cs index 69b63f8f0..22be985fd 100644 --- a/src/client/spark_test/api/ApiTests.cs +++ b/src/client/spark_test/api/ApiTests.cs @@ -20,7 +20,6 @@ namespace mbts.api.Test { ApiTestService[] test_services() { return new[] { _mtest, _ntest }; } public ApiTests() { - config.Configuration.initialize(); _context = ServiceContextTestHelpers.create_private_context(); _native_server = ApiTestsNativeMethods.apitest_start_apitest_service(_context.native_context); _managed_server = new ApiTestServiceServer(_context); @@ -34,7 +33,7 @@ namespace mbts.api.Test { Disposable.dispose(ref _context); } - [Test, Ignore("Times out")] + [Test] public void test_empty_reply_is_not_null() { foreach (var svc in test_services()) { Assert.IsNotNull( @@ -43,7 +42,6 @@ namespace mbts.api.Test { } [Test] - [Ignore("Fixme")] public void hello_server_test() { _mtest.run_hello_service(null); _mtest.run_shout_service(null);