From cd050b5a007b1418f25eeb2f512bbcd0c93c85e6 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Sat, 17 Feb 2018 21:40:57 -0500 Subject: [PATCH] SPARK-487, SPARK-488 - sprucing up ladder --- .../view/Controls/SparkMenu/SparkMenu.cs | 18 +- .../spark/view/Spark/Ladder/LadderVM.cs | 24 +- .../spark/view/Spark/Ladder/LadderView.xaml | 322 +++++++++--------- src/client/spark/view/Spark/Ladder/OrderVM.cs | 1 + 4 files changed, 188 insertions(+), 177 deletions(-) diff --git a/src/client/spark/view/Controls/SparkMenu/SparkMenu.cs b/src/client/spark/view/Controls/SparkMenu/SparkMenu.cs index 1187bcf46..ae9d32476 100644 --- a/src/client/spark/view/Controls/SparkMenu/SparkMenu.cs +++ b/src/client/spark/view/Controls/SparkMenu/SparkMenu.cs @@ -1,24 +1,20 @@ using bts.api; using bts.spark; -using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; -using System.Windows.Media; namespace mbts.ui.controls { public class SparkMenu : ItemsControl { - static SparkMenu() { + static SparkMenu() => DefaultStyleKeyProperty.OverrideMetadata(typeof(SparkMenu), new FrameworkPropertyMetadata(typeof(SparkMenu))); - } - public SparkMenu(IEnumerable commands, IBus bus) { - ItemsSource = commands.Select(c => new SparkCommandVM(c, bus)).ToList(); + public SparkMenu() => SetCurrentValue(FocusableProperty, false); - } + + public SparkMenu(IEnumerable commands, IBus bus) : this() => + ItemsSource = commands.Select(c => new SparkCommandVM(c, bus)).ToList(); public bool ShowText { get { return (bool)GetValue(ShowTextProperty); } @@ -26,7 +22,5 @@ namespace mbts.ui.controls { } public static readonly DependencyProperty ShowTextProperty = DependencyProperty.Register("ShowText", typeof(bool), typeof(SparkMenu), new PropertyMetadata(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 000d9e837..1d8fbccb5 100644 --- a/src/client/spark/view/Spark/Ladder/LadderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderVM.cs @@ -1,5 +1,6 @@ using bts.api; using bts.api.orderman; +using bts.spark; using mbts.co2; using mbts.ui; using mbts.ui.shell; @@ -40,15 +41,29 @@ namespace mbts.spark { // calculator calculator = new CalculatorLogic(0, settings.Select(s => s.calculator_buttons)); - // cancel - cancel_command = new AsyncCommand(_model.cancel_orders); - send_order_command = new AsyncCommand<(double, Side?)>(send_order); - // Order _selected_time_in_force = backing(nameof(selected_order_type), TimeInForce.Day); selected_order_type = _limit; _revert = backing(nameof(revert), false); show_ticket_command = new DelegateCommand(show_ticket); + send_order_command = new AsyncCommand<(double, Side?)>(send_order); + cancel_command = new AsyncCommand(_model.cancel_orders); + menu_items = new[] { + new SparkCommandVM(SparkCommand.create("Cxl Buys", Icons.CancelBuys, SparkTags.CancelOrders).complete(() => orders.Where(ovm => ovm.side == Side.Buy).Select(ovm => ovm.id)), _bus), + new SparkCommandVM(SparkCommand.create("Cxl Sells", Icons.CancelSells, SparkTags.CancelOrders).complete(() => orders.Where(ovm => ovm.side == Side.Sell).Select(ovm => ovm.id)), _bus), + new SparkCommandVM(SparkCommand.create("Cxl All", Icons.CancelOrders, SparkTags.CancelOrders).complete(() => orders.Select(ovm => ovm.id)), _bus), + new SparkCommandVM(SparkCommand.create("Details", Icons.Book, SparkTags.ShowOrderBookTag).complete(() => new bts.shell.OrderBookWindowFactory.OrderBookStartupData { + filters = new bts.shell.OrderBookWindowFactory.FilterStates { + security_criteria = new SecurityCriteria(security) + } + }), _bus), + //new SparkCommandVM(SparkCommands.ShowFills.complete(() => new bts.shell.FillsWindowFactory.StartupData( + // new bts.shell.FillsWindowFactory.FilterStates { + // security = new SecurityCriteria(security) + // } + //)), _bus), + new SparkCommandVM(SparkCommand.create("Ticket", Icons.Ticket, SparkTags.ShowOrderTicketTag).complete(() => (new OrderDefinitionImmutable(create_order()), 0d, 0u)), _bus) + }; // Settings this.settings = settings; @@ -77,6 +92,7 @@ namespace mbts.spark { public IMDHandle md => _model.md; public bool is_synthetic => _model.security.ContractCase == Security.ContractOneofCase.Synthetic; public CalculatorLogic calculator { get; } + public SparkCommandVM[] menu_items { get; } internal LadderModel model => _model; internal IReadOnlyDictionary orders_cache { get; private set; } = new Dictionary(); diff --git a/src/client/spark/view/Spark/Ladder/LadderView.xaml b/src/client/spark/view/Spark/Ladder/LadderView.xaml index 1aa5c5273..35fa51103 100644 --- a/src/client/spark/view/Spark/Ladder/LadderView.xaml +++ b/src/client/spark/view/Spark/Ladder/LadderView.xaml @@ -4,9 +4,7 @@ xmlns:mbts="clr-namespace:mbts.ui" xmlns:controls="clr-namespace:mbts.ui.controls" xmlns:spark="clr-namespace:mbts.spark" - xmlns:usp="clr-namespace:mbts.ui.spark" xmlns:uag="clr-namespace:mbts.ui.spark.algo" - xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:converters="clr-namespace:mbts.ui.converters" Height="600" Width="400" @@ -18,169 +16,171 @@ - - - - - - + + + + + + - - - - - - + + + + + + + - - - - - - - - Revert + + + + + + + + Revert - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/client/spark/view/Spark/Ladder/OrderVM.cs b/src/client/spark/view/Spark/Ladder/OrderVM.cs index 24dc524b0..eb9dd68cc 100644 --- a/src/client/spark/view/Spark/Ladder/OrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/OrderVM.cs @@ -62,6 +62,7 @@ namespace mbts.spark { public uint id => _order.Key; public uint security_key => _parent.security.Id; public double price { get => double.IsNaN(_phantom_price) ? _real_price : _phantom_price; } + public Side side => _order.Def.Side; public string text => ""; string _buy_sell_indicator => _order.Def.Side == Side.Buy ? "B" : "S";