diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index cba873b5f..98490b306 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -212,6 +212,7 @@ namespace mbts.spark { } } _custom_state_sync.sync(true); + orders_changed?.Invoke(); }), model.on_orders_can_attach.OnDispatcher().Subscribe(table => { _cached_attachable = new MappedDictionary, bool>(table.state, kv => kv.Value); @@ -380,7 +381,7 @@ namespace mbts.spark { } public event Action selected_order_changed; - public event Action begin_attaching, end_attaching; + public event Action begin_attaching, end_attaching, orders_changed; public event Action<(IEnumerable, bool)> request_selection; public ObservableAppendCollection columns { get; } @@ -480,6 +481,28 @@ namespace mbts.spark { public IObservable subscribe_show_fills() => _show_fills.observe_current(true); public IObservable subscribe_show_ladder() => _show_ladder.observe_current(true); public IObservable subscribe_show_order_params() => _show_order_params.observe_current(true); + public IObservable subscribe_single_selected_order() => + Observable.Create(o => { + OrderSecurityAlgo? last_fired = null; + orders_changed += notify; + _current_row.Changed += on_current_row_changed; + notify(); + return Disposable.Create(dispose); + // local methods + void notify() { + var next = current_row == null ? (OrderSecurityAlgo?)null : current_row.order_tuple.order; + if (next != last_fired) + o.OnNext(last_fired = next); + } + + void on_current_row_changed(OrderBookRowVM oldval, OrderBookRowVM newval) => + notify(); + + void dispose() { + orders_changed -= notify; + _current_row.Changed -= on_current_row_changed; + } + }); public void row_selection_changed(SelectionChangedEventArgs e) { try { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs index 686624fa0..8da78a4a6 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs @@ -1,4 +1,5 @@ -using bts.api; +using bts; +using bts.api; using bts.api.orderman; using bts.shell; using bts.shell.fills; @@ -6,9 +7,11 @@ using bts.shell.orderbook; using bts.spark; using bts.view; using mbts.persist; +using mbts.spark.utilities; using mbts.ui; using mbts.ui.extensions; using mbts.ui.spark; +using mbts.ui.utilities; using mbts.ui.utility; using mbts.utils; using System; @@ -24,7 +27,10 @@ namespace mbts.spark { const string _window_type = "OrderBook", _default_title = "Order Book"; readonly INotificationService _notification_service; readonly IWindowSettingsManager _settings_manager; + readonly bool _can_edit_specific_algo_params; IDisposable _attachment_exit_sub; + // initialized in thread_init + List _thread_init_resources; OrderBookStartupData _state; OrdersModel _model; OrderBookVM _vm; @@ -34,13 +40,14 @@ namespace mbts.spark { SparkCommand[] _commands; public OrderBookWindow(OrdersModel model, OrderBookWindowFactory factory, IBus bus, INotificationService notification_service, - OrderBookStartupData state, ImageSource icon, IWindowSettingsManager settings_manager) + OrderBookStartupData state, ImageSource icon, IWindowSettingsManager settings_manager, bool can_edit_specific_algo_params) : base(_default_title, bus, factory, SparkCommands.ShowOrders.icon) { _model = model; _factory = factory; _notification_service = notification_service; _state = state; _settings_manager = settings_manager; + _can_edit_specific_algo_params = can_edit_specific_algo_params; thread_id = config.Configuration.get().order_book ? "OrderBook" : null; } @@ -64,12 +71,14 @@ namespace mbts.spark { public string thread_id { get; } public override void Dispose() { - _commands.OfType().DisposeAll(); + Disposable.dispose(_thread_init_resources); Disposable.dispose(ref _attachment_exit_sub); Disposable.dispose(ref _vm); } public void thread_init() { + Log.assert(_thread_init_resources == null, $"{nameof(_thread_init_resources)} must be initialized in thread_init."); + _thread_init_resources = new List(); _menu_display_vm = new SparkMenuDisplayVM(); if (_state != null) _menu_display_vm.load_from(_state.menu_display); @@ -147,6 +156,15 @@ namespace mbts.spark { can_execute: () => _vm.selected_orders.Any(x => passes_recreate_search_criteria(x)) ); recreate_selected_orders_command.group = CommandGroups.Modify; + ICommand edit_algo_params_cmd; + if (_can_edit_specific_algo_params) { + _thread_init_resources.Add(CommandHelper.bind_param_source( + new DialogCommand(mk_algo_params_dialog, has_algo_params), + _vm.subscribe_single_selected_order(), + out edit_algo_params_cmd, true)); + } else { + edit_algo_params_cmd = DelegateCommand.empty; + } var attach_selected_orders_command = new SparkCommandCommand( "Attach To Selected", @@ -194,14 +212,22 @@ namespace mbts.spark { show_grid_settings_command.group = CommandGroups.Auxiliary; _commands = new SparkCommand[] { + // modify commands toggle_show_right_panel_command, attach_selected_orders_command, detach_selected_orders_command, recreate_selected_orders_command, + new SparkCommandCommand("Algo Params...", Icons.Algo, edit_algo_params_cmd) { + group = CommandGroups.Modify, + show_in_toolbar = false, + show_in_context_menu = _can_edit_specific_algo_params + }, + // cancel commands cancel_selected_orders_command, cancel_buy_orders_command, cancel_sell_orders_command, cancel_all_orders_command, + toggle_collapse_all_command, toggle_expand_all_command, show_grid_settings_command, @@ -210,9 +236,12 @@ namespace mbts.spark { hidden_cmd(new SparkCommandCommand(OrderBookView.CommandDescriptions.RevertOrders, null, _vm.revert_selected_orders_cmd, OrderBookView.KeyboardShortcuts.RevertOrders)), _menu_display_vm.spark_cmd }; - _vm.as_demuxer().subscribe(nameof(OrderBookVM.show_right_panel)) - .Subscribe(_ => toggle_show_right_panel_command.title = get_toggle_show_right_panel_cmd_title()); + _thread_init_resources.AddRange(_commands.OfType()); + _thread_init_resources.Add(_vm.as_demuxer() + .subscribe(nameof(OrderBookVM.show_right_panel)) + .Subscribe(_ => toggle_show_right_panel_command.title = get_toggle_show_right_panel_cmd_title())); _vm.selected_order_changed += vm_selected_order_changed; + _thread_init_resources.Add(Disposable.Create(() => _vm.selected_order_changed -= vm_selected_order_changed)); // local methods string get_toggle_show_right_panel_cmd_title() => _vm.show_right_panel ? OrderBookView.CommandDescriptions.HideRightPanel : OrderBookView.CommandDescriptions.ShowRightPanel; @@ -234,6 +263,36 @@ namespace mbts.spark { attach_selected_orders_command.raiseCanExecuteChanged(); detach_selected_orders_command.raiseCanExecuteChanged(); } + + bool has_algo_params(OrderSecurityAlgo? order) => + order.HasValue && !OrderDataHelper.get_metadata(order.Value.algo.value.CustomCase).NoProps; + + Window mk_algo_params_dialog(OrderSecurityAlgo? order) { + if (!has_algo_params(order)) + return null; + var algo_def = AlgoDefinitionVM.create(_model, order.Value.algo, editing_permissions: AlgoEditingPermissions.AllowEditValues); + var algo_params_vm = new OrderBookAlgoParamsVM(algo_def, order.Value.order.is_non_terminal()); + var dialog = new OrderBookAlgoParamsDialog { + Content = algo_params_vm + }; + ui.WindowStyle.SetTitleContent(dialog, algo_def); + dialog.Closed += (s, e) => { + Disposable.dispose(ref algo_params_vm); + dialog = null; + }; + algo_params_vm.RequestCommit += commit; + algo_params_vm.RequestClose += (s, e) => close_dialog(); + return dialog; + + void close_dialog() { + dialog?.Close(); + dialog = null; + } + void commit(CustomOrderDefinitionImmutable value) { + _model.update_order(order.Value.order, new_algo: value).ignore(); + close_dialog(); + } + } } protected override void OnParentViewCreated(SparkWindowView parent_view) { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs index f1ac4429a..cf94dde9b 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs @@ -1,6 +1,7 @@ using bts.api; using bts.shell.orderbook; using bts.spark; +using mbts.config; using mbts.persist; using mbts.spark; using mbts.ui; @@ -15,8 +16,11 @@ namespace bts.shell { readonly INotificationServiceDataCache _notification_service_data_cache; readonly OrdersModel _model; readonly UserSettingsHub _settings_hub; + readonly OrderBookConfig _config; public OrderBookWindowFactory(IShellModule owner, IBus bus, INotificationService notification_service, INotificationServiceDataCache notification_service_data_cache, OrdersModel model, UserSettingsHub settings_hub) : base(owner, "SparkOrderBookWindow") { + var raw_config = Configuration.get(); + _config = new OrderBookConfig(raw_config.can_edit_specific_algo_params); _bus = bus; _notification_service = notification_service; _notification_service_data_cache = notification_service_data_cache; @@ -29,7 +33,8 @@ namespace bts.shell { var settings_manager = new WindowSettingsManager(_settings_hub, state.grid_settings_wrapper(), us => us.order_book_grid ?? OrderBookStartupData.DefaultGrid, (us, s) => us.with(order_book_grid: s)); - var w = new OrderBookWindow(_model, this, _bus, _notification_service, state, SparkCommands.ShowOrders.icon, settings_manager.as_non_shared()); + var w = new OrderBookWindow(_model, this, _bus, _notification_service, state, + SparkCommands.ShowOrders.icon, settings_manager.as_non_shared(), _config.can_edit_specific_algo_params); return Task.FromResult(w); } @@ -37,5 +42,12 @@ namespace bts.shell { var w = await load(startup_data); _bus.post(SparkTags.ShowWindow, w); } + + readonly struct OrderBookConfig { + public readonly bool can_edit_specific_algo_params; + + public OrderBookConfig(bool can_edit_specific_algo_params) => + this.can_edit_specific_algo_params = can_edit_specific_algo_params; + } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookAlgoParamsDialog.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookAlgoParamsDialog.xaml new file mode 100644 index 000000000..67f5647cc --- /dev/null +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookAlgoParamsDialog.xaml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookAlgoParamsDialog.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookAlgoParamsDialog.xaml.cs new file mode 100644 index 000000000..c7e7da778 --- /dev/null +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookAlgoParamsDialog.xaml.cs @@ -0,0 +1,49 @@ +using bts.api.orderman; +using bts.collections; +using mbts.spark; +using mbts.ui; +using mbts.ui.controls; +using mbts.ui.shell; +using System; +using System.Collections.Generic; +using System.Windows; + +namespace bts.shell.orderbook { + /// + /// Interaction logic for OrderBookAlgoParamsDialog.xaml + /// + partial class OrderBookAlgoParamsDialog : Window { + public OrderBookAlgoParamsDialog() => + InitializeComponent(); + } + + class OrderBookAlgoParamsVM : DisposableViewModelBase, IRequestViewClose { + readonly ObservableAggregateCollection _param_rows = new ObservableAggregateCollection(); + readonly DialogSkirtItem _commit, _cancel; + + public OrderBookAlgoParamsVM(AlgoDefinitionVM algo_definition, bool can_user_edit) { + this.algo_definition = algo_definition; + _dispose = AlgoParamRowsHelper.connect(algo_definition, _param_rows, false); + _commit = new DialogSkirtItem("OK", new DelegateCommand(commit, () => can_user_edit)) { is_default = true }; + _cancel = new DialogSkirtItem("Cancel", new DelegateCommand(close)) { is_cancel = true }; + // local methods + void commit() { + RequestCommit?.Invoke(new CustomOrderDefinitionImmutable(algo_definition.algo_root.created_assigned())); + close(); + } + void close() => RequestClose?.Invoke(this, EventArgs.Empty); + } + + public event EventHandler RequestClose; + public event Action RequestCommit; + + public AlgoDefinitionVM algo_definition { get; } + public IReadOnlyObservableCollection param_rows => _param_rows; + public IEnumerable dialog_skirt { + get { + yield return _commit; + yield return _cancel; + } + } + } +} diff --git a/src/client/spark/Orders/OrderTypeVMs/GenericOrderHelper.cs b/src/client/spark/Orders/OrderTypeVMs/GenericOrderHelper.cs index 948b8a487..96aa6a986 100644 --- a/src/client/spark/Orders/OrderTypeVMs/GenericOrderHelper.cs +++ b/src/client/spark/Orders/OrderTypeVMs/GenericOrderHelper.cs @@ -33,7 +33,7 @@ namespace mbts.spark { return; } - var ev = fd.EnumType.Values.First(x => x.Name == value)?.Number; + var ev = fd.EnumType.Values.FirstOrDefault(x => x.Name == value)?.Number; if(ev.HasValue) fd.Accessor.SetValue(message, ev.Value); } diff --git a/src/client/spark/view/Utility/CommandHelper.cs b/src/client/spark/view/Utility/CommandHelper.cs index 3a3a076a3..01cd26a49 100644 --- a/src/client/spark/view/Utility/CommandHelper.cs +++ b/src/client/spark/view/Utility/CommandHelper.cs @@ -1,5 +1,7 @@ using mbts.ui.converters; +using System; using System.Globalization; +using System.Reactive.Linq; using System.Windows; using System.Windows.Data; using System.Windows.Input; @@ -12,6 +14,31 @@ namespace mbts.ui.utilities { public static string fmt(string title, KeyGesture key_gesture) => key_gesture == null ? title : $"{title} ({key_gesture.GetDisplayStringForCulture(CultureInfo.CurrentCulture)})"; + public static IDisposable bind_param_source(ICommand command, IObservable param_source, out ICommand bound_cmd, bool dispose_command_on_dispose = false) { + bool initialized = false; + bool can_execute = false; + T param = default; + var bcmd = new DelegateCommand(() => command.Execute(param), () => can_execute); + bound_cmd = bcmd; + var sub = param_source.Subscribe(p => { + param = p; + if (!initialized) { + initialized = true; + can_execute = command.CanExecute(p); + bcmd.RaiseCanExecuteChanged(); + } else if (can_execute != command.CanExecute(p)) { + can_execute = !can_execute; + bcmd.RaiseCanExecuteChanged(); + } + }); + return dispose_command_on_dispose ? + Disposable.Create(() => { + Disposable.dispose(ref sub); + (command as IDisposable)?.Dispose(); + command = null; + }) : sub; + } + #region Paraphrased from https://referencesource.microsoft.com/#PresentationFramework/src/Framework/MS/Internal/Commands/CommandHelpers.cs public static bool CanExecuteCommandSource(ICommandSource commandSource) { diff --git a/src/lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp b/src/lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp index 2e766f8b6..1a9a1de5a 100644 --- a/src/lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp +++ b/src/lib/orderman/orders/algo/algo_orders/LimitCoverAlgo.cpp @@ -193,7 +193,7 @@ void LimitCoverAlgo::do_update(Update const &upd) { recompute_limit_price(); recompute_limit_volume(); } - me->gates = Adapter::from_proto(upd.custom()).normal_gates(); + me->gates = lcdef.normal_gates(); if (me->status == Status::WORKING) recompute_gate(); }