diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs index 5ac03d359..4158bd0c8 100644 --- a/src/client/spark/Images/Icons.cs +++ b/src/client/spark/Images/Icons.cs @@ -22,7 +22,9 @@ namespace mbts.ui { AddBoxesGeometryKey = nameof(AddBoxesGeometryKey), AddFileGeometryKey = nameof(AddFileGeometryKey), AddFileThinGeometryKey = nameof(AddFileThinGeometryKey), + AttachAlgosGeometryKey = nameof(AttachAlgosGeometryKey), CheckMarkGeometryKey = nameof(CheckMarkGeometryKey), + DetachAlgosGeometryKey = nameof(DetachAlgosGeometryKey), DiskGeometryKey = nameof(DiskGeometryKey), DiskFileGeometryKey = nameof(DiskFileGeometryKey), DocumentGeometryKey = nameof(DocumentGeometryKey), @@ -39,6 +41,7 @@ namespace mbts.ui { PaymentGeometryKey = nameof(PaymentGeometryKey), PencilGeometryKey = nameof(PencilGeometryKey), PlayGeometryKey = nameof(PlayGeometryKey), + ProhibitedGeometryKey = nameof(ProhibitedGeometryKey), StarGeometryKey = nameof(StarGeometryKey), ToolsGeometryKey = nameof(ToolsGeometryKey), TrashGeometryKey = nameof(TrashGeometryKey), @@ -115,6 +118,7 @@ namespace mbts.ui { public static ImageSource AddBoxes => create_icon(AddBoxesGeometryKey); public static ImageSource AddEncircled { get { return load_resource_and_freeze("AddEncircled"); } } public static ImageSource AddFile => create_icon(Smashicons.AddFileGeometryKey); + public static ImageSource AttachAlgos => create_icon(AttachAlgosGeometryKey); public static ImageSource Beaker { get { return load_resource_and_freeze("Beaker"); } } public static ImageSource Book { get { return load_resource_and_freeze("Book"); } } @@ -139,6 +143,7 @@ namespace mbts.ui { public static ImageSource CheckMark => create_icon(CheckMarkGeometryKey); public static ImageSource Clock { get { return load_resource_and_freeze("Clock"); } } public static ImageSource Defrag { get { return load_resource_and_freeze("Defrag"); } } + public static ImageSource DetachAlgos => create_icon(DetachAlgosGeometryKey); public static ImageSource Disk => create_icon(DiskGeometryKey); public static ImageSource DiskFile => create_icon(DiskFileGeometryKey); public static ImageSource Display { get { return load_resource_and_freeze("Display"); } } @@ -158,6 +163,7 @@ namespace mbts.ui { public static ImageSource Knight { get { return load_resource_and_freeze("Knight"); } } public static ImageSource Payment => create_icon(PaymentGeometryKey); public static ImageSource Pencil => create_icon(PencilGeometryKey); + public static ImageSource Prohibited => create_icon(ProhibitedGeometryKey); public static ImageSource RedoCircular => create_icon(UndoCircularGeometryKey, Brushes.Black, null, new ScaleTransform(-1, 1)); public static ImageSource Spawn { get { return load_resource_and_freeze("Spawn"); } } public static ImageSource Star => create_icon(StarGeometryKey); diff --git a/src/client/spark/Images/Vector/Icons.xaml b/src/client/spark/Images/Vector/Icons.xaml index 9cba2864c..906aab109 100644 --- a/src/client/spark/Images/Vector/Icons.xaml +++ b/src/client/spark/Images/Vector/Icons.xaml @@ -40,6 +40,69 @@ + + + + M51.173,3.801c-5.068-5.068-13.315-5.066-18.384,0l-9.192,9.192c-0.781,0.781-0.781,2.047,0,2.828 + c0.781,0.781,2.047,0.781,2.828,0l9.192-9.192c1.691-1.69,3.951-2.622,6.363-2.622c2.413,0,4.673,0.932,6.364,2.623 + s2.623,3.951,2.623,6.364c0,2.412-0.932,4.672-2.623,6.363L36.325,31.379c-3.51,3.508-9.219,3.508-12.729,0 + c-0.781-0.781-2.047-0.781-2.828,0s-0.781,2.048,0,2.828c2.534,2.534,5.863,3.801,9.192,3.801s6.658-1.267,9.192-3.801 + l12.021-12.021c2.447-2.446,3.795-5.711,3.795-9.192C54.968,9.512,53.62,6.248,51.173,3.801z + + + M27.132,40.57l-7.778,7.778c-1.691,1.691-3.951,2.623-6.364,2.623c-2.412,0-4.673-0.932-6.364-2.623 + c-3.509-3.509-3.509-9.219,0-12.728L17.94,24.306c1.691-1.69,3.951-2.622,6.364-2.622c2.412,0,4.672,0.932,6.363,2.622 + c0.781,0.781,2.047,0.781,2.828,0s0.781-2.047,0-2.828c-5.067-5.067-13.314-5.068-18.384,0L3.797,32.793 + c-2.446,2.446-3.794,5.711-3.794,9.192c0,3.48,1.348,6.745,3.795,9.191c2.446,2.447,5.711,3.795,9.191,3.795 + c3.481,0,6.746-1.348,9.192-3.795l7.778-7.778c0.781-0.781,0.781-2.047,0-2.828S27.913,39.789,27.132,40.57z + + + + + + + M462.557,77.627c-14.323-25.556-41.488-41.423-70.889-41.423c-13.835,0-27.54,3.585-39.602,10.364 + l-152.557,85.635l17.55,31.279l152.565-85.635c6.747-3.78,14.371-5.779,22.069-5.779c16.428,0,31.596,8.852,39.594,23.11 + c5.909,10.535,7.356,22.752,4.072,34.408c-3.268,11.656-10.876,21.346-21.411,27.255l-138.291,77.604 + c-2.634-16.851-10.494-32.392-22.793-44.699c-21.687-21.663-56.063-29.328-84.935-18.964l-12.485,4.495l12.128,33.734 + l12.534-4.471c16.127-5.869,35.319-1.496,47.406,10.567c6.974,6.982,11.388,15.826,12.786,25.41 + c-0.585-0.138-1.171-0.285-1.731-0.447c-11.681-3.284-21.354-10.9-27.271-21.476l-6.519-11.518l-31.303,17.59l6.56,11.518 + c10.6,18.915,27.93,32.571,48.836,38.44c0.723,0.187,1.455,0.39,2.187,0.561c-1.105,1.398-2.284,2.731-3.536,3.983 + l-114.32,114.328c-8.551,8.543-19.931,13.241-32.035,13.241c-12.112,0-23.492-4.698-32.027-13.241 + c-8.535-8.543-13.233-19.907-13.233-32.027c0-12.112,4.698-23.483,13.233-32.018l99.291-99.282l-25.369-25.369l-99.282,99.282 + C8.446,319.427,0,339.806,0,361.468c0,21.679,8.446,42.049,23.776,57.396c15.339,15.339,35.709,23.768,57.388,23.768 + s42.049-8.429,57.388-23.768l114.345-114.32c8.372-8.405,14.81-18.566,18.842-29.71c6.625-1.764,12.924-4.3,18.777-7.6 + l140.99-79.115c18.875-10.608,32.514-27.946,38.375-48.828C475.749,118.4,473.148,96.493,462.557,77.627z + + + M173.171,141.769c4.503-0.821,7.511-5.145,6.69-9.657l-17.103-94.942 + c-0.821-4.519-5.162-7.527-9.665-6.722c-4.511,0.821-7.527,5.145-6.706,9.673l17.111,94.925 + C164.311,139.575,168.644,142.574,173.171,141.769z + + + M43.561,191.776l94.934-17.119c4.519-0.821,7.527-5.145,6.706-9.657 + c-0.821-4.528-5.145-7.543-9.649-6.722L40.61,175.405c-4.503,0.797-7.519,5.145-6.698,9.657 + C34.717,189.582,39.058,192.589,43.561,191.776z + + + + + + M32.759,0C14.696,0,0,14.695,0,32.759s14.695,32.759,32.759,32.759s32.759-14.695,32.759-32.759S50.822,0,32.759,0z + M6,32.759C6,18.004,18.004,6,32.759,6c6.648,0,12.734,2.443,17.419,6.472L12.472,50.178C8.443,45.493,6,39.407,6,32.759z + M32.759,59.518c-5.948,0-11.447-1.953-15.895-5.248l37.405-37.405c3.295,4.448,5.248,9.947,5.248,15.895 + C59.518,47.514,47.514,59.518,32.759,59.518z + + 4 @@ -559,71 +557,14 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + AllowEditStructure + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs index d0a878a08..62202b655 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs @@ -2,27 +2,31 @@ using bts.api.orderman; using bts.shell; using bts.spark; +using bts.view; using mbts.persist; using mbts.ui; using mbts.ui.converters; +using mbts.ui.extensions; using mbts.ui.spark; using mbts.ui.utility; +using mbts.utils; using System; using System.Collections.Generic; using System.Linq; using System.Reactive.Linq; using System.Windows; using System.Windows.Data; +using System.Windows.Input; using System.Windows.Media; -//using IOrderBookWSM = mbts.persist.IWindowSettingsManager>; using OrderBookGridSettings = bts.shell.OrderBookWindowFactory.OrderBookGridSettings; using OrderBookGridSettingsVM = mbts.spark.GridSettingsVM; namespace mbts.spark { internal class OrderBookWindow : SparkWindow, ISharedWindow { - const string _window_type = "OrderBook", ORDERBOOK_THREAD_ID = "OrderBook", _default_title = "Order Book"; + const string _window_type = "OrderBook", _default_title = "Order Book"; readonly INotificationService _notification_service; readonly IWindowSettingsManager _settings_manager; + IDisposable _attachment_exit_sub; OrderBookWindowFactory.OrderBookStartupData _state; OrdersModel _model; OrderBookVM _vm; @@ -30,17 +34,6 @@ namespace mbts.spark { OrderBookWindowFactory _factory; SparkCommand[] _commands; - SparkCommand _show_fills_command - , _modify_order_command - , _cancel_buy_orders_command - , _cancel_sell_orders_command - , _cancel_all_orders_command - , _cancel_selected_orders_command - , _recreate_selected_orders_command - , _toggle_collapse_all_command - , _toggle_expand_all_command - , _show_grid_settings_command; - public OrderBookWindow(OrdersModel model, OrderBookWindowFactory factory, IBus bus, INotificationService notification_service, OrderBookWindowFactory.OrderBookStartupData state, ImageSource icon, IWindowSettingsManager settings_manager) : base(_default_title, bus, factory, SparkCommands.ShowOrders.icon) { @@ -49,6 +42,7 @@ namespace mbts.spark { _notification_service = notification_service; _state = state; _settings_manager = settings_manager; + thread_id = config.Configuration.get().order_book ? "OrderBook" : null; } public override OrderBookWindowFactory.OrderBookStartupData SaveState => _state = _vm?.create(); @@ -61,10 +55,11 @@ namespace mbts.spark { + SPARK_MENU_COLLAPSED_WIDTH + LAUNCHER_BUTTON_BORDER_WIDTH + EXTRA_FOR_NO_HORIZONTAL_SCROLLBAR_WIDTH; - public string thread_id => ORDERBOOK_THREAD_ID; + public string thread_id { get; } public override void Dispose() { _commands.OfType().DisposeAll(); + Disposable.dispose(ref _attachment_exit_sub); Disposable.dispose(ref _vm); } @@ -73,54 +68,62 @@ namespace mbts.spark { _vm.load_from(_state); _view = new OrderBookView(_vm); - _show_fills_command = SparkCommands.ShowFills.complete(() => new FillsWindowFactory.StartupData(_vm.selected_orders.Select(r => r.Key).ToArray())); + var show_fills_command = SparkCommands.ShowFills.complete(() => new FillsWindowFactory.StartupData(_vm.selected_orders.Select(r => r.Key).ToArray())); - _modify_order_command = SparkCommands.ShowModifyOrder.complete( - () => _vm.current_order.Value.Key, - can_execute: () => { - if (_vm.current_order.HasValue) { - return _vm.current_order.Value.State.Status == bts.api.orderman.OrderStatus.Working; - } - return false; - } - ); + var toggle_right_panel_is_visible_command = new SparkCommandCommand( + get_toggle_algo_editor_cmd_title(), + Icons.ModifyOrder, + _vm.toggle_algo_editor_is_visible_cmd, + new KeyGesture(Key.M, ModifierKeys.Control | ModifierKeys.Shift)); - _cancel_buy_orders_command = SparkCommands.CancelBuyOrders.complete( + var cancel_buy_orders_command = SparkCommands.CancelBuyOrders.complete( _model.working_orders.Select(os => os.Values.Where(o => o.order.side() == Side.Buy).Select(o => o.order.Key)), wbids => wbids.Any() ); - _cancel_sell_orders_command = SparkCommands.CancelSellOrders.complete( + var cancel_sell_orders_command = SparkCommands.CancelSellOrders.complete( _model.working_orders.Select(os => os.Values.Where(o => o.order.side() == Side.Sell).Select(o => o.order.Key)), wasks => wasks.Any() ); - _cancel_all_orders_command = SparkCommands.CancelOrders.complete( + var cancel_all_orders_command = SparkCommands.CancelOrders.complete( _model.working_orders.Select(os => os.Select(o => o.Key)), worders => worders.Any() ); - _cancel_selected_orders_command = SparkCommands.CancelSelectedOrders.complete( + var cancel_selected_orders_command = SparkCommands.CancelSelectedOrders.complete( () => _vm.selected_orders.Where(x => x.status() == OrderStatus.Working).Select(x => x.Key), can_execute: () => _vm.selected_orders.Any(x => x.status() == OrderStatus.Working) ); - _recreate_selected_orders_command = SparkCommands.RecreateSelectedOrders.complete( + var recreate_selected_orders_command = SparkCommands.RecreateSelectedOrders.complete( () => - _vm.selected_orders.Where(x => _passes_recreate_search_criteria(x)) + _vm.selected_orders.Where(x => passes_recreate_search_criteria(x)) .Select(x => (x.Def, x.State.Price, x.State.Quantity - x.State.FilledQuantity)), - can_execute: () => _vm.selected_orders.Any(x => _passes_recreate_search_criteria(x)) + can_execute: () => _vm.selected_orders.Any(x => passes_recreate_search_criteria(x)) ); - _toggle_collapse_all_command = new SparkCommandCommand("Collapse All", + var attach_selected_orders_command = new SparkCommandCommand( + "Attach To Selected Orders", + Icons.AttachAlgos, + new DelegateCommand(_vm.begin_attach_algos, () => _vm.selected_rows.Count > 0), + new KeyGesture(Key.A, ModifierKeys.Control | ModifierKeys.Shift)); + + var detach_selected_orders_command = new SparkCommandCommand( + "Detach And Cancel Selected Orders", + Icons.DetachAlgos, + new DelegateCommand(_vm.detach_selected_algos, () => _vm.selected_rows.Count > 0), + new KeyGesture(Key.D, ModifierKeys.Control | ModifierKeys.Shift)); + + var toggle_collapse_all_command = new SparkCommandCommand("Collapse All", Icons.RightArrow, _vm.collapse_all_rows_command); - _toggle_expand_all_command = new SparkCommandCommand("Expand All", + var toggle_expand_all_command = new SparkCommandCommand("Expand All", Icons.DownArrow, _vm.expand_all_rows_command); - _show_grid_settings_command = SparkCommands.window_settings_command(new DialogCommand(() => { + var show_grid_settings_command = SparkCommands.window_settings_command(new DialogCommand(() => { var gs_vm = new WindowSettingsDialogVM( _settings_manager, us => us.order_book_grid, @@ -145,31 +148,44 @@ namespace mbts.spark { return dialog; })); - _commands = new SparkCommand[] { - _show_fills_command, - _modify_order_command, - _cancel_selected_orders_command, - _cancel_buy_orders_command, - _cancel_sell_orders_command, - _cancel_all_orders_command, - _recreate_selected_orders_command, - _toggle_collapse_all_command, - _toggle_expand_all_command, - _show_grid_settings_command + _commands = new SparkCommand[] { + show_fills_command, + toggle_right_panel_is_visible_command, + cancel_selected_orders_command, + cancel_buy_orders_command, + cancel_sell_orders_command, + cancel_all_orders_command, + recreate_selected_orders_command, + attach_selected_orders_command, + detach_selected_orders_command, + toggle_collapse_all_command, + toggle_expand_all_command, + show_grid_settings_command }; - _vm.selected_order_changed += _vm_selected_order_changed; + _vm.as_demuxer().subscribe(nameof(OrderBookVM.algo_editor_is_visible)) + .Subscribe(_ => toggle_right_panel_is_visible_command.title = get_toggle_algo_editor_cmd_title()); + _vm.selected_order_changed += vm_selected_order_changed; + // local methods + string get_toggle_algo_editor_cmd_title() => + $"{(_vm.algo_editor_is_visible ? "Hide" : "Show")} Order Params"; + + bool passes_recreate_search_criteria(OrderRecordImmutable record) => + (record.status() == OrderStatus.Canceled || record.status() == OrderStatus.Error) && + !record.has_parent() && + record.State.Quantity > record.State.FilledQuantity; + + void vm_selected_order_changed(OrderRecordImmutable? e) { + cancel_selected_orders_command.raiseCanExecuteChanged(); + recreate_selected_orders_command.raiseCanExecuteChanged(); + attach_selected_orders_command.raiseCanExecuteChanged(); + detach_selected_orders_command.raiseCanExecuteChanged(); + } } - private bool _passes_recreate_search_criteria(OrderRecordImmutable record) { - return (record.status() == OrderStatus.Canceled || record.status() == OrderStatus.Error) - && !record.has_parent() - && record.State.Quantity > record.State.FilledQuantity; - } - - private void _vm_selected_order_changed(OrderRecordImmutable? e) { - _modify_order_command.raiseCanExecuteChanged(); - _cancel_selected_orders_command.raiseCanExecuteChanged(); - _recreate_selected_orders_command.raiseCanExecuteChanged(); - } + protected override void OnParentViewCreated(SparkWindowView parent_view) => + Disposable.replace(ref _attachment_exit_sub, parent_view.SubscribePreviewKeyDown((s, e) => { + if (e.Key == Key.Escape || (e.Key == Key.Z && KeyboardExtensions.IsCtrlDown())) + _vm.is_attaching_algos = false; + })); } } diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs index 5101a4149..83578cb44 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs @@ -12,10 +12,11 @@ using mbts.ui.settings; using ProtoBuf; using System; using System.Collections.Generic; +using System.ComponentModel; using System.Reactive.Linq; using System.Threading.Tasks; using System.Windows; -using static mbts.spark.OrderBookView; +using Columns = mbts.spark.OrderBookGridView.ColumnKeys; namespace bts.shell { internal class OrderBookWindowFactory : ShellWindowFactory { @@ -49,24 +50,57 @@ namespace bts.shell { [ProtoContract] public class OrderBookStartupData { - //[ProtoMember(5)] - //public readonly List sort_criteria; + const bool _default_algo_editor_is_visible = true; + const double + _default_right_panel_width = 400, + _default_fills_slave_grid_height = 138; + // ALREADY USED TAGS + // [ProtoMember(5)] + // public readonly List sort_criteria; + + // filters [ProtoMember(10)] public FilterStates filters; + // grid [ProtoMember(15)] [Obsolete] public GridSettings grid; + // algo editor is visible + [ProtoMember(16)] + [DefaultValue(_default_algo_editor_is_visible)] + public bool algo_editor_is_visible { get; set; } + // right panel width + [ProtoMember(17)] + [DefaultValue(_default_right_panel_width)] + public double right_panel_width { get; set; } + // fills slave grid height + [ProtoMember(18)] + [DefaultValue(_default_fills_slave_grid_height)] + public double fills_slave_grid_height { get; set; } + // fills slave grid is visible + [ProtoMember(19)] + public bool fills_slave_grid_is_visible { get; set; } + // predicate animations [ProtoMember(20)] [Obsolete] List _predicate_animations; + // use defaults [ProtoMember(25)] public bool use_defaults; - public OrderBookStartupData() { } + public OrderBookStartupData() { + algo_editor_is_visible = _default_algo_editor_is_visible; + right_panel_width = _default_right_panel_width; + fills_slave_grid_height = _default_fills_slave_grid_height; + } - public OrderBookStartupData(FilterStates filters, GridSettings grid = default, IEnumerable predicate_animations = null, bool use_defaults = false) { + public OrderBookStartupData(FilterStates filters, GridSettings grid = default, bool algo_editor_is_visible = false, double right_panel_width = 0, double fills_slave_grid_height = 0, bool fills_slave_grid_is_visible = false, IEnumerable predicate_animations = null, bool use_defaults = false) { this.filters = filters; this.use_defaults = use_defaults; + this.algo_editor_is_visible = algo_editor_is_visible; + this.right_panel_width = right_panel_width; + this.fills_slave_grid_height = fills_slave_grid_height; + this.fills_slave_grid_is_visible = fills_slave_grid_is_visible; #pragma warning disable CS0612 // Type or member is obsolete this.grid = grid; _predicate_animations = new List(); @@ -83,9 +117,12 @@ namespace bts.shell { public static OrderBookStartupData Default => new OrderBookStartupData( - new FilterStates { - statuses = new[] { OrderStatus.Working } - }, _default_general_grid, use_defaults: true); + new FilterStates { statuses = new[] { OrderStatus.Working } }, + _default_general_grid, + _default_algo_editor_is_visible, + _default_right_panel_width, + _default_fills_slave_grid_height, + use_defaults: true); public static OrderBookGridSettings DefaultGrid => new OrderBookGridSettings(_default_general_grid); @@ -115,6 +152,7 @@ namespace bts.shell { public static GridColumnSettings security_key => new GridColumnSettings(Columns.SecurityKey.ToString(), DIYGrid.DefaultColumnHeaders.SecurityKey, is_visible: false, width: DIYGrid.DefaultColumnWidths.SecurityKey); public static GridColumnSettings order_key => new GridColumnSettings(Columns.OrderKey.ToString(), DIYGrid.DefaultColumnHeaders.OrderKey, width: DIYGrid.DefaultColumnWidths.OrderKey); public static GridColumnSettings parent_key => new GridColumnSettings(Columns.ParentKey.ToString(), "Parent Key", width: DIYGrid.DefaultColumnWidths.ParentKey); + public static GridColumnSettings attached_target_order_key => new GridColumnSettings(Columns.AttachedTargetOrderKey.ToString(), DIYGrid.DefaultColumnHeaders.AttachedTargetOrderKey, width: DIYGrid.DefaultColumnWidths.ParentKey); public static IEnumerable sorting_criterion { get { @@ -145,11 +183,12 @@ namespace bts.shell { yield return security_key; yield return order_key; yield return parent_key; + yield return attached_target_order_key; } } private static HashSet _mini_mode_columns_to_hide = new HashSet { - time_created, exchange, sub_type, quantity, price, avg_price, last_price, status, last_message, security_key, order_key, parent_key + time_created, exchange, sub_type, quantity, price, avg_price, last_price, status, last_message, security_key, order_key, parent_key, attached_target_order_key }; public static IEnumerable mini { @@ -208,11 +247,17 @@ namespace bts.shell { public api.orderman.OrderSubType[] order_sub_types; [ProtoMember(20)] public string[] symbols; + [ProtoMember(21)] + public string parent_key_regex; + [ProtoMember(22)] + public string attached_target_order_key_regex; public bool Equals(FilterStates other) => other != null && security_criteria.safe_equals(other.security_criteria) && order_key_regex == other.order_key_regex && + parent_key_regex == other.parent_key_regex && + attached_target_order_key_regex == other.attached_target_order_key_regex && time_created.Equals(other.time_created) && EqualityComparer.safe_sequence_equals(users, other.users) && EqualityComparer.safe_sequence_equals(accounts, other.accounts) && @@ -230,6 +275,32 @@ namespace bts.shell { last_change.Equals(other.last_change) && EqualityComparer.safe_sequence_equals(order_sub_types, other.order_sub_types) && EqualityComparer.safe_sequence_equals(symbols, other.symbols); + + public override bool Equals(object obj) => Equals(obj as FilterStates); + + public override int GetHashCode() => + EqualityComparer.aggregate_hash( + security_criteria?.GetHashCode() ?? 0, + order_key_regex?.GetHashCode() ?? 0, + parent_key_regex?.GetHashCode() ?? 0, + attached_target_order_key_regex?.GetHashCode() ?? 0, + time_created.GetHashCode(), + EqualityComparer.safe_aggregate_hash(users), + EqualityComparer.safe_aggregate_hash(accounts), + EqualityComparer.safe_aggregate_hash(exchanges), + EqualityComparer.safe_aggregate_hash(tifs), + EqualityComparer.safe_aggregate_hash(order_types), + EqualityComparer.safe_aggregate_hash(sides), + qty?.GetHashCode() ?? 0, + price?.GetHashCode() ?? 0, + qty_filled?.GetHashCode() ?? 0, + avg_price?.GetHashCode() ?? 0, + last_price?.GetHashCode() ?? 0, + EqualityComparer.safe_aggregate_hash(statuses), + exchange_message_regex?.GetHashCode() ?? 0, + last_change.GetHashCode(), + EqualityComparer.safe_aggregate_hash(order_sub_types), + EqualityComparer.safe_aggregate_hash(symbols)); } [ProtoContract] @@ -240,7 +311,7 @@ namespace bts.shell { List _predicate_animations; public OrderBookGridSettings() { } - public OrderBookGridSettings(GridSettings general = default, IEnumerable predicate_animations = null) { + public OrderBookGridSettings(GridSettings general = default, IEnumerable predicate_animations = null, double right_panel_width = double.NaN) { this.general = general; _predicate_animations = new List(); if (predicate_animations != null) diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookAttachmentTargetAdorner.cs b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookAttachmentTargetAdorner.cs new file mode 100644 index 000000000..ff71d046b --- /dev/null +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookAttachmentTargetAdorner.cs @@ -0,0 +1,63 @@ +using mbts.ui; +using mbts.ui.controls; +using mbts.ui.controls.adorners; +using mbts.ui.extensions; +using System; +using System.Reactive.Linq; +using System.Windows; +using System.Windows.Input; + +namespace mbts.spark { + partial class OrderBookView { + public class OrderBookAttachmentTargetAdorner : DIYGridRowHighlighterAdorner, IDisposable { + IDisposable _attach_op; + bool _is_active, _is_disposed; + + #region IsActive + public static readonly DependencyProperty IsActiveProperty = + WPFHelper.create_dp( + nameof(IsActive), + FrameworkPropertyMetadataOptions.AffectsRender, + (o, v) => { + o._is_active = v; + Disposable.dispose(ref o._attach_op); + if (v && !o._is_disposed) { + o.IsHitTestVisible = true; + o._attach_op = Disposable.Create( + o.SubscribePreviewMouseDown((s, e) => { + if (e.ChangedButton == MouseButton.Left) { + if (e.ClickCount > 1 && o.TargetRow is OrderBookRowVM r) { + e.Handled = true; + o._raise_target_row_selected(r); + } + } + }), + o.AdornedElement.SubscribeMouseHoverRow().Subscribe(row => o.TargetRow = row)); + } else { + o.IsHitTestVisible = false; + o.TargetRow = null; + } + }, + false); + + public bool IsActive { + get => (bool)GetValue(IsActiveProperty); + set => SetValue(IsActiveProperty, value); + } + + public event Action TargetRowSelected; + #endregion + + public OrderBookAttachmentTargetAdorner(DIYGrid grid) : base(grid) { } + + public void Dispose() { + if (!_is_disposed) { + _is_disposed = true; + Disposable.dispose(ref _attach_op); + } + } + + void _raise_target_row_selected(OrderBookRowVM row) => TargetRowSelected?.Invoke(row); + } + } +} \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml new file mode 100644 index 000000000..10493f539 --- /dev/null +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs similarity index 54% rename from src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs rename to src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs index 8fb0a43c9..945a5eb9f 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookGridView.xaml.cs @@ -1,11 +1,7 @@ using mbts.ui.controls; -using System.Windows.Controls; namespace mbts.spark { - internal partial class OrderBookView : UserControl { - // IMPORTANT: these enums are stored as strings in the general-purpose GridColumnSettings proto, and are used to ID THE COLUMNS! - // Do NOT RENAME them! However, if you must, be sure to write an IShellWindowMigrationRule or something to account for backwards compatability. - public enum Columns { Security, Symbol, Time, LastChange, User, Account, Exchange, TimeInForce, OrderType, SubType, Side, Size, Price, Filled, AvgFilled, LastPrice, Status, LastMessage, SecurityKey, OrderKey, ParentKey, Cancel, EditableQty, EditablePrice } + internal partial class OrderBookGridView : DIYGrid { public const string SubTypeFilterTemplateKey = "SubTypeFilterTemplate", ExpandCollapseToggleStyleKey = "ExpandCollapseToggleStyle", @@ -14,13 +10,41 @@ namespace mbts.spark { CVRowStyleKey = "CVRowStyle", CVRowTemplateKey = "CVRowTemplateKey"; - public OrderBookView(OrderBookVM vm) { - InitializeComponent(); - DataContext = vm; + // IMPORTANT: these enums are stored as strings in the general-purpose GridColumnSettings proto, and are used to ID THE COLUMNS! + // Do NOT RENAME them! However, if you must, be sure to write an IShellWindowMigrationRule or something to account for backwards compatability. + public enum ColumnKeys { + Security, + Symbol, + Time, + LastChange, + User, + Account, + Exchange, + TimeInForce, + OrderType, + SubType, + Side, + Size, + Price, + Filled, + AvgFilled, + LastPrice, + Status, + LastMessage, + SecurityKey, + OrderKey, + ParentKey, + AttachedTargetOrderKey, + Cancel, + EditableQty, + EditablePrice } + + public OrderBookGridView() => + InitializeComponent(); } - class OrderBookRowView : DIYGrid.HighPerformanceRow { + class OrderBookRowView : DIYGrid.HighPerformanceRow { public OrderBookRowView() : base() { } } } \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml new file mode 100644 index 000000000..bb11c6804 --- /dev/null +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml @@ -0,0 +1,407 @@ + + + + + + + + 5 + 64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +