From 16acc4f5b066e60170f9d4ba0ecd8423dd16f399 Mon Sep 17 00:00:00 2001 From: Jake Norbut Date: Tue, 2 Apr 2019 09:42:20 -0500 Subject: [PATCH 01/54] Mass cancel messaging nits --- .../spark/Modules/Trading/OrderBook/OrderBookWindow.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs index d1472349d..f4eb11c35 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindow.cs @@ -90,7 +90,7 @@ namespace mbts.spark { wbids => wbids.Any(), () => { var resp = BTSMessageBox.Show( - "Are you sure you want to cancel all working buy orders?", + "Are you sure you want to cancel all BUY orders?", "Cancel Buy Orders", BTSMessageBoxButtons.Yes | BTSMessageBoxButtons.No, MessageBoxImage.Question); @@ -103,7 +103,7 @@ namespace mbts.spark { wasks => wasks.Any(), () => { var resp = BTSMessageBox.Show( - "Are you sure you want to cancel all working sell orders?", + "Are you sure you want to cancel all SELL orders?", "Cancel Sell Orders", BTSMessageBoxButtons.Yes | BTSMessageBoxButtons.No, MessageBoxImage.Question); @@ -116,7 +116,7 @@ namespace mbts.spark { worders => worders.Any(), () => { var resp = BTSMessageBox.Show( - "Are you sure you want to cancel all working orders?", + "Are you sure you want to cancel ALL orders?", "Cancel All Orders", BTSMessageBoxButtons.Yes | BTSMessageBoxButtons.No, MessageBoxImage.Question); From 369b89b3a74baf8b09a32b58ee76d9833f48c480 Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Tue, 2 Apr 2019 15:15:12 -0400 Subject: [PATCH 02/54] Update default symbol list for compat with deployed config --- src/lib/config/defaults/Symbols.conf | 97 +++++++++++++++++++--------- 1 file changed, 67 insertions(+), 30 deletions(-) diff --git a/src/lib/config/defaults/Symbols.conf b/src/lib/config/defaults/Symbols.conf index 147e5c917..8494cc578 100644 --- a/src/lib/config/defaults/Symbols.conf +++ b/src/lib/config/defaults/Symbols.conf @@ -1,11 +1,71 @@ -SymbolLists -{ - value + +SymbolList { + value { + # This key is here for backwards compatability ONLY. + # If you need to update symbols you should update SymbolLists (plural) + symbol: "6B" + symbol: "6E" + symbol: "6J" + symbol: "6P" + symbol: "ARE" + symbol: "BK" + symbol: "BOB" + symbol: "BUB" + symbol: "BZ" + symbol: "CL" + symbol: "EH" + symbol: "ES" + symbol: "FYT" + symbol: "FOB" + symbol: "GC" + symbol: "GE" + symbol: "GLI" + symbol: "HE" + symbol: "HG" + symbol: "HO" + symbol: "KE" + symbol: "LE" + symbol: "NB" + symbol: "NBY" + symbol: "NOB" + symbol: "NON" + symbol: "NG" + symbol: "NQ" + symbol: "NUB" + symbol: "RB" + symbol: "SI" + symbol: "SOM" + symbol: "SR1" + symbol: "SR3" + symbol: "TN" + symbol: "TUF" + symbol: "TUT" + symbol: "UB" + symbol: "XC" + symbol: "XK" + symbol: "YM" + symbol: "ZB" + symbol: "ZC" + symbol: "ZCW" + symbol: "ZF" + symbol: "ZL" + symbol: "ZM" + symbol: "ZN" + symbol: "ZO" + symbol: "ZQ" + symbol: "ZR" + symbol: "ZS" + symbol: "ZT" + symbol: "ZW" + } +} +SymbolLists +{ + value { list { key: "ICE" - # symbol: "BRN" # symbol: "WBS" # symbol: "OJ" @@ -13,31 +73,8 @@ SymbolLists list { key: "GLBX" - - symbol: "HE" - symbol: "LE" - symbol: "CL" - symbol: "RB" - symbol: "HO" - symbol: "BZ" - symbol: "NG" - symbol: "GC" - symbol: "SI" - symbol: "HG" - symbol: "ZW" - symbol: "ZC" - symbol: "ZS" - symbol: "ZM" - symbol: "ZL" - symbol: "ZO" - symbol: "ZR" - symbol: "ZB" - symbol: "ZN" - symbol: "ZF" - symbol: "ZT" - symbol: "UB" - symbol: "GE" - } + symbol: @SymbolList.symbol + } } } @@ -74,6 +111,6 @@ Symbols { ice { future: @SymbolLists.list[ICE].symbol spread: @SymbolLists.list[ICE].symbol - } + } } } From 6d0eb627124b9c201d7cd9a08dedc6a5f846e9cd Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Tue, 2 Apr 2019 15:55:29 -0400 Subject: [PATCH 03/54] changes to compile ice work with clang --- src/lib/md/ice/ICEUtils.cpp | 4 +-- src/server/sparkd/md/platforms/IMDPlatform.h | 3 +- .../md/platforms/ice_onixs/ICEListener.cpp | 36 ++++++------------- .../sparkd/md/platforms/ice_onixs/ICEMain.cpp | 1 - 4 files changed, 14 insertions(+), 30 deletions(-) diff --git a/src/lib/md/ice/ICEUtils.cpp b/src/lib/md/ice/ICEUtils.cpp index d25fb696a..1533964a0 100644 --- a/src/lib/md/ice/ICEUtils.cpp +++ b/src/lib/md/ice/ICEUtils.cpp @@ -26,7 +26,7 @@ std::string ICEChannel::to_string() const { std::string mt = name; for(const auto& x : market_types) - mt += " " + x; + mt += " " + std::to_string(x); return mt; } @@ -123,4 +123,4 @@ const std::vector get_configured_ice_channels() { }}} //namespace -#endif \ No newline at end of file +#endif diff --git a/src/server/sparkd/md/platforms/IMDPlatform.h b/src/server/sparkd/md/platforms/IMDPlatform.h index df4840f30..fb36c9168 100644 --- a/src/server/sparkd/md/platforms/IMDPlatform.h +++ b/src/server/sparkd/md/platforms/IMDPlatform.h @@ -7,6 +7,7 @@ class IMDPlatform { public: virtual void send_heartbeats(); + virtual ~IMDPlatform() {} }; -}} \ No newline at end of file +}} diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index df13de9bb..7c85642ad 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -56,17 +56,14 @@ void ICEListener::onMarketStateChange(const onixs_ice::MarketStateChange& , cons void ICEListener::onError(const onixs_ice::Error& error) { std::string error_desc(error.description()); - tracepoint (bts_trace,trace_order,(char*) "onError", 0, (uint16_t) 0, 0); LOG(md,Warn, "OnixS ICE Error: {} - {}", error.toString(), error_desc ); } void ICEListener::onFeedError(onixs_ice::FeedId feedid, onixs_ice::ErrorCode code, const std::string& desc) { - tracepoint (bts_trace,trace_order,(char*) "onFeedError", 0, (uint16_t) 0, 0); LOG(md,Warn, "OnixS ICE FeedError: {} - {}", feedid, desc, code); } void ICEListener::onWarning(const onixs_ice::Warning& warning) { - tracepoint (bts_trace,trace_order,(char*) "onWarning", 0, (uint16_t) 0, 0); LOG(md,Warn, "OnixS ICE Warn: {} - {}", warning.toString(), std::string(warning.description()) ); } @@ -74,31 +71,27 @@ void ICEListener::onWarning(const onixs_ice::Warning& warning) // Security discovery void ICEListener::onFuturesProductDefinition(const onixs_ice::FuturesProductDefinition& msg, bool& is_interested) { - tracepoint (bts_trace,trace_order,(char*) "onFuturesProductDefinition", 0, (uint16_t) 0, 0); if(msg.isSpread) on_future_strip(msg, is_interested); else on_future(msg, is_interested); } -void ICEListener::onNewExpiry(const onixs_ice::NewExpiry& msg, bool& is_interested, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onNewExpiry(const onixs_ice::NewExpiry& msg, bool& is_interested, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onNewExpiry", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); on_future(msg, is_interested); } void ICEListener::onFuturesStrategyDefinition(const onixs_ice::FuturesStrategyDefinition& def, bool& is_interested) { - tracepoint (bts_trace,trace_order,(char*) "onFuturesStrategyDefinition", 0, (uint16_t) 0, 0); //TODO need to find out how to produce data for testing //on_uds_future_spread(def, is_interested); UNUSED(def); UNUSED(is_interested); } //This is only for UDS -void ICEListener::onNewFuturesStrategyDefinition(const onixs_ice::NewFuturesStrategyDefinition& msg, bool& is_interested, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onNewFuturesStrategyDefinition(const onixs_ice::NewFuturesStrategyDefinition& msg, bool& is_interested, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onFuturesStrategyDefinition", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); //TODO need to find out how to produce data for testing //on_uds_future_spread(msg, is_interested); UNUSED(msg); @@ -152,7 +145,7 @@ void ICEListener::onMarketSnapshotPriceLevel(const onixs_ice::MarketSnapshotPric // Book void ICEListener::onOrderBookUpdated(const onixs_ice::OrderBook& onixs_book, const onixs_ice::MessageInfo& msg_info) { - tracepoint (bts_trace,trace_order,(char*) "onBookUpdate", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); + //tracepoint (bts_trace,trace_order,(char*) "onBookUpdate", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto data = _index.get_security(onixs_book.marketId()); if (data == nullptr) @@ -214,9 +207,8 @@ void on_trade(ICESecurityData* data, const onixs_ice::Price& price, int size, on data->handle.add_trade(ts, ps, date, map_aggressor(agside), size); } -void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onTrade", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != NULL) { @@ -230,9 +222,8 @@ void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageI // // RFQ -void ICEListener::onRfq(const onixs_ice::Rfq& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onRfq(const onixs_ice::Rfq& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onRfq", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -267,9 +258,8 @@ void ICEListener::onRfq(const onixs_ice::Rfq& msg, const onixs_ice::MessageInfo& // // Misc -void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onSettlementPrice", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -287,9 +277,8 @@ void ICEListener::onOpenInterest(const onixs_ice::OpenInterest &msg, const onixs UNUSED(msg_info); } -void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onOpenPrice", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -301,9 +290,8 @@ void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice:: } } -void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onClosePrice", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -315,9 +303,8 @@ void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice } } -void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onEndOfDayMarketSummary", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -333,18 +320,15 @@ void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary // // Feed -void ICEListener::onMulticastMessageBlockBegin(onixs_ice::FeedId feedId, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onMulticastMessageBlockBegin(onixs_ice::FeedId feedId, const onixs_ice::MessageInfo& ) { UNUSED(feedId); - tracepoint (bts_trace,trace_order,(char*) "onMulticastMessageBlockBegin", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); } void ICEListener::onMulticastMessageBlockEnd(onixs_ice::FeedId feedId, const onixs_ice::MarketIds& marketIds) { UNUSED(feedId); UNUSED(marketIds); - tracepoint (bts_trace,trace_order,(char*) "onMulticastMessageBlockEnd.begin", 0, (uint16_t) 0, 0); - tracepoint (bts_trace,trace_order,(char*) "onMulticastMessageBlockEnd.end", 0, (uint16_t) 0, 0); } void ICEListener::onFeedStarted(onixs_ice::FeedId, const onixs_ice::MarketIds&) diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp index c44ad0d3a..f36be139d 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp @@ -217,7 +217,6 @@ unique_ptr ICEMain::prepare_listener(onixs_ice::Handler& handler, c producer_channels.push_back(_producer.get_channel(symbol.symbol().c_str(), symbol.type(), symbol.exchange())); } - const auto& options = channel_settings_for(channel); unique_ptr listener(new ICEListener(_index, _producer, /*_settlement_recorder,*/ producer_channels)); for (auto& symbol : channel.symbols) listener->add_filter_symbol(symbol.symbol()); From 55ee293f96492ed61b21ef2fa7669e962f543bb5 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 2 Apr 2019 16:18:29 -0400 Subject: [PATCH 04/54] Ice clang build fixes. --- src/lib/md/ice/ICEUtils.cpp | 6 ++-- src/server/sparkd/md/platforms/IMDPlatform.h | 3 +- .../md/platforms/ice_onixs/ICEListener.cpp | 35 +++++-------------- .../sparkd/md/platforms/ice_onixs/ICEMain.cpp | 1 - 4 files changed, 14 insertions(+), 31 deletions(-) diff --git a/src/lib/md/ice/ICEUtils.cpp b/src/lib/md/ice/ICEUtils.cpp index d25fb696a..f687100a4 100644 --- a/src/lib/md/ice/ICEUtils.cpp +++ b/src/lib/md/ice/ICEUtils.cpp @@ -25,8 +25,8 @@ namespace ice { std::string ICEChannel::to_string() const { std::string mt = name; - for(const auto& x : market_types) - mt += " " + x; + // for(const auto& x : market_types) + // mt += " " + x; return mt; } @@ -123,4 +123,4 @@ const std::vector get_configured_ice_channels() { }}} //namespace -#endif \ No newline at end of file +#endif diff --git a/src/server/sparkd/md/platforms/IMDPlatform.h b/src/server/sparkd/md/platforms/IMDPlatform.h index df4840f30..fb36c9168 100644 --- a/src/server/sparkd/md/platforms/IMDPlatform.h +++ b/src/server/sparkd/md/platforms/IMDPlatform.h @@ -7,6 +7,7 @@ class IMDPlatform { public: virtual void send_heartbeats(); + virtual ~IMDPlatform() {} }; -}} \ No newline at end of file +}} diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp index df13de9bb..a1aa7f373 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.cpp @@ -56,17 +56,14 @@ void ICEListener::onMarketStateChange(const onixs_ice::MarketStateChange& , cons void ICEListener::onError(const onixs_ice::Error& error) { std::string error_desc(error.description()); - tracepoint (bts_trace,trace_order,(char*) "onError", 0, (uint16_t) 0, 0); LOG(md,Warn, "OnixS ICE Error: {} - {}", error.toString(), error_desc ); } void ICEListener::onFeedError(onixs_ice::FeedId feedid, onixs_ice::ErrorCode code, const std::string& desc) { - tracepoint (bts_trace,trace_order,(char*) "onFeedError", 0, (uint16_t) 0, 0); LOG(md,Warn, "OnixS ICE FeedError: {} - {}", feedid, desc, code); } void ICEListener::onWarning(const onixs_ice::Warning& warning) { - tracepoint (bts_trace,trace_order,(char*) "onWarning", 0, (uint16_t) 0, 0); LOG(md,Warn, "OnixS ICE Warn: {} - {}", warning.toString(), std::string(warning.description()) ); } @@ -74,31 +71,27 @@ void ICEListener::onWarning(const onixs_ice::Warning& warning) // Security discovery void ICEListener::onFuturesProductDefinition(const onixs_ice::FuturesProductDefinition& msg, bool& is_interested) { - tracepoint (bts_trace,trace_order,(char*) "onFuturesProductDefinition", 0, (uint16_t) 0, 0); if(msg.isSpread) on_future_strip(msg, is_interested); else on_future(msg, is_interested); } -void ICEListener::onNewExpiry(const onixs_ice::NewExpiry& msg, bool& is_interested, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onNewExpiry(const onixs_ice::NewExpiry& msg, bool& is_interested, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onNewExpiry", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); on_future(msg, is_interested); } void ICEListener::onFuturesStrategyDefinition(const onixs_ice::FuturesStrategyDefinition& def, bool& is_interested) { - tracepoint (bts_trace,trace_order,(char*) "onFuturesStrategyDefinition", 0, (uint16_t) 0, 0); //TODO need to find out how to produce data for testing //on_uds_future_spread(def, is_interested); UNUSED(def); UNUSED(is_interested); } //This is only for UDS -void ICEListener::onNewFuturesStrategyDefinition(const onixs_ice::NewFuturesStrategyDefinition& msg, bool& is_interested, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onNewFuturesStrategyDefinition(const onixs_ice::NewFuturesStrategyDefinition& msg, bool& is_interested, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onFuturesStrategyDefinition", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); //TODO need to find out how to produce data for testing //on_uds_future_spread(msg, is_interested); UNUSED(msg); @@ -152,7 +145,6 @@ void ICEListener::onMarketSnapshotPriceLevel(const onixs_ice::MarketSnapshotPric // Book void ICEListener::onOrderBookUpdated(const onixs_ice::OrderBook& onixs_book, const onixs_ice::MessageInfo& msg_info) { - tracepoint (bts_trace,trace_order,(char*) "onBookUpdate", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto data = _index.get_security(onixs_book.marketId()); if (data == nullptr) @@ -214,9 +206,8 @@ void on_trade(ICESecurityData* data, const onixs_ice::Price& price, int size, on data->handle.add_trade(ts, ps, date, map_aggressor(agside), size); } -void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onTrade", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != NULL) { @@ -230,9 +221,8 @@ void ICEListener::onTrade(const onixs_ice::Trade& msg, const onixs_ice::MessageI // // RFQ -void ICEListener::onRfq(const onixs_ice::Rfq& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onRfq(const onixs_ice::Rfq& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onRfq", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -267,9 +257,8 @@ void ICEListener::onRfq(const onixs_ice::Rfq& msg, const onixs_ice::MessageInfo& // // Misc -void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onSettlementPrice(const onixs_ice::SettlementPrice& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onSettlementPrice", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -287,9 +276,8 @@ void ICEListener::onOpenInterest(const onixs_ice::OpenInterest &msg, const onixs UNUSED(msg_info); } -void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onOpenPrice", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -301,9 +289,8 @@ void ICEListener::onOpenPrice(const onixs_ice::OpenPrice& msg, const onixs_ice:: } } -void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onClosePrice", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -315,9 +302,8 @@ void ICEListener::onClosePrice(const onixs_ice::ClosePrice& msg, const onixs_ice } } -void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary& msg, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary& msg, const onixs_ice::MessageInfo& ) { - tracepoint (bts_trace,trace_order,(char*) "onEndOfDayMarketSummary", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); auto* data = _index.get_security(msg.marketId); if (data != nullptr) { @@ -333,18 +319,15 @@ void ICEListener::onEndOfDayMarketSummary(const onixs_ice::EndOfDayMarketSummary // // Feed -void ICEListener::onMulticastMessageBlockBegin(onixs_ice::FeedId feedId, const onixs_ice::MessageInfo& msg_info) +void ICEListener::onMulticastMessageBlockBegin(onixs_ice::FeedId feedId, const onixs_ice::MessageInfo& ) { UNUSED(feedId); - tracepoint (bts_trace,trace_order,(char*) "onMulticastMessageBlockBegin", (uint32_t)msg_info.sequenceNumber, (uint16_t) msg_info.sequenceNumber, 0); } void ICEListener::onMulticastMessageBlockEnd(onixs_ice::FeedId feedId, const onixs_ice::MarketIds& marketIds) { UNUSED(feedId); UNUSED(marketIds); - tracepoint (bts_trace,trace_order,(char*) "onMulticastMessageBlockEnd.begin", 0, (uint16_t) 0, 0); - tracepoint (bts_trace,trace_order,(char*) "onMulticastMessageBlockEnd.end", 0, (uint16_t) 0, 0); } void ICEListener::onFeedStarted(onixs_ice::FeedId, const onixs_ice::MarketIds&) diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp index c44ad0d3a..f36be139d 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEMain.cpp @@ -217,7 +217,6 @@ unique_ptr ICEMain::prepare_listener(onixs_ice::Handler& handler, c producer_channels.push_back(_producer.get_channel(symbol.symbol().c_str(), symbol.type(), symbol.exchange())); } - const auto& options = channel_settings_for(channel); unique_ptr listener(new ICEListener(_index, _producer, /*_settlement_recorder,*/ producer_channels)); for (auto& symbol : channel.symbols) listener->add_filter_symbol(symbol.symbol()); From eb053ee99dc13cc59ba0f2e9c6ca2ceccac2d4f8 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 2 Apr 2019 16:36:24 -0400 Subject: [PATCH 05/54] Cleaned up algos. --- .../orders/book_algos/BookOrderBase.cpp | 71 ++++++++++++++-- .../orders/book_algos/BookOrderBase.h | 5 ++ .../orderman/orders/book_algos/JoinOrder2.cpp | 85 +++++++++---------- .../orderman/orders/book_algos/JoinOrder2.h | 1 + .../orderman/orders/book_algos/LeanOrder2.cpp | 24 ++---- .../orderman/orders/book_algos/LeanOrder2.h | 11 +-- 6 files changed, 120 insertions(+), 77 deletions(-) diff --git a/src/lib/orderman/orders/book_algos/BookOrderBase.cpp b/src/lib/orderman/orders/book_algos/BookOrderBase.cpp index 052daf16f..58c4259ac 100644 --- a/src/lib/orderman/orders/book_algos/BookOrderBase.cpp +++ b/src/lib/orderman/orders/book_algos/BookOrderBase.cpp @@ -1,4 +1,5 @@ #include "BookOrderBase.h" +#include "lib/domain_model/Security.h" #include "lib/orderman/actors/order_manager/ChildOrder.h" #include "lib/orderman/orderman_utils/orderman_utils.h" #include "lib/orderman/orders/PreActivationOrderServices.h" @@ -16,6 +17,7 @@ enum class BookOrderBase::InternalStatus { PENDING_ATTACH, WAITING_FOR_MD, WORKING, + INERT, COMPLETED }; @@ -117,6 +119,7 @@ OrderOpResult BookOrderBase::on_activate(Price p, Quantity q, case InternalStatus::WORKING: case InternalStatus::WAITING_FOR_MD: + case InternalStatus::INERT: bts_assert(false); break; } @@ -137,6 +140,7 @@ OrderOpResult BookOrderBase::on_update(Update const &update) { return OrderOpResult(ORDER_ERROR_INVALID_OP, "Order is already completed"); + case InternalStatus::INERT: case InternalStatus::WORKING: { auto r = do_on_update(update); if (r.ok()) { @@ -172,6 +176,7 @@ orderman::OrderOpResult BookOrderBase::on_detach() { case InternalStatus::WAITING_FOR_MD: case InternalStatus::PENDING_ATTACH: case InternalStatus::WORKING: + case InternalStatus::INERT: me->child = ChildOrder{}; terminate(ORDER_STATUS_CANCELED); break; @@ -191,6 +196,7 @@ orderman::OrderOpResult BookOrderBase::on_cancel() { case InternalStatus::WAITING_FOR_MD: case InternalStatus::PENDING_ATTACH: case InternalStatus::WORKING: + case InternalStatus::INERT: terminate(ORDER_STATUS_CANCELED); return report_and_return(); @@ -235,6 +241,7 @@ void BookOrderBase::on_book_update(const BookUpdateEvent &ev) { case InternalStatus::PENDING_ATTACH: case InternalStatus::COMPLETED: + case InternalStatus::INERT: return; case InternalStatus::INACTIVE: @@ -284,6 +291,7 @@ void BookOrderBase::on_attach_complete(OrderOpResult r, ChildOrder const &child, case InternalStatus::INACTIVE: case InternalStatus::WAITING_FOR_MD: case InternalStatus::WORKING: + case InternalStatus::INERT: bts_assert(false); break; } @@ -297,6 +305,7 @@ void BookOrderBase::on_child_order_update(OrderStateUpdateEvent const &ev) { void BookOrderBase::on_child_order_update( api::orderman::OrderState const &child_state) { switch (me->internal_status) { + case InternalStatus::INERT: case InternalStatus::WORKING: switch (child_state.status()) { @@ -330,7 +339,7 @@ void BookOrderBase::on_child_order_update( case OrderStatus_INT_MAX_SENTINEL_DO_NOT_USE_: bts_assert(false); return; - } // End JOINED internal state + } return; case InternalStatus::COMPLETED: break; @@ -365,9 +374,8 @@ void BookOrderBase::on_child_update_completed(OrderOpResult r) { on_detach(); return; + case InternalStatus::INERT: case InternalStatus::COMPLETED: - return; - case InternalStatus::WAITING_FOR_MD: case InternalStatus::PENDING_ATTACH: case InternalStatus::INACTIVE: @@ -517,6 +525,26 @@ void BookOrderBase::transition(InternalStatus new_state) { _transition(new_state); return; } + + // To INERT + if (new_state == InternalStatus::INERT) { + me->pending_update.reset(); + unsubscribe_from_book(); + _transition(new_state); + return; + } + } + + // From INERT + if (me->internal_status == InternalStatus::INERT) { + if (new_state == InternalStatus::COMPLETED) { + if (!me->child.empty()) { + me->child.cancel(); + me->child = ChildOrder{}; + } + _transition(new_state); + return; + } } // Everything else is verbotten @@ -556,6 +584,14 @@ void BookOrderBase::check_invariants() { bts_assert(!never_saw_md()); break; + case InternalStatus::INERT: + bts_assert(!me->child.empty()); + bts_assert(me->external_status() == ORDER_STATUS_WORKING); + bts_assert(!never_saw_md()); + bts_assert(me->book_sid.empty()); + bts_assert(!me->pending_update); + break; + case InternalStatus::COMPLETED: bts_assert(me->child.empty()); bts_assert(me->external_status() == ORDER_STATUS_CANCELED || @@ -563,7 +599,6 @@ void BookOrderBase::check_invariants() { me->external_status() == ORDER_STATUS_ERROR || me->external_status() == ORDER_STATUS_REJECTED_BY_SPARK); bts_assert(me->book_sid.empty()); - bts_assert(me->book_sid.empty()); bts_assert(!me->pending_update); break; } @@ -601,8 +636,16 @@ void BookOrderBase::cancel(std::string const &msg) { void BookOrderBase::detach(std::string const &msg) { bts_assert(me->internal_status == InternalStatus::WORKING); - me->child = {}; - terminate(ORDER_STATUS_CANCELED, msg); + bts_assert(!me->child.empty()); + + if (parent_key() == null_order_key()) { + if (msg.size()) + me->state.set_last_msg(msg); + me->child = ChildOrder{}; + terminate(ORDER_STATUS_CANCELED); + } else + transition(InternalStatus::INERT); + report_and_return(); } @@ -617,6 +660,20 @@ Price BookOrderBase::tick_size() const { return Price(me->security->contract_spec().low_tick()); } +md::PriceSize BookOrderBase::other_side_top_of_book() const { + return last_book().side(other_side())[0]; +} + +md::PriceSize BookOrderBase::my_side_top_of_book() const { + return last_book().side(my_side())[0]; +} + +api::Side BookOrderBase::my_side() const { return definition().side(); } + +api::Side BookOrderBase::other_side() const { + return securities::other_side(my_side()); +} + void BookOrderBase::launch_child( api::orderman::OrderDefinition const &child_def) { bts_assert(me->internal_status == InternalStatus::WORKING); @@ -637,6 +694,8 @@ log::CharPtrWrapper BookOrderBase::state_name(InternalStatus st) { return {"INACTIVE"}; case InternalStatus::WORKING: return {"WORKING"}; + case InternalStatus::INERT: + return {"INERT"}; } bts_assert(false); return {""}; diff --git a/src/lib/orderman/orders/book_algos/BookOrderBase.h b/src/lib/orderman/orders/book_algos/BookOrderBase.h index 3f73d35e0..92275ca6a 100644 --- a/src/lib/orderman/orders/book_algos/BookOrderBase.h +++ b/src/lib/orderman/orders/book_algos/BookOrderBase.h @@ -3,6 +3,7 @@ #include "lib/api/services/OrderService.server.pb.h" #include "lib/logging/logging.h" #include "lib/orderman/orders/Order.h" +#include "lib/md/PriceSize.h" #include @@ -47,6 +48,10 @@ class BookOrderBase : public Order { Book const&last_book() const; Book const&book_at_inception() const; Price tick_size() const; + api::Side my_side() const; + api::Side other_side() const; + md::PriceSize other_side_top_of_book() const; + md::PriceSize my_side_top_of_book() const; private: enum class InternalStatus; diff --git a/src/lib/orderman/orders/book_algos/JoinOrder2.cpp b/src/lib/orderman/orders/book_algos/JoinOrder2.cpp index 3bec00d16..ae97343f2 100644 --- a/src/lib/orderman/orders/book_algos/JoinOrder2.cpp +++ b/src/lib/orderman/orders/book_algos/JoinOrder2.cpp @@ -8,7 +8,7 @@ namespace orderman { using namespace api::orderman; -enum class JoinOrder2::Status { WAITING_TO_JOIN, JOINED, DONE }; +enum class JoinOrder2::Status { WAITING_TO_JOIN, JOINED }; struct JoinOrder2::PImpl { Quantity min_quantity_to_join; @@ -46,7 +46,7 @@ void JoinOrder2::do_on_ready(bool is_attached) { Quantity(state().quantity())); if (!is_attached) { - auto const&def = definition(); + auto const &def = definition(); api::orderman::OrderDefinition child_def = def; *child_def.mutable_custom_def() = definition().custom_def().join().child(); @@ -81,59 +81,56 @@ void JoinOrder2::try_to_join() { child_update.set_quantity(state().quantity()); update_child(child_update); - // We no longer need market data updates - unsubscribe_from_book(); - - me->status = Status::JOINED; - LOG(OrderMan, Info, "JoinOrder2 order {} joined the market {}@{}", - key().value(), state().quantity(), my_side_psz.price()); + done(); + } } OrderOpResult JoinOrder2::do_on_update(api::orderman::Update const &update) { - switch (me->status) { - case Status::WAITING_TO_JOIN: - case Status::JOINED: { - if (update.has_custom() && !update.custom().has_join()) - return {ORDER_ERROR_INVALID_OP, - "Update is not valid for this order type"}; + if (update.has_custom() && !update.custom().has_join()) + return {ORDER_ERROR_INVALID_OP, + "Update is not valid for this order type"}; - // copy new price, size to our state - state().set_price(update.price()); - state().set_quantity(update.quantity()); + // copy new price, size to our state + state().set_price(update.price()); + state().set_quantity(update.quantity()); - // Build child update - Update child_update; - child_update.set_price(update.price()); - child_update.set_quantity(update.quantity()); + // Build child update + Update child_update; + child_update.set_price(update.price()); + child_update.set_quantity(update.quantity()); - if (update.has_custom()) { - // process custom part of the udpate if any - auto &join_update = update.custom().join(); - *child_update.mutable_custom() = join_update.child(); + if (update.has_custom()) { + // process custom part of the udpate if any + auto &join_update = update.custom().join(); + *child_update.mutable_custom() = join_update.child(); - // Update quantity threshold - me->min_quantity_to_join = SpreaderUtils::_quantity_threshold( - definition().custom_def().join().join_threshold(), - Quantity(update.quantity())); - } - - update_child(child_update); - - // If we were not yet joined it is possible we now can, since we - // could have changed the min_quantity_to_join - if (me->status == Status::WAITING_TO_JOIN) - try_to_join(); - return OrderOpResult(); - } - case Status::DONE: - bts_assert(false); - break; + // Update quantity threshold + me->min_quantity_to_join = SpreaderUtils::_quantity_threshold( + definition().custom_def().join().join_threshold(), + Quantity(update.quantity())); } - bts_assert(false); - return OrderOpResult{}; + update_child(child_update); + + // If we were not yet joined it is possible we now can, since we + // could have changed the min_quantity_to_join + if (me->status == Status::WAITING_TO_JOIN) + try_to_join(); + return OrderOpResult(); } +void JoinOrder2::done() +{ + bts_assert(me->status == Status::WAITING_TO_JOIN); + auto my_side = definition().side(); + auto &my_side_psz = last_book().side(my_side)[0]; + + me->status = Status::JOINED; + LOG(OrderMan, Diag, "JoinOrder2 order {} joined the market {}@{}", + key().value(), state().quantity(), my_side_psz.price()); + detach("Joined successfully"); +} + } // namespace orderman } // namespace bts diff --git a/src/lib/orderman/orders/book_algos/JoinOrder2.h b/src/lib/orderman/orders/book_algos/JoinOrder2.h index 89089e107..717fa6afc 100644 --- a/src/lib/orderman/orders/book_algos/JoinOrder2.h +++ b/src/lib/orderman/orders/book_algos/JoinOrder2.h @@ -11,6 +11,7 @@ class JoinOrder2 : public BookOrderBase { ~JoinOrder2(); private: + void done(); OrderOpResult do_on_init_new() override; void do_on_book(Book const &) override; void do_on_ready(bool is_attached) override; diff --git a/src/lib/orderman/orders/book_algos/LeanOrder2.cpp b/src/lib/orderman/orders/book_algos/LeanOrder2.cpp index 8e169f3e5..bdaa6cb4d 100644 --- a/src/lib/orderman/orders/book_algos/LeanOrder2.cpp +++ b/src/lib/orderman/orders/book_algos/LeanOrder2.cpp @@ -117,7 +117,7 @@ void LeanOrder2::on_toward_me_move() { LOG(OrderMan, Diag, "LeanOrder2 {} is done because opposite moved towards order", key().value()); - done(); + done("Opposite market moved towards"); break; case LeanOrderDefinition_OnToward_REPRICE: me->target_price = Price(other_side_top_of_book().price()); @@ -160,7 +160,7 @@ void LeanOrder2::payup() { "Could not find opposite market to set new target price in " "LeanOrder2, order: {} is done.", key().value()); - done(); + done("Could not find new opposite market"); return; } @@ -175,7 +175,7 @@ void LeanOrder2::payup() { LOG(OrderMan, Diag, "Reached limit of jumps in LeanOrder2 {}. Order is done.", key().value()); - done(); + done("Max number of jumps reached"); return; } } @@ -206,23 +206,17 @@ OrderOpResult LeanOrder2::do_on_update(api::orderman::Update const &update) { update_child(child_update); if (me->status == Status::WORKING) { - // re-eval given that our parameters might hace changed + // re-eval given that our parameters might have changed try_jump(); } return OrderOpResult(); } -void LeanOrder2::done() +void LeanOrder2::done(std::string const&msg) { bts_assert(me->status == Status::WORKING); me->status = Status::DONE; - - if (parent_key() == null_order_key()) - detach(); -} - -md::PriceSize LeanOrder2::other_side_top_of_book() const { - return last_book().side(other_side())[0]; + detach(msg); } bool LeanOrder2::book_moved_toward_me() const { @@ -237,12 +231,6 @@ bool LeanOrder2::book_moved_away_from_me() const { other_side_price); } -api::Side LeanOrder2::my_side() const { return definition().side(); } - -api::Side LeanOrder2::other_side() const { - return securities::other_side(my_side()); -} - uint32_t LeanOrder2::max_jumps() const { return definition().custom_def().lean().max_chase_ticks(); } diff --git a/src/lib/orderman/orders/book_algos/LeanOrder2.h b/src/lib/orderman/orders/book_algos/LeanOrder2.h index 103ac7b5e..6a445dcd6 100644 --- a/src/lib/orderman/orders/book_algos/LeanOrder2.h +++ b/src/lib/orderman/orders/book_algos/LeanOrder2.h @@ -1,7 +1,6 @@ #pragma once #include "lib/orderman/orders/book_algos/BookOrderBase.h" -#include "lib/md/PriceSize.h" namespace bts { namespace orderman { @@ -19,21 +18,15 @@ private: struct PImpl; enum class Status; - api::Side my_side() const; - api::Side other_side() const; - md::PriceSize other_side_top_of_book() const; spark::QuantityMeasure jump_threshold() const; uint32_t max_jumps() const ; api::orderman::LeanOrderDefinition::OnToward on_toward_behaviour() const; - bool book_moved_toward_me() const; bool book_moved_away_from_me() const; - - void try_jump(); void on_toward_me_move(); + void try_jump(); void payup(); - - void done(); + void done(std::string const&msg); std::unique_ptr me; }; From cdd3afd1eebc8dd5a4ed53b8d386aee24cb4d9e7 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Tue, 2 Apr 2019 16:47:48 -0400 Subject: [PATCH 06/54] Code review commit. --- src/lib/orderman/orders/book_algos/JoinOrder2.cpp | 2 ++ src/lib/orderman/orders/book_algos/LeanOrder2.cpp | 2 ++ src/lib/orderman/orders/book_algos/TopOrder2.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/lib/orderman/orders/book_algos/JoinOrder2.cpp b/src/lib/orderman/orders/book_algos/JoinOrder2.cpp index ae97343f2..ccc381364 100644 --- a/src/lib/orderman/orders/book_algos/JoinOrder2.cpp +++ b/src/lib/orderman/orders/book_algos/JoinOrder2.cpp @@ -1,3 +1,5 @@ +// READY TO REVIEW + #include "JoinOrder2.h" #include "lib/orderman/order_factory/IOrderFactory.h" #include "lib/orderman/orderman_utils/orderman_utils.h" diff --git a/src/lib/orderman/orders/book_algos/LeanOrder2.cpp b/src/lib/orderman/orders/book_algos/LeanOrder2.cpp index bdaa6cb4d..83839fc45 100644 --- a/src/lib/orderman/orders/book_algos/LeanOrder2.cpp +++ b/src/lib/orderman/orders/book_algos/LeanOrder2.cpp @@ -1,3 +1,5 @@ +// READY TO REVIEW + #include "LeanOrder2.h" #include "lib/domain_model/Security.h" diff --git a/src/lib/orderman/orders/book_algos/TopOrder2.cpp b/src/lib/orderman/orders/book_algos/TopOrder2.cpp index 6340b5f44..daf844d08 100644 --- a/src/lib/orderman/orders/book_algos/TopOrder2.cpp +++ b/src/lib/orderman/orders/book_algos/TopOrder2.cpp @@ -1,3 +1,5 @@ +// READY TO REVIEW + #include "TopOrder2.h" #include "lib/domain_model/Security.h" #include "lib/orderman/order_factory/IOrderFactory.h" From 036f53c849237cb881f30258ea4a14ac88591f00 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 2 Apr 2019 11:01:34 -0500 Subject: [PATCH 07/54] create 'MiniLadderView' (will be added to OrderBook's right panel) --- .../Modules/Trading/Ladder/LadderModel.cs | 14 ++- .../Trading/Ladder/LadderWindowFactory.cs | 8 +- .../Modules/Trading/Ladder/VM/LadderVM.cs | 42 +++++-- .../Trading/Ladder/View/LadderGridHost.cs | 5 +- .../Trading/Ladder/View/LadderViewHelper.cs | 14 +++ .../Trading/Ladder/View/MiniLadderView.xaml | 115 ++++++++++++++++++ .../Ladder/View/MiniLadderView.xaml.cs | 17 +++ .../Modules/Trading/TradingShellModule.cs | 5 +- src/client/spark/Orders/OrdersModel.cs | 6 +- .../WindowSettings/IWindowSettingsManager.cs | 47 ++++++- 10 files changed, 245 insertions(+), 28 deletions(-) create mode 100644 src/client/spark/Modules/Trading/Ladder/View/LadderViewHelper.cs create mode 100644 src/client/spark/Modules/Trading/Ladder/View/MiniLadderView.xaml create mode 100644 src/client/spark/Modules/Trading/Ladder/View/MiniLadderView.xaml.cs diff --git a/src/client/spark/Modules/Trading/Ladder/LadderModel.cs b/src/client/spark/Modules/Trading/Ladder/LadderModel.cs index 7576b8374..2ff11fa2f 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderModel.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderModel.cs @@ -1,17 +1,23 @@ using bts; using bts.api; +using bts.api.orderman; +using bts.collections; using mbts.co2; +using System; +using System.Collections.Generic; +using System.Reactive.Linq; using System.Threading.Tasks; namespace mbts.spark { class LadderModel { readonly OrdersModel _order_gateway; - readonly MarketDataAuxiliaryModel _md_auxiliary_model; - public LadderModel(SecurityMD source, OrdersModel ordergw, MarketDataAuxiliaryModel md_auxiliary_model) { + public LadderModel(SecurityMD source, OrdersModel ordergw, Func order_filter = null) { security_md = source; _order_gateway = ordergw; - _md_auxiliary_model = md_auxiliary_model; + orders = ordergw.working_orders; + if (order_filter != null) + orders = orders.Select(order_map => new FilteredDictionary(order_map, order_filter)); } public enum CancelType { All, Bids, Asks } @@ -20,7 +26,7 @@ namespace mbts.spark { public SecurityImmutable security => security_md.security; public MDConsumerHandle md => security_md.md; public OrdersModel order_gateway => _order_gateway; - public MarketDataAuxiliaryModel md_auxiliary_model => _md_auxiliary_model; + public IObservable> orders { get; } public Task cancel_orders(CancelType ct) { switch (ct) { diff --git a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs index 33c8b36ec..b36af3813 100644 --- a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs +++ b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs @@ -23,16 +23,14 @@ namespace bts.shell { readonly IWindowManager _wm; readonly UserSettingsHub _settings_hub; readonly OrdersModel _orders_model; - readonly MarketDataAuxiliaryModel _md_auxiliary_model; IReadOnlyDictionary _securities = new Dictionary(); - public LadderWindowFactory(IShellModule owner, IBus bus, IWindowManager wm, UserSettingsHub settings_hub, OrdersModel orders_model, MarketDataAuxiliaryModel md_auxiliary_model) + public LadderWindowFactory(IShellModule owner, IBus bus, IWindowManager wm, UserSettingsHub settings_hub, OrdersModel orders_model) : base(owner, "SparkLadder") { _bus = bus; _wm = wm; _settings_hub = settings_hub; _orders_model = orders_model; - _md_auxiliary_model = md_auxiliary_model; _ladder_conf = new LadderConfig(Configuration.get(), Configuration.get().ladder); _dispose = Disposable.Create( bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s), @@ -56,14 +54,14 @@ namespace bts.shell { IShellWindow create_ladder_window(SecurityMD md, LadderSettings state_settings) { var id = Interlocked.Increment(ref _ladder_count) % Environment.ProcessorCount; var view = new Lazy(() => { - var model = new LadderModel(md, _orders_model, _md_auxiliary_model); + var model = new LadderModel(md, _orders_model); var settings_manager = new WindowSettingsManager( _settings_hub, state_settings == null || state_settings.use_defaults ? null : state_settings, us => sanitize_ladder_settings(us.ladder), (us, v) => us.with(sanitize_ladder_settings(v))); var init = state_settings ?? settings_manager.default_settings; init.use_defaults |= state_settings == null; - var vm = new LadderVM(_bus, model, settings_manager, init); + var vm = LadderVM.create(_bus, model, settings_manager, init); vm.order_properties_vm.open_algo_popup_on_select = _ladder_conf.open_algo_popup_on_select; var lv = new LadderView(vm); foreach (var kv in AlgoStudioModelUtils.get_dynamic_resources(vm.model.order_gateway.algo_model.ui_configuration)) diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs index 5be07f911..2828e094a 100644 --- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs +++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs @@ -38,14 +38,26 @@ namespace mbts.spark { IEqualityComparer _equality; Dictionary _slot_price_vs_orders; - public LadderVM(IBus bus, LadderModel model, IWindowSettingsManager settings_manager, LadderSettings init) { + public static LadderVM create(IBus bus, LadderModel model, IWindowSettingsManager settings_manager, LadderSettings init) { + var non_shared_wsm = settings_manager.as_non_shared(); + return new LadderVM(bus, model, settings_manager, non_shared_wsm, init, new OrderPropertiesEditorVM(model.order_gateway, Observable.Return(model.security_md), settings_manager.subscribe_current().Select(s => new InlineOrderProperties(model.order_gateway, s)))); + } + + public static LadderVM create_readonly(IBus bus, LadderModel model) { + var default_settings = LadderSettings.Default; + return create_readonly(bus, model, new WindowSettingsManager.DisconnectedImpl(default_settings), default_settings); + } + + public static LadderVM create_readonly(IBus bus, LadderModel model, IWindowSettingsManager settings_manager, LadderSettings init) => + new LadderVM(bus, model, settings_manager, settings_manager.as_non_shared(), init); + + LadderVM(IBus bus, LadderModel model, IWindowSettingsManager settings_manager, IWindowSettingsManagerNonShared non_shared_wsm, LadderSettings init, OrderPropertiesEditorVM order_properties_vm = null) { _bus = bus; _model = model; _equality = TickUtils.tick_equality_comparer(_model.security.ContractSpec); _slot_price_vs_orders = new Dictionary(_equality); - var non_shared_wsm = settings_manager.as_non_shared(); _settings_manager = non_shared_wsm; - order_properties_vm = new OrderPropertiesEditorVM(_model.order_gateway, Observable.Return(_model.security_md), _settings_manager.subscribe_current().Select(s => new InlineOrderProperties(_model.order_gateway, s))); + this.order_properties_vm = order_properties_vm; _high = backing(nameof(high), double.NaN); _low = backing(nameof(low), double.NaN); _change = backing(nameof(change), double.NaN); @@ -126,13 +138,11 @@ namespace mbts.spark { _dispose = Disposable.Create( settings_command, non_shared_wsm, - settings.OnDispatcher().Subscribe(s => order_properties_vm.on_favorite_algos(s.favorite_algos)), - order_properties_vm, - order_properties_vm.observe_account(true).Select(a => a?.name ?? string.Empty).Subscribe(account_positions), + get_order_properties_editor_hooks(), account_positions, size_calculator = new CalculatorLogic(0, _settings_manager.subscribe_current().Select(s => s.calculator_buttons)), bus.subscribe(SparkTags.LogActivity).OnDispatcher().Subscribe(status_update), - model.order_gateway.working_orders.OnDispatcher().Subscribe(working => { + model.orders.OnDispatcher().Subscribe(working => { // Here we manage N orders to 1 price slot in the ladder Dictionary> orders_used_in_this_update = new Dictionary>(_equality); @@ -225,6 +235,13 @@ namespace mbts.spark { WorkLoop.Start($"Ladder '{security}'", _tick), Disposable.Create(() => _on_disposed_impl?.Invoke(true)) ); + IDisposable get_order_properties_editor_hooks() => + order_properties_vm == null ? + Disposable.empty : + Disposable.Create( + settings.OnDispatcher().Subscribe(s => order_properties_vm.on_favorite_algos(s.favorite_algos)), + order_properties_vm, + order_properties_vm.observe_account(true).Select(a => a?.name ?? string.Empty).Subscribe(account_positions)); } public IBus bus => _bus; @@ -269,6 +286,7 @@ namespace mbts.spark { public ulong volume => _volume.Value; public bool auto_clear { get => _auto_clear.Value; set => _auto_clear.set(value); } public CalculatorLogic size_calculator { get; } + /// Important: can be null. public OrderPropertiesEditorVM order_properties_vm { get; } public ObservableCollection orders { get; } public IAsyncCommand cancel_command { get; } @@ -318,6 +336,8 @@ namespace mbts.spark { } public void key_down(KeyEventArgs e) { + if (order_properties_vm == null) + return; // the ctrl modifier requirement helps avoid keyboard-input collisions w/ algo-templates popup if (!KeyboardExtensions.IsCtrlDown()) return; var new_algo = order_properties_vm.algo_definitions.FirstOrDefault(o => o.algo_root.key_match(e)); @@ -328,6 +348,8 @@ namespace mbts.spark { } public async void send_order((double price, Side? side, bool size_from_alternate) args) { + if (order_properties_vm == null) + return; var s = _settings_manager.current_settings(); if (DoubleHelper.IsNaNOrInfinity(args.price) || !args.side.HasValue || HasErrors || order_properties_vm.HasErrors || (args.size_from_alternate && s.alternate_order_size == 0)) return; @@ -383,8 +405,10 @@ namespace mbts.spark { } }); - void _show_ticket() => - _bus.post(SparkTags.ShowOrderTicketTag, (new OrderDefinitionImmutable(order_properties_vm.create(Side.Buy)), 0d, 0u)); + void _show_ticket() { + if (order_properties_vm != null) + _bus.post(SparkTags.ShowOrderTicketTag, (new OrderDefinitionImmutable(order_properties_vm.create(Side.Buy)), 0d, 0u)); + } void _tick() { _update_header(); diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs index 2f91999d2..62ddd93d9 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs @@ -81,6 +81,7 @@ namespace mbts.spark { }; RecenterCommand = new DelegateCommand(_scroll_to_center); DataContextChanged += (s, e) => _connect_vm(); + IsVisibleChanged += (s, e) => _connect_vm(); Unloaded += (s, e) => { Disposable.dispose(ref _settings_sub); Disposable.dispose(ref _tick_sub); @@ -419,14 +420,14 @@ namespace mbts.spark { void _connect_vm() { _dispose_resources(); _vm = DataContext as LadderVM; - if (_vm != null) { + if (_vm != null && IsVisible) { _vm.OnDisposed += _on_vm_disposed; _prices_updated = 0; _price_comparer = Comparer.Create((x, y) => security.ContractSpec.tick_equals(x, y) ? 0 : y.CompareTo(x)); _price_dirty = true; _vm.on_tick += _tick; _settings_sub = _vm.settings.OnDispatcher().Subscribe(_settings_updated); - _volume_sub = _vm.model.md_auxiliary_model.security_volume_at_price(security.Id).Subscribe(t => _volume_container.write_value(t.state.Values)); + _volume_sub = _vm.model.order_gateway.md_auxiliary_model.security_volume_at_price(security.Id).Subscribe(t => _volume_container.write_value(t.state.Values)); _tick_sub = Disposable.Create(() => _vm.on_tick -= _tick); } } diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderViewHelper.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderViewHelper.cs new file mode 100644 index 000000000..e4bbee4d5 --- /dev/null +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderViewHelper.cs @@ -0,0 +1,14 @@ +using mbts.ui; +using System.Windows.Controls; +using System.Windows.Controls.Primitives; + +namespace mbts.ui.spark { + static class LadderViewHelper { + public static readonly DragDeltaEventHandler ColumnHeaderThumb_DragDeltaHandler = + (s, e) => + e.Handled = + s is Thumb thumb && + thumb.try_find_ancestor_of_type(out Canvas canvas) && + canvas.ActualWidth + e.HorizontalChange < canvas.MinWidth; + } +} \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/Ladder/View/MiniLadderView.xaml b/src/client/spark/Modules/Trading/Ladder/View/MiniLadderView.xaml new file mode 100644 index 000000000..2507c169d --- /dev/null +++ b/src/client/spark/Modules/Trading/Ladder/View/MiniLadderView.xaml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/Ladder/View/MiniLadderView.xaml.cs b/src/client/spark/Modules/Trading/Ladder/View/MiniLadderView.xaml.cs new file mode 100644 index 000000000..a0f1bc186 --- /dev/null +++ b/src/client/spark/Modules/Trading/Ladder/View/MiniLadderView.xaml.cs @@ -0,0 +1,17 @@ +using System.Windows; +using System.Windows.Controls; + +namespace mbts.ui.spark { + partial class MiniLadderView : UserControl { + public MiniLadderView() => + InitializeComponent(); + + public static readonly DependencyProperty SettingsProperty = + WPFHelper.create_dp(nameof(Settings)); + + public mbts.spark.LadderSettings Settings { + get => GetValue(SettingsProperty) as mbts.spark.LadderSettings; + set => SetValue(SettingsProperty, value); + } + } +} \ No newline at end of file diff --git a/src/client/spark/Modules/Trading/TradingShellModule.cs b/src/client/spark/Modules/Trading/TradingShellModule.cs index 9285c646f..f144d41a4 100644 --- a/src/client/spark/Modules/Trading/TradingShellModule.cs +++ b/src/client/spark/Modules/Trading/TradingShellModule.cs @@ -1,5 +1,4 @@ using bts.api; -using bts.api.md.auxiliary; using bts.spark; using mbts.persist; using mbts.spark; @@ -22,8 +21,8 @@ namespace bts.shell { [ImportingConstructor] public TradingShellModule(IBus bus, IWindowManager wm, INotificationService notification_service, INotificationServiceDataCache notification_service_data_cache, - UserSettingsHub settings_hub, OrdersModel orders_model, PAndLModel pandl_model, MarketDataAuxiliaryModel md_auxiliary_model, ErrorReporter error_reporter) { - _lwf = new LadderWindowFactory(this, bus, wm, settings_hub, orders_model, md_auxiliary_model); + UserSettingsHub settings_hub, OrdersModel orders_model, PAndLModel pandl_model, ErrorReporter error_reporter) { + _lwf = new LadderWindowFactory(this, bus, wm, settings_hub, orders_model); _obwf = new OrderBookWindowFactory(this, bus, notification_service, notification_service_data_cache, orders_model, settings_hub); _fwf = new FillsWindowFactory(this, bus, settings_hub, orders_model); _plwf = new PAndLWindowFactory(this, bus, settings_hub, pandl_model); diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index ce8024ad0..d60fef640 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -4,7 +4,6 @@ using bts.api.core; using bts.api.orderman; using bts.api.position; using bts.spark; -using bts.utils; using mbts.collections; using mbts.spark.utilities; using mbts.utils; @@ -22,6 +21,8 @@ using OrderUpdate = bts.api.core.TableUpdate<(bts.api.SecurityImmutable? sec, bt namespace mbts.spark { [Export] class OrdersModel : IDisposable { + public readonly MarketDataAuxiliaryModel md_auxiliary_model; + readonly IBus _bus; readonly OrderFactory _factory; readonly OrderService _service; @@ -36,7 +37,7 @@ namespace mbts.spark { [ImportingConstructor] OrdersModel(IBus bus, OrderFactory factory, OrderService service, PositionService position_service, - SpreaderModel spreader, DynamicOrderHelper dynamic_helper, AdminModel admin_model, IAlgoStudioModel algo_model, SecurityStore sstore, ErrorReporter error) { + SpreaderModel spreader, DynamicOrderHelper dynamic_helper, AdminModel admin_model, IAlgoStudioModel algo_model, MarketDataAuxiliaryModel md_auxiliary_model, SecurityStore sstore, ErrorReporter error) { _bus = bus; _factory = factory; _service = service; @@ -46,6 +47,7 @@ namespace mbts.spark { _dynamic_helper = dynamic_helper; this.admin_model = admin_model; this.algo_model = algo_model; + this.md_auxiliary_model = md_auxiliary_model; var scheduler = ThreadPoolScheduler.Instance; var interval = TimeSpan.FromMilliseconds(100); on_orders = diff --git a/src/client/spark/core/ShellInterface/UserSettings/WindowSettings/IWindowSettingsManager.cs b/src/client/spark/core/ShellInterface/UserSettings/WindowSettings/IWindowSettingsManager.cs index 2f727b39d..9a6d5057b 100644 --- a/src/client/spark/core/ShellInterface/UserSettings/WindowSettings/IWindowSettingsManager.cs +++ b/src/client/spark/core/ShellInterface/UserSettings/WindowSettings/IWindowSettingsManager.cs @@ -57,13 +57,13 @@ namespace mbts.persist { new NonSharedWrapper(this); class NonSharedWrapper : IWindowSettingsManagerNonShared { - readonly WindowSettingsManager _wsm; + readonly IWindowSettingsManager _wsm; readonly BehaviorSubject _default_subject; IDisposable _dispose; - public NonSharedWrapper(WindowSettingsManager wsm) { + public NonSharedWrapper(IWindowSettingsManager wsm) { _wsm = wsm; - _default_subject = new BehaviorSubject(_wsm.default_settings ?? wsm._get(UserSettings.factory_defaults)); + _default_subject = new BehaviorSubject(_wsm.default_settings); _dispose = wsm.subscribe_default().Subscribe(s => _default_subject.OnNext(default_settings = MiscUtils.clone_proto(s))); } @@ -88,6 +88,47 @@ namespace mbts.persist { public void Dispose() => Disposable.dispose(ref _dispose); } + + public class DisconnectedImpl : IWindowSettingsManager { + readonly BehaviorSubject _default_settings_subject; + T _instance_settings, _default_settings; + + public DisconnectedImpl(T settings) : this(settings, settings) { } + public DisconnectedImpl(T instance_settings, T default_settings) { + _instance_settings = instance_settings; + _default_settings = default_settings; + _default_settings_subject = new BehaviorSubject(default_settings); + } + + public T instance_settings { + get => _instance_settings; + set { + if (!Equals(_instance_settings, value)) { + _instance_settings = value; + instance_settings_changed?.Invoke(value); + } + } + } + public T default_settings { + get => _default_settings; + set { + if (!Equals(_default_settings, _default_settings)) { + _default_settings = value; + _default_settings_subject.OnNext(value); + } + + } + } + + public event Action instance_settings_changed; + + public IWindowSettingsManagerNonShared as_non_shared() => new NonSharedWrapper(this); + public Task save_default_settings(T value) { + default_settings = value; + return Task.CompletedTask; + } + public IObservable subscribe_default() => _default_settings_subject; + } } static class WindowSettingsManagerExtensions { From 3ef87df0bc450e2ee047c877029e1d61946e102a Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 2 Apr 2019 11:09:47 -0500 Subject: [PATCH 08/54] LadderGridHost - clear visuals when DataContext is null --- .../Trading/Ladder/View/LadderGridHost.cs | 31 ++++++++++++++++--- .../Trading/Ladder/View/LadderRender.cs | 17 +++++++++- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs index 62ddd93d9..d9227595e 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs @@ -6,7 +6,6 @@ using mbts.co2; using mbts.ui; using mbts.ui.controls; using mbts.ui.spark; -using mbts.ui.utility; using mbts.ui.utility.text; using mbts.utils; using System; @@ -53,7 +52,7 @@ namespace mbts.spark { LadderVM _vm; LadderTactileAdorner _tactile_adorner; ulong _prices_updated; - NativePriceSize[] _bids, _asks; + NativePriceSize[] _bids = new NativePriceSize[NativePriceHelpers.COCONUT_MAX_DEPTH], _asks = new NativePriceSize[NativePriceHelpers.COCONUT_MAX_DEPTH]; bool _price_dirty = false; double[] _price_list = null; IComparer _price_comparer; @@ -420,7 +419,11 @@ namespace mbts.spark { void _connect_vm() { _dispose_resources(); _vm = DataContext as LadderVM; - if (_vm != null && IsVisible) { + if (!IsVisible) + return; + else if (_vm == null) { + _clear_visuals(); + } else { _vm.OnDisposed += _on_vm_disposed; _prices_updated = 0; _price_comparer = Comparer.Create((x, y) => security.ContractSpec.tick_equals(x, y) ? 0 : y.CompareTo(x)); @@ -637,6 +640,26 @@ namespace mbts.spark { _ordershost.Height = height; _render_grid_background(); } + + void _clear_visuals() { + if (_settings == null) + return; + _price_list = new double[_row_count]; + for (int i = 0; i < _price_list.Length; i++) + _price_list[i] = double.NaN; + Array.Clear(_bids, 0, _bids.Length); + Array.Clear(_asks, 0, _asks.Length); + _price_dirty = true; + LadderRender.clear_prices(_price_vis_tup.visual, _row_count, _settings.row_height, _settings.price_column, _price_vis_tup.glyph_context); + _refresh_bid_mkt_break(); + _refresh_ask_mkt_break(); + _refresh_mid_mkt_break(); + _refresh_session_low_line(); + _refresh_session_high_line(); + _refresh_session_range(); + _refresh_last_trade(); + _refresh_sizes(); + } #endregion #region Market Break, Session Low/High Utils @@ -888,4 +911,4 @@ namespace mbts.spark { } } } -} \ No newline at end of file +} diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs index 014176202..35d862f25 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderRender.cs @@ -4,7 +4,6 @@ using bts.api.md.auxiliary; using mbts.co2; using mbts.ui; using mbts.ui.controls; -using mbts.ui.spark; using mbts.ui.utility.text; using System; using System.Collections.Generic; @@ -86,6 +85,16 @@ namespace mbts.spark { return result; } + public static void clear_prices(DrawingVisual price, int row_count, double row_height, LadderColumnSettings settings, GlyphContext glyph_context) { + var foreground = settings.foreground.rgb_brush(); + var fprices = _format_empty_prices(row_count, row_height, settings, glyph_context); + using (var dc = price.RenderOpen()) + using (_draw_with_clip(dc, settings, row_height, row_count)) { + for (int x = 0; x < row_count; ++x) + dc.DrawGlyphRun(foreground, fprices[x]); + } + } + public static double[] render_prices(DrawingVisual price, GlyphContext glyph_context, double mid, double wrt_price, bool format_in_tick_terms, int row_count, double row_height, LadderColumnSettings settings, ContractSpecificationImmutable spec) { var dprices = gen_prices(mid, row_count, spec); @@ -293,6 +302,12 @@ namespace mbts.spark { dc.DrawRectangle(new SolidColorBrush(color.rgb_color()) { Opacity = 0.2 }, null, new Rect(0, high_index * row_height, settings.width, (low_index - high_index) * row_height)); } + static GlyphRun[] _format_empty_prices(int row_count, double row_height, LadderColumnSettings settings, GlyphContext glyph_context) { + var result = new GlyphRun[row_count]; + Parallel.For(0, row_count, i => result[i] = format_text("-", i, row_height, settings, glyph_context)); + return result; + } + static IDisposable _draw_with_clip(DrawingContext dc, LadderColumnSettings settings, double row_height, int row_count) { dc.PushClip(new RectangleGeometry(new Rect(0, 0, settings.width, row_height * row_count))); return Disposable.Create(dc.Pop); From e368468ffaad2d41a989bb9e9a0def5dd57f4169 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 2 Apr 2019 11:22:45 -0500 Subject: [PATCH 09/54] OrderBook - add 'MiniLadderView' to right panel --- .../Modules/Trading/OrderBook/OrderBookVM.cs | 92 ++++- .../OrderBook/OrderBookWindowFactory.cs | 31 +- .../Trading/OrderBook/View/OrderBookView.xaml | 334 ++++++++++++------ .../OrderBook/View/OrderBookView.xaml.cs | 62 ++-- 4 files changed, 365 insertions(+), 154 deletions(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs index 525b0716a..ff2070494 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs @@ -13,12 +13,14 @@ using mbts.ui.controls; using mbts.ui.settings; using mbts.ui.shell; using mbts.ui.utility; +using mbts.utils; using System; using System.Collections.Generic; using System.Collections.Immutable; using System.Collections.ObjectModel; using System.Collections.Specialized; using System.Linq; +using System.Reactive.Disposables; using System.Reactive.Linq; using System.Threading.Tasks; using System.Windows.Controls; @@ -40,13 +42,15 @@ namespace mbts.spark { readonly IBus _bus; readonly OrdersModel _model; readonly Property _current_row; - readonly Property _fills_slave_grid_is_visible; + readonly Property _fills_slave_grid_is_visible, _show_ladder, _show_fills, _show_order_params; readonly OrderBookRowCollection _row_collection; readonly OrderBookColumnCollection _columns; readonly IWindowSettingsManager _settings_manager; readonly SelectedOrderParamsMon _selected_params_mon; double _raw_right_panel_width = OrderBookStartupData.Default.right_panel_width, + _order_params_height = OrderBookStartupData.Default.order_params_height, + _ladder_height = OrderBookStartupData.Default.ladder_height, _raw_fills_slave_grid_height = OrderBookStartupData.Default.fills_slave_grid_height; OrderBookStartupData _state; bool @@ -61,6 +65,9 @@ namespace mbts.spark { order_mod_vm = new OrderParamsVM(this, AlgoDefinitionVM.create(model, OrderDataHelper.Defaults.AlgoData(), editing_permissions: AlgoEditingPermissions.AllowEditValues)); order_mod_vm.algo_vm.editing_permissions_mask = AlgoEditingPermissions.None; order_mod_vm.algo_vm.algo_root = null; + _show_ladder = backing(nameof(show_ladder), false); + _show_fills = backing(nameof(show_fills), false); + _show_order_params = backing(nameof(show_order_params), false); attach_vm = new OrderParamsVM(this, AlgoDefinitionVM.create(_model, OrderDataHelper.Defaults.AlgoData(CustomOrderDefinition.CustomOneofCase.Iceberg), editing_permissions: AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowEditValues)); _fills_slave_grid_is_visible = backing(nameof(fills_slave_grid_is_visible), false); _settings_manager = settings_manager; @@ -96,7 +103,7 @@ namespace mbts.spark { order_mod_vm.algo_vm, bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(_selected_params_mon.on_security_md_map), attach_vm, - _fills_slave_grid_is_visible.observe_current(true) + _show_fills.observe_current(true) .Subscribe(is_visible => fills_vm.value = is_visible ? new FillsVM( bus, model, Observable.Return(FillsWindowFactory.StartupData.Default()), @@ -117,10 +124,12 @@ namespace mbts.spark { } IObservable> mk_fills_slave_predicate_src() => Observable.Create>(o => { - return selected_rows.Observe().BufferLatest(TimeSpan.FromSeconds(0.2)).OnDispatcher().Subscribe(_ => { - var keys = new HashSet(selected_rows.SelectMany(r => new[] { r }.Concat(_row_collection.get_descendent_rows(r))).Select(r => r.order_key)); - o.OnNext(ft => keys.Contains(ft.fill.OrderKey)); - }); + notify(); + return _subscribe_throttled_selected_rows().OnDispatcher().Subscribe(_ => notify()); + void notify() { + var keys = new HashSet(selected_hierarchical_rows.Select(r => r.order_key)); + o.OnNext(new Func(ft => keys.Contains(ft.fill.OrderKey))); + } }); void on_filter_changed() => _row_collection.filter = _columns.get_filter(); @@ -211,6 +220,7 @@ namespace mbts.spark { public OrderParamsVM attach_vm { get; } public ObservableCollection selected_rows { get; } = new ObservableCollection(); public IEnumerable selected_orders => selected_rows.Select(r => r.order); + public IEnumerable selected_hierarchical_rows => selected_rows.SelectMany(r => new[] { r }.Concat(_row_collection.get_descendent_rows(r))); public _GridSettingsManager grid_settings_manager { get; } public bool is_attaching_algos { get => _is_attaching_algos; @@ -236,14 +246,25 @@ namespace mbts.spark { get => Math.Max(_raw_right_panel_width, _min_visible_right_panel_width); set => Set(ref _raw_right_panel_width, value); } + public double order_params_height { + get => _order_params_height; + set => Set(ref _order_params_height, value); + } public double fills_slave_grid_height { - get => Math.Max(_raw_fills_slave_grid_height, _min_visible_fills_slave_grid_height); + get => _raw_fills_slave_grid_height; set => Set(ref _raw_fills_slave_grid_height, value); } + public double ladder_height { + get => _ladder_height; + set => Set(ref _ladder_height, value); + } public bool is_row_collection_populated { get => _is_row_collection_populated; set => Set(ref _is_row_collection_populated, value); } + public bool show_ladder { get => _show_ladder.Value; set => _show_ladder.set(value); } + public bool show_fills { get => _show_fills.Value; set => _show_fills.set(value); } + public bool show_order_params { get => _show_order_params.Value; set => _show_order_params.set(value); } public void row_selection_changed(SelectionChangedEventArgs e) { try { @@ -274,16 +295,34 @@ namespace mbts.spark { public OrderBookStartupData create() { var (filters, sorting) = _columns.create(); var gs = grid_settings_manager.create(); - return new OrderBookStartupData(filters, gs.general.with(sorting_criterion: sorting), _show_right_panel, _raw_right_panel_width, _raw_fills_slave_grid_height, fills_slave_grid_is_visible, gs.predicate_animations, use_defaults: _settings_manager.instance_settings == null); + return new OrderBookStartupData( + filters, + gs.general.with(sorting_criterion: sorting), + _show_right_panel, + _raw_right_panel_width, + _raw_fills_slave_grid_height, + show_fills, + gs.predicate_animations, + use_defaults: _settings_manager.instance_settings == null) { + order_params_height = order_params_height, + show_ladder = show_ladder, + show_order_params = show_order_params, + ladder_height = ladder_height + }; } public void load_from(OrderBookStartupData state) { if (state == null) return; _state = state; show_right_panel = state.show_right_panel; + show_order_params = state.show_order_params; right_panel_width = state.right_panel_width; + order_params_height = state.order_params_height; fills_slave_grid_height = state.fills_slave_grid_height; fills_slave_grid_is_visible = state.fills_slave_grid_is_visible; + show_fills = state.fills_slave_grid_is_visible; + show_ladder = state.show_ladder; + ladder_height = state.ladder_height; var gs = state.grid_settings_wrapper(); if (gs != null) { grid_settings_manager.load_from(gs); @@ -415,6 +454,9 @@ namespace mbts.spark { } } + IObservable> _subscribe_throttled_selected_rows() => + selected_rows.Observe().BufferLatest(TimeSpan.FromSeconds(0.2)).Select(_ => selected_rows); + static _GridSettingsManager _create_grid_settings_manager( IObservable owner_title, IBus bus, INotificationService notification_service, OrdersModel model, ObservableCollection rows, ObservableCollection columns) { // make font-weight immutable for all columns (the font-weight rule is hard-coded: Regular for root-orders, Light for all others) @@ -444,8 +486,8 @@ namespace mbts.spark { (gen, anims) => new OrderBookGridSettings(gen, anims.Select(a => new OrderRecordTuplePredicateAnimations(a.predicate_data, a.cell_animations, a.row_animations, a.sound_notifications))), p => p.create_predicate(notification_service.data_cache), p => p.create_notification_predicate(notification_service.data_cache), - notification_service == null ? new Func, SoundNotification, IDisposable>((p, sn) => Disposable.empty) : notification_service.link_to_order, - notification_service == null ? new Func, IDisposable>(t => Disposable.empty) : notification_service.link_to_order, + notification_service.link_to_order, + notification_service.link_to_order, col_settings_flags); } @@ -525,6 +567,8 @@ namespace mbts.spark { public class OrderParamsVM : DisposableViewModelBase { readonly SelectorProperty _accounts; readonly OrderBookVM _owner; + HashSet _selected_order_tree = new HashSet(); + LadderVM _ladder_vm; SecurityMD? _security_md; double _price = 0; @@ -549,7 +593,13 @@ namespace mbts.spark { Array.Empty>()); set_price_command = new DelegateCommand(p => price = p); bbo = new BBOVM { security_md = security_md }; - _dispose = Disposable.Create( bbo, algo_vm); + _dispose = new CompositeDisposable(bbo, algo_vm, + owner._subscribe_throttled_selected_rows().OnDispatcher().Subscribe(_ => { + _selected_order_tree = new HashSet(_owner.selected_hierarchical_rows.Select(r => r.order_key)); + _reset_ladder_vm(); + })) { + () => Disposable.dispose(ref _ladder_vm) + }; } public ReadOnlyObservableCollection accounts => _accounts.items; @@ -559,7 +609,8 @@ namespace mbts.spark { get => _security_md; set { if (Set(ref _security_md, value)) { - RaisePropertyChanged(nameof(security), nameof(spec)); + _reset_ladder_vm(); + RaisePropertyChanged(nameof(security), nameof(spec), nameof(ladder_vm)); bbo.security_md = value; } } @@ -568,11 +619,22 @@ namespace mbts.spark { public double price { get => _price; set => Set(ref _price, value); } public CalculatorLogic size_calculator { get; } public AlgoDefinitionVM algo_vm { get; } + public LadderVM ladder_vm => _ladder_vm; public BBOVM bbo { get; } public ICommand send_order { get; } public ICommand set_price_command { get; } OrdersModel _model => _owner._model; + + void _reset_ladder_vm() { + if (_ladder_vm == null && !_security_md.HasValue) + return; + Disposable.replace(ref _ladder_vm, + _security_md.HasValue ? + LadderVM.create_readonly(_owner._bus, new LadderModel(security_md.Value, _owner._model, new Func(osec => _selected_order_tree.Contains(osec.order.Key)))) : + null); + RaisePropertyChanged(nameof(ladder_vm)); + } } /// @@ -657,8 +719,10 @@ namespace mbts.spark { } void _on_row_updated((OrderSecurityAlgoMeta oldval, OrderSecurityAlgoMeta newval) ch) { - _group_mon.remove(ch.oldval); - _group_mon.add(ch.newval); + using (begin_udpate()) { + _group_mon.remove(ch.oldval); + _group_mon.add(ch.newval); + } } static SecurityImmutable? _get_spreader_sec(OrderSecurityAlgoMeta osam) => diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs index c39c8998b..23fa78a51 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookWindowFactory.cs @@ -50,10 +50,14 @@ namespace bts.shell { [ProtoContract] public class OrderBookStartupData { - const bool _default_show_right_panel = true; + const bool + _default_show_right_panel = true, + _default_show_order_params = true; const double _default_right_panel_width = 400, - _default_fills_slave_grid_height = 138; + _default_order_params_height = 250, + _default_fills_slave_grid_height = 300, + _default_ladder_height = 350; // ALREADY USED TAGS // [ProtoMember(5)] // public readonly List sort_criteria; @@ -73,6 +77,14 @@ namespace bts.shell { [ProtoMember(17)] [DefaultValue(_default_right_panel_width)] public double right_panel_width { get; set; } + // show order params + [ProtoMember(23)] + [DefaultValue(_default_show_order_params)] + public bool show_order_params { get; set; } + // order params height + [ProtoMember(24)] + [DefaultValue(_default_order_params_height)] + public double order_params_height { get; set; } // fills slave grid height [ProtoMember(18)] [DefaultValue(_default_fills_slave_grid_height)] @@ -80,6 +92,13 @@ namespace bts.shell { // fills slave grid is visible [ProtoMember(19)] public bool fills_slave_grid_is_visible { get; set; } + // ladder height + [ProtoMember(21)] + [DefaultValue(_default_ladder_height)] + public double ladder_height { get; set; } + // show ladder + [ProtoMember(22)] + public bool show_ladder { get; set; } // predicate animations [ProtoMember(20)] [Obsolete] @@ -90,8 +109,11 @@ namespace bts.shell { public OrderBookStartupData() { show_right_panel = _default_show_right_panel; + show_order_params = _default_show_order_params; right_panel_width = _default_right_panel_width; + order_params_height = _default_order_params_height; fills_slave_grid_height = _default_fills_slave_grid_height; + ladder_height = _default_ladder_height; } public OrderBookStartupData(FilterStates filters, GridSettings grid = default, bool show_right_panel = 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) { @@ -122,7 +144,10 @@ namespace bts.shell { _default_show_right_panel, _default_right_panel_width, _default_fills_slave_grid_height, - use_defaults: true); + use_defaults: true) { + show_order_params = _default_show_order_params, + order_params_height = _default_order_params_height + }; public static OrderBookGridSettings DefaultGrid => new OrderBookGridSettings(_default_general_grid); diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml index 309394968..f810b0577 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml @@ -21,9 +21,9 @@ 5 - 64 + - - - - + + + + + + + + + + + + + + + + diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs index fa4defab4..7a3adbd0c 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml.cs @@ -4,13 +4,13 @@ using mbts.ui.controls.adorners; using mbts.ui.converters; using mbts.ui.extensions; using mbts.ui.spark; +using mbts.ui.utility; using mbts.utils; using System; using System.Reactive.Disposables; using System.Windows; using System.Windows.Controls; using System.Windows.Data; -using System.Windows.Input; using System.Windows.Media; using OrderParamsVM = mbts.spark.OrderBookVM.OrderParamsVM; @@ -18,21 +18,25 @@ namespace mbts.spark { internal partial class OrderBookView : UserControl { public const double GridSplitterWidth = 5, - GridSplitterHeight = 5, - MinAlgoEditorHeight = 64, - MinAttachOrderParamsPanelWidth = 340, - AttachOrderParamsPanelWidthRatio = 0.33; + GridSplitterHeight = 5; public static readonly IValueConverter OrderDescriptionConverter = ValueConverter.create(row => row == null ? string.Empty : row.order.short_description(row.security)), - RightPanelVisualStateConverter = ValueConverter.create(is_modifying => is_modifying ? VisualStateNames.RightPanel.ModifyOrders : VisualStateNames.RightPanel.Normal), - FillsSlaveGridMaxHeightConverter = ValueConverter.create(right_panel_height => right_panel_height - (GridSplitterHeight + MinAlgoEditorHeight)), - FillsPanelVisualStateConverter = ValueConverter.create(show => show ? VisualStateNames.FillsPanel.Active : VisualStateNames.FillsPanel.Inactive), - FillsSlaveGridStateConverter = ValueConverter.create(is_fills_grid_visible => is_fills_grid_visible ? VisualStateNames.FillsPanel.Active : VisualStateNames.FillsPanel.Inactive), - AttachmentTargetCursorConverter = ValueConverter.create(is_active => is_active ? Cursors.Pen : Cursors.Arrow); + RightPanelVisualStateConverter = ValueConverter.create(show_panel => show_panel ? VisualStateNames.RightPanel.Active : VisualStateNames.RightPanel.Inactive); public static readonly IMultiValueConverter - RightPanelDialogSkirtLeftAnchorConverter = ValueConverter.create((canvas_width, skirt_width) => canvas_width - skirt_width + GridSplitterWidth); + RightPanelDialogSkirtLeftAnchorConverter = ValueConverter.create((canvas_width, skirt_width) => canvas_width - skirt_width + GridSplitterWidth), + SlaveDataVisualStateConverter = ValueConverter.create( + (show_order_params, show_fills, show_ladder) => { + VisualStateNames.SlaveData.Data d = (VisualStateNames.SlaveData.Data)0; + if (show_order_params) + d |= VisualStateNames.SlaveData.Data.OrderParams; + if (show_fills) + d |= VisualStateNames.SlaveData.Data.Fills; + if (show_ladder) + d |= VisualStateNames.SlaveData.Data.Ladder; + return VisualStateNames.SlaveData.fmt_name(d); + }); IDisposable _attach_op; @@ -95,7 +99,8 @@ namespace mbts.spark { VerticalPosition.Middle, 0, orders_grid.RowHeight) { - OpenRelativeToMouse = true + OpenRelativeToMouse = true, + ClipToBounds = true }; popup_adorner.attach(); popup_adorner.IsOpen = true; @@ -116,18 +121,35 @@ namespace mbts.spark { public static class RightPanel { public const string GroupName = nameof(RightPanel); - public static readonly string - Normal = $"{GroupName}{nameof(Normal)}", - ModifyOrders = $"{GroupName}{nameof(ModifyOrders)}"; - } - - public static class FillsPanel { - public const string GroupName = nameof(FillsPanel); - public static readonly string Active = $"{GroupName}{VisualStates.Active}", Inactive = $"{GroupName}{VisualStates.Inactive}"; } + + public static class SlaveData { + public const string GroupName = nameof(SlaveData); + + public static readonly string + None = $"{GroupName}{nameof(None)}", + OrderParams = $"{GroupName}{nameof(OrderParams)}", + OrderParamsLadder = $"{GroupName}{nameof(OrderParamsLadder)}", + OrderParamsFills = $"{GroupName}{nameof(OrderParamsFills)}", + OrderParamsLadderFills = $"{GroupName}{nameof(OrderParamsLadderFills)}", + LadderFills = $"{GroupName}{nameof(LadderFills)}", + Ladder = $"{GroupName}{nameof(Ladder)}", + Fills = $"{GroupName}{nameof(Fills)}"; + + public enum Data { + OrderParams = 1, + Ladder = 1 << 1, + Fills = 1 << 2 + } + + public static string fmt_name(Data d) { + var vis_data = string.Join("", EnumHelper.split_flags(d)); + return vis_data == string.Empty ? None : GroupName + vis_data; + } + } } } } \ No newline at end of file From fa840eb0ac97a758114484998919d1e42cda1458 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 2 Apr 2019 12:46:02 -0500 Subject: [PATCH 10/54] PopupAdorner - implement ClipToBounds behavior --- .../spark/view/Controls/Adorners/PopupAdorner.cs | 15 +++++++++++---- src/client/spark/view/Extensions/WPFExtensions.cs | 4 ++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/client/spark/view/Controls/Adorners/PopupAdorner.cs b/src/client/spark/view/Controls/Adorners/PopupAdorner.cs index ea837ce02..d3142c20d 100644 --- a/src/client/spark/view/Controls/Adorners/PopupAdorner.cs +++ b/src/client/spark/view/Controls/Adorners/PopupAdorner.cs @@ -103,8 +103,9 @@ namespace mbts.ui.controls.adorners { return _popupElement.TranslatePoint(new Point(0, 0), this); double el_width = _popupElement.DesiredSize.Width; double el_height = _popupElement.DesiredSize.Height; + Point tl; if (OpenRelativeToMouse) { - Point tl = Mouse.GetPosition(this); + tl = Mouse.GetPosition(this); double rltv_x, rltv_y; switch (_horizontalPosition) { case HorizontalPosition.Left: rltv_x = -el_width; break; @@ -118,9 +119,9 @@ namespace mbts.ui.controls.adorners { case VerticalPosition.Botton: rltv_y = 0; break; default: throw new NotImplementedException(); } - return _popupTarget.TranslatePoint(new Point(tl.X + rltv_x + _horizontalOffset, tl.Y + rltv_y + _verticalOffset), _popupTarget); + tl = new Point(tl.X + rltv_x + _horizontalOffset, tl.Y + rltv_y + _verticalOffset); } else { - Point tl = _popupTarget.TranslatePoint(new Point(0, 0), AdornedElement); + tl = _popupTarget.TranslatePoint(new Point(0, 0), AdornedElement); double rltv_x, rltv_y; switch (_horizontalPosition) { case HorizontalPosition.Left: rltv_x = -el_width; break; @@ -134,8 +135,14 @@ namespace mbts.ui.controls.adorners { case VerticalPosition.Botton: rltv_y = _popupTarget.ActualHeight + el_height; break; default: throw new NotImplementedException(); } - return _popupTarget.TranslatePoint(new Point(tl.X + rltv_x + _horizontalOffset, tl.Y + rltv_y + _verticalOffset), _popupTarget); + tl = new Point(tl.X + rltv_x + _horizontalOffset, tl.Y + rltv_y + _verticalOffset); } + if (ClipToBounds) { + tl = tl.within_bounds( + x_max: AdornedElement.RenderSize.Width - el_width, + y_max: AdornedElement.RenderSize.Height - el_height); + } + return _popupTarget.TranslatePoint(tl, _popupTarget); } } } \ No newline at end of file diff --git a/src/client/spark/view/Extensions/WPFExtensions.cs b/src/client/spark/view/Extensions/WPFExtensions.cs index 1accb6894..d3cd43afa 100644 --- a/src/client/spark/view/Extensions/WPFExtensions.cs +++ b/src/client/spark/view/Extensions/WPFExtensions.cs @@ -1,4 +1,5 @@ using bts; +using bts.utils; using mbts.utils; using System; using System.Collections.Generic; @@ -116,6 +117,9 @@ namespace mbts.ui { return image_source; } + public static Point within_bounds(this Point point, double x_min = 0, double y_min = 0, double x_max = double.PositiveInfinity, double y_max = double.PositiveInfinity) => + new Point(MathUtils.within_range(x_min, x_max, point.X), MathUtils.within_range(y_min, y_max, point.Y)); + // Perform a breadth first traversal of all children returning any that match the predicate. // Matching children are *not* further traversed public static IEnumerable visual_children_where(this FrameworkElement v, Func match) { From 912ddf3a2af334cc1ac25a3682a68b4f6ad33d04 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 2 Apr 2019 12:51:08 -0500 Subject: [PATCH 11/54] Ladder/MiniLadder - added 'CanUserSendOrders' dp, when false a 'No' cursor is displayed over bid/ask columns --- .../Trading/Ladder/View/LadderGridHost.cs | 36 +++++++++++++++++++ .../Ladder/View/LadderTactileAdorner.cs | 17 ++++++--- .../Trading/Ladder/View/MiniLadderView.xaml | 1 + .../Ladder/View/MiniLadderView.xaml.cs | 12 +++++++ 4 files changed, 62 insertions(+), 4 deletions(-) diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs index d9227595e..c0a1d8258 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs @@ -5,6 +5,7 @@ using bts.utils; using mbts.co2; using mbts.ui; using mbts.ui.controls; +using mbts.ui.extensions; using mbts.ui.spark; using mbts.ui.utility.text; using mbts.utils; @@ -192,6 +193,25 @@ namespace mbts.spark { set => SetValue(LastColumnWidthProperty, value); } + #region CanUserSendOrders + public static readonly DependencyProperty CanUserSendOrdersProperty = + DependencyProperty.Register( + nameof(CanUserSendOrders), + typeof(bool), + typeof(LadderGridHost), + new PropertyMetadata(true, (d, e) => ((LadderGridHost)d).OnCanUserSendOrdersChanged(e))); + + public bool CanUserSendOrders { + get => (bool)GetValue(CanUserSendOrdersProperty); + set => SetValue(CanUserSendOrdersProperty, value); + } + + event Action CanUserSendOrdersChanged; + + void OnCanUserSendOrdersChanged(DependencyPropertyChangedEventArgs e) => + CanUserSendOrdersChanged?.Invoke((bool)e.NewValue); + #endregion + #region Command public ICommand Command { get => (ICommand)GetValue(CommandProperty); @@ -244,6 +264,15 @@ namespace mbts.spark { public void drag_out_of_bounds() => _tactile_adorner?.drag_out_of_bounds(); + public IObservable subscribe_hover_column() => + Observable.Create(o => { + notify(Mouse.GetPosition(this)); + return this.SubscribePreviewMouseMove((s, e) => notify(e.GetPosition(this))); + void notify(Point pt) => + o.OnNext(_column_for_point(pt)?.column_type ?? ColumnType.None); + }); + + public override void OnApplyTemplate() { base.OnApplyTemplate(); _scrollViewer = this.descendants_of_type().First(); @@ -468,6 +497,13 @@ namespace mbts.spark { } } + IObservable _subscribe_can_send_orders() => + Observable.Create(o => { + o.OnNext(CanUserSendOrders); + CanUserSendOrdersChanged += o.OnNext; + return Disposable.Create(() => CanUserSendOrdersChanged -= o.OnNext); + }); + #region Timer.Tick, Refresh Methods void _tick() { if (_settings != null) { diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderTactileAdorner.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderTactileAdorner.cs index d2687010d..ef8d80395 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderTactileAdorner.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderTactileAdorner.cs @@ -1,9 +1,9 @@ using mbts.ui; using mbts.ui.controls; using mbts.ui.extensions; -using mbts.ui.utility.text; using System; using System.Collections.Generic; +using System.Reactive.Linq; using System.Windows; using System.Windows.Controls; using System.Windows.Documents; @@ -30,7 +30,7 @@ namespace mbts.spark { readonly LadderGridHost _host; readonly IList _hooks; - bool _is_mouse_over, _is_mouse_down, _is_mouse_dragging; + bool _is_mouse_over, _is_mouse_down, _is_mouse_dragging, _can_send_orders; int _curr_row; Column _curr_column = Column.Empty; @@ -41,6 +41,10 @@ namespace mbts.spark { _bid_mouse_down_pen = new Pen(new SolidColorBrush(Color.FromRgb(102, 178, 255)), 1).frozen(); _ask_mouse_down_pen = new Pen(new SolidColorBrush(Color.FromRgb(255, 178, 102)), 1).frozen(); _hooks = new List { + _host._subscribe_can_send_orders().Subscribe(v => { + _can_send_orders = v; + _host.Cursor = _evaluate_position(); + }), _host.SubscribeMouseEnter(_host_MouseEnter), _host.SubscribeMouseMove(_host_MouseMove), _host.SubscribeMouseLeave(_host_MouseLeave), @@ -88,7 +92,7 @@ namespace mbts.spark { _draw_cell(drawingContext, _navy_pen, x, y, _curr_column.settings.width); } } - else if (_is_mouse_over && (_curr_column.column_type == ColumnType.Bid || _curr_column.column_type == ColumnType.Ask)) { + else if (_is_mouse_over && _can_send_orders && (_curr_column.column_type == ColumnType.Bid || _curr_column.column_type == ColumnType.Ask)) { double y = _curr_row * _host._settings.row_height; double x = _curr_column.x_left; Pen style = default; @@ -112,12 +116,17 @@ namespace mbts.spark { } } + Cursor _evaluate_position() { + var pos = Mouse.GetPosition(_host); + return _evaluate_position(_host._column_for_point(pos), pos, _host.columns); + } + Cursor _evaluate_position(Column column, Point point, Column[] columns) { if (columns.Length == 0) return Cursors.Arrow; switch (column.column_type) { case ColumnType.Bid: - case ColumnType.Ask: return Cursors.Hand; + case ColumnType.Ask: return _can_send_orders ? Cursors.Hand : Cursors.No; default: return Cursors.Arrow; } } diff --git a/src/client/spark/Modules/Trading/Ladder/View/MiniLadderView.xaml b/src/client/spark/Modules/Trading/Ladder/View/MiniLadderView.xaml index 2507c169d..4f3ca62aa 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/MiniLadderView.xaml +++ b/src/client/spark/Modules/Trading/Ladder/View/MiniLadderView.xaml @@ -87,6 +87,7 @@ ask_column_width="{Binding Settings.ask_column.width, RelativeSource={RelativeSource AncestorType=usp:MiniLadderView}}" LastColumnWidth="{Binding Settings.last_column.width, RelativeSource={RelativeSource AncestorType=usp:MiniLadderView}}" VolumeColumnWidth="{Binding Settings.volume_column.general.width, RelativeSource={RelativeSource AncestorType=usp:MiniLadderView}}" + CanUserSendOrders="{Binding CanUserSendOrders, RelativeSource={RelativeSource AncestorType=usp:MiniLadderView}}" > + + + + + + + @ + + + + + + + + + + + + @@ -300,18 +329,27 @@ - + + + + + + + - @@ -356,7 +394,7 @@ - + Value; + return new ValidationResult(false, "Not an integer."); + } + + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/src/client/spark/view/Converters/Numeric/IntSubtractionConverter.cs b/src/client/spark/view/Converters/Numeric/IntSubtractionConverter.cs new file mode 100644 index 000000000..fbaefcdd2 --- /dev/null +++ b/src/client/spark/view/Converters/Numeric/IntSubtractionConverter.cs @@ -0,0 +1,24 @@ +using System; +using System.Globalization; +using System.Windows.Controls; +using System.Windows.Data; + +namespace mbts.ui.converters { + [ValueConversion(typeof(double), typeof(string))] + class IntSubtractionConverter : IValueConverter { + public int Value { get; set; } + + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { + if (value is int i) + return i - Value; + return new ValidationResult(false, "Not an integer."); + } + + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) { + if (value is int i) + return i + Value; + return new ValidationResult(false, "Not an integer."); + } + } +} \ No newline at end of file diff --git a/src/client/spark/view/Spark/Core/OrderUtils.cs b/src/client/spark/view/Spark/Core/OrderUtils.cs index 9a999c65a..15d8f70bf 100644 --- a/src/client/spark/view/Spark/Core/OrderUtils.cs +++ b/src/client/spark/view/Spark/Core/OrderUtils.cs @@ -165,16 +165,23 @@ namespace mbts.spark { $"{(order.HasDef ? order.Def.Side.ToString() : "(unknown-side)")} {(order.HasState ? ($@"{spec.format(order.State.Price)} @ {order.State.Quantity}") : "(unknown-price) @ (unknown-quantity)")}"; public static string short_description(this OrderRecordImmutable order, SecurityImmutable? security) { - var sb = new StringBuilderEx("[", order.Key.ToString(), "] ", "[", camel_to_title_case(order.status().ToString()), "] ", security.display_name(), " ", order.side().ToString(), " "); - if (order.HasState) { - sb.Add(order.State.Quantity.ToString(), " @ ", security.spec_or_default().format(order.State.Price), " (filled ", order.State.FilledQuantity.ToString()); - if (order.State.FilledQuantity > 0) { - sb.Add(" @ ", security.spec_or_default().format(order.State.AvgPrice)); - } - sb.Add(")"); - } else { - sb.Add("(unknown-quantity) @ (unknown-price)"); - } + var spec = security.spec_or_default(); + return new StringBuilderEx( + security.display_name(), " ", + order.side().ToString(), " ", + price_quantity_description(order.price(), order.quantity(), spec), " (", + filled_status_description(order, spec), ")" + ).ToString(); + } + + public static string price_quantity_description(double price, uint quantity, ContractSpecificationImmutable spec) => + new StringBuilderEx(quantity.ToString(), " @ ", spec.format(price) ?? price.ToString("#0.00##")).ToString(); + + public static string filled_status_description(this OrderRecordImmutable order, ContractSpecificationImmutable spec) { + var sb = new StringBuilderEx("filled ", order.filled().ToString()); + if (order.filled() > 0) + sb.Add(" @ ", spec.format(order.avg_price())); + sb.Add(", ", camel_to_title_case(order.status().ToString(), TextCapitalizationFormat.NoCaps)); return sb.ToString(); } From 4b8d66de979d1d1c148ca0fb86390cf4fff51248 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 2 Apr 2019 16:54:55 -0500 Subject: [PATCH 17/54] OrderBookView - 'Modify Orders' button tooltip --- .../spark/Modules/Trading/OrderBook/View/OrderBookView.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml index d4483e22d..56418a0bc 100644 --- a/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml +++ b/src/client/spark/Modules/Trading/OrderBook/View/OrderBookView.xaml @@ -377,7 +377,7 @@ -