From bbf3726241a00d0157e0939ee8eabcdbf17fb380 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 1 Mar 2018 18:22:19 -0500 Subject: [PATCH] ladder/ticket default to Limit Order --- src/client/spark/Daemons/OrderTicketDaemon.cs | 4 +- .../Modules/Trading/LadderWindowFactory.cs | 6 +- .../spark/view/Spark/Ladder/LadderSettings.cs | 131 +++++++++++------- .../spark/view/Spark/Ladder/LadderVM.cs | 52 ++++--- .../view/Spark/Orders/IOrderTypeDefVM.cs | 10 +- .../spark/view/Spark/Orders/OrderTicketVM.cs | 42 +++++- 6 files changed, 158 insertions(+), 87 deletions(-) diff --git a/src/client/spark/Daemons/OrderTicketDaemon.cs b/src/client/spark/Daemons/OrderTicketDaemon.cs index 43875ba48..138c3eb48 100644 --- a/src/client/spark/Daemons/OrderTicketDaemon.cs +++ b/src/client/spark/Daemons/OrderTicketDaemon.cs @@ -38,14 +38,14 @@ namespace bts.shell var smd_lookup = await SparkUtils.get_security_md_async(_bus, order_params.def.SecurityKey); if (smd_lookup.success) _show_order_window(new OrderTicket { - DataContext = new OrderTicketVM(_model, smd_lookup.result, order_params.def, order_params.price, order_params.size, Observable.Return(new mbts.spark.LadderSettings())) + DataContext = new OrderTicketVM(_model, smd_lookup.result, order_params.def, order_params.price, order_params.size, Observable.Return(mbts.spark.LadderSettings.Default)) }); else _error_reporter.report_error($"Failed to look up security (key: {order_params.def.SecurityKey})", "Order Ticket", MessageBoxImage.Error).ignore(); } void _show_modify_order(uint order_key) => _show_order_window(new OrderModificationDialog { - DataContext = new OrderTicketVM(_model, order_key, Observable.Return(new mbts.spark.LadderSettings())) + DataContext = new OrderTicketVM(_model, order_key, Observable.Return(mbts.spark.LadderSettings.Default)) }); static void _show_order_window(Window window) => diff --git a/src/client/spark/Modules/Trading/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/LadderWindowFactory.cs index 7fde5efcf..2ff038db4 100644 --- a/src/client/spark/Modules/Trading/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/LadderWindowFactory.cs @@ -39,10 +39,8 @@ namespace bts.shell { static LadderSaveState _get_state(LadderVM vm) => new LadderSaveState { security_key = vm.security.Id, settings = vm.current_settings }; - IObservable default_ladder_settings() { - var settings = new mbts.spark.LadderSettings(); - return Observable.Return(settings); - } + IObservable default_ladder_settings() => + Observable.Return(mbts.spark.LadderSettings.Default); IShellWindow create_ladder_window(SecurityMD md, IObservable settings) { var model = new LadderModel(md, _orders_model); diff --git a/src/client/spark/view/Spark/Ladder/LadderSettings.cs b/src/client/spark/view/Spark/Ladder/LadderSettings.cs index 271fd7db8..6f49f6f0e 100644 --- a/src/client/spark/view/Spark/Ladder/LadderSettings.cs +++ b/src/client/spark/view/Spark/Ladder/LadderSettings.cs @@ -1,80 +1,105 @@ -using ProtoBuf; -using System; +using bts.api.orderman; +using mbts.ui; +using ProtoBuf; namespace mbts.spark { public enum ATMLine { Bid, Ask, Mid } - [ProtoContract(ImplicitFields = ImplicitFields.AllPublic)] + [ProtoContract] public class LadderColumnSettings { - public bool show { get; set; } = true; - public uint width { get; set; } = 50; - public uint background { get; set; } - public UInt32 foreground { get; set; } + public static LadderColumnSettings Default => new LadderColumnSettings { + show = true, + width = 50, + font_family = "Segoe UI Semibold", + font_size = 10 + }; - public string font_family { get; set; } = "Segoe UI Semibold"; - public double font_size { get; set; } = 10; + [ProtoMember(1)] + public bool show { get; set; } + [ProtoMember(2)] + public uint width { get; set; } + [ProtoMember(3)] + public uint background { get; set; } + [ProtoMember(4)] + public uint foreground { get; set; } + + [ProtoMember(5)] + public string font_family { get; set; } + [ProtoMember(6)] + public double font_size { get; set; } } [ProtoContract] public class LadderSettings { - public double row_height { get; set; } = 20; - public UInt32 grid_line_color { get; set; } = 0x535353; - public ATMLine atm_line { get; set; } = ATMLine.Bid; - - // Column settings + public static LadderSettings Default { + get { + LadderColumnSettings + orders_column = LadderColumnSettings.Default, + bid_column = LadderColumnSettings.Default, + ask_column = LadderColumnSettings.Default, + price_column = LadderColumnSettings.Default, + last_column = LadderColumnSettings.Default; + orders_column.background = 0xBABABA; + bid_column.foreground = 0xFFFFFF; + bid_column.background = BTSColors.MarketData.bid; + ask_column.foreground = 0xFFFFFF; + ask_column.background = BTSColors.MarketData.ask; + price_column.background = 0xBABABA; + last_column.background = 0xBABABA; + return new LadderSettings { + row_height = 20, + grid_line_color = 0x535353, + atm_line = ATMLine.Bid, + orders_column = orders_column, + bid_column = bid_column, + ask_column = ask_column, + price_column = price_column, + last_column = last_column, + calculator_buttons = new[] { 1, 5, 10, 25, 50, 100 }, + scroll_bar_visible = false, + ticks_to_recenter = 300000, + seconds_to_recenter = 3000000, + default_order_type = CustomOrderDefinition.CustomOneofCase.Limit, + default_time_in_force = TimeInForce.Day, + animate_recenter = true + }; + } + } [ProtoMember(1)] - public LadderColumnSettings orders_column { get; set; } = new LadderColumnSettings() { - show = true, - background = 0XBABABA, - //background = 0xFF3399 // for taha - }; - + public double row_height { get; set; } [ProtoMember(2)] - public LadderColumnSettings bid_column { get; set; } = new LadderColumnSettings() { - show = true, - foreground = 0xFFFFFF, - background = ui.BTSColors.MarketData.bid - }; - + public uint grid_line_color { get; set; } [ProtoMember(3)] - public LadderColumnSettings ask_column { get; set; } = new LadderColumnSettings() { - show = true, - foreground = 0xFFFFFF, - background = ui.BTSColors.MarketData.ask - }; + public ATMLine atm_line { get; set; } + // Column settings [ProtoMember(4)] - public LadderColumnSettings price_column { get; set; } = new LadderColumnSettings() { - show = true, - foreground = 0x000000, - background = 0xBABABA, - }; - + public LadderColumnSettings orders_column { get; set; } [ProtoMember(5)] - public LadderColumnSettings last_column { get; set; } = new LadderColumnSettings() { - show = true, - foreground = 0x000000, - background = 0xBABABA, - }; - - [ProtoMember(6, OverwriteList = true)] - public int[] calculator_buttons { get; set; } = new int[] { 1,5,10,25,50,100 }; - + public LadderColumnSettings bid_column { get; set; } + [ProtoMember(6)] + public LadderColumnSettings ask_column { get; set; } [ProtoMember(7)] - public bool scroll_bar_visible { get; set; } + public LadderColumnSettings price_column { get; set; } [ProtoMember(8)] - public int ticks_to_recenter { get; set; } = 300000; - [ProtoMember(9)] - public int seconds_to_recenter { get; set; } = 3000000; + public LadderColumnSettings last_column { get; set; } + [ProtoMember(9)] + public int[] calculator_buttons { get; set; } [ProtoMember(10)] - public string SelectedAlgo { get; set; } = "LimitOrder"; + public bool scroll_bar_visible { get; set; } [ProtoMember(11)] - public string DefaultTimeInForce { get; set; } = "Day"; + public int ticks_to_recenter { get; set; } [ProtoMember(12)] - public uint size { get; set; } = 0; + public int seconds_to_recenter { get; set; } [ProtoMember(13)] + public CustomOrderDefinition.CustomOneofCase default_order_type { get; set; } + [ProtoMember(14)] + public TimeInForce default_time_in_force { get; set; } + [ProtoMember(15)] + public uint size { get; set; } + [ProtoMember(16)] public bool animate_recenter { get; set; } = true; } } \ No newline at end of file diff --git a/src/client/spark/view/Spark/Ladder/LadderVM.cs b/src/client/spark/view/Spark/Ladder/LadderVM.cs index 24e185945..885c514fd 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -59,13 +59,14 @@ namespace mbts.spark { calculator = new CalculatorLogic(0, settings.Select(s => s.calculator_buttons)); // Order - order_types = OrderTypeDefVMFactory.get_collection(model.order_gateway, Observable.Return(model.security)); - WPFHelper.select_first_item(order_types, new Action(ot => { - if (!_try_select_settings_algo()) { - selected_order_type = ot; + order_types = OrderTypeDefVMFactory.get_collection(model.order_gateway, Observable.Return(model.security), ots => { + if (selected_order_type == null || !ots.Contains(selected_order_type)) { + selected_order_type = order_types.FirstOrDefault(ot => ot.order_type == _settings.default_order_type); + if (selected_order_type == null) + selected_order_type = order_types.FirstOrDefault(); RaisePropertyChanged(nameof(selected_order_type)); } - })); + }); _selected_time_in_force = backing(nameof(selected_order_type), TimeInForce.Day); _revert = backing(nameof(revert), false); send_order_command = new AsyncCommand<(double, Side?)>(send_order); @@ -124,7 +125,7 @@ namespace mbts.spark { log_messages.AddLog(new LogViewerMessage(warn_category, msg)); Logger.error(bts.log.Subsystem.Ui, msg); } - + public event Action on_tick; public SecurityImmutable security => _model.security; @@ -187,7 +188,7 @@ namespace mbts.spark { public bool revert { get => _revert.Value; set => _revert.set(value); } public string[] accounts => _model.order_gateway.factory.accounts; public string account { get => _order_template.Account; set => _order_template = _order_template.with(account: value); } - public TimeInForce[] time_in_forces => Enum.GetValues(typeof(TimeInForce)).Cast().ToArray(); + public TimeInForce[] time_in_forces { get; } = EnumHelper.get_values().ToLArray(); public TimeInForce selected_time_in_force { get => _selected_time_in_force.Value; set => _selected_time_in_force.Value = value; } public IRXCollection order_types { get; } @@ -272,22 +273,33 @@ namespace mbts.spark { } void settings_updated(LadderSettings settings) { - if (selected_order_type == null) { - selected_time_in_force = (TimeInForce)Enum.Parse(typeof(TimeInForce), settings.DefaultTimeInForce); - RaisePropertyChanged(nameof(selected_order_type), nameof(selected_time_in_force)); - } - if (!calculator.value.HasValue) calculator.value = settings.size; _settings = settings; + _select_settings_order_type(); + _select_settings_time_in_force(); + _select_settings_size_if_none(); } - bool _try_select_settings_algo() { - var algo_match = order_types.FirstOrDefault(o => o.type_name == _settings.SelectedAlgo); - if (algo_match != null) { - selected_order_type = algo_match; - RaisePropertyChanged(nameof(selected_order_type)); - return true; - } - return false; + void _select_settings_order_type() { + var order_type = order_types.FirstOrDefault(o => o.order_type == _settings.default_order_type); + if (order_type != null) { + selected_order_type = order_type; + } else if (selected_order_type == null || !order_types.Contains(selected_order_type)) { + selected_order_type = order_types.FirstOrDefault(); + } else return; + RaisePropertyChanged(nameof(selected_order_type)); + } + + void _select_settings_time_in_force() { + if (time_in_forces.Contains(_settings.default_time_in_force)) { + selected_time_in_force = _settings.default_time_in_force; + } else if (!time_in_forces.Contains(selected_time_in_force)) { + selected_time_in_force = time_in_forces.FirstOrDefault(); + } else return; + } + + void _select_settings_size_if_none() { + if (!calculator.value.HasValue) + calculator.value = _settings.size; } } } \ No newline at end of file diff --git a/src/client/spark/view/Spark/Orders/IOrderTypeDefVM.cs b/src/client/spark/view/Spark/Orders/IOrderTypeDefVM.cs index 349399dc1..63f794f5d 100644 --- a/src/client/spark/view/Spark/Orders/IOrderTypeDefVM.cs +++ b/src/client/spark/view/Spark/Orders/IOrderTypeDefVM.cs @@ -35,7 +35,9 @@ namespace mbts.spark { public static ISecurityOrderTypeDefVM iceberg(OrdersModel orders_model) => new IcebergOrderVM(orders_model); public static ISecurityOrderTypeDefVM spreader(OrdersModel orders_model) => new SpreaderOrderVM(orders_model); - public static IRXCollection get_collection(OrdersModel orders_model, IObservable security) { + // on_complete_change allows the caller to select a default after the collection has finished adding/removing elements from an update + // doing this via the incremental CollectionChanged event is impossible because the caller has no way of knowing if/when the update is complete + public static IRXCollection get_collection(OrdersModel orders_model, IObservable security, Action> on_update_completed=null) { var vm_factory = _vm_factory(orders_model); return RXCollection.Create(security, (collection, sec) => { var order_types = orders_model.factory.security_order_types(sec).ToList(); @@ -48,6 +50,7 @@ namespace mbts.spark { collection.Add(vm); } } + on_update_completed?.Invoke(collection); }); } @@ -165,7 +168,10 @@ namespace mbts.spark { get { if (_order_types == null) { var sec_src = Observable.FromEvent(cb => _on_security += cb, cb => _on_security -= cb); - _order_types = get_collection(_orders_model, _security.HasValue ? sec_src.StartWith(_security.Value) : sec_src); + _order_types = get_collection(_orders_model, _security.HasValue ? sec_src.StartWith(_security.Value) : sec_src, ots => { + var limit = ots.FirstOrDefault(ot => ot.order_type == CustomOrderDefinition.CustomOneofCase.Limit); + if (limit != null) child_order = limit; + }); WPFHelper.select_first_item(_order_types, new Action(ot => { child_order = ot; RaisePropertyChanged(nameof(child_order)); diff --git a/src/client/spark/view/Spark/Orders/OrderTicketVM.cs b/src/client/spark/view/Spark/Orders/OrderTicketVM.cs index 3386ad745..967249b06 100644 --- a/src/client/spark/view/Spark/Orders/OrderTicketVM.cs +++ b/src/client/spark/view/Spark/Orders/OrderTicketVM.cs @@ -13,6 +13,7 @@ using System.Windows.Input; namespace mbts.spark { class OrderTicketVM : DisposableViewModelBase, IRequestViewClose { OrderDefinitionImmutable _def = OrderDataHelper.Defaults.OrderDefinitionImmutable; + LadderSettings _settings; uint _key; public OrderTicketVM(OrdersModel model, SecurityMD security, OrderDefinitionImmutable order_def, double price, uint size, IObservable settings) @@ -27,6 +28,7 @@ namespace mbts.spark { accounts = model.factory.accounts; bbo = new BBOVM(order_params.Select(o => o.smd)); size_calculator = new CalculatorLogic(null, settings.Select(s => s.calculator_buttons)); + settings.ObserveOnDispatcher().Subscribe(_on_settings); set_price_command = new DelegateCommand(p => { price = p; RaisePropertyChanged(nameof(price)); }); send_order = new DelegateCommand(side => { var vi = _validate_input(); @@ -57,11 +59,14 @@ namespace mbts.spark { model.cancel_order(_key).ignore(); _raise_request_close(); }); - order_types = OrderTypeDefVMFactory.get_collection(model, order_params.Select(ops => ops.smd.security)); - WPFHelper.select_first_item(order_types, new Action(ot => { - selected_order_type = ot; - RaisePropertyChanged(nameof(selected_order_type)); - })); + order_types = OrderTypeDefVMFactory.get_collection(model, order_params.Select(ops => ops.smd.security), ots => { + if (selected_order_type == null || !ots.Contains(selected_order_type)) { + selected_order_type = order_types.FirstOrDefault(ot => ot.order_type == _settings.default_order_type); + if (selected_order_type == null) + selected_order_type = order_types.FirstOrDefault(); + RaisePropertyChanged(nameof(selected_order_type)); + } + }); _dispose = Disposable.Create(bbo, Disposable.Create(() => { foreach (var ot in order_types.OfType()) @@ -97,7 +102,7 @@ namespace mbts.spark { public double? working_price { get; set; } public CalculatorLogic size_calculator { get; } public int? working_size { get; set; } - public IEnumerable time_in_forces => EnumHelper.get_values(); + public TimeInForce[] time_in_forces => EnumHelper.get_values().ToLArray(); public TimeInForce selected_time_in_force { get => _def.TimeInForce; set => _def = _def.with(time_in_force: value); } public string[] accounts { get; } public string account { get => _def.Account; set => _def = _def.with(account: value); } @@ -139,6 +144,31 @@ namespace mbts.spark { void _raise_request_close() => RequestClose?.Invoke(this, new EventArgs()); + void _on_settings(LadderSettings settings) { + _settings = settings; + _select_settings_order_type(); + _select_settings_time_in_force(); + } + + void _select_settings_order_type() { + var order_type = order_types.FirstOrDefault(o => o.order_type == _settings.default_order_type); + if (order_type != null) { + selected_order_type = order_type; + } else if (selected_order_type == null || !order_types.Contains(selected_order_type)) { + selected_order_type = order_types.FirstOrDefault(); + } else return; + RaisePropertyChanged(nameof(selected_order_type)); + } + + void _select_settings_time_in_force() { + if (time_in_forces.Contains(_settings.default_time_in_force)) { + selected_time_in_force = _settings.default_time_in_force; + } else if (!time_in_forces.Contains(selected_time_in_force)) { + selected_time_in_force = time_in_forces.FirstOrDefault(); + } else return; + RaisePropertyChanged(nameof(selected_time_in_force)); + } + struct OrderParams { public readonly SecurityMD smd; public readonly OrderDefinitionImmutable def;