From c91eedcca089d920291c4dcd3922c44437fa8a45 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 1 Feb 2019 12:04:34 -0600 Subject: [PATCH] minor refactoring, some notes after talking w/ john --- .../spark/Modules/Trading/OrderBook/OrderBookColumns.cs | 4 ++-- .../spark/Modules/Trading/OrderBook/OrderBookRowVM.cs | 4 ++-- .../spark/view/Controls/DIYGrid/Columns/ColumnBase.cs | 2 +- src/client/spark/view/Spark/Ladder/LadderOrderVM.cs | 6 +++++- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index 6cf5f3623..dd240cfb7 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -668,9 +668,9 @@ namespace mbts.spark { public class CancelColumn : FrameworkElementColumnBase { readonly BindingBase _command_binding; - public CancelColumn(Columns key, string command_property) : base(key) { + public CancelColumn(string command_property) : base(Columns.Cancel) { id = key.ToString(); - Header = DefaultColumnHeaders.Delete; + Header = DefaultColumnHeaders.Cancel; _command_binding = new Binding(command_property); } diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index a49a2c23d..ca6bf6be2 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -132,7 +132,7 @@ namespace mbts.spark { (desired_quantity) => _owner.modify_order_quantity(this, (uint)desired_quantity), (desired_quantity) => (desired_quantity != null && this.status == OrderStatus.Working && (uint)desired_quantity != this.quantity) - || prospective_quantity != this.quantity + || is_qty_dirty ) ); @@ -141,7 +141,7 @@ namespace mbts.spark { (desired_price) => _owner.modify_order_price(this, (double)desired_price), (desired_price) => (desired_price != null && this.status == OrderStatus.Working && (double)desired_price != this.price) - || prospective_price != this.price + || is_price_dirty ) ); diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index 019581851..02ff43b49 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -98,7 +98,7 @@ namespace mbts.ui.controls { TotalNetPos = "Total Net Pos", TotalPnL = "Total PnL", PnLPrice = "PnL Price", - Delete = "Delete"; + Cancel = "Cancel"; } public interface IKeyedColumn { diff --git a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs index 7e40e3473..43a018033 100644 --- a/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs +++ b/src/client/spark/view/Spark/Ladder/LadderOrderVM.cs @@ -213,7 +213,11 @@ namespace mbts.spark { bts.shell.OrderBookWindowFactory.OrderBookStartupData.default_mini_grid, use_defaults: false ); - obvm.columns.Insert(0, new OrderBookVM.CancelColumn(OrderBookView.Columns.Cancel, nameof(OrderBookRowVM.cancel_command))); + // NOTE: + // we might need the ObservableAppend to InsertAt + // if these EditXXX ever support settings. + // insert the cancel column + obvm.columns.Insert(0, new OrderBookVM.CancelColumn(nameof(OrderBookRowVM.cancel_command))); var qty_col = obvm.columns.Where(x => x.id == OrderBookView.Columns.Size.ToString()).FirstOrDefault(); var qty_index = obvm.columns.indexOf(qty_col); if (qty_index > -1) {