diff --git a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersVM.cs b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersVM.cs index 8838591de..6358dd8d5 100644 --- a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersVM.cs +++ b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersVM.cs @@ -26,6 +26,7 @@ namespace Spark.Trading { using System.Collections.ObjectModel; using System.Linq; using System.Reactive.Linq; + using System.Windows.Controls; using static mbts.ui.controls.DIYGrid; @@ -35,10 +36,11 @@ namespace Spark.Trading { using RowKey = OpenOrdersRowKey; using RowVM = OpenOrdersRowVM; - class OpenOrdersVM : DisposableViewModelBase, IHandleGridSorting { + class OpenOrdersVM : DisposableViewModelBase, IHandleGridSorting, IHandleRowSelection { readonly IWindowSettingsManager _settings_manager; readonly DIYGridRowsModel _rows_model; readonly ObservableKeyedCollection _columns = new(c => c.id); + readonly ObservableCollection _selected_rows = new(); public OpenOrdersVM( OpenOrdersModel model, @@ -48,6 +50,7 @@ namespace Spark.Trading { columns = _columns.WrapSelector(c => c.column_view); column_models = _columns.AsReadOnlyKeyedCollection().WrapSelector( c => (IDIYGridColumnModel)c); + selected_rows = ObservableAutoWrapper.create_read_only_wrapper(_selected_rows); // filters var time_filter = new TimeFilterVM(r => r.time); @@ -158,6 +161,7 @@ namespace Spark.Trading { public IReadOnlyObservableCollection column_models { get; } public IReadOnlyObservableCollection columns { get; } public ObservableCollection rows { get; } = new(); + public IReadOnlyObservableCollection selected_rows { get; } public SimpleGridSettingsManager grid_settings_manager { get; } public OpenOrdersSettings get_settings() { @@ -235,5 +239,11 @@ namespace Spark.Trading { } } } + + void IHandleRowSelection.row_selection_changed(SelectionChangedEventArgs e) { + var comp = ComparerWrapper.wrap(r => r.row_key); + _selected_rows.RemoveSorted(e.RemovedItems.OfType(), comp); + _selected_rows.InsertSorted(e.AddedItems.OfType(), comp); + } } } diff --git a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersWindow.cs b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersWindow.cs index f120eb024..84d4a6144 100644 --- a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersWindow.cs +++ b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersWindow.cs @@ -20,6 +20,7 @@ namespace Spark.Trading { using System; using System.Collections.Generic; + using System.Collections.Specialized; using System.Diagnostics.CodeAnalysis; using System.Diagnostics.Contracts; using System.Linq; @@ -111,6 +112,10 @@ namespace Spark.Trading { _menu_display_vm = new(); _menu_display_vm.load_from(_settings.menu_display); + var has_selected_rows = _vm.selected_rows.ObserveHasItems(); + var show_ladder_cmd = SparkCommands.show_ladder_lazy( + _bus, has_selected_rows, get_selected_sec_ids, SparkCommands.KeyGestures.ShowLadder); + var settings_cmd = SparkCommands.window_settings_command(new DialogCommand(() => { var vm = new ShellSettingsDialogVM( _settings_manager, @@ -126,7 +131,14 @@ namespace Spark.Trading { vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog); return dialog; })); - _commands.AddRange(settings_cmd, _menu_display_vm.spark_cmd); + + _commands.AddRange( + show_ladder_cmd, + settings_cmd, + _menu_display_vm.spark_cmd); + + IEnumerable get_selected_sec_ids() => + _vm.selected_rows.Select(r => r.security_key); } protected override void OnParentViewCreated(SparkWindowView parent_view) =>