From f16ed40c821ff09bd8fc3cd1aae736c68e439b03 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 9 May 2019 12:12:21 -0500 Subject: [PATCH] OrderUtils.badge_fill does not need the OrderRecordImmutable arg --- .../spark/Modules/Trading/Fills/FillsVM.cs | 2 +- .../Trading/OrderBook/OrderBookRowVM.cs | 6 +++--- src/client/spark/Orders/OrderUtils.cs | 18 ++++-------------- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs index 841e32391..d3a47734d 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs @@ -233,7 +233,7 @@ namespace mbts.spark { public OrderType order_type => _order.order_type(); public string display_name => OrderUtils.display_name(_order, _fill_tuple.algo); public OrderMetadata order_metadata => _order_metadata ?? (_order_metadata = _model.factory.get_metadata(_order.Def.CustomDef.CustomCase)); - public Brush badge_fill => _badge_fill ?? (_badge_fill = OrderUtils.badge_fill(_order, _fill_tuple.algo_meta, order_metadata)); + public Brush badge_fill => _badge_fill ?? (_badge_fill = OrderUtils.badge_fill(_fill_tuple.algo_meta, order_metadata)); public string account { get; private set; } public string user => _order.user(); public Venue exchange => security.Exchange; diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 650e5c0d2..a93c6bbc3 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -58,7 +58,7 @@ namespace mbts.spark { public OrderSecurityAlgoMeta order_tuple { get; private set; } public OrderRecordImmutable order => order_tuple.order; public OrderMetadata order_metadata => _owner.get_metadata(this); - public Brush badge_fill => _badge_fill ?? (_badge_fill = order_tuple.badge_fill(order_metadata)); + public Brush badge_fill => _badge_fill ?? (_badge_fill = OrderUtils.badge_fill(order_tuple.meta, root_algo_order_metadata)); public uint order_key => order.Key; public uint parent_order_key => order.ParentKey; public uint security_key => order.security_key(); @@ -201,7 +201,7 @@ namespace mbts.spark { // private props Color _root_algo_badge_color { - get => _root_algo_badge_color_backing ?? (_root_algo_badge_color_backing = order_tuple.root_badge_color(root_algo_order_metadata)).Value; + get => _root_algo_badge_color_backing ?? (_root_algo_badge_color_backing = OrderUtils.badge_color(order_tuple.root_meta, root_algo_order_metadata)).Value; set { if (_root_algo_badge_color_backing != value) { _root_algo_badge_color_backing = value; @@ -282,7 +282,7 @@ namespace mbts.spark { // root badge fill if (_root_algo_badge_color_backing.HasValue) { // only need to invalidate it if it had a value (it is lazily instantiated) - _root_algo_badge_color = order_tuple.root_badge_color(root_algo_order_metadata); + _root_algo_badge_color = OrderUtils.badge_color(order_tuple.root_meta, root_algo_order_metadata); RaisePropertyChanged(nameof(root_algo_badge_fill)); } // root display name diff --git a/src/client/spark/Orders/OrderUtils.cs b/src/client/spark/Orders/OrderUtils.cs index ebab05067..d8096a508 100644 --- a/src/client/spark/Orders/OrderUtils.cs +++ b/src/client/spark/Orders/OrderUtils.cs @@ -240,22 +240,12 @@ namespace mbts.spark { } return false; } - public static Brush badge_fill(this OrderSecurityAlgoMeta order_sam, OrderMetadata order_meta) => - badge_fill(order_sam.order, order_sam.meta, order_meta); - public static Brush badge_fill(OrderRecordImmutable order, AlgoDefinitionMetadata? algo_meta, OrderMetadata order_meta) { - if (algo_meta?.badge_color is Color c) { - return c.to_brush(); - } else { - return order_meta.Color.rgb_brush(); - } - } + public static Brush badge_fill(AlgoDefinitionMetadata? algo_meta, OrderMetadata order_meta) => + new SolidColorBrush(badge_color(algo_meta, order_meta)); - public static Color root_badge_color(this OrderSecurityAlgoMeta order_sam, OrderMetadata root_order_meta) => - order_sam.root_meta?.badge_color is Color c ? c : root_order_meta.Color.rgb_color(); - - public static Brush root_badge_fill(this OrderSecurityAlgoMeta order_sam, OrderMetadata root_order_meta) => - new SolidColorBrush(root_badge_color(order_sam, root_order_meta)); + public static Color badge_color(AlgoDefinitionMetadata? algo_meta, OrderMetadata order_meta) => + algo_meta?.badge_color ?? order_meta.Color.rgb_color(); public static string order_collection_summary(double best_price, int best_price_volume, int total_volume, ContractSpecificationImmutable spec) { if (total_volume == 0)