From 87030dbb88a96f1edaa6f6d268ba31629a1e838a Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 25 Jul 2018 13:20:15 -0400 Subject: [PATCH 01/11] SPARK-1199 TradeMessage should include AggressorSide --- src/lib/md/MDProducerHandle.cpp | 3 ++- src/lib/md/MDProducerHandle.h | 2 +- src/lib/md/protos/co2.proto | 7 +++++ .../exchange_sim/ExchangeSimApplication.cpp | 3 ++- .../md/platforms/mdp3_onixs/MDP3Listener.cpp | 27 +++++++++++++++---- 5 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/lib/md/MDProducerHandle.cpp b/src/lib/md/MDProducerHandle.cpp index f9fa16cd3..39ae6578c 100644 --- a/src/lib/md/MDProducerHandle.cpp +++ b/src/lib/md/MDProducerHandle.cpp @@ -115,7 +115,7 @@ void MDProducerHandle::set_status(CoconutSecurityStatus status) { } } -void MDProducerHandle::add_trade(TimeStamp time, const PriceSize price, LLDateTime tradetime, uint32_t volume) { +void MDProducerHandle::add_trade(TimeStamp time, const PriceSize price, LLDateTime tradetime, co2::AggressorSide agside, uint32_t volume) { cdata().last_trade.store(price); cdata().last_trade_time = tradetime; cdata().total_volume = volume; @@ -127,6 +127,7 @@ void MDProducerHandle::add_trade(TimeStamp time, const PriceSize price, LLDateTi trade.set_mantissa(price.mantissa()); trade.set_size(price.size()); trade.set_time(tradetime); + trade.set_aggressor_side(agside); if (volume > 0) trade.set_total_volume(volume); trade.set_key(key()); _channel.add_trade(trade); diff --git a/src/lib/md/MDProducerHandle.h b/src/lib/md/MDProducerHandle.h index c323dbee6..a3c530250 100644 --- a/src/lib/md/MDProducerHandle.h +++ b/src/lib/md/MDProducerHandle.h @@ -56,7 +56,7 @@ public: void set_status(co2::CoconutSecurityStatus status); // hot // Updates trade log and last trade - void add_trade(TimeStamp time, const PriceSize pricesize, datetime::LLDateTime date, uint32_t total_volume=0); // cold + void add_trade(TimeStamp time, const PriceSize pricesize, datetime::LLDateTime date, co2::AggressorSide agside, uint32_t total_volume=0); // cold // Update last_trade without updating trade log void set_last_trade(TimeStamp time, const PriceSize ps, datetime::LLDateTime date, uint32_t total_volume); void add_rfq(TimeStamp time, const co2::QuoteRequestMessage& rfq); // cold diff --git a/src/lib/md/protos/co2.proto b/src/lib/md/protos/co2.proto index f6f99a56d..89d83fa90 100644 --- a/src/lib/md/protos/co2.proto +++ b/src/lib/md/protos/co2.proto @@ -119,6 +119,12 @@ message MiscMessage { double session_low_offer = 12; double fixing_price = 13; } + +enum AggressorSide { + AGGRESSOR_SIDE_NONE = 0; + AGGRESSOR_SIDE_BUY = 1; + AGGRESSOR_SIDE_SELL = 2; +} message TradeMessage { uint32 key = 1; @@ -130,6 +136,7 @@ message TradeMessage { uint32 size = 6; uint32 total_volume = 7; bool gap = 8; + AggressorSide aggressor_side = 9; } message QuoteRequestMessage { enum Side { diff --git a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp index f2ffe0f0d..dd13cd46d 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp +++ b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp @@ -474,7 +474,8 @@ void ExchangeSimApplication::update_md(std::string const &sec_desc) { utils::TimeStamp::now(), md::PriceSize::from_double<7>(t.price.value() * price_factor, t.quantity.value()), - datetime::ll_now()); + datetime::ll_now(), + co2::AGGRESSOR_SIDE_NONE); } } diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp index ecb96d617..bbc9be406 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp @@ -3,6 +3,7 @@ #include #include "lib/utils/helper_macros.h" #include "lib/config/protos/MarketData.pb.h" +#include "lib/md/protos/co2.pb.h" using namespace std; using namespace bts::co2; @@ -349,11 +350,23 @@ void MDP3Listener::onBookUpdate(onixs::Handler&, const onixs::Security& sec, con // // Trades -void on_trade(SecurityData* data, const onixs::PRICE& price, int size, const onixs::Timestamp& onixs_date) { +AggressorSide map_aggressor(onixs::AggressorSide::Enum agside) { + switch(agside) { + default: + case onixs::AggressorSide::NoAggressor: + return AGGRESSOR_SIDE_NONE; + case onixs::AggressorSide::Buy: + return AGGRESSOR_SIDE_BUY; + case onixs::AggressorSide::Sell: + return AGGRESSOR_SIDE_SELL; + } +} + +void on_trade(SecurityData* data, const onixs::PRICE& price, int size, AggressorSide agside, const onixs::Timestamp& onixs_date) { auto ts = utils::TimeStamp::now(); PriceSize ps = pricesize_of_price_size(price, data->handle.security().display_factor, size); auto date = ll_of_timestamp(onixs_date); - data->handle.add_trade(ts, ps, date, data->electronic_volume + size); + data->handle.add_trade(ts, ps, date, agside, data->electronic_volume + size); } void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const onixs::RecoveryEntryArgs& arg) { @@ -364,7 +377,7 @@ void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const on arg.entry().entrySize(size); onixs::PRICE price; arg.entry().entryPx(price); - on_trade(data, price, size, arg.message().transactTime()); + on_trade(data, price, size, AGGRESSOR_SIDE_NONE, arg.message().transactTime()); } } void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const onixs::TradeSummaryArgs& arg) { @@ -373,7 +386,9 @@ void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const on if (data != NULL) { auto size = arg.entry().entrySize(); onixs::PRICE price = arg.entry().entryPx(); - on_trade(data, price, size, arg.message().transactTime()); + onixs::AggressorSide::Enum agside = onixs::AggressorSide::NoAggressor; + arg.entry().aggressorSide(agside); + on_trade(data, price, size, map_aggressor(agside), arg.message().transactTime()); } } void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const onixs::TradeArgs& arg) { @@ -383,7 +398,9 @@ void MDP3Listener::onTrade(onixs::Handler&, const onixs::Security& sec, const on if (data != nullptr) { int size = arg.entry().entrySize(); onixs::PRICE price = arg.entry().entryPx(); - on_trade(data, price, size, arg.message().transactTime()); + onixs::AggressorSide::Enum agside = onixs::AggressorSide::NoAggressor; + arg.entry().aggressorSide(agside); + on_trade(data, price, size, map_aggressor(agside), arg.message().transactTime()); } } } From 0f62f14a1dfbf52953f04a8f46cabc24c7aa62f5 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Fri, 27 Jul 2018 11:17:52 -0500 Subject: [PATCH 02/11] Adding Agressor as a column to TaS as well as setting row bg color/opacity based on agg side --- .../Market/TimeAndSales/TimeAndSalesVM.cs | 51 +++++++++++++++---- .../TimeAndSales/TimeAndSalesView.xaml.cs | 2 +- .../Market/TimeAndSalesWindowFactory.cs | 2 + .../Controls/DIYGrid/Columns/ColumnBase.cs | 7 ++- .../TimeAndSalesColumn.cs | 36 +++++++++++++ 5 files changed, 84 insertions(+), 14 deletions(-) create mode 100644 src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/TimeAndSalesColumn.cs diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs index 2d5a8ea8e..6f2e89299 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs @@ -6,11 +6,14 @@ using mbts.ui.controls; using mbts.ui.spark; using mbts.ui.utility; using System; +using System.Linq; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Threading.Tasks; using System.Windows.Input; +using System.Windows.Media; using static bts.shell.TimeAndSalesWindowFactory; +using static mbts.ui.controls.DIYGrid; namespace mbts.spark { class TimeAndSalesVM : SecurityGrid { @@ -26,23 +29,32 @@ namespace mbts.spark { security_filter.load_state(filters.security); price_filter.load_state(filters.price); size_filter.load_state(filters.size); + aggressor_filter.load_state(filters.aggressor_sides); trade_key_filter.load_state(filters.trade_key); security_key_filter.load_state(filters.security_key); } // Columns - add_column(TimeAndSalesView.Columns.Security, "Security", DIYGrid.DefaultColumnWidths.Security, security_filter, DataGridFilterKnownTemplates.Regex); - add_column(TimeAndSalesView.Columns.Time, "Time", DIYGrid.DefaultColumnWidths.Time, time_filter, DataGridFilterKnownTemplates.TimeFilter); - add_column(TimeAndSalesView.Columns.Price, "Price", DIYGrid.DefaultColumnWidths.Price, price_filter, DataGridFilterKnownTemplates.DoubleMinMax); - add_column(TimeAndSalesView.Columns.Size, "Size", DIYGrid.DefaultColumnWidths.Size, size_filter, DataGridFilterKnownTemplates.UIntMinMax); - add_column(TimeAndSalesView.Columns.TradeKey, "Trade Key", DIYGrid.DefaultColumnWidths.TradeKey, trade_key_filter, DataGridFilterKnownTemplates.Regex); - add_column(TimeAndSalesView.Columns.SecurityKey, "Security Key", DIYGrid.DefaultColumnWidths.SecurityKey, security_key_filter, DataGridFilterKnownTemplates.Regex); - void add_column(TimeAndSalesView.Columns col_key, string header, double width, IDataGridColumnFilter filter, string filter_template) => - columns.Add(new DIYGrid.RenderTextColumn(r => r[col_key], filter, filter_template) { Header = header, Width = width }); - // + add_column(TimeAndSalesView.Columns.Security, DefaultColumnHeaders.Security, DefaultColumnWidths.Security, security_filter, DataGridFilterKnownTemplates.Regex); + add_column(TimeAndSalesView.Columns.Time, DefaultColumnHeaders.Time, DefaultColumnWidths.Time, time_filter, DataGridFilterKnownTemplates.TimeFilter); + add_column(TimeAndSalesView.Columns.Price, DefaultColumnHeaders.Price, DefaultColumnWidths.Price, price_filter, DataGridFilterKnownTemplates.DoubleMinMax, System.Windows.HorizontalAlignment.Right); + add_column(TimeAndSalesView.Columns.Size, DefaultColumnHeaders.Size, DefaultColumnWidths.Size, size_filter, DataGridFilterKnownTemplates.UIntMinMax, System.Windows.HorizontalAlignment.Right); + add_column(TimeAndSalesView.Columns.Aggressor, DefaultColumnHeaders.Aggressor, DIYGrid.DefaultColumnWidths.Aggressor, aggressor_filter, DataGridFilterKnownTemplates.EnumValues); + add_column(TimeAndSalesView.Columns.TradeKey, DefaultColumnHeaders.TradeKey, DIYGrid.DefaultColumnWidths.TradeKey, trade_key_filter, DataGridFilterKnownTemplates.Regex); + add_column(TimeAndSalesView.Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, DIYGrid.DefaultColumnWidths.SecurityKey, security_key_filter, DataGridFilterKnownTemplates.Regex); + void add_column(TimeAndSalesView.Columns col_key, string header, double width, IDataGridColumnFilter filter, string filter_template, System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) => + columns.Add(new TimeAndSalesColumn( + r => r[col_key] + , (r) => _get_aggressor_brush(r) + , filter + , filter_template + ) + { Header = header, Width = width, horizontal_alignment = h_alignment } + ); + _resources.AddRange( show_ladder, DataGridFilterHelper.hook_filters( - rows_view, time_filter, security_filter, price_filter, size_filter, trade_key_filter, security_key_filter + rows_view, time_filter, security_filter, price_filter, size_filter, aggressor_filter, trade_key_filter, security_key_filter ) ); } @@ -50,11 +62,22 @@ namespace mbts.spark { public ObservableCollection columns { get; } = new ObservableCollection(); public DelegateCommandParamObserver show_ladder { get; } + private Brush _get_aggressor_brush(Row r) { + BTSColor c; + Brush b; + if (r.aggressor_side == AggressorSide.Buy) c = BTSColors.MarketData.bid; + else if (r.aggressor_side == AggressorSide.Sell) c = BTSColors.MarketData.ask; + else c = Brushes.Transparent; + (b = new SolidColorBrush(c) { Opacity = 0.33 }).Freeze(); + return b; + } + #region Filters public IDataGridColumnPersistentFilter time_filter { get; } = new TimeFilterVM(r => r.time, nameof(Row.time)); public IDataGridColumnPersistentFilter security_filter { get; } public IDataGridColumnPersistentFilter price_filter { get; } = new DoubleMinMax(r => r.price, nameof(Row.price)); public IDataGridColumnPersistentFilter size_filter { get; } = new UIntMinMax(r => r.size, nameof(Row.size)); + public IDataGridColumnPersistentFilter aggressor_filter { get; } = DiscreteValuesFilterVM.Create(EnumHelper.get_values().ToArray(), r => r.aggressor_side, nameof(Row.aggressor_side)); public IDataGridColumnPersistentFilter security_key_filter { get; } = new RegexFilterVM(r => r.security_key.ToString(), nameof(Row.security_key)); public IDataGridColumnPersistentFilter trade_key_filter { get; } = new RegexFilterVM(r => r.trade_key.ToString(), nameof(Row.trade_key)); @@ -65,7 +88,8 @@ namespace mbts.spark { price = price_filter.get_state(), size = size_filter.get_state(), trade_key = trade_key_filter.get_state(), - security_key = security_key_filter.get_state() + security_key = security_key_filter.get_state(), + aggressor_sides = aggressor_filter.get_state() }; #endregion @@ -90,6 +114,7 @@ namespace mbts.spark { _time_text, _price_text, _size_text, + _aggressor_text, _trade_key_text, _security_key_text; @@ -98,11 +123,13 @@ namespace mbts.spark { time = trade.Time.lldatetime(); price = trade.Mantissa * Math.Pow(10, trade.Exponent); size = trade.Size; + aggressor_side = trade.AggressorSide; show_ladder = new DelegateCommand(() => parent._show_ladder_async(this).ignore()); _security_text = security.ToString(); _time_text = time.ToString("M/d h:mm:ss tt"); _price_text = security.ContractSpec.format(price); _size_text = size.ToString(); + _aggressor_text = aggressor_side.ToString(); _trade_key_text = _trade_key.ToString(); _security_key_text = security_key.ToString(); } @@ -113,6 +140,7 @@ namespace mbts.spark { public DateTime time { get; } public double price { get; } public uint size { get; } + public AggressorSide aggressor_side { get; } public ICommand show_ladder { get; } public string this[TimeAndSalesView.Columns col] { @@ -122,6 +150,7 @@ namespace mbts.spark { case TimeAndSalesView.Columns.Time: return _time_text; case TimeAndSalesView.Columns.Price: return _price_text; case TimeAndSalesView.Columns.Size: return _size_text; + case TimeAndSalesView.Columns.Aggressor: return _aggressor_text; case TimeAndSalesView.Columns.TradeKey: return _trade_key_text; case TimeAndSalesView.Columns.SecurityKey: return _security_key_text; default: return null; diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs index 6609f7541..fff762c5c 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesView.xaml.cs @@ -7,7 +7,7 @@ namespace mbts.ui.spark { /// Interaction logic for TimeAndSalesView.xaml /// partial class TimeAndSalesView : UserControl { - public enum Columns { Time, Security, Price, Size, OrderType, TradeKey, SecurityKey } + public enum Columns { Time, Security, Price, Size, OrderType, TradeKey, SecurityKey, Aggressor } public TimeAndSalesView() => InitializeComponent(); diff --git a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs index f45ad897d..b3dfad8bf 100644 --- a/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs +++ b/src/client/spark/Modules/Market/TimeAndSalesWindowFactory.cs @@ -70,6 +70,8 @@ namespace bts.shell { public string trade_key; [ProtoMember(6)] public string security_key; + [ProtoMember(7)] + public co2.AggressorSide[] aggressor_sides; } } } \ No newline at end of file diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs index e37b7af0c..eab4451fc 100644 --- a/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs +++ b/src/client/spark/view/Controls/DIYGrid/Columns/ColumnBase.cs @@ -22,7 +22,8 @@ namespace mbts.ui.controls { Time = 100, TimeInForce = 47, TradeKey = 76, - User = 53; + User = 53, + Aggressor = 80; } public static class DefaultColumnHeaders { @@ -40,7 +41,9 @@ namespace mbts.ui.controls { Size = "Qty", TimeInForce = "TIF", TradeKey = "Trade Key", - User = "User"; + User = "User", + Time = "Time", + Aggressor = "Aggressor"; } internal interface IKeyedColumn { diff --git a/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/TimeAndSalesColumn.cs b/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/TimeAndSalesColumn.cs new file mode 100644 index 000000000..f035c3ef1 --- /dev/null +++ b/src/client/spark/view/Controls/DIYGrid/Columns/FrameworkElementColumns/TimeAndSalesColumn.cs @@ -0,0 +1,36 @@ +using mbts.spark; +using mbts.spark.filters; +using mbts.ui.utility.text; +using System; +using System.Windows; +using System.Windows.Media; + +namespace mbts.ui.controls { + public partial class DIYGrid { + internal class TimeAndSalesColumn : RenderTextColumn { + + readonly Func _get_text; + readonly Func _get_brush; + + public TimeAndSalesColumn(Func get_text, Func get_brush, IDataGridColumnFilter filter = null, string filter_template = null, GlyphContext glyph_context = null) : base(get_text, filter, filter_template, glyph_context) { + _get_text = get_text; + _get_brush = get_brush; + } + + public override void draw(TimeAndSalesVM.Row row, DrawingContext dc, ColumnGeometry position, double row_height) { + CellRender.draw_text(dc + , glyph_context + , font_size + , _get_text(row) + , position + , row_height + , foreground + , _get_brush(row) + , horizontal_alignment + , vertical_alignment + , padding); + } + + } + } +} From bc36db048061e1b2fe9cd1ee8aca82c3c890f9ef Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Wed, 1 Aug 2018 14:03:42 -0500 Subject: [PATCH 03/11] TimeAndSales - Replacing 444 with calculations made from the the DefaultColumnWidths --- .../Market/TimeAndSales/TimeAndSalesWindow.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs index adf9c0ba1..84432a570 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesWindow.cs @@ -12,6 +12,7 @@ using System.Reactive.Linq; using System.Windows; using System.Windows.Media; using static bts.shell.TimeAndSalesWindowFactory; +using static mbts.ui.controls.DIYGrid; namespace mbts.spark { class TimeAndSalesWindow : SparkWindow, ISlowWindow { @@ -36,7 +37,16 @@ namespace mbts.spark { public override string window_type => _window_type; public override IEnumerable Commands => _commands; public override UIElement Content => _view; - public override double MinWidth => 444 + SPARK_MENU_COLLAPSED_WIDTH + LAUNCHER_BUTTON_BORDER_WIDTH; + public override double MinWidth => DefaultColumnWidths.Security + + DefaultColumnWidths.Time + + DefaultColumnWidths.Price + + DefaultColumnWidths.Size + + DefaultColumnWidths.Aggressor + + DefaultColumnWidths.TradeKey + + DefaultColumnWidths.SecurityKey + + SPARK_MENU_COLLAPSED_WIDTH + + LAUNCHER_BUTTON_BORDER_WIDTH; + public override StartupData SaveState => _state = new StartupData(_state.security_criteria, _vm.value.rows_view.GetSortingCriteria(), _vm.value.get_filter_states()); public override void Dispose() => From ae7e1761a73b4cc3f7066acee0b8eae7c4afa85d Mon Sep 17 00:00:00 2001 From: John Colvin Date: Wed, 1 Aug 2018 17:10:30 -0400 Subject: [PATCH 04/11] SPARK-1527 Production client crash (ListBoxEx) --- .../view/Controls/ListBoxEx/ListBoxEx.xaml.cs | 28 +++++++++++-------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/src/client/spark/view/Controls/ListBoxEx/ListBoxEx.xaml.cs b/src/client/spark/view/Controls/ListBoxEx/ListBoxEx.xaml.cs index 8dfaaab07..5fbdcd504 100644 --- a/src/client/spark/view/Controls/ListBoxEx/ListBoxEx.xaml.cs +++ b/src/client/spark/view/Controls/ListBoxEx/ListBoxEx.xaml.cs @@ -190,17 +190,21 @@ namespace mbts.ui.controls } } - void item_Unselected(object sender, RoutedEventArgs e) { - if (_selection_changing) return; - var item = ((ListBoxItem)sender).DataContext; - var selected_items = Selection; - if (selected_items.Contains(item)) { - using (_selection_change()) { - selected_items.Remove(item); - _update_is_all_selected(); - } - } - } + void item_Unselected(object sender, RoutedEventArgs e) { + if (!_selection_changing && sender is ListBoxItem container) { + // the [ListBoxItem] sender may be "Disconnected" https://stackoverflow.com/questions/14282894/wpf-listbox-virtualization-creates-disconnecteditems/14358688 + var item = ItemContainerGenerator.ItemFromContainer(container); + if (item != DependencyProperty.UnsetValue) { + var selected_items = Selection; + if (selected_items.Contains(item)) { + using (_selection_change()) { + selected_items.Remove(item); + _update_is_all_selected(); + } + } + } + } + } void item_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e) { using (_selection_change()) ((ListBoxItem)sender).IsSelected = Selection.Contains(e.NewValue); @@ -368,4 +372,4 @@ namespace mbts.ui.controls } } } -} \ No newline at end of file +} From 4f912f99bd19a8ee153ba57607f853e4573742c1 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 1 Aug 2018 21:18:45 +0000 Subject: [PATCH 05/11] release_notes.txt edited online with Bitbucket --- release_notes.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/release_notes.txt b/release_notes.txt index 260462e56..09115c7f6 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,3 +1,9 @@ +1.1.6 +- Fixed occasional crash when filtering fills +- Fixed several cash per point multipliers +- Colored time of sales row with aggressor side +- Iceberg orders now cancel (rathern than error) when a child is canceled + 1.1.0 - Added per user self match protection, location and self match protection FIX tag settings - Implemented a new "Trigger Order" algo From 4e08a43d0ce30bdba7826cc0e0b7a95145a763b2 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Thu, 2 Aug 2018 14:12:13 -0500 Subject: [PATCH 06/11] Cpp - updating HO to match RB per Kev --- src/lib/config/defaults/cpp_config.conf | 2 +- tools/cpp_helper/Generate-Cpps-reqs.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/config/defaults/cpp_config.conf b/src/lib/config/defaults/cpp_config.conf index ad5310cae..1e2f217d6 100644 --- a/src/lib/config/defaults/cpp_config.conf +++ b/src/lib/config/defaults/cpp_config.conf @@ -666,7 +666,7 @@ CppConfig cpp_entry { key: "HIB" value: 1000 } cpp_entry { key: "HIL" value: 1000 } cpp_entry { key: "HJC" value: 1000 } - cpp_entry { key: "HO" value: 420 } + cpp_entry { key: "HO" value: 42000 } cpp_entry { key: "HO2" value: 42000 } cpp_entry { key: "HO4" value: 42000 } cpp_entry { key: "HOA" value: 5 } diff --git a/tools/cpp_helper/Generate-Cpps-reqs.ps1 b/tools/cpp_helper/Generate-Cpps-reqs.ps1 index d006f5520..bcdf10e21 100644 --- a/tools/cpp_helper/Generate-Cpps-reqs.ps1 +++ b/tools/cpp_helper/Generate-Cpps-reqs.ps1 @@ -11,7 +11,7 @@ $known_good = @{ "GE" = 2500 "HE" = 400 "HG" = 5000 - "HO" = 420 + "HO" = 42000 "LE" = 400 "M6E" = 125 "NG" = 100 From 38bf38c62d09559911d9fba50746f24a3a56d262 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 2 Aug 2018 20:12:27 +0000 Subject: [PATCH 07/11] Fixed price conversion for spread leg fill. --- release_notes.txt | 4 ++++ .../sparkd/orderman/actors/ExecutionGateway.cpp | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/release_notes.txt b/release_notes.txt index 09115c7f6..0905ea3c2 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,3 +1,7 @@ +1.1.7 +- Fixed spread leg price fill +- Fixed HO cash per point value + 1.1.6 - Fixed occasional crash when filtering fills - Fixed several cash per point multipliers diff --git a/src/server/sparkd/orderman/actors/ExecutionGateway.cpp b/src/server/sparkd/orderman/actors/ExecutionGateway.cpp index a8338026b..97104015c 100644 --- a/src/server/sparkd/orderman/actors/ExecutionGateway.cpp +++ b/src/server/sparkd/orderman/actors/ExecutionGateway.cpp @@ -218,9 +218,14 @@ void ExecutionGateway::on_exe_report( : api::orderman::MANUAL_ORDER_INDICATOR_YES; str_to(msg.get(), &data->exchange_order_id); - if (msg.has()) - data->price = securities::decode_exchange_price( - *sec, Price(msg.get())); + if (msg.has()) { + if (data->leg_security) + data->price = securities::decode_exchange_price( + *data->leg_security, Price(msg.get())); + else + data->price = securities::decode_exchange_price( + *sec, Price(msg.get())); + } else data->price = Price(os::nan()); From 1b5f58c5720b534386cb1c48ef9d244378b2704f Mon Sep 17 00:00:00 2001 From: Michael Harding Date: Fri, 3 Aug 2018 14:16:20 -0400 Subject: [PATCH 08/11] SparkAdmin: The return of wildcards and other tweaks --- src/web/ui/sass/main.scss | 2 +- src/web/ui/src/Accounts/State.fs | 4 ++-- src/web/ui/src/Accounts/View.fs | 32 +++++++++++++++++++++----------- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/web/ui/sass/main.scss b/src/web/ui/sass/main.scss index e28fb4513..c37815561 100644 --- a/src/web/ui/sass/main.scss +++ b/src/web/ui/sass/main.scss @@ -139,7 +139,7 @@ body { .is-main-control-bar { margin:2rem 3rem 0 0; overflow: hidden; - text-align: center; + //text-align: center; .button { margin-left: 1em; } diff --git a/src/web/ui/src/Accounts/State.fs b/src/web/ui/src/Accounts/State.fs index 94b7fc1ce..d8a82ffa6 100644 --- a/src/web/ui/src/Accounts/State.fs +++ b/src/web/ui/src/Accounts/State.fs @@ -24,8 +24,8 @@ let init (context:ServiceContext.ServiceContext) = mdRelayExpNameData = Array.empty scratch = emptyAccount previousScratch = emptyAccount - AllValue = "" - AllValueDisplay = "" + AllValue = "*" + AllValueDisplay = "All" OptionsMenuOpen = "" ConfirmModal = "", (Msg.SelectTab General) SelectedClipLimits = [] diff --git a/src/web/ui/src/Accounts/View.fs b/src/web/ui/src/Accounts/View.fs index 6faa2bf00..456bd467d 100644 --- a/src/web/ui/src/Accounts/View.fs +++ b/src/web/ui/src/Accounts/View.fs @@ -69,10 +69,12 @@ let GetSymbolArray (model:Model) = |> Array.distinct let GetFilteredSymbolArray (model:Model) (remove:string []) = - Array.map (fun a -> a.symbol ) model.mdRelayProductData - |> Array.filter (fun elm -> (not <| Array.exists (fun e -> elm = e) remove)) - |> Array.distinct - + let a = (Array.map (fun a -> a.symbol ) model.mdRelayProductData + |> Array.filter (fun elm -> (not <| Array.exists (fun e -> elm = e) remove)) + |> Array.distinct) + match a.Length with + | 0 -> a + | _ -> [ a; [|model.AllValueDisplay|] ] |> Array.concat let limitFilter (positionLimit:AccountSecurityPositionLimitUnit option) (clipLimit:AccountSecurityClipLimitUnit option) allValueDisplay (array:'a []) = match positionLimit, clipLimit with @@ -193,7 +195,11 @@ let clipLimitsView model dispatch = && (elm.security.securityType = limit.security.securityType) ) model.scratch.securityClipLimits.limit - |> Array.map (fun (elm:AccountSecurityClipLimitUnit) -> elm.security.securitySymbol) + |> Array.map (fun (elm:AccountSecurityClipLimitUnit) -> + match (elm.security.securitySymbol = model.AllValue) with + | true -> model.AllValueDisplay + | false -> elm.security.securitySymbol + ) @@ -223,7 +229,7 @@ let clipLimitsView model dispatch = ) TableControl.Cell (Fields.enumSelect "" - limit.security.securitySymbol + (match (limit.security.securitySymbol = model.AllValue) with | true -> model.AllValueDisplay | false -> limit.security.securitySymbol) (GetFilteredSymbolArray model <| (getUsedSymbolNames limit)) [] (fun value -> ((limit, (changeSymbol limit value)) |> ClipLimits |> dispatch)) @@ -262,7 +268,7 @@ let clipLimitsView model dispatch = div [ ClassName "column is-size-7 has-text-grey-mid is-help-text"; ] [str "Clip limits can be set for one security, for all securities in a product (by selecting \"All\" for securities), or for all products within a security type (by selecting \"All\" for both symbol and security)"] ] - TableControl.createDataTable (Some headerRow) rws (Button.button "Add" "" "plus" Button.Enabled addRow) + TableControl.createDataTable (Some headerRow) rws (Button.button "Add" "" "plus-circle" Button.Enabled addRow) ] let productLimits model dispatch = @@ -362,7 +368,11 @@ let productLimits model dispatch = && (elm.product.securityType = limit.product.securityType) ) model.scratch.productPositionLimits - |> Array.map (fun (elm:AccountProductPositionLimitUnit) -> elm.product.securitySymbol) + |> Array.map (fun (elm:AccountProductPositionLimitUnit) -> + match (elm.product.securitySymbol = model.AllValue) with + | true -> model.AllValueDisplay + | false -> elm.product.securitySymbol + ) let rws:TableControl.row list = @@ -390,7 +400,7 @@ let productLimits model dispatch = ) TableControl.Cell (Fields.enumSelect "" - limit.product.securitySymbol + (match (limit.product.securitySymbol = model.AllValue) with | true -> model.AllValueDisplay | false -> limit.product.securitySymbol) (GetFilteredSymbolArray model (getUsedSymbolNames limit)) [] (fun value -> ((limit, (changeSymbol limit value)) |> ProductLimits |> dispatch)) @@ -433,7 +443,7 @@ let productLimits model dispatch = div [ ClassName "column is-size-7 has-text-grey-mid is-help-text" ] [str "This limits the net position for a product (i.e. accumulated position over all securities belonging to a product). This can be set for one product, or for all products within a security type by selecting \"All\" for symbol"] ] - TableControl.createDataTable (Some headerRow) rws (Button.button "Add" "" "plus" Button.Enabled addRow) + TableControl.createDataTable (Some headerRow) rws (Button.button "Add" "" "plus-circle" Button.Enabled addRow) br [] ] @@ -551,7 +561,7 @@ let securityLimitsView model dispatch = div [ ClassName "column is-size-7 has-text-grey-mid is-help-text" ] [str "Optionally, the net position for one or more securities can also be limited. For example, the Product Limits can be set to restrict the Max Net Long Position across all ES futures to 10,000 contracts, but Security Limits can be used to restrict the ES Jun future to 500 only"] ] - TableControl.createDataTable (Some headerRow) rws (Button.button "Add" "" "plus" Button.Enabled addRow) + TableControl.createDataTable (Some headerRow) rws (Button.button "Add" "" "plus-circle" Button.Enabled addRow) ] let LimitsView model dispatch = From f3f53d05c84ebb5dfe708f251e4594ac031df32e Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 3 Aug 2018 23:11:04 +0000 Subject: [PATCH 09/11] Fixed spreader order state update. From the middle of the Atlantic. Go BTS. --- src/server/sparkd/orderman/orders/NativeOrder.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/server/sparkd/orderman/orders/NativeOrder.cpp b/src/server/sparkd/orderman/orders/NativeOrder.cpp index 2476957b2..ad6528a5a 100644 --- a/src/server/sparkd/orderman/orders/NativeOrder.cpp +++ b/src/server/sparkd/orderman/orders/NativeOrder.cpp @@ -588,6 +588,12 @@ void NativeOrder::on_exe_report(const NewExecutionReportEvent &er) { auto &state = me->state; auto &native_state = get_native_state(state); + if (er.data->leg_security) { + LOG(OrderMan, Diag, + "Ignoring leg execution report for order {}", key().value()); + return; + } + if (native_state.last_msg_seq_num() > er.data->msg_seq_num) { LOG(OrderMan, Warn, "Ignoring already seen execution report {} in order {}", From 9937fc7cd26d037831b675c40374862fb0da50fe Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Fri, 3 Aug 2018 23:15:01 +0000 Subject: [PATCH 10/11] Updated release notes. --- release_notes.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/release_notes.txt b/release_notes.txt index 0905ea3c2..7ca461b79 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,3 +1,7 @@ +1.1.8 +- Enabled wild cards in risk management UI +- Fixed spreader order updates + 1.1.7 - Fixed spread leg price fill - Fixed HO cash per point value From ea180d8ebcf7ebb4d242c7bdb00e2bdc0bb1f422 Mon Sep 17 00:00:00 2001 From: Taha Afzal Date: Mon, 6 Aug 2018 22:32:26 -0400 Subject: [PATCH 11/11] In case of a state of position violation, Limiter lets orders in if they are closing the position --- src/server/sparkd/orderman/limiter/LimiterUtils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/sparkd/orderman/limiter/LimiterUtils.h b/src/server/sparkd/orderman/limiter/LimiterUtils.h index 87e2ed5bc..da9aa3c87 100644 --- a/src/server/sparkd/orderman/limiter/LimiterUtils.h +++ b/src/server/sparkd/orderman/limiter/LimiterUtils.h @@ -21,14 +21,14 @@ public: net_pos_new = net_pos + quantity.value(); else if(side == api::Side::SIDE_SELL) net_pos_new = net_pos - quantity.value(); - if (net_pos_new > long_pos_limit){ + if (net_pos_new > long_pos_limit && side==api::Side::SIDE_BUY){ out_res.ok = false; if (is_security_level) out_res.error_msg = fmt::format("Security Long Position (Max {} Current {})", long_pos_limit, net_pos); else out_res.error_msg = fmt::format("Product Long Position (Max {} Current {})", long_pos_limit, net_pos); } - else if (net_pos_new < short_pos_limit){ + else if (net_pos_new < short_pos_limit && side==api::Side::SIDE_SELL){ out_res.ok = false; if (is_security_level) out_res.error_msg = fmt::format("Security Short Position (Max {} Current {})", short_pos_limit, net_pos);