diff --git a/.gitignore b/.gitignore
index 10a357f8b..6896b131c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,5 +32,4 @@ trace_data/
/src/lib/orderman/perf_analysis/last_pretty_log.csv
/src/lib/orderman/perf_analysis/log.csv
/doc/user/public/*
-.ionide/*
-src/web/ui/.ionide/symbolCache.db
+.ionide/*
diff --git a/doc/user/CMakeDeps.cmake b/doc/user/CMakeDeps.cmake
index 636b0797c..59a6b66b9 100644
--- a/doc/user/CMakeDeps.cmake
+++ b/doc/user/CMakeDeps.cmake
@@ -1 +1 @@
-set(sources /home/ppinto/Dropbox/bts/spark/doc/user/build.sh;content/_index.md;content/bts_spark/Algos/_index.md;content/bts_spark/Glossary/index.md;content/bts_spark/Help/about_spark.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Help/index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Launcher/index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Logging-In-to-the-System/index.md;content/bts_spark/Market/change_securities.png;content/bts_spark/Market/image11.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/index.md;content/bts_spark/Market/market_view.png;content/bts_spark/Market/settings_icon.png;content/bts_spark/Market/time_and_sales.png;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/My-Windows/index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Settings/index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Spreader/index.md;content/bts_spark/Trading/algo_studio.png;content/bts_spark/Trading/collapse_all_icon.png;content/bts_spark/Trading/cover_algo_control.png;content/bts_spark/Trading/expand_all_icon.png;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/index.md;content/bts_spark/Trading/join_algo_control.png;content/bts_spark/Trading/ladder.png;content/bts_spark/Trading/ladder_badges.png;content/bts_spark/Trading/ladder_main_part.png;content/bts_spark/Trading/lean_algo_control.png;content/bts_spark/Trading/mini_orderbook.png;content/bts_spark/Trading/oco_algo_control.png;content/bts_spark/Trading/offset_algo_control.png;content/bts_spark/Trading/pnl_calculation.png;content/bts_spark/Trading/pnl_window.png;content/bts_spark/Trading/recreate_icon.png;content/bts_spark/Trading/settings_icon.png;content/bts_spark/Trading/spark_menu_order_book.png;content/bts_spark/Trading/top_algo_control.png;content/bts_spark/Trading/trigger_algo_control.png;content/bts_spark/_index.md;content/release_notes/_index.md;content/system_requirements/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html)
\ No newline at end of file
+set(sources /home/ppinto/Dropbox/bts/spark/doc/user/build.sh;content/_index.md;content/bts_spark/Glossary/_index.md;content/bts_spark/Help/_index.md;content/bts_spark/Help/about_spark.png;content/bts_spark/Help/image39.png;content/bts_spark/Help/image58.png;content/bts_spark/Launcher/_index.md;content/bts_spark/Launcher/image38.png;content/bts_spark/Launcher/image68.png;content/bts_spark/Logging-In-to-the-System/_index.md;content/bts_spark/Logging-In-to-the-System/image3.png;content/bts_spark/Logging-In-to-the-System/image64.png;content/bts_spark/Market/_index.md;content/bts_spark/Market/change_securities.png;content/bts_spark/Market/image11.png;content/bts_spark/Market/image14.png;content/bts_spark/Market/image20.png;content/bts_spark/Market/image21.png;content/bts_spark/Market/image23.png;content/bts_spark/Market/image24.png;content/bts_spark/Market/image34.png;content/bts_spark/Market/image49.png;content/bts_spark/Market/image53.png;content/bts_spark/Market/image66.png;content/bts_spark/Market/image69.png;content/bts_spark/Market/market_view.png;content/bts_spark/Market/settings_icon.png;content/bts_spark/Market/time_and_sales.png;content/bts_spark/My-Windows/_index.md;content/bts_spark/My-Windows/image15.png;content/bts_spark/My-Windows/image16.png;content/bts_spark/My-Windows/image37.png;content/bts_spark/Settings/_index.md;content/bts_spark/Settings/image51.png;content/bts_spark/Settings/image9.png;content/bts_spark/Spreader/_index.md;content/bts_spark/Spreader/image10.png;content/bts_spark/Spreader/image13.png;content/bts_spark/Spreader/image18.png;content/bts_spark/Spreader/image19.png;content/bts_spark/Spreader/image28.png;content/bts_spark/Spreader/image29.png;content/bts_spark/Spreader/image31.png;content/bts_spark/Spreader/image35.png;content/bts_spark/Spreader/image40.png;content/bts_spark/Spreader/image43.png;content/bts_spark/Spreader/image54.png;content/bts_spark/Spreader/image55.png;content/bts_spark/Spreader/image56.png;content/bts_spark/Spreader/image6.png;content/bts_spark/Spreader/image7.png;content/bts_spark/Spreader/image70.png;content/bts_spark/Spreader/image72.png;content/bts_spark/Spreader/image8.png;content/bts_spark/Trading/OrderTypes/index.md;content/bts_spark/Trading/_index.md;content/bts_spark/Trading/algo_studio.png;content/bts_spark/Trading/collapse_all_icon.png;content/bts_spark/Trading/cover_algo_control.png;content/bts_spark/Trading/expand_all_icon.png;content/bts_spark/Trading/image1.png;content/bts_spark/Trading/image17.png;content/bts_spark/Trading/image2.png;content/bts_spark/Trading/image25.png;content/bts_spark/Trading/image27.png;content/bts_spark/Trading/image33.png;content/bts_spark/Trading/image42.png;content/bts_spark/Trading/image44.png;content/bts_spark/Trading/image47.png;content/bts_spark/Trading/image48.png;content/bts_spark/Trading/image5.png;content/bts_spark/Trading/image50.png;content/bts_spark/Trading/image52.png;content/bts_spark/Trading/image57.png;content/bts_spark/Trading/image59.png;content/bts_spark/Trading/image60.png;content/bts_spark/Trading/image61.png;content/bts_spark/Trading/image62.png;content/bts_spark/Trading/image73.png;content/bts_spark/Trading/image74.png;content/bts_spark/Trading/join_algo_control.png;content/bts_spark/Trading/ladder.png;content/bts_spark/Trading/ladder_badges.png;content/bts_spark/Trading/ladder_main_part.png;content/bts_spark/Trading/lean_algo_control.png;content/bts_spark/Trading/mini_orderbook.png;content/bts_spark/Trading/oco_algo_control.png;content/bts_spark/Trading/offset_algo_control.png;content/bts_spark/Trading/pnl_calculation.png;content/bts_spark/Trading/pnl_window.png;content/bts_spark/Trading/recreate_icon.png;content/bts_spark/Trading/settings_icon.png;content/bts_spark/Trading/spark_menu_order_book.png;content/bts_spark/Trading/top_algo_control.png;content/bts_spark/Trading/trigger_algo_control.png;content/bts_spark/_index.md;content/release_notes/_index.md;content/system_requirements/_index.md;static/book.js;static/favicon.ico;static/image.js;templates/index.html;templates/page.html;templates/section.html;templates/shortcodes/back_button.html)
\ No newline at end of file
diff --git a/doc/user/content/release_notes/_index.md b/doc/user/content/release_notes/_index.md
index 0d865e921..41d6c4811 100644
--- a/doc/user/content/release_notes/_index.md
+++ b/doc/user/content/release_notes/_index.md
@@ -4,6 +4,56 @@ weight = 3
sort_by = "weight"
insert_anchor_links = "right"
+++
+## 2.10.0
+### User Visible Changes
+ - Fills now include information about the algo that originated the fill
+ - A new, more powerful PnL form is now available
+### API Changes
+ - Added security state information (pre open, halted, normal, closed, etc)
+### Internal Changes
+ - Fixed an issue that was stopping us from interpreting SOD times as local rather than GMT
+
+## 2.9.1
+### Bug Fixes
+ - Fixed an issue with trade sound alerts, where in some cases the use of a "In Between" condition could lead to a UI failure.
+ - Fixed an issue with the display of the new raw position column in the market view window.
+ - Fixed the popup label that describes the raw position information in the ladder
+### Internal Changes
+ - Avoided shipping production configuration defaults that lead to trying to download a position file for the development sftp server.
+### Api
+ - C# API sample now uses synchronous calls.
+
+## 2.9.0
+### User Visible Changes
+ - Improved Workspace management User Interface
+ - Added the ability to change grid background colors
+ - The Spark UI Window group now has a title in the Windows task bar
+ - Added sound alerts for trade events, see Launcher -> Settings -> Alerts
+ - Allowed composite algos that are attached to existing orders to identify fills that were already present prior to attachment
+ - Added import facilities for GMI position files
+ - Added the ability for risk managers to enter manual fills
+ - Added "raw" P&L columns, that is columns that *do not* include spread legs in their accounting
+### Bug Fixes
+ - Fixed the settings action menu (Load/Save/Reset to Factory)
+ - Fixed the method used to determine if a security is expired to take into account the start of day time
+### API Changes
+ - Fixed an issue in the Client SDK that could lead to occasional failures to connect to the spark server as well as excessive memory usage.
+ - Added the ability for algo orders to distinguish fills existing prior to launch
+### Internal Changes
+ - Changed how we packaged certain third-party components
+ - Added logging of entitlement status
+ - Tagged outgoing orders with sequence number of marketdata or FIX event that triggered them
+## 2.8.3
+### Bug Fixes
+ - Fixed a bug that could cause an OrderBook's Security column filter to be blank
+ - Fixed a bug that could cause a UI failure when clearing a filter selection on a filtering widget
+## 2.8.2
+### Bug Fixes
+ - Added proper display factors for SOM spreads
+ - Fixed a bug that could cause a UI failure when trying to change settings in a synthetic ladder
+## 2.8.1
+### Bug fixes
+ - Fixed an error in the UI grids filtering widget
## 2.8.0
### User Visible Changes
- Added ProRata and Scratch algos
diff --git a/docker/linux b/docker/linux
index e13bb5d8d..b09d4c035 160000
--- a/docker/linux
+++ b/docker/linux
@@ -1 +1 @@
-Subproject commit e13bb5d8df14171a9a5abfdb8b6b4ecbc519032a
+Subproject commit b09d4c035b4c0d0e600c7639cd9cb5edaee98d2e
diff --git a/externals b/externals
index 67a79263b..6b8c745fb 160000
--- a/externals
+++ b/externals
@@ -1 +1 @@
-Subproject commit 67a79263ba116a7646beb8368cef015530bea027
+Subproject commit 6b8c745fb2725ad92fc0292b7836e0838e7e1679
diff --git a/src/client/spark/App.xaml.cs b/src/client/spark/App.xaml.cs
index ea2b1de78..0883bc861 100644
--- a/src/client/spark/App.xaml.cs
+++ b/src/client/spark/App.xaml.cs
@@ -70,7 +70,6 @@ namespace mbts.ui.shell
{
Log.Gen.info("Application.OnExit");
if (_runtime != null) _runtime.Dispose();
- utils.BTSNativeMethods.finit_spark_lib();
base.OnExit(e);
Environment.Exit(0);
}
diff --git a/src/client/spark/Daemons/GlobalAlertsDaemon.cs b/src/client/spark/Daemons/GlobalAlertsDaemon.cs
new file mode 100644
index 000000000..7cc191ea9
--- /dev/null
+++ b/src/client/spark/Daemons/GlobalAlertsDaemon.cs
@@ -0,0 +1,68 @@
+using bts.api;
+using bts.shell;
+using mbts;
+using mbts.persist;
+using mbts.spark;
+using mbts.ui;
+using mbts.ui.spark;
+using mbts.ui.utilities;
+using System;
+using System.ComponentModel.Composition;
+using System.Linq;
+using System.Reactive.Disposables;
+using System.Reactive.Linq;
+using System.Windows;
+using Disposable = mbts.Disposable;
+
+namespace bts {
+ [Export(typeof(IShellDaemon))]
+ class GlobalAlertsDaemon : IShellDaemon, IDisposable {
+ const string
+ // used for logging/diagnostic purposes
+ _window_name = "Global Alerts Dialog",
+ // actual window title
+ _window_title = "Alerts";
+
+ readonly ThreadedWindowLauncher _launcher;
+ readonly UserSettingsHub _hub;
+ readonly IBus _bus;
+ readonly INotificationService _notification_service;
+ IDisposable _dispose;
+
+ [ImportingConstructor]
+ public GlobalAlertsDaemon(IBus bus, UserSettingsHub hub, INotificationService notification_service) {
+ _bus = bus;
+ _hub = hub;
+ _notification_service = notification_service;
+ _launcher = new ThreadedWindowLauncher(_window_name);
+ _dispose = Disposable.Create(
+ bus.subscribe(SparkTags.ShowGlobalAlertsTag)
+ .Subscribe(_ => _launcher.show(_view_factory)),
+ _hub.subscribe_default_settings()
+ .SubscribeEach(s => new CompositeDisposable(
+ s.alerts.trade_alerts.Where(t => t.is_enabled).Select(
+ a => _notification_service.link_to_trades(
+ a.predicate.security_criteria, a.predicate.create(), a.sound)))));
+ }
+
+ Window _view_factory() {
+ var vm = new GlobalAlertsVM();
+ vm.load_from(_hub.current.alerts);
+ vm.request_commit += commit;
+ var sec_sub = _bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(m => vm.security_map = m);
+ var win = new GlobalAlertsDialog {
+ Title = "Alerts",
+ DataContext = vm
+ };
+ win.Closed += (s, e) => Disposable.dispose(ref sec_sub);
+ return win;
+ void commit() {
+ var s = _hub.current.with(alerts: vm.create());
+ _hub.save_default(s).ignore();
+ }
+ }
+
+ public void Dispose() =>
+ Disposable.dispose(ref _dispose);
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs
index 3cc17164d..aef0d6142 100644
--- a/src/client/spark/Images/Icons.cs
+++ b/src/client/spark/Images/Icons.cs
@@ -40,14 +40,18 @@ namespace mbts.ui {
EditDocumentAltGeometryKey = nameof(EditDocumentAltGeometryKey),
EditDocumentGeometryKey = nameof(EditDocumentGeometryKey),
GearGeometryKey = nameof(GearGeometryKey),
+ HornGeometryKey = nameof(HornGeometryKey),
+ KeyGeometryKey = nameof(KeyGeometryKey),
LetterAKey = nameof(LetterAKey),
LetterDKey = nameof(LetterDKey),
OrdersGeometryKey = nameof(OrdersGeometryKey),
+ PauseGeometryKey = nameof(PauseGeometryKey),
PaymentGeometryKey = nameof(PaymentGeometryKey),
PencilGeometryKey = nameof(PencilGeometryKey),
PlayGeometryKey = nameof(PlayGeometryKey),
ProhibitedGeometryKey = nameof(ProhibitedGeometryKey),
RubberStampGeometryKey = nameof(RubberStampGeometryKey),
+ SpeakerGeometryKey = nameof(SpeakerGeometryKey),
StarGeometryKey = nameof(StarGeometryKey),
ToolsGeometryKey = nameof(ToolsGeometryKey),
TrashGeometryKey = nameof(TrashGeometryKey),
@@ -149,7 +153,7 @@ namespace mbts.ui {
public static ImageSource CheckMark => create_icon(CheckMarkGeometryKey);
public static ImageSource Clock { get { return load_resource_and_freeze("Clock"); } }
public static ImageSource CopyWF => create_icon(CopyWFGeometryKey);
- public static ImageSource DataEdit => create_icon(DataEditGeometryKey, Brushes.White, new Pen(Brushes.Black, 1).frozen());
+ public static ImageSource DataEdit => create_icon(DataEditGeometryKey);
public static ImageSource Defrag { get { return load_resource_and_freeze("Defrag"); } }
public static ImageSource DetachAlgos => create_icon_and_rotate(DetachAlgosKey, Brushes.Red);
public static ImageSource Disk => create_icon(DiskGeometryKey);
@@ -168,14 +172,19 @@ namespace mbts.ui {
public static ImageSource FilterActive { get { return load_resource_and_freeze("FilterActive"); } }
public static ImageSource FilterError { get { return load_resource_and_freeze("FilterError"); } }
public static ImageSource Gear => create_icon(GearGeometryKey);
+ public static ImageSource Horn => create_icon(HornGeometryKey);
public static ImageSource Import => load_resource_and_freeze("Import");
+ public static ImageSource Key => create_icon(KeyGeometryKey);
public static ImageSource Knight { get { return load_resource_and_freeze("Knight"); } }
+ public static ImageSource Pause => create_icon(PauseGeometryKey);
public static ImageSource Payment => create_icon(PaymentGeometryKey);
public static ImageSource Pencil => create_icon(PencilGeometryKey);
+ public static ImageSource Play => create_icon(PlayGeometryKey);
public static ImageSource Prohibited => create_icon(ProhibitedGeometryKey);
public static ImageSource RubberStamp => create_icon(RubberStampGeometryKey);
public static ImageSource RedoCircular => create_icon(UndoCircularGeometryKey, Brushes.Black, null, new ScaleTransform(-1, 1));
public static ImageSource Spawn { get { return load_resource_and_freeze("Spawn"); } }
+ public static ImageSource Speaker => create_icon(SpeakerGeometryKey);
public static ImageSource Star => create_icon(StarGeometryKey);
public static ImageSource Target { get { return load_resource_and_freeze("Target"); } }
public static ImageSource Tetris { get { return load_resource_and_freeze("Tetris"); } }
diff --git a/src/client/spark/Images/Vector/Icons.xaml b/src/client/spark/Images/Vector/Icons.xaml
index a0ce61363..650c43eb0 100644
--- a/src/client/spark/Images/Vector/Icons.xaml
+++ b/src/client/spark/Images/Vector/Icons.xaml
@@ -1,7 +1,7 @@

@@ -18,9 +18,7 @@
Ttile: Add free icon
Credit: Icon made by Gregor Cresnar from www.flaticon.com-->
- M393,480.3c0-5-4.1-9.1-9.1-9.1H18.2V105.5c0-5-4.1-9.1-9.1-9.1S0,100.5,0,105.5v374.8c0,5,4.1,9.1,9.1,9.1h374.8 C388.9,489.4,393,485.3,393,480.3z
- M373.9,187.5H302v-71.9c0-5-4.1-9.1-9.1-9.1s-9.1,4.1-9.1,9.1v71.9h-71.9c-5,0-9.1,4.1-9.1,9.1s4.1,9.1,9.1,9.1h71.9v71.9 c0,5,4.1,9.1,9.1,9.1s9.1-4.1,9.1-9.1v-71.9h71.9c5,0,9.1-4.1,9.1-9.1C382.9,191.5,378.9,187.5,373.9,187.5z
- M105.5,393h374.8c5,0,9.1-4.1,9.1-9.1V9.1c0-5-4.1-9.1-9.1-9.1H105.5c-5,0-9.1,4.1-9.1,9.1v374.8 C96.4,388.9,100.5,393,105.5,393z M114.5,18.2h356.7v356.7H114.5V18.2z
+ M 87.5 10 C 80.313542 10 74.400391 15.913151 74.400391 23.099609 V 397.90039 C 74.400391 405.08685 80.313541 411 87.5 411 h 374.80078 c 7.18646 0 13.09961 -5.91315 13.09961 -13.09961 V 23.099609 C 475.40039 15.913151 469.48724 10 462.30078 10 Z m 13 26.199219 H 449.19922 V 384.90039 H 100.5 Z M 21.099609 76.400391 C 13.912943 76.400391 8 82.313333 8 89.5 v 374.80078 c 0 7.18667 5.912943 13.09961 13.099609 13.09961 H 395.90039 c 7.18667 0 13.09961 -5.91294 13.09961 -13.09961 0 -7.18667 -5.91294 -13.10156 -13.09961 -13.10156 H 34.199219 V 89.5 c 0 -7.186667 -5.912943 -13.099609 -13.09961 -13.099609 z M 274.90039 116.5 c -7.18667 0 -13.09961 5.91294 -13.09961 13.09961 V 197.5 h -67.90039 c -7.18667 0 -13.09961 5.91294 -13.09961 13.09961 0 7.18667 5.91294 13.09961 13.09961 13.09961 h 67.90039 v 67.90039 c 0 7.18667 5.91294 13.09961 13.09961 13.09961 7.18667 0 13.09961 -5.91294 13.09961 -13.09961 v -67.90039 h 67.90039 c 7.18667 0 13.09961 -5.91294 13.09961 -13.09961 v -0.0391 -0.0391 C 368.85982 203.37217 363.03372 197.5 355.90039 197.5 H 288 V 129.59961 C 288 122.41294 282.08706 116.5 274.90039 116.5 Z
-
+
diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs
index 2cb3efe52..947a02440 100644
--- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs
+++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs
@@ -36,6 +36,7 @@ namespace mbts.spark {
readonly MyOrderSummarizer _order_summarizer = new MyOrderSummarizer();
readonly MDDisplayHelper.SizeFormatter _size_formatter = MDDisplayHelper.get_formatter(MarketSizeDisplay.get_default());
Property _bid_direct_size, _bid_merged_size, _ask_direct_size, _ask_merged_size;
+ double _raw_day_position;
string _bid_merged_size_text, _ask_merged_size_text;
ulong _bbo_ref, _last_ref;
@@ -89,6 +90,10 @@ namespace mbts.spark {
_dispose = Disposable.Create(
_orders_model.on_security_root_orders(security.Id).OnDispatcher().Subscribe(_on_orders),
_position.OnDispatcher().Subscribe(v => _animation.animate_position(v.newval > v.oldval)),
+ _orders_model.on_security_positions(security.Id).OnDispatcher().Subscribe(t => {
+ if (Set(ref _raw_day_position, t.state.Values.Sum(p => p.Item2.raw_day_pos()), nameof(raw_day_position)))
+ raise_invalidated();
+ }),
_inside_bids.OnDispatcher().Subscribe(v => _animation.animate_working_bids_inside(v.newval)),
_inside_asks.OnDispatcher().Subscribe(v => _animation.animate_working_asks_inside(v.newval)),
_day_change.OnDispatcher().Subscribe(v => _animation.animate_day_change(v.newval > v.oldval)),
@@ -102,6 +107,7 @@ namespace mbts.spark {
public bool inside_bids => _inside_bids.value;
public bool inside_asks => _inside_asks.value;
public int position => _position.value;
+ public double raw_day_position => _raw_day_position;
public double last_price => _last_price.Value;
public uint last_size => _last_size.value;
public double bid_price => _bid_price.Value;
diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs
index 73581518c..b57e17d33 100644
--- a/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs
+++ b/src/client/spark/Modules/Market/MarketView/MarketViewVM.cs
@@ -10,7 +10,6 @@ using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Reactive.Linq;
-using System.Reactive.Subjects;
using System.Windows.Data;
using System.Windows.Media;
using static bts.shell.MarketViewWindowFactory;
@@ -42,12 +41,13 @@ namespace mbts.spark {
add_col(Columns.Last, "Last", r => r.format_price(r.last_price), nameof(Row.last_price), DefaultColumnWidths.Price, last_price_filter, DataGridFilterKnownTemplates.DoubleMinMax);
add_col(Columns.LastSize, merged_size_col_header, r => r.last_size.ToString(), nameof(Row.last_size), DefaultColumnWidths.Size, last_size_filter, DataGridFilterKnownTemplates.UIntMinMax, h_alignment: System.Windows.HorizontalAlignment.Right);
add_col(Columns.Position, "Pos", r => r.position.ToString(), nameof(Row.position), DefaultColumnWidths.Size, position_filter, DataGridFilterKnownTemplates.IntMinMax, true, h_alignment: System.Windows.HorizontalAlignment.Right);
+ add_col(Columns.RawDayPosition, "Raw Day Pos", r => SparkUtils.fmt_position(r.raw_day_position), nameof(Row.raw_day_position), DefaultColumnWidths.Size, raw_day_position_filter, DataGridFilterKnownTemplates.DoubleMinMax, true, h_alignment: System.Windows.HorizontalAlignment.Right);
add_hl_working_orders_col(Columns.WorkingBids, working_col_header, nameof(Row.working_bids_text), nameof(Row.working_best_bid), nameof(Row.working_bids_click), working_bid_volume_filter, BTSColors.MarketData.bid, System.Windows.HorizontalAlignment.Right);
add_col(Columns.BidImpliedSize, implied_size_col_header, r => r.bid_implied_size.ToString(), nameof(Row.bid_implied_size), DefaultColumnWidths.ImpliedDirectMergedSize, bid_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
add_col(Columns.BidDirectSize, direct_size_col_header, r => r.bid_direct_size.ToString(), nameof(Row.bid_direct_size), DefaultColumnWidths.ImpliedDirectMergedSize, bid_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
add_hl_merged_size_col(Columns.BidMergedSize, merged_size_col_header, nameof(Row.bid_merged_size), nameof(Row.bid_merged_size_text), nameof(Row.bid_merged_size_click), bid_merged_size_filter, BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
- add_hl_price_col(Columns.Bid, "Bid", nameof(Row.bid_price), nameof(Row.bid_price_click), bid_price_filter, BTSColors.header_text, BTSColors.MarketData.bid_brush, h_alignment: System.Windows.HorizontalAlignment.Right);
- add_hl_price_col(Columns.Ask, "Ask", nameof(Row.ask_price), nameof(Row.ask_price_click), ask_price_filter, BTSColors.header_text, BTSColors.MarketData.ask_brush, h_alignment: System.Windows.HorizontalAlignment.Right);
+ add_hl_price_col(Columns.Bid, "Bid", nameof(Row.bid_price), nameof(Row.bid_price_click), bid_price_filter, BTSColors.header_text, BTSColors.MarketData.bid, h_alignment: System.Windows.HorizontalAlignment.Right);
+ add_hl_price_col(Columns.Ask, "Ask", nameof(Row.ask_price), nameof(Row.ask_price_click), ask_price_filter, BTSColors.header_text, BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
add_hl_merged_size_col(Columns.AskMergedSize, merged_size_col_header, nameof(Row.ask_merged_size), nameof(Row.ask_merged_size_text), nameof(Row.ask_merged_size_click), ask_merged_size_filter, BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
add_col(Columns.AskDirectSize, direct_size_col_header, r => r.ask_direct_size.ToString(), nameof(Row.ask_direct_size), DefaultColumnWidths.ImpliedDirectMergedSize, ask_direct_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
add_col(Columns.AskImpliedSize, implied_size_col_header, r => r.ask_implied_size.ToString(), nameof(Row.ask_implied_size), DefaultColumnWidths.ImpliedDirectMergedSize, ask_implied_size_filter, DataGridFilterKnownTemplates.UIntMinMax, font_color: BTSColors.MarketData.ask, h_alignment: System.Windows.HorizontalAlignment.Right);
@@ -77,18 +77,18 @@ namespace mbts.spark {
horizontal_alignment = h_alignment
});
- void add_hl_price_col(Columns col_key, string header, string prop, string command_prop, IDataGridColumnFilter filter, Color foreground, Brush background, System.Windows.HorizontalAlignment h_alignment) =>
- add_hl_col(col_key, header, price_binding(prop), prop, command_prop, filter, DataGridFilterKnownTemplates.DoubleMinMax, DefaultColumnWidths.MViewPrice, foreground, background, DefaultSelectionHighlight, h_alignment);
+ void add_hl_price_col(Columns col_key, string header, string prop, string command_prop, IDataGridColumnFilter filter, Color foreground, Color? background, System.Windows.HorizontalAlignment h_alignment) =>
+ add_hl_col(col_key, header, price_binding(prop), prop, command_prop, filter, DataGridFilterKnownTemplates.DoubleMinMax, DefaultColumnWidths.MViewPrice, foreground, background, h_alignment);
void add_hl_merged_size_col(Columns col_key, string header, string sort_prop, string text_prop, string command_prop, IDataGridColumnFilter filter, Color foreground, System.Windows.HorizontalAlignment h_alignment) =>
- add_hl_col(col_key, header, new Binding(text_prop), sort_prop, command_prop, filter, DataGridFilterKnownTemplates.UIntMinMax, DefaultColumnWidths.ImpliedDirectMergedSize, foreground, null, null, h_alignment);
+ add_hl_col(col_key, header, new Binding(text_prop), sort_prop, command_prop, filter, DataGridFilterKnownTemplates.UIntMinMax, DefaultColumnWidths.ImpliedDirectMergedSize, foreground, null, h_alignment);
void add_hl_working_orders_col(Columns col_key, string header, string text_prop, string sort_prop, string command_prop, IDataGridColumnFilter filter, Color foreground, System.Windows.HorizontalAlignment h_alignment) =>
- add_hl_col(col_key, header, new Binding(text_prop), sort_prop, command_prop, filter, DataGridFilterKnownTemplates.IntMinMax, working_orders_col_width, foreground, null, null, h_alignment);
+ add_hl_col(col_key, header, new Binding(text_prop), sort_prop, command_prop, filter, DataGridFilterKnownTemplates.IntMinMax, working_orders_col_width, foreground, null, h_alignment);
void add_hl_col(
Columns col_key, string header, BindingBase binding, string prop, string command_prop,
- IDataGridColumnFilter filter, string filter_template, double width, Color foreground, Brush background, Brush background_overlay, System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) =>
+ IDataGridColumnFilter filter, string filter_template, double width, Color foreground, Color? background, System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) =>
columns.Add(new HyperlinkElementColumn(
col_key, binding, new Binding(command_prop), filter, filter_template) {
// it's necessary to have this id populated for grid settings
@@ -96,8 +96,7 @@ namespace mbts.spark {
Header = header,
sort_member_path = prop,
font_color_override = foreground,
- background = background,
- background_overlay = background_overlay,
+ background_color_override = background,
Width = DefaultColumnWidths.Price,
horizontal_alignment = h_alignment
});
@@ -111,14 +110,8 @@ namespace mbts.spark {
//
// make font-color immutable for Side, Size, (the font-color rule is hard-coded: MarketData.bid for Buy orders, MarketData.ask for Sells)
var col_settings_flags = new Dictionary {
- { Columns.Bid.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor },
- { Columns.Ask.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor },
- { Columns.BidImpliedSize.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor },
- { Columns.BidDirectSize.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor },
- { Columns.BidMergedSize.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor },
- { Columns.AskImpliedSize.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor },
- { Columns.AskDirectSize.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor },
- { Columns.AskMergedSize.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor },
+ { Columns.Bid.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableBackgroundColor },
+ { Columns.Ask.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor | GridColumnSettingsFeatureFlags.ImmutableBackgroundColor},
{ Columns.WorkingAsks.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor },
{ Columns.WorkingBids.ToString(), GridColumnSettingsFeatureFlags.ImmutableFontColor }
};
@@ -151,6 +144,7 @@ namespace mbts.spark {
session_low_filter.load_state(filters.session_low);
session_high_filter.load_state(filters.session_high);
position_filter.load_state(filters.position);
+ raw_day_position_filter.load_state(filters.raw_day_position);
working_bid_volume_filter.load_state(filters.working_bid_volume);
working_ask_volume_filter.load_state(filters.working_ask_volume);
volume_filter.load_state(filters.volume);
@@ -162,7 +156,7 @@ namespace mbts.spark {
bid_price_filter, bid_merged_size_filter, bid_direct_size_filter, bid_implied_size_filter,
ask_price_filter, ask_merged_size_filter, ask_direct_size_filter, ask_implied_size_filter,
last_price_filter, last_size_filter, day_change_filter, settlement_filter,
- session_low_filter, session_high_filter, position_filter, working_bid_volume_filter, working_ask_volume_filter, volume_filter, security_key_filter),
+ session_low_filter, session_high_filter, position_filter, raw_day_position_filter, working_bid_volume_filter, working_ask_volume_filter, volume_filter, security_key_filter),
settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager),
WorkLoop.Start("MarketView", _refresh)
);
@@ -230,6 +224,7 @@ namespace mbts.spark {
public IDataGridColumnPersistentFilter session_low_filter { get; } = new DoubleMinMax(r => r.session_low, nameof(Row.session_low));
public IDataGridColumnPersistentFilter session_high_filter { get; } = new DoubleMinMax(r => r.session_high, nameof(Row.session_high));
public IDataGridColumnPersistentFilter position_filter { get; } = new IntMinMax(r => r.position, nameof(Row.position));
+ public IDataGridColumnPersistentFilter raw_day_position_filter { get; } = new DoubleMinMax(r => r.raw_day_position, nameof(Row.raw_day_position));
public IDataGridColumnPersistentFilter working_bid_volume_filter { get; } = new IntMinMax(r => r.working_bid_volume, nameof(Row.working_bid_volume));
public IDataGridColumnPersistentFilter working_ask_volume_filter { get; } = new IntMinMax(r => r.working_ask_volume, nameof(Row.working_ask_volume));
public IDataGridColumnPersistentFilter volume_filter { get; } = new ULongMinMax(r => r.volume, nameof(Row.volume));
@@ -261,6 +256,7 @@ namespace mbts.spark {
session_low = session_low_filter.get_state(),
session_high = session_high_filter.get_state(),
position = position_filter.get_state(),
+ raw_day_position = raw_day_position_filter.get_state(),
working_bid_volume = working_bid_volume_filter.get_state(),
working_ask_volume = working_ask_volume_filter.get_state(),
volume = volume_filter.get_state(),
diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs
index edbea884b..86f9d5593 100644
--- a/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs
+++ b/src/client/spark/Modules/Market/MarketView/MarketViewView.xaml.cs
@@ -8,8 +8,34 @@ namespace mbts.ui.spark {
/// Interaction logic for MarketSheetsView.xaml
///
partial class MarketViewView : UserControl {
- public enum Columns { Security, Volume, Last, LastSize, Position, WorkingBids, Bid, BidMergedSize, BidDirectSize, BidImpliedSize, Ask, AskMergedSize, AskDirectSize, AskImpliedSize, WorkingAsks, Settlement, DayChange, SessionLow, SessionHigh, SecurityKey,
- MarketDescription, ClearedAlias, ProductDescription, HubAlias, StripName, MicCode
+ public enum Columns {
+ Security,
+ Volume,
+ Last,
+ LastSize,
+ Position,
+ RawDayPosition,
+ WorkingBids,
+ Bid,
+ BidMergedSize,
+ BidDirectSize,
+ BidImpliedSize,
+ Ask,
+ AskMergedSize,
+ AskDirectSize,
+ AskImpliedSize,
+ WorkingAsks,
+ Settlement,
+ DayChange,
+ SessionLow,
+ SessionHigh,
+ SecurityKey,
+ MarketDescription,
+ ClearedAlias,
+ ProductDescription,
+ HubAlias,
+ StripName,
+ MicCode
}
public MarketViewView() {
diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs
index 35f22e89c..dede41acc 100644
--- a/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs
+++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindow.cs
@@ -33,7 +33,7 @@ namespace mbts.spark {
_selected_security_criteria_backing,
_sorted_selected_security_criteria_backing;
- public MarketViewWindow(MarketViewWindowFactory factory, IBus bus, OrdersModel orders_model, MarketViewWindowFactory.StartupData state, WindowSettingsManager settings_manager)
+ public MarketViewWindow(MarketViewWindowFactory factory, IBus bus, OrdersModel orders_model, MarketViewWindowFactory.StartupData state, IWindowSettingsManager settings_manager)
: base("Market View", bus, factory, SparkCommands.ShowMarketView.icon) {
_orders_model = orders_model;
_state = state;
diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs
index 38931a3eb..9c49672a9 100644
--- a/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs
+++ b/src/client/spark/Modules/Market/MarketView/MarketViewWindowFactory.cs
@@ -1,4 +1,6 @@
using bts.api;
+using bts.proto;
+using bts.settings;
using mbts.persist;
using mbts.spark;
using mbts.spark.filters;
@@ -7,6 +9,7 @@ using mbts.ui.settings;
using ProtoBuf;
using System;
using System.Collections.Generic;
+using System.ComponentModel.Composition;
using System.Linq;
using System.Reactive.Linq;
using System.Threading.Tasks;
@@ -35,13 +38,8 @@ namespace bts.shell {
void _show(SecurityCriteria criteria) =>
_bus.post(SparkTags.ShowWindow, _create(StartupData.Default(criteria)));
- IShellWindow _create(StartupData state) {
- var settings_manager = new WindowSettingsManager(_settings_hub,
- state.grid,
- get: us => us.market_view_grid,
- set: (us, gs) => us.with(provided_market_view_gridsettings: gs));
- return new MarketViewWindow(this, _bus, _orders_model, state, settings_manager);
- }
+ IShellWindow _create(StartupData state) =>
+ new MarketViewWindow(this, _bus, _orders_model, state, _settings_hub.create_mview_settings_manager(state.grid));
[ProtoContract]
public class StartupData {
@@ -68,7 +66,29 @@ namespace bts.shell {
_sorting_criteria = sort;
}
- public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion);
+ public static GridSettings sanitize(GridSettings s) {
+ if (s == null) {
+ return null;
+ }
+
+ // column upgrade
+ var columns = s.columns.ToList();
+ var bid_col_index = columns.FindIndex(x => x.id == col_id(Columns.Bid));
+ var ask_col_index = columns.FindIndex(x => x.id == col_id(Columns.Ask));
+ if (bid_col_index > -1 && ask_col_index > -1) {
+ if (!columns[bid_col_index].background_color_override.HasValue) {
+ columns[bid_col_index] = columns[bid_col_index].with(background_color_override: new NullableColorProto(BTSColors.MarketData.bid.ToUint()));
+ }
+ if (!columns[ask_col_index].background_color_override.HasValue) {
+ columns[ask_col_index] = columns[ask_col_index].with(background_color_override: new NullableColorProto(BTSColors.MarketData.ask.ToUint()));
+ }
+ }
+ // and enable background color upgrade
+ return s.with(columns, enable_background_color: true);
+ }
+
+
+ public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion, enable_background_color: true);
public IReadOnlyList sorting_criterion => _sorting_criteria ?? (_sorting_criteria = DefaultColumns.default_sorting_criterion.ToList());
@@ -82,12 +102,13 @@ namespace bts.shell {
public static GridColumnSettings last => new GridColumnSettings(col_id(Columns.Last), DefaultColumnHeaders.Last, width: DefaultColumnWidths.Price);
public static GridColumnSettings last_size => new GridColumnSettings(col_id(Columns.LastSize), DefaultColumnHeaders.Size, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings position => new GridColumnSettings(col_id(Columns.Position), DefaultColumnHeaders.Pos, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
+ public static GridColumnSettings raw_day_position => new GridColumnSettings(col_id(Columns.RawDayPosition), DefaultColumnHeaders.RawDayPos, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right, is_visible: false);
public static GridColumnSettings working_bids => new GridColumnSettings(col_id(Columns.WorkingBids), DefaultColumnHeaders.Working, font_color_override: BTSColors.MarketData.bid, width: DefaultColumnWidths.Working, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings bid_implied_size => new GridColumnSettings(col_id(Columns.BidImpliedSize), DefaultColumnHeaders.ImpliedSize, font_color_override: BTSColors.MarketData.bid, width: DefaultColumnWidths.ImpliedDirectMergedSize, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings bid_direct_size => new GridColumnSettings(col_id(Columns.BidDirectSize), DefaultColumnHeaders.DirectSize, font_color_override: BTSColors.MarketData.bid, width: DefaultColumnWidths.ImpliedDirectMergedSize, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings bid_merged_size => new GridColumnSettings(col_id(Columns.BidMergedSize), DefaultColumnHeaders.MergedSize, font_color_override: BTSColors.MarketData.bid, width: DefaultColumnWidths.ImpliedDirectMergedSize, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
- public static GridColumnSettings bid => new GridColumnSettings(col_id(Columns.Bid), DefaultColumnHeaders.Bid, font_color_override: BTSColors.header_text, width:DefaultColumnWidths.MViewPrice, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
- public static GridColumnSettings ask => new GridColumnSettings(col_id(Columns.Ask), DefaultColumnHeaders.Ask, font_color_override: BTSColors.header_text, width: DefaultColumnWidths.MViewPrice, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
+ public static GridColumnSettings bid => new GridColumnSettings(col_id(Columns.Bid), DefaultColumnHeaders.Bid, font_color_override: BTSColors.header_text, width:DefaultColumnWidths.MViewPrice, horizontal_alignment: System.Windows.HorizontalAlignment.Right, background_color_override: BTSColors.MarketData.bid);
+ public static GridColumnSettings ask => new GridColumnSettings(col_id(Columns.Ask), DefaultColumnHeaders.Ask, font_color_override: BTSColors.header_text, width: DefaultColumnWidths.MViewPrice, horizontal_alignment: System.Windows.HorizontalAlignment.Right, background_color_override: BTSColors.MarketData.ask);
public static GridColumnSettings ask_merged_size => new GridColumnSettings(col_id(Columns.AskMergedSize), DefaultColumnHeaders.MergedSize, font_color_override: BTSColors.MarketData.ask, width: DefaultColumnWidths.ImpliedDirectMergedSize, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings ask_direct_size => new GridColumnSettings(col_id(Columns.AskDirectSize), DefaultColumnHeaders.DirectSize, font_color_override: BTSColors.MarketData.ask, width: DefaultColumnWidths.ImpliedDirectMergedSize, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings ask_implied_size => new GridColumnSettings(col_id(Columns.AskImpliedSize), DefaultColumnHeaders.ImpliedSize, font_color_override: BTSColors.MarketData.ask, width: DefaultColumnWidths.ImpliedDirectMergedSize, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
@@ -119,6 +140,7 @@ namespace bts.shell {
yield return last;
yield return last_size;
yield return position;
+ yield return raw_day_position;
yield return working_bids;
yield return bid_implied_size;
yield return bid_direct_size;
@@ -173,6 +195,8 @@ namespace bts.shell {
public DoubleMinMaxState session_high;
[ProtoMember(12)]
public IntMinMaxState position;
+ [ProtoMember(27)]
+ public DoubleMinMaxState raw_day_position;
[ProtoMember(13)]
public IntMinMaxState working_bid_volume;
[ProtoMember(14)]
@@ -202,5 +226,46 @@ namespace bts.shell {
[ProtoMember(26)]
public string mic_code;
}
+
+ // migration rules
+ [Export(typeof(IMarketViewGridSettingsMigrationRule))]
+ class AddMissingColumnsMigrationRule : IMarketViewGridSettingsMigrationRule {
+ public bool apply(GridSettings settings, out GridSettings new_settings) =>
+ settings.add_missing_columns(StartupData.DefaultGridSettings.columns, out new_settings);
+ }
+
+ [Export(typeof(IMarketViewGridSettingsMigrationRule))]
+ class InitBidAskBackgroundOverrideMigrationRule : IMarketViewGridSettingsMigrationRule {
+ public bool apply(GridSettings s, out GridSettings new_settings) {
+ var columns = s.columns.ToList();
+ var bid_col_index = columns.FindIndex(x => x.id == col_id(Columns.Bid));
+ var ask_col_index = columns.FindIndex(x => x.id == col_id(Columns.Ask));
+ bool applied = false;
+ if (bid_col_index > -1 && ask_col_index > -1) {
+ if (!columns[bid_col_index].background_color_override.HasValue) {
+ columns[bid_col_index] = columns[bid_col_index].with(background_color_override: new NullableColorProto(BTSColors.MarketData.bid.ToUint()));
+ applied = true;
+ }
+ if (!columns[ask_col_index].background_color_override.HasValue) {
+ columns[ask_col_index] = columns[ask_col_index].with(background_color_override: new NullableColorProto(BTSColors.MarketData.ask.ToUint()));
+ applied = true;
+ }
+ }
+ new_settings = applied ? s.with(columns) : default;
+ return applied;
+ }
+ }
+
+ [Export(typeof(IMarketViewGridSettingsMigrationRule))]
+ class InitBackgroundOverrideMigrationRule : IMarketViewGridSettingsMigrationRule {
+ public bool apply(GridSettings settings, out GridSettings new_settings) {
+ if (!settings.enable_background_color) {
+ new_settings = settings.with(enable_background_color: true);
+ return true;
+ }
+ new_settings = default;
+ return false;
+ }
+ }
}
-}
\ No newline at end of file
+}
diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs
index 2b17345e6..b0121b166 100644
--- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs
+++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesModel.cs
@@ -7,16 +7,6 @@ using System.Linq;
using System.Reactive.Linq;
namespace mbts.spark {
- struct TradeInfo {
- public readonly SecurityImmutable security;
- public readonly TradeMessageImmutable trade;
-
- public TradeInfo(SecurityImmutable security, TradeMessageImmutable trade) {
- this.security = security;
- this.trade = trade;
- }
- }
-
class TimeAndSalesModel : IDisposable {
internal readonly SecurityCriteria security_criteria;
diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs
index 11a3a44ee..e2b5b8139 100644
--- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs
+++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs
@@ -137,7 +137,7 @@ namespace mbts.spark {
public Row(TimeAndSalesVM parent, SecurityImmutable security, TradeMessageImmutable trade) : base(security) {
_trade_key = trade.Key;
time = ((ulong)trade.Time).lldatetime().ToLocalTime();
- price = trade.Mantissa * Math.Pow(10, trade.Exponent);
+ price = trade.price();
size = trade.Size;
aggressor_side = trade.AggressorSide;
show_ladder = new DelegateCommand(() => parent._show_ladder_async(this).ignore());
diff --git a/src/client/spark/Modules/Settings/SettingsShellModule.cs b/src/client/spark/Modules/Settings/SettingsShellModule.cs
index 005dd648b..ce995d025 100644
--- a/src/client/spark/Modules/Settings/SettingsShellModule.cs
+++ b/src/client/spark/Modules/Settings/SettingsShellModule.cs
@@ -26,7 +26,10 @@ namespace bts.ui {
public SettingsShellModule(IBus bus, UserSettingsHub settings_hub, WorkspacesModel ws) {
// todo: settings dialog
ws_model = ws;
- var actions_list = new List(2) { SparkCommands.ShowWorkspaces };
+ var actions_list = new List(2) {
+ SparkCommands.ShowGlobalAlerts,
+ SparkCommands.ShowWorkspaces
+ };
if (Configuration.get().enabled) {
actions_list.Add(SparkCommands.ShowSettings);
}
diff --git a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs
index acb014317..3e5f12997 100644
--- a/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs
+++ b/src/client/spark/Modules/Trading/AlgoStudio/Model/AlgoData.cs
@@ -19,6 +19,8 @@ namespace mbts.spark {
this.key = key;
}
+ public static AlgoData empty => from_custom_def(new CustomOrderDefinitionImmutable(new CustomOrderDefinition()));
+
///
/// This is the only factory method that allows callers to explicitly specify a name.
/// It should only be used within the context of creating, or renaming, studio algos.
@@ -65,6 +67,8 @@ namespace mbts.spark {
}
struct AlgoDataVM : IEquatable {
+ public static readonly Func id_fn = vm => AlgoID.from_algo_key(vm.data.key);
+
public readonly AlgoData data;
public readonly AlgoDefinitionMetadata? meta;
diff --git a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamTemplateSelector.cs b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamTemplateSelector.cs
index 11459e1bc..5b7aa2be7 100644
--- a/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamTemplateSelector.cs
+++ b/src/client/spark/Modules/Trading/AlgoStudio/View/AlgoEditorGridView/AlgoParamTemplateSelector.cs
@@ -21,7 +21,7 @@ namespace mbts.ui.spark {
class AlgoParamTemplateSelector : DataTemplateSelector {
public static readonly Type generic_algo_param_itype = typeof(IAlgoParamVM<>);
- KeyedCollection _keyed_templates = new KeyedCollection(tsk => tsk.Key);
+ KeyedCollection _keyed_templates = new KeyedCollection(tsk => tsk.Key.ToString());
public DataTemplate BoolTemplate { get; set; }
public DataTemplate NullableBoolTemplate { get; set; }
diff --git a/src/client/spark/Modules/Trading/Fills/FillsVM.cs b/src/client/spark/Modules/Trading/Fills/FillsVM.cs
index 1832f4132..d600aef4f 100644
--- a/src/client/spark/Modules/Trading/Fills/FillsVM.cs
+++ b/src/client/spark/Modules/Trading/Fills/FillsVM.cs
@@ -68,13 +68,51 @@ namespace mbts.spark {
nameof(OrderBookRowVM.symbol)),
DataGridFilterKnownTemplates.DiscreteValues,
DefaultColumnWidths.Symbol);
+ // algo items view (common resources)
+ var algo_items_comp = AlgoCollectionHelper.algo_data_vm_comparer.to_non_generic();
+ var algo_items_group_desc = new PropertyGroupDescription(nameof(AlgoDataVM.group));
// order type
- var order_type_filter = dv_filter(OrderDataHelper.all_order_types, r => r.order?.order_type() ?? OrderType.None);
+ var order_type_filter = DiscreteValuesFilterVM.CreateTableUpdate(
+ ft => new AlgoDataVM(ft.algo ?? AlgoData.empty),
+ AlgoDataVM.id_fn,
+ ots => Array.ConvertAll(ots ?? Array.Empty(), ot => AlgoID.from_algo_key(AlgoKey.from_known_type(ot))),
+ ids => ids.empty_if_null().Select(AlgoID.to_algo_key).Where(k => k.mode == AlgoKey.Mode.Factory).Select(k => k.factory).ToArray(),
+ out var order_type_observer,
+ out var order_type_items_view);
+
+ order_type_items_view.CustomSort = algo_items_comp;
+ order_type_items_view.GroupDescriptions.Add(algo_items_group_desc);
+ order_type_observer.OnNext(TableUpdate.mk_empty(AlgoDataVM.id_fn)
+ .with_added(OrderDataHelper.all_order_types
+ .Select(OrderDataHelper.Defaults.CustomOrderDefinitionImmutable)
+ .Select(AlgoData.from_custom_def)
+ .Select(d => new AlgoDataVM(d))));
+
add_col_expl(Columns.OrderType,
new OrderTypeColumn(Columns.OrderType, new Binding(nameof(Row.badge_fill)), new Binding(nameof(Row.display_name)), order_type_filter) {
id = col_id(Columns.OrderType),
sort_member_path = nameof(Row.order_type)
}, order_type_filter);
+ // root algo type
+ var root_algo_type_filter = DiscreteValuesFilterVM.CreateTableUpdate(
+ ft => new AlgoDataVM(ft.root_algo ?? AlgoData.empty),
+ AlgoDataVM.id_fn,
+ out var root_algo_type_observer,
+ out var root_algo_type_items_view);
+
+ root_algo_type_items_view.CustomSort = algo_items_comp;
+ root_algo_type_items_view.GroupDescriptions.Add(algo_items_group_desc);
+
+ add_col_expl(Columns.RootAlgoType,
+ new OrderTypeColumn(
+ Columns.RootAlgoType,
+ new Binding(nameof(Row.root_algo_badge_color)) { Converter = new ui.converters.ColorToBrushConverter() },
+ new Binding(nameof(Row.root_algo_display_name)),
+ root_algo_type_filter,
+ DefaultColumnHeaders.RootAlgoType) {
+ id = col_id(Columns.RootAlgoType),
+ sort_member_path = nameof(Row.root_algo_order_type)
+ }, root_algo_type_filter);
// side
var side_filter = dv_filter(new[] { Side.Buy, Side.Sell }, r => r.fill.Side);
add_col_expl(Columns.Side, new SideColumn(Columns.Side, r => r.side, side_filter) { id = col_id(Columns.Side) }, side_filter);
@@ -128,6 +166,7 @@ namespace mbts.spark {
};
_rows_manager.on_settings(fs, s.sorting_criterion);
}),
+ model.subscribe_all_algos().SelectKeyValue(AlgoDataVM.from_data, d => AlgoID.from_algo_key(d.data.key)).OnDispatcher().Subscribe(root_algo_type_observer),
settings_manager == null ? Disposable.empty : settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager)
);
// local methods
@@ -175,8 +214,8 @@ namespace mbts.spark {
static IObservable> _get_observable(IBus bus, OrdersModel model, FillsSettings state) {
if (!state.orders.is_null_or_empty()) {
var orders_hash = new HashSet(state.orders);
- return model.on_fill_tuples.Filter(f => orders_hash.Contains(f.fill.OrderKey));
- } else return model.on_fill_tuples;
+ return model.on_fill_tuples_with_root.Filter(f => orders_hash.Contains(f.fill.OrderKey));
+ } else return model.on_fill_tuples_with_root;
}
static IObservable> _get_observable(IBus bus, OrdersModel model, IObservable state) =>
@@ -191,6 +230,7 @@ namespace mbts.spark {
case Columns.FillTime: return wrap(ft => ft.fill.Timestamp.to_local_time());
case Columns.OrderKey: return wrap(ft => ft.fill.OrderKey);
case Columns.OrderType: return wrap_default(ft => ft.order?.order_type() ?? OrderType.None);
+ case Columns.RootAlgoType: return wrap_default(ft => ft.root_algo.HasValue ? ft.root_algo.Value.value.CustomCase : OrderType.None);
case Columns.Price: return wrap(ft => ft.fill.LastPrice);
case Columns.Security: return wrap(ft => ft.security ?? SecurityDataHelper.Defaults.SecurityImmutable);
case Columns.SecurityKey: return wrap(ft => ft.fill.SecurityKey);
@@ -224,7 +264,10 @@ namespace mbts.spark {
readonly OrdersModel _model;
readonly FillImmutable _fill;
readonly OrderRecordImmutable _order;
+ AlgoData? _root_algo => fill_tuple.root_algo;
+ AlgoDefinitionMetadata? _root_algo_meta => fill_tuple.root_algo_meta;
Brush _badge_fill;
+ Color? _root_algo_badge_color;
OrderMetadata _order_metadata;
public Row(FillTuple fill_tuple, OrdersModel model) :
@@ -239,6 +282,7 @@ namespace mbts.spark {
public DateTime fill_time => _fill.Timestamp.to_local_time();
public TimeInForce time_in_force => _order.time_in_force();
public OrderType order_type => _order.order_type();
+ //public OrderType root_algo_type => _or
public string display_name => OrderUtils.display_name(_order, fill_tuple.algo);
public OrderMetadata order_metadata => _order_metadata ?? (_order_metadata = _model.factory.get_metadata(_order.Def.CustomDef.CustomCase));
public Brush badge_fill => _badge_fill ?? (_badge_fill = OrderUtils.badge_fill(fill_tuple.algo_meta, order_metadata));
@@ -252,6 +296,12 @@ namespace mbts.spark {
public string fill_key => _fill.FillKey;
public string order_key => _order.Key.ToString();
+ // Root Algo
+ public OrderType root_algo_order_type => _root_algo.HasValue ? _root_algo.Value.value.CustomCase : OrderType.None;
+ public OrderMetadata root_algo_order_metadata => _model.factory.get_metadata(root_algo_order_type);
+ public Color root_algo_badge_color => _root_algo_badge_color ?? (_root_algo_badge_color = OrderUtils.badge_color(_root_algo_meta, root_algo_order_metadata)).Value;
+ public string root_algo_display_name => _root_algo?.name ?? root_algo_order_type.display_name();
+
public bool Equals(Row other) => other != null && other._fill.Equals(_fill) && other._order.Equals(_order);
public override bool Equals(object obj) => Equals(obj as Row);
public override int GetHashCode() => _fill.FillKey.GetHashCode() ^ _order.Key.GetHashCode();
diff --git a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs
index 4b74769eb..197e97ea5 100644
--- a/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs
+++ b/src/client/spark/Modules/Trading/Fills/FillsView.xaml.cs
@@ -16,6 +16,7 @@ namespace mbts.ui.spark {
Symbol,
TimeInForce,
OrderType,
+ RootAlgoType,
Side,
Price,
Size,
diff --git a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs
index bbd9ddf5e..e89aa70a0 100644
--- a/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs
+++ b/src/client/spark/Modules/Trading/Fills/FillsWindowFactory.cs
@@ -1,19 +1,15 @@
using bts.api;
-using bts.api.orderman;
+using bts.settings;
using bts.shell.fills;
using mbts.persist;
using mbts.spark;
-using mbts.spark.filters;
using mbts.ui;
-using mbts.ui.controls;
using mbts.ui.settings;
-using ProtoBuf;
using System;
using System.Collections.Generic;
-using System.Linq;
+using System.ComponentModel.Composition;
using System.Reactive.Linq;
using System.Threading.Tasks;
-using static mbts.ui.controls.DIYGrid;
using static mbts.ui.spark.FillsView;
namespace bts.shell {
@@ -34,6 +30,7 @@ namespace bts.shell {
{ nameof(FillsVM.Row.fill_time), Columns.FillTime },
{ nameof(FillsVM.Row.order_key), Columns.OrderKey },
{ nameof(FillsVM.Row.order_type), Columns.OrderType },
+ { nameof(FillsVM.Row.root_algo_order_type), Columns.RootAlgoType },
{ nameof(FillsVM.Row.price), Columns.Price },
{ nameof(FillsVM.Row.security), Columns.Security },
{ nameof(FillsVM.Row.security_key), Columns.SecurityKey },
@@ -67,5 +64,12 @@ namespace bts.shell {
set: (us, gs) => us.with(provided_fills_gridsettings: gs));
return new FillsWindow(this, _bus, _orders_model, state, settings_manager);
}
+
+ // migration rules
+ [Export(typeof(IFillsGridSettingsMigrationRule))]
+ class AddMissingColumnsMigrationRule : IFillsGridSettingsMigrationRule {
+ public bool apply(GridSettings settings, out GridSettings new_settings) =>
+ settings.add_missing_columns(FillsSettings.DefaultGridSettings.columns, out new_settings);
+ }
}
}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs b/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs
index d981552be..b09603871 100644
--- a/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs
+++ b/src/client/spark/Modules/Trading/Fills/Settings/FillsFilterStates.cs
@@ -23,6 +23,10 @@ namespace bts.shell.fills {
[DIYGridColumnID(nameof(Columns.OrderType))]
public CustomOrderDefinition.CustomOneofCase[] order_type { get; set; }
+ [ProtoMember(16)]
+ [DIYGridColumnID(nameof(Columns.RootAlgoType))]
+ public AlgoID[] root_algo_type { get; set; }
+
[ProtoMember(4)]
[DIYGridColumnID(nameof(Columns.Account))]
public string[] account { get; set; }
@@ -88,6 +92,7 @@ namespace bts.shell.fills {
pb.add_discrete_values(fs.exchange, ft => ft.exchange());
pb.add_discrete_values(fs.time_in_force, ft => ft.time_in_force());
pb.add_discrete_values(fs.order_type, ft => ft.order_type());
+ pb.add_discrete_values(fs.root_algo_type, ft => AlgoID.from_algo_key((ft.root_algo ?? AlgoData.empty).key));
pb.add_discrete_values(fs.side, ft => ft.fill.Side);
pb.add_discrete_values(fs.fill_kind, ft => ft.fill.FillKind);
pb.add_discrete_values(fs.symbol, ft => ft.security?.Symbol ?? string.Empty);
diff --git a/src/client/spark/Modules/Trading/Fills/Settings/FillsSettings.cs b/src/client/spark/Modules/Trading/Fills/Settings/FillsSettings.cs
index 63ace677e..d6a24363d 100644
--- a/src/client/spark/Modules/Trading/Fills/Settings/FillsSettings.cs
+++ b/src/client/spark/Modules/Trading/Fills/Settings/FillsSettings.cs
@@ -47,6 +47,7 @@ namespace bts.shell.fills {
public static GridColumnSettings exchange => new GridColumnSettings(col_id(Columns.Exchange), DefaultColumnHeaders.Exchange, width: DefaultColumnWidths.Exchange);
public static GridColumnSettings time_in_force => new GridColumnSettings(col_id(Columns.TimeInForce), DefaultColumnHeaders.TimeInForce, width: DefaultColumnWidths.TimeInForce);
public static GridColumnSettings order_type => new GridColumnSettings(col_id(Columns.OrderType), DefaultColumnHeaders.OrderType, width: DefaultColumnWidths.OrderType);
+ public static GridColumnSettings root_algo_type => new GridColumnSettings(col_id(Columns.RootAlgoType), DefaultColumnHeaders.RootAlgoType, width: DefaultColumnWidths.OrderType);
public static GridColumnSettings side => new GridColumnSettings(col_id(Columns.Side), DefaultColumnHeaders.Side, width: DefaultColumnWidths.Side);
public static GridColumnSettings quantity => new GridColumnSettings(col_id(Columns.Size), DefaultColumnHeaders.Size, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings price => new GridColumnSettings(col_id(Columns.Price), DefaultColumnHeaders.Price, width: DefaultColumnWidths.Price, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
@@ -70,6 +71,7 @@ namespace bts.shell.fills {
yield return exchange;
yield return time_in_force;
yield return order_type;
+ yield return root_algo_type;
yield return side;
yield return quantity;
yield return price;
diff --git a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs
index a26f626ae..e1222b5af 100644
--- a/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs
+++ b/src/client/spark/Modules/Trading/Ladder/LadderSettings.cs
@@ -450,6 +450,8 @@ namespace mbts.spark {
public bool account_position_visible { get; set; }
[ProtoMember(50), DefaultValue(true)]
public bool day_position_visible { get; set; }
+ [ProtoMember(56)]
+ public bool raw_day_position_visible { get; set; }
[ProtoMember(37), DefaultValue(true)]
public bool size_presets_visible { get; set; }
[ProtoMember(38), DefaultValue(true)]
@@ -570,6 +572,7 @@ namespace mbts.spark {
order_type_visible == other.order_type_visible &&
account_position_visible == other.account_position_visible &&
day_position_visible == other.day_position_visible &&
+ raw_day_position_visible == other.raw_day_position_visible &&
size_presets_visible == other.size_presets_visible &&
cancel_buys_visible == other.cancel_buys_visible &&
cancel_sells_visible == other.cancel_sells_visible &&
diff --git a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs
index 0b5030b0b..e7a16fdce 100644
--- a/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs
+++ b/src/client/spark/Modules/Trading/Ladder/LadderWindowFactory.cs
@@ -15,7 +15,6 @@ using System.IO;
using System.Linq;
using System.Reactive.Linq;
using System.Reactive.Subjects;
-using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using LadderSettings = mbts.spark.LadderSettings;
@@ -30,13 +29,14 @@ namespace bts.shell {
readonly MBOService _mbo;
readonly UserSettingsHub _settings_hub;
readonly OrdersModel _orders_model;
+ readonly IShellWindowThreadIDProvider _thread_id_provider;
IReadOnlyDictionary _securities = new Dictionary();
public LadderWindowFactory(
- IShellModule owner,
- IBus bus,
- IWindowManager wm,
- UserSettingsHub settings_hub,
+ IShellModule owner,
+ IBus bus,
+ IWindowManager wm,
+ UserSettingsHub settings_hub,
OrdersModel orders_model,
MBOService mbo)
@@ -46,6 +46,7 @@ namespace bts.shell {
_settings_hub = settings_hub;
_orders_model = orders_model;
_ladder_conf = new LadderConfig(Configuration.get(), Configuration.get().ladder);
+ _thread_id_provider = ShellWindowThreadIDFactory.create("Ladder", _ladder_conf.ladders_on_threads);
_mbo = mbo;
_dispose = Disposable.Create(
bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s),
@@ -88,10 +89,8 @@ namespace bts.shell {
return new LadderSaveState { security_key = vm.security.Id, settings = s, settings_id = id };
}
- int _ladder_count = 0;
IShellWindow create_ladder_window(SecurityMD md, LadderSettings last_value, uint settings_id = 0) {
IDisposable active_settings_dialog = null;
- var thread_id = Interlocked.Increment(ref _ladder_count) % Environment.ProcessorCount;
// on_shell_window_vm should behave like an event (do not set to null)
Action on_shell_window_vm = _ => { };
ShellWindowVM shell_window_vm = null;
@@ -263,12 +262,11 @@ namespace bts.shell {
Log.Ui.warn($"LadderSettingsDialog error {action_desc}: {error}.");
}
});
- string thread = _ladder_conf.ladders_on_threads ? $"Ladder{thread_id:00}" : "";
return shell_window = ShellWindow.create(
module, md.security.ToString(), _window_type, view,
(v, s) => save(_get_state(((LadderView)v).vm, settings_id), s),
icon: Icons.Ladder,
- thread_id: thread,
+ thread_id: _thread_id_provider.next_id(),
vm => {
shell_window_vm = vm;
title_source.connect();
@@ -313,4 +311,4 @@ namespace bts.shell {
[ProtoMember(3)]
public uint settings_id;
}
-}
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs
index 97db476d3..68fffdeb8 100644
--- a/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs
+++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderSettingsVM.cs
@@ -72,6 +72,7 @@ namespace mbts.spark {
_order_type_visibility = new OrderEntryPanelItemVisibilityVM("Order Type"),
_account_position_visibility = new OrderEntryPanelItemVisibilityVM("Account Position"),
_day_position_visibility = new OrderEntryPanelItemVisibilityVM("Day Position"),
+ _raw_day_position_visibility = new OrderEntryPanelItemVisibilityVM("Raw Day Position"),
_size_preset_visibility = new OrderEntryPanelItemVisibilityVM("Size Presets"),
_auto_clear_visibility = new OrderEntryPanelItemVisibilityVM("Auto Clear"),
_clear_visibility = new OrderEntryPanelItemVisibilityVM("Clear"),
@@ -136,8 +137,8 @@ namespace mbts.spark {
foreach (var c in _observable_components)
c.PropertyChanged -= on_prop_changed;
}
- AccountTuple? account_factory(KeyValuePair kv) => new AccountTuple(kv.Key, kv.Value);
- AlgoDefinitionVM algo_factory(AlgoData data) => AlgoDefinitionVM.create(_model, data);
+ AccountTuple? account_factory(uint key, string name) => new AccountTuple(key, name);
+ AlgoDefinitionVM algo_factory(AlgoData data) => AlgoDefinitionVM.create(_model, data, is_synthetic ? AlgoFormats.Spreader : AlgoFormats.Exchange);
}
public event Action result_changed;
@@ -239,6 +240,7 @@ namespace mbts.spark {
yield return _order_type_visibility;
yield return _account_position_visibility;
yield return _day_position_visibility;
+ yield return _raw_day_position_visibility;
yield return _size_preset_visibility;
yield return _clear_visibility;
yield return _auto_clear_visibility;
@@ -281,6 +283,7 @@ namespace mbts.spark {
yield return _order_type_visibility;
yield return _account_position_visibility;
yield return _day_position_visibility;
+ yield return _raw_day_position_visibility;
yield return _size_preset_visibility;
yield return _auto_clear_visibility;
yield return _clear_visibility;
@@ -343,6 +346,7 @@ namespace mbts.spark {
_order_type_visibility.show = settings.order_type_visible;
_account_position_visibility.show = settings.account_position_visible;
_day_position_visibility.show = settings.day_position_visible;
+ _raw_day_position_visibility.show = settings.raw_day_position_visible;
_size_preset_visibility.show = settings.size_presets_visible;
_clear_visibility.show = settings.clear_visible;
_auto_clear_visibility.show = settings.auto_clear_visible;
@@ -415,6 +419,7 @@ namespace mbts.spark {
clone.order_type_visible = _order_type_visibility.show;
clone.account_position_visible = _account_position_visibility.show;
clone.day_position_visible = _day_position_visibility.show;
+ clone.raw_day_position_visible = _raw_day_position_visibility.show;
clone.size_presets_visible = _size_preset_visibility.show;
clone.auto_clear_visible = _auto_clear_visibility.show;
clone.clear_visible = _clear_visibility.show;
diff --git a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs
index c985e6381..f72d2cc1c 100644
--- a/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs
+++ b/src/client/spark/Modules/Trading/Ladder/VM/LadderVM.cs
@@ -35,8 +35,8 @@ namespace mbts.spark {
_show_cancel_sells, _show_cancel_all, _show_zoom;
readonly PropertyAutoWrapper _bid_background, _bid_foreground, _ask_background, _ask_foreground;
readonly HashSet _sticky_algos = new HashSet();
- double _position, _day_position;
- bool _show_account_position, _show_day_position;
+ double _position, _day_position, _raw_day_position;
+ bool _show_account_position, _show_day_position, _show_raw_day_position;
ulong _misc_time = 0;
ulong _last_trade_time = 0;
IEqualityComparer _equality;
@@ -109,7 +109,10 @@ namespace mbts.spark {
(_show_cancel_all = bool_prop(nameof(show_cancel_all), s => s.cancel_all_visible)).set,
(_show_zoom = bool_prop(nameof(show_zoom), s => s.zoom_slider_visible)).set,
s => {
- if (Set(ref _show_account_position, s.account_position_visible, nameof(show_account_position)) | Set(ref _show_day_position, s.day_position_visible, nameof(show_day_position))) {
+ if (
+ Set(ref _show_account_position, s.account_position_visible, nameof(show_account_position)) |
+ Set(ref _show_day_position, s.day_position_visible, nameof(show_day_position)) |
+ Set(ref _show_raw_day_position, s.raw_day_position_visible, nameof(show_raw_day_position))) {
RaisePropertyChanged(nameof(position_display_text));
}
size_calculator.buttons = s.calculator_buttons;
@@ -135,7 +138,7 @@ namespace mbts.spark {
//
//_window_height = backing(nameof(window_height), settings_manager.subscribe_current().OnDispatcher().Select(s => s.zoom_factor), (scale) => scale * 600);
//_window_width = backing(nameof(window_width), settings_manager.subscribe_current().OnDispatcher().Select(s => s.zoom_factor), (scale) => scale * 420);
- position_click_command = new DelegateCommand(() => size_calculator.value = DoubleHelper.safe_convert_to_uint(Math.Abs(_show_day_position ? day_position : position)));
+ position_click_command = new DelegateCommand(() => size_calculator.value = DoubleHelper.safe_convert_to_uint(Math.Abs(_show_day_position ? day_position : (_show_raw_day_position ? _raw_day_position : position))));
send_order_command = new AsyncCommand<(double price, Side? side, MouseButton button)>(send_order_async);
cancel_command = new AsyncCommand(_model.cancel_orders, true);
show_book_command = new DelegateCommand(_show_book);
@@ -232,14 +235,19 @@ namespace mbts.spark {
}),
order_properties_vm,
position_src.OnDispatcher().Subscribe(pos => {
- double total, day;
+ double total, day, raw_day;
if (pos.HasValue) {
total = pos.Value.total_pos();
day = pos.Value.day_pos();
+ raw_day = pos.Value.raw_day_pos();
} else {
- total = day = double.NaN;
+ total = day = raw_day = double.NaN;
}
- if ((Set(ref _position, total, nameof(position)) | Set(ref _day_position, day, nameof(day_position))) && (show_day_position || show_account_position))
+ if ((
+ Set(ref _position, total, nameof(position)) |
+ Set(ref _day_position, day, nameof(day_position)) |
+ Set(ref _raw_day_position, raw_day, nameof(raw_day_position))
+ ) && (show_day_position || show_account_position || show_raw_day_position))
RaisePropertyChanged(nameof(position_display_text));
}));
}
@@ -290,6 +298,7 @@ namespace mbts.spark {
public double settlement => _settlement.Value;
public double position => _position;
public double day_position => _day_position;
+ public double raw_day_position => _raw_day_position;
public ulong volume => _volume.Value;
public bool auto_clear { get => _auto_clear.Value; set => _auto_clear.set(value); }
public CalculatorLogic size_calculator { get; } = new CalculatorLogic(0);
@@ -316,6 +325,7 @@ namespace mbts.spark {
public bool show_order_type => _show_order_type.view;
public bool show_account_position => _show_account_position;
public bool show_day_position => _show_day_position;
+ public bool show_raw_day_position => _show_raw_day_position;
public bool show_size_preset => _show_size_preset.view;
public bool show_auto_clear => _show_auto_clear.view;
public bool show_clear => _show_clear.view;
@@ -327,12 +337,18 @@ namespace mbts.spark {
public double zoom_factor { get => _zoom_factor.Value; set => _zoom_factor.set(value); }
public string position_display_text {
get {
- if (show_day_position) {
- string day_pos_text = SparkUtils.fmt_position(day_position);
- return show_account_position ? $"{day_pos_text} ({SparkUtils.fmt_position(position)})" : day_pos_text;
- } else if (show_account_position) {
- return SparkUtils.fmt_position(position);
- } else return string.Empty;
+ string rv = null;
+ if (show_day_position)
+ rv = SparkUtils.fmt_position(day_position);
+ if (show_raw_day_position) {
+ var raw_day_text = SparkUtils.fmt_position(raw_day_position);
+ rv = rv == null ? raw_day_text : $"{rv} / {raw_day_text}";
+ }
+ if (show_account_position) {
+ var acc_text = SparkUtils.fmt_position(position);
+ rv = rv == null ? SparkUtils.fmt_position(position) : $"{rv} ({acc_text})";
+ }
+ return rv ?? "";
}
}
//public double window_height { get => _window_height.Value; set => _window_height.set(value); }
diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml
index f6dd7a8d4..b761e9b75 100644
--- a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml
+++ b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml
@@ -476,6 +476,7 @@
+
@@ -486,6 +487,7 @@
+
diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs
index efaf28cda..015680d5c 100644
--- a/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs
+++ b/src/client/spark/Modules/Trading/Ladder/View/LadderView.xaml.cs
@@ -18,32 +18,60 @@ namespace mbts.spark {
MaxZoomFactor = 1.5;
public static IMultiValueConverter PositionToolTipConverter =
- ValueConverter.create((account, show_day_pos, show_total_pos) => {
- const string day_pos_text = "day", total_pos_text = "total";
+ ValueConverter.create((account, show_day_pos, show_raw_day_pos, show_total_pos) => {
+ const string day_pos_text = "day", raw_day_pos_text = "raw day", total_pos_text = "total";
if (!account.HasValue)
return string.Empty;
- var sb = new StringBuilderEx(account.Value.name);
- string primary_pos;
- if (show_day_pos) {
- primary_pos = day_pos_text;
- if (show_total_pos) {
- sb.Add(" '", primary_pos, " ");
- sb.Add("(", total_pos_text, ")' ");
- } else {
- sb.Add(" ", primary_pos, " ");
- }
- } else if (show_total_pos) {
- primary_pos = total_pos_text;
- sb.Add(" ", primary_pos, " ");
+ /// Note: 'day,' and 'raw day,' are interchangeable wrt the string format, 'total' however is treated differently.
+ /// Different Formats:
+ // No parts are visible:
+ // null
+ //
+ // 1 part 'foo' is visible:
+ // " foo position
+ // click to copy to size"
+ //
+ // 2 parts 'day' and 'raw day' are visible:
+ // " 'day / raw day' position
+ // click to copy day to size"
+ //
+ // 2 parts 'day' and 'total' are visible:
+ // " 'day (total)' position
+ // click to copy day to size"
+ //
+
+ string primary_pos = null;
+ // part count is incremented in the 'add_part' method
+ int part_count = 0;
+ var sb = new StringBuilderEx();
+
+ if (show_day_pos) add_part(day_pos_text, " / ");
+ if (show_raw_day_pos) add_part(raw_day_pos_text, " / ");
+ if (show_total_pos) add_part(total_pos_text, " (", ")");
+ //
+ if (part_count > 1) {
+ // This is a complex expression (showing more than 1 value) - wrap it in single quotes.
+ // Explicitly state which value will be copied to the size input.
+ sb.Insert(0, "'");
+ sb.Add("'");
+ sb.Add(" position\n(click to copy ", primary_pos, " to size)");
} else {
- // unexpected code path (the button for which this tooltip is destined should be invisible in this case), but no need to throw an exception.
- return string.Empty;
+ // Only showing 1 value, no need for single quotes,
+ // nor an explicit statement that indicates which value will be copied to the size input.
+ sb.Add(" position\n(click to copy to size)");
}
- sb.Add("position\n(click to copy ");
- if (show_day_pos && show_total_pos)
- sb.Add(primary_pos, " position ");
- sb.Add("to size)");
return sb.ToString();
+
+ void add_part(string part_name, string separator = null, string separator_suffix = null) {
+ if (part_count++ > 0) {
+ sb.Add(separator);
+ sb.Add(part_name);
+ sb.Add(separator_suffix);
+ } else {
+ primary_pos = part_name;
+ sb.Add($"{account.Value.name} {part_name}");
+ }
+ }
});
internal LadderView(LadderVM vm) {
diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillsModel.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillsModel.cs
index 871aaf940..4a11bbc14 100644
--- a/src/client/spark/Modules/Trading/ManualFills/ManualFillsModel.cs
+++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillsModel.cs
@@ -79,8 +79,8 @@ namespace bts.shell.manual_fills {
public ManualFillsModel(OrdersModel model)
: this(model, model.on_manual_fill_tuples,
- model.factory.subscribe_accounts().Select(d => MappedDictionary.create(d, kv => new AccountTuple(kv.Key, kv.Value))).Table(u => u.id),
- model.factory.subscribe_users().Select(d => MappedDictionary.create(d, kv => new UserTuple(kv.Key, kv.Value))).Table(a => a.id)) { }
+ model.factory.subscribe_accounts().Select(d => MappedDictionary.create(d, (k, v) => new AccountTuple(k, v))).Table(u => u.id),
+ model.factory.subscribe_users().Select(d => MappedDictionary.create(d, (k, v) => new UserTuple(k, v))).Table(a => a.id)) { }
public ManualFillsModel(OrdersModel model, IObservable> manual_fills, IObservable> accounts, IObservable> users) {
_model = model;
diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillsParser.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillsParser.cs
index 7d6ca8968..a8a2cb990 100644
--- a/src/client/spark/Modules/Trading/ManualFills/ManualFillsParser.cs
+++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillsParser.cs
@@ -73,7 +73,7 @@ namespace bts.shell.manual_fills {
// The security desc lookup could be better optimized, but the speed at which fills are imported is probably not a paramount concern.
public static IEnumerable parse_rows(IEnumerable rows, IReadOnlyDictionary security_map, IReadOnlyDictionary account_map, IReadOnlyDictionary user_map) =>
parse_rows(rows,
- reverse_lookup(MappedDictionary.create(security_map, kv => kv.Value.ToString())),
+ reverse_lookup(MappedDictionary.create(security_map, s => s.ToString())),
reverse_lookup(account_map),
reverse_lookup(user_map));
diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs
index cb2ecf39b..57579502c 100644
--- a/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs
+++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillsVM.cs
@@ -157,7 +157,7 @@ namespace bts.shell.manual_fills {
var lines = File.ReadAllLines(file_name);
var parsed_fills = ManualFillsParser.parse_rows(
lines,
- MappedDictionary.create(security_map, kv => kv.Value.security),
+ MappedDictionary.create(security_map, smd => smd.security),
accounts.ToDictionary(a => a.Value.id, a => a.Value.name),
users.ToDictionary(u => u.Value.id, u => u.Value.name)
).ToList();
diff --git a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml.cs b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml.cs
index e21ffd1f9..1ac4cd14d 100644
--- a/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml.cs
+++ b/src/client/spark/Modules/Trading/OrderBook/MiniOrderBook/MiniOrderBookView.xaml.cs
@@ -15,10 +15,11 @@ namespace mbts.spark {
CVRowStyleKey = "CVRowStyle",
CVRowTemplateKey = "CVRowTemplateKey";
- public MiniOrderBookView(OrderBookVM vm) {
+ public MiniOrderBookView() =>
InitializeComponent();
+
+ public MiniOrderBookView(OrderBookVM vm) : this() =>
DataContext = vm;
- }
}
class MiniOrderBookRowView : DIYGrid.HighPerformanceRow {
diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs
index c39eb7ea2..704c358c1 100644
--- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs
+++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs
@@ -327,6 +327,18 @@ namespace mbts.spark {
public event Action filter_changed;
+ public static IEnumerable editable_columns {
+ get {
+ yield return new AttachDetachColumn(typeof(MiniOrderBookView));
+ yield return new CommitColumn();
+ yield return new EditablePriceColumn();
+ yield return new EditableQtyColumn();
+ yield return new UpdateColumn(typeof(MiniOrderBookView));
+ yield return new CancelColumn(nameof(OrderBookRowVM.cancel_command));
+ yield return new CheckColumn(nameof(OrderBookRowVM.is_selected));
+ }
+ }
+
public SecurityColumn security_column { get; }
public SimpleTextColumn symbol_column { get; }
public SimpleTextColumn time_created_column { get; }
@@ -731,8 +743,11 @@ namespace mbts.spark {
Width = 30;
_checked_binding = new Binding(checked_property);
- var header_cb = new CheckBox();
- header_cb.ToolTip = "Select / Unselect All";
+ var header_cb = new CheckBox {
+ HorizontalAlignment = HorizontalAlignment.Center,
+ VerticalAlignment = VerticalAlignment.Center,
+ ToolTip = "Select / Unselect All"
+ };
header_cb.SetBinding(CheckBox.IsCheckedProperty, new Binding(nameof(OrderBookVM.all_rows_selected)));
this.Header = header_cb;
}
@@ -1164,6 +1179,7 @@ namespace mbts.spark {
public override FrameworkElement view_factory() {
var price_up_down = new PriceEntryCommitControl();
+ price_up_down.SetBinding(PriceEntryCommitControl.RealPriceProperty, new Binding(nameof(OrderBookRowVM.price)));
price_up_down.SetBinding(PriceEntryCommitControl.SourceValueProperty, nameof(OrderBookRowVM.prospective_price));
price_up_down.SetBinding(PriceEntryCommitControl.SourceContractSpecProperty, nameof(OrderBookRowVM.contract_spec));
price_up_down.SetBinding(PriceEntryCommitControl.OnCommitProperty, nameof(OrderBookRowVM.modify_order_quantity_andor_price));
diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs
index d6c63fad4..54ffe800c 100644
--- a/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs
+++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookVM.cs
@@ -69,10 +69,15 @@ namespace mbts.spark {
_detachable_selected_orders = new HashSet();
FilterData _cached_filter_data;
+ public OrderBookVM(
+ IBus bus, INotificationService notification_service, OrdersModel model, IWindowSettingsManager settings_manager, bool rows_are_initially_expanded = false)
+ : this(bus, notification_service, model, OrdersModel.piq_enabled ? model.on_order_tuples_with_root_and_piq : model.on_order_tuples_with_root, settings_manager, rows_are_initially_expanded) { }
+
public OrderBookVM(
IBus bus,
INotificationService notification_service,
OrdersModel model,
+ IObservable> orders_source,
IWindowSettingsManager settings_manager,
bool rows_are_initially_expanded = false) {
@@ -157,7 +162,6 @@ namespace mbts.spark {
begin_attaching += on_begin_attaching;
end_attaching += on_end_attaching;
// switch between orders and/or orders w/ piq
- var orders_source = OrdersModel.piq_enabled ? model.on_order_tuples_with_root_and_piq : model.on_order_tuples_with_root;
concat_disposable(
connect_order_mod_vm(),
_can_attach_selected_orders.observe_current().Subscribe(send_attached_orders_async_cmd, begin_attach_cmd),
@@ -761,7 +765,7 @@ namespace mbts.spark {
_size_param = new AlgoParamVM("size", "Size", owner._selected_params_mon.size) {
permissions = _size_permissions & _param_permissions
};
- var price_param = new AlgoParamVM("price", "Price", owner._selected_params_mon.price, spec?.tick_equality_comparer() ?? MathUtils.epsilon_comparer) {
+ var price_param = new AlgoParamVM("price", "Price", owner._selected_params_mon.price, spec?.tick_equality_comparer() ?? MathUtils.epsilon_eq_comparer) {
permissions = _price_permissions & _param_permissions
};
_price_param = price_param;
diff --git a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookGridSettingsManager.cs b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookGridSettingsManager.cs
index a1a96f240..8500d5c5d 100644
--- a/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookGridSettingsManager.cs
+++ b/src/client/spark/Modules/Trading/OrderBook/Settings/OrderBookGridSettingsManager.cs
@@ -54,7 +54,7 @@ namespace bts.shell.orderbook {
pvm.selected_predicate_type = _corresponding_predicate_type(EnumHelper.parse_or_default(col_id));
return pvm;
},
- (gen, anims) => new OrderBookGridSettings(gen, anims.Select(a => new OrderRecordTuplePredicateAnimations(a.predicate_data, a.cell_animations, a.row_animations, a.sound_notifications))) { algo_tree_display_mode = _algo_tree_display_mode },
+ (gen, anims) => new OrderBookGridSettings(gen, anims.empty_if_null().Select(a => new OrderRecordTuplePredicateAnimations(a.predicate_data, a.cell_animations, a.row_animations, a.sound_notifications))) { algo_tree_display_mode = _algo_tree_display_mode },
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,
diff --git a/src/client/spark/Modules/Trading/PAndLWindowFactory.cs b/src/client/spark/Modules/Trading/PAndLWindowFactory.cs
index 07aba2002..bf16ea5a7 100644
--- a/src/client/spark/Modules/Trading/PAndLWindowFactory.cs
+++ b/src/client/spark/Modules/Trading/PAndLWindowFactory.cs
@@ -1,15 +1,15 @@
using bts.api;
-using bts.api.orderman;
+using bts.settings;
using bts.spark;
using mbts.persist;
using mbts.spark;
using mbts.spark.filters;
using mbts.ui;
using mbts.ui.settings;
-using mbts.ui.spark;
using ProtoBuf;
using System;
using System.Collections.Generic;
+using System.ComponentModel.Composition;
using System.Linq;
using System.Reactive.Linq;
using System.Threading.Tasks;
@@ -40,13 +40,14 @@ namespace bts.shell {
_bus.post(SparkTags.ShowWindow, w);
}
- IShellWindow _create(PAndLStartupData state) {
- var settings_manager = new WindowSettingsManager(_settings_hub,
- state.grid,
- get: us => us.pnl_grid,
- set: (us, gs) => us.with(provided_pnl_gridsettings: gs));
- return new PAndLWindow(_orders_model, this, _bus, state, SparkCommands.ShowPAndL.icon, settings_manager);
- }
+ IShellWindow _create(PAndLStartupData state) =>
+ new PAndLWindow(
+ _orders_model,
+ this,
+ _bus,
+ state,
+ SparkCommands.ShowPAndL.icon,
+ _settings_hub.create_pandl_settings_manager(state.grid));
[ProtoContract]
public class PAndLStartupData {
@@ -92,10 +93,12 @@ namespace bts.shell {
public static GridColumnSettings start_pnl => new GridColumnSettings(col_id(Columns.StartPNL), DefaultColumnHeaders.StartPnL, false, width: DefaultColumnWidths.PnL_Generic, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings day_long_pnl => new GridColumnSettings(col_id(Columns.DayLong), DefaultColumnHeaders.DayLong, width: DefaultColumnWidths.PnL_Generic, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings day_short_pnl => new GridColumnSettings(col_id(Columns.DayShort), DefaultColumnHeaders.DayShort, width: DefaultColumnWidths.PnL_Generic, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
+ public static GridColumnSettings raw_day_net_position => new GridColumnSettings(col_id(Columns.RawDayPos), DefaultColumnHeaders.RawDayPos, width: DefaultColumnWidths.PnL_Generic, horizontal_alignment: System.Windows.HorizontalAlignment.Right, is_visible: false);
public static GridColumnSettings day_pnl => new GridColumnSettings(col_id(Columns.DayPNL), DefaultColumnHeaders.DayPnL, width: DefaultColumnWidths.PnL_Generic, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings total_net_pos => new GridColumnSettings(col_id(Columns.TotalNetPos), DefaultColumnHeaders.TotalNetPos, false, width: DefaultColumnWidths.Total_Net_Pos, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings total_pnl => new GridColumnSettings(col_id(Columns.TotalPNL), DefaultColumnHeaders.TotalPnL, false, width: DefaultColumnWidths.PnL_Generic, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings pnl_price => new GridColumnSettings(col_id(Columns.PNLPrice), DefaultColumnHeaders.PnLPrice, width: DefaultColumnWidths.PnL_Generic, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
+ public static GridColumnSettings has_day_trades => new GridColumnSettings(col_id(Columns.TradedToday), "Traded Today", width: 100, horizontal_alignment: System.Windows.HorizontalAlignment.Center);
public static IEnumerable default_sorting_criterion {
get {
@@ -117,10 +120,12 @@ namespace bts.shell {
yield return start_pnl;
yield return day_long_pnl;
yield return day_short_pnl;
+ yield return raw_day_net_position;
yield return day_pnl;
yield return total_net_pos;
yield return total_pnl;
yield return pnl_price;
+ yield return has_day_trades;
}
}
@@ -145,6 +150,8 @@ namespace bts.shell {
public UIntMinMaxState day_long_pos;
[ProtoMember(8)]
public UIntMinMaxState day_short_pos;
+ [ProtoMember(16)]
+ public DoubleMinMaxState raw_day_net_pos;
[ProtoMember(9)]
public DoubleMinMaxState day_pnl;
[ProtoMember(10)]
@@ -162,7 +169,11 @@ namespace bts.shell {
public bool[] has_day_trades;
}
+ // migration rules
+ [Export(typeof(IPAndLGridSettingsMigrationRule))]
+ class AddMissingColumnsMigrationRule : IPAndLGridSettingsMigrationRule {
+ public bool apply(GridSettings settings, out GridSettings new_settings) =>
+ settings.add_missing_columns(PAndLStartupData.DefaultGridSettings.columns, out new_settings);
+ }
}
-
-
-}
\ No newline at end of file
+}
diff --git a/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs b/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs
new file mode 100644
index 000000000..9c941fc55
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/Data/PNLData.cs
@@ -0,0 +1,553 @@
+using bts.api;
+using bts.api.orderman;
+using bts.api.position;
+using bts.utils;
+using mbts;
+using mbts.spark;
+using mbts.spark.utilities;
+using mbts.ui.controls;
+using mbts.utils;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.ComponentModel;
+using System.Linq;
+
+namespace bts.shell.pnl {
+ public enum PNLCalculationType {
+ None,
+ Bid,
+ Ask,
+ Opposite,
+ Same,
+ [Description("Cascade")]
+ Waterfall,
+ Last,
+ Mid,
+ Settle
+ }
+
+ readonly struct PositionPriceSize : IEquatable {
+ public static readonly PositionPriceSize empty = new PositionPriceSize(0, 0, 0, 0);
+ public readonly double long_pos, short_pos, long_avg, short_avg;
+ public double net_pos => long_pos - short_pos;
+ public bool has_position => long_pos > 0 || short_pos > 0;
+
+ public PositionPriceSize(double long_pos, double long_avg, double short_pos, double short_avg) {
+ this.long_pos = long_pos;
+ this.long_avg = long_avg;
+ this.short_pos = short_pos;
+ this.short_avg = short_avg;
+ }
+
+ public bool Equals(PositionPriceSize other) =>
+ MathUtils.epsilon_equals(long_pos, other.long_pos) &&
+ MathUtils.epsilon_equals(long_avg, other.long_avg) &&
+ MathUtils.epsilon_equals(short_pos, other.short_pos) &&
+ MathUtils.epsilon_equals(short_avg, other.short_avg);
+
+ public override bool Equals(object obj) =>
+ obj is PositionPriceSize other && Equals(other);
+
+ public override int GetHashCode() =>
+ EqualityComparer.aggregate_hash(
+ long_pos.GetHashCode(),
+ long_avg.GetHashCode(),
+ short_pos.GetHashCode(),
+ short_avg.GetHashCode());
+
+ public static bool operator ==(PositionPriceSize a, PositionPriceSize b) => a.Equals(b);
+ public static bool operator !=(PositionPriceSize a, PositionPriceSize b) => !a.Equals(b);
+ }
+
+ readonly struct PNLRowKey : IEquatable, IComparable, IComparable {
+ public static readonly PNLRowKey empty = new PNLRowKey();
+ static readonly IComparer _comparer_inst = new ComparerBuilder(
+ new[] {
+ Comparer.Default.wrap(r => r.account ?? 0),
+ Comparer.Default.wrap(r => r.security ?? 0)
+ }).to_comparer();
+
+ public readonly Venue? exchange;
+ public readonly Security.ContractOneofCase? security_type;
+ public readonly string symbol;
+ public readonly PNLKey data_key;
+ public uint? security => data_key.security_id;
+ public uint? account => data_key.account_id;
+
+ public PNLRowKey(
+ Venue? exchange = null,
+ Security.ContractOneofCase? security_type = null,
+ string symbol = null,
+ uint? security = null,
+ uint? account = null) {
+ //
+ this.exchange = exchange;
+ this.security_type = security_type;
+ this.symbol = symbol;
+ data_key = new PNLKey(account.Value, security.Value);
+ }
+
+ int IComparable.CompareTo(object obj) =>
+ obj is PNLRowKey other ? CompareTo(other) : 1;
+
+ public int CompareTo(PNLRowKey other) =>
+ _comparer_inst.Compare(this, other);
+
+ public bool Equals(PNLRowKey other) =>
+ exchange == other.exchange &&
+ security_type == other.security_type &&
+ symbol == other.symbol &&
+ security == other.security &&
+ account == other.account;
+
+ public override bool Equals(object obj) =>
+ obj is PNLRowKey other && Equals(other);
+
+ public override int GetHashCode() =>
+ EqualityComparer.aggregate_hash(
+ exchange?.GetHashCode() ?? 0,
+ security_type?.GetHashCode() ?? 0,
+ symbol?.GetHashCode() ?? 0,
+ security?.GetHashCode() ?? 0,
+ account?.GetHashCode() ?? 0);
+
+ public static bool operator ==(PNLRowKey a, PNLRowKey b) => a.Equals(b);
+ public static bool operator !=(PNLRowKey a, PNLRowKey b) => !a.Equals(b);
+ }
+
+ readonly struct WorkingOrderData {
+ public readonly WorkingOrderSideData long_data, short_data;
+
+ WorkingOrderData(WorkingOrderSideData long_data, WorkingOrderSideData short_data) {
+ this.long_data = long_data;
+ this.short_data = short_data;
+ }
+
+ public static WorkingOrderData Empty =>
+ new WorkingOrderData(WorkingOrderSideData.EmptyLong, WorkingOrderSideData.EmptyShort);
+
+ public double top_bid =>
+ long_data.data.Count > 0 ?
+ long_data.data.First().Key :
+ double.NaN;
+
+ public double top_ask =>
+ short_data.data.Count > 0 ?
+ short_data.data.First().Key :
+ double.NaN;
+
+ public PositionPriceSize summary =>
+ new PositionPriceSize(long_data.working_total, long_data.avg_price, short_data.working_total, short_data.avg_price);
+
+ public static WorkingOrderData Create(IEnumerable orders) =>
+ orders.Aggregate(Empty, (seed, order) => seed.Add(order));
+
+ public WorkingOrderData Add(OrderRecordImmutable order) {
+ if (order.working_quantity() <= 0)
+ return new WorkingOrderData(long_data, short_data);
+ switch (order.side()) {
+ case Side.Buy: return new WorkingOrderData(long_data.Add(order), short_data);
+ case Side.Sell: return new WorkingOrderData(long_data, short_data.Add(order));
+ default: throw ExceptionBuilder.Argument.unexpected_case(order.side(), "order.side");
+ }
+ }
+
+ public WorkingOrderData Remove(OrderRecordImmutable order) {
+ if (order.working_quantity() <= 0)
+ return new WorkingOrderData(long_data, short_data);
+ switch (order.side()) {
+ case Side.Buy: return new WorkingOrderData(long_data.Remove(order.Key, order.price()), short_data);
+ case Side.Sell: return new WorkingOrderData(long_data, short_data.Remove(order.Key, order.price()));
+ default: throw ExceptionBuilder.Argument.unexpected_case(order.side(), "order.side");
+ }
+ }
+ }
+
+ readonly struct WorkingOrderSideData {
+ public readonly double avg_price;
+ public readonly ImmutableSortedDictionary> data;
+ public readonly int working_total;
+
+ WorkingOrderSideData(double avg_price, int working_total, ImmutableSortedDictionary> data) {
+ this.avg_price = avg_price;
+ this.working_total = working_total;
+ this.data = data;
+ }
+
+ public static WorkingOrderSideData EmptyLong => new WorkingOrderSideData(double.NaN, 0, ImmutableSortedDictionary.Create>(new ReverseComparer(OrderDataHelper.PriceComparer)));
+ public static WorkingOrderSideData EmptyShort => new WorkingOrderSideData(double.NaN, 0, ImmutableSortedDictionary.Create>(OrderDataHelper.PriceComparer));
+
+ public double top_price =>
+ data.Count > 0 ?
+ data.First().Key :
+ double.NaN;
+
+ public int top_volume =>
+ data.Count > 0 ?
+ data.Values.First().Values.Sum(o => o.working_quantity()) :
+ 0;
+
+ public WorkingOrderSideData Add(OrderRecordImmutable order_record) {
+ uint order = order_record.Key;
+ int working_qty = order_record.working_quantity();
+ double price = order_record.price();
+ if (working_qty <= 0)
+ throw new ArgumentException(nameof(working_qty));
+ if (working_total == 0) {
+ return new WorkingOrderSideData(price, working_qty, data.Add(price, ImmutableDictionary.Empty.Add(order, order_record)));
+ } else return new WorkingOrderSideData(
+ avg_price + ((price - avg_price) * ((double)working_qty / (working_total + working_qty))),
+ working_total + working_qty,
+ data.SetItem(price, data.TryGetValue(price, out var curr) ?
+ curr.Add(order, order_record) :
+ ImmutableDictionary.Empty.Add(order, order_record)));
+ }
+
+ public WorkingOrderSideData Remove(uint order, double price) {
+ var tmp_data = data;
+ if (!tmp_data.TryGetValue(price, out var wdata))
+ throw new KeyNotFoundException(nameof(price));
+ if (!wdata.TryGetValue(order, out var worder))
+ throw new KeyNotFoundException(nameof(order));
+ var wqty = worder.working_quantity();
+ wdata = wdata.Remove(order);
+ if (wdata.Count == 0)
+ tmp_data = tmp_data.Remove(price);
+ if (tmp_data.Count == 0)
+ return new WorkingOrderSideData(double.NaN, 0, ImmutableSortedDictionary.Create>(data.KeyComparer));
+ return new WorkingOrderSideData(
+ avg_price - ((price - avg_price) * (wqty / (working_total - wqty))),
+ working_total - wqty,
+ tmp_data);
+ }
+
+ public override string ToString() {
+ if (data.Count > 0) {
+ var best_order = data.Values.First().Values.First();
+ return OrderUtils.order_collection_summary(best_order.price(), avg_price, best_order.working_quantity(), working_total, SecurityDataHelper.Defaults.ContractSpecificationImmutable);
+ }
+ return string.Empty;
+ }
+ }
+
+ readonly struct PNLRowData : IEquatable {
+ public static readonly Func key_fn = d => d.key;
+ public static IComparer key_comparer = Comparer.Default.wrap(d => d.key);
+
+ static readonly WaterfallPriceFlags[] _waterfall_preferences = new[] {
+ WaterfallPriceFlags.LastInsideSpread,
+ WaterfallPriceFlags.Mid,
+ WaterfallPriceFlags.LastGTEBid,
+ WaterfallPriceFlags.Bid,
+ WaterfallPriceFlags.LastLTEAsk,
+ WaterfallPriceFlags.Ask,
+ WaterfallPriceFlags.Last,
+ WaterfallPriceFlags.Settle
+ };
+
+ public readonly PNLKey key;
+ public readonly SecurityImmutable? security;
+ public readonly string account_name;
+ public readonly PNLCalculationType calc_type;
+ public readonly PositionPriceSize day, raw_day, sod;
+ public readonly WorkingOrderData working;
+
+ public readonly double
+ cpp,
+ bid_price,
+ ask_price,
+ last_price,
+ settlement_price;
+
+ public PNLRowData(
+ PNLKey key,
+ double cpp = 0,
+ double bid_price = 0,
+ double ask_price = 0,
+ double last_price = 0,
+ double settlement_price = 0,
+ PositionPriceSize? sod = null,
+ PositionPriceSize? day = null,
+ PositionPriceSize? raw_day = null,
+ WorkingOrderData? working = null,
+ SecurityImmutable? security = null,
+ string account_name = null,
+ PNLCalculationType calc_type = PNLCalculationType.Mid) {
+ //
+ this.key = key;
+ this.cpp = cpp;
+ this.bid_price = bid_price;
+ this.ask_price = ask_price;
+ this.last_price = last_price;
+ this.settlement_price = settlement_price;
+ this.sod = sod ?? PositionPriceSize.empty;
+ this.day = day ?? PositionPriceSize.empty;
+ this.raw_day = raw_day ?? PositionPriceSize.empty;
+ this.working = working ?? WorkingOrderData.Empty;
+ this.security = security;
+ this.account_name = account_name;
+ this.calc_type = calc_type;
+ }
+
+ [Flags]
+ enum WaterfallPriceFlags {
+ None = 0,
+ Bid = 1,
+ Ask = 1 << 1,
+ Last = 1 << 2,
+ Settle = 1 << 3,
+ Mid = Bid | Ask,
+ LastGTEBid = Bid | Last | 1 << 4,
+ LastLTEAsk = Ask | Last | 1 << 5,
+ LastInsideSpread = LastGTEBid | LastLTEAsk,
+ BidGTESettle = Bid | Settle | 1 << 6,
+ AskLTESettle = Ask | Settle | 1 << 7
+ }
+
+ /// Market/Calc
+ public double mid_price => (bid_price + ask_price) / 2;
+ public double pnl_price {
+ get {
+ if (!day.has_position && !sod.has_position)
+ return double.NaN;
+ switch (calc_type) {
+ case PNLCalculationType.Bid: return bid_price;
+ case PNLCalculationType.Ask: return ask_price;
+ case PNLCalculationType.Mid: return mid_price;
+ case PNLCalculationType.Last: return last_price;
+ // waited averages must be used when the pnl price varies, depending on the side.
+ case PNLCalculationType.Same: return MathUtils.weighted_average(bid_price, day_long_pos, ask_price, day_short_pos);
+ case PNLCalculationType.Opposite: return MathUtils.weighted_average(ask_price, day_long_pos, bid_price, day_short_pos);
+ case PNLCalculationType.Settle: return settlement_price;
+ case PNLCalculationType.Waterfall:
+ default: return _waterfall_price();
+ }
+ }
+ }
+ public double long_pnl_price {
+ get {
+ switch (calc_type) {
+ case PNLCalculationType.Same: return bid_price;
+ case PNLCalculationType.Opposite: return ask_price;
+ default: return pnl_price;
+ }
+ }
+ }
+ public double short_pnl_price {
+ get {
+ switch (calc_type) {
+ case PNLCalculationType.Same: return ask_price;
+ case PNLCalculationType.Opposite: return bid_price;
+ default: return pnl_price;
+ }
+ }
+ }
+ /// Sod
+ public double sod_pnl => cpp *
+ DoubleUtil.nan_to_zero_sum(
+ sod_long_avg_price_delta_raw * sod_long_pos,
+ sod_short_avg_price_delta_raw * sod_short_pos
+ );
+ // long
+ public double sod_long_pos => sod.long_pos;
+ public double sod_long_avg_price => cpp * sod.long_avg;
+ public double sod_long_avg_price_raw => sod.long_avg;
+ public double sod_long_avg_price_delta => cpp * sod_long_avg_price_delta_raw;
+ public double sod_long_avg_price_delta_raw => sod.long_pos == 0 ? double.NaN : long_pnl_price - sod.long_avg;
+ // short
+ public double sod_short_pos => sod.short_pos;
+ public double sod_short_avg_price => cpp * sod.short_avg;
+ public double sod_short_avg_price_raw => sod.short_avg;
+ public double sod_short_avg_price_delta => cpp * sod_short_avg_price_delta_raw;
+ public double sod_short_avg_price_delta_raw => sod.short_pos == 0 ? double.NaN : sod.short_avg - short_pnl_price;
+ // net
+ public double sod_net_pos => sod.net_pos;
+ public double sod_net_avg_price_delta => cpp * sod_net_avg_price_delta_raw;
+ public double sod_net_avg_price_delta_raw =>
+ MathUtils.weighted_average(
+ sod_long_avg_price_delta_raw, sod.long_pos,
+ sod_short_avg_price_delta_raw, sod.short_pos);
+
+ /// Day
+ public double day_pnl => cpp *
+ DoubleUtil.nan_to_zero_sum(
+ day_long_avg_price_delta_raw * day_long_pos,
+ day_short_avg_price_delta_raw * day_short_pos
+ );
+ // long
+ public double day_long_pos => day.long_pos;
+ public double day_long_avg_price => cpp * day.long_avg;
+ public double day_long_avg_price_raw => day.long_avg;
+ public double day_long_avg_price_delta => cpp * day_long_avg_price_delta_raw;
+ public double day_long_avg_price_delta_raw => day.long_pos == 0 ? double.NaN : long_pnl_price - day.long_avg;
+ // short
+ public double day_short_pos => day.short_pos;
+ public double day_short_avg_price => cpp * day.short_avg;
+ public double day_short_avg_price_raw => day.short_avg;
+ public double day_short_avg_price_delta => cpp * day_short_avg_price_delta_raw;
+ public double day_short_avg_price_delta_raw => day.short_pos == 0 ? double.NaN : day.short_avg - short_pnl_price;
+ public bool has_day_trades => day.long_pos > 0 || day.short_pos > 0;
+ // net
+ public double day_net_pos => day.net_pos;
+ public double day_net_avg_price_delta => cpp * day_net_avg_price_delta_raw;
+ public double day_net_avg_price_delta_raw =>
+ MathUtils.weighted_average(
+ day_long_avg_price_delta_raw, day.long_pos,
+ day_short_avg_price_delta_raw, day.short_pos);
+
+ /// Raw Day
+ public double raw_day_long_pos => raw_day.long_pos;
+ public double raw_day_short_pos => raw_day.short_pos;
+ public double raw_day_net_pos => raw_day.net_pos;
+
+ /// Total
+ public double total_pnl => DoubleUtil.nan_to_zero_sum(sod_pnl, day_pnl);
+ // long
+ public double total_long_pos => DoubleUtil.nan_to_zero_sum(sod.long_pos, day.long_pos);
+ public double total_long_avg_price => cpp * total_long_avg_price_raw;
+ public double total_long_avg_price_raw => DoubleUtil.nan_to_zero_sum(sod.long_avg, day.long_avg);
+ public double total_long_avg_price_delta => cpp * total_long_avg_price_delta_raw;
+ public double total_long_avg_price_delta_raw =>
+ MathUtils.weighted_average(
+ sod_long_avg_price_delta_raw, sod.long_pos,
+ day_long_avg_price_delta_raw, day.long_pos);
+ // short
+ public double total_short_pos => DoubleUtil.nan_to_zero_sum(sod.short_pos, day.short_pos);
+ public double total_short_avg_price => cpp * total_short_avg_price_raw;
+ public double total_short_avg_price_raw => DoubleUtil.nan_to_zero_sum(sod.short_avg, day.short_avg);
+ public double total_short_avg_price_delta => cpp * total_short_avg_price_delta_raw;
+ public double total_short_avg_price_delta_raw =>
+ MathUtils.weighted_average(
+ sod_short_avg_price_delta_raw, sod.short_pos,
+ day_short_avg_price_delta_raw, day.short_pos);
+ // net
+ public double total_net_pos => DoubleUtil.nan_to_zero_sum(sod.long_pos, -sod.short_pos, day.long_pos, -day.short_pos);
+ public double total_net_avg_price_delta => cpp * total_net_avg_price_delta_raw;
+ public double total_net_avg_price_delta_raw =>
+ MathUtils.weighted_average(
+ total_long_avg_price_delta_raw, total_long_pos,
+ total_short_avg_price_delta_raw, total_short_pos);
+
+ #region Working
+ // long
+ public double working_long_pos => working.long_data.working_total;
+ public double working_long_avg_price => cpp * working_long_avg_price_raw;
+ public double working_long_top_price => cpp * working_long_top_price_raw;
+ public double working_long_top_price_raw => working.top_bid;
+ public double working_long_avg_price_raw => working.long_data.avg_price;
+ public double working_long_avg_price_delta => cpp * working_long_avg_price_delta_raw;
+ public double working_long_avg_price_delta_raw => working_long_pos == 0 ? double.NaN : long_pnl_price - working_long_avg_price_raw;
+ // short
+ public double working_short_pos => working.short_data.working_total;
+ public double working_short_avg_price => cpp * working_short_avg_price_raw;
+ public double working_short_top_price => cpp * working_short_top_price_raw;
+ public double working_short_top_price_raw => working.top_ask;
+ public double working_short_avg_price_raw => working.short_data.avg_price;
+ public double working_short_avg_price_delta => cpp * working_short_avg_price_delta_raw;
+ public double working_short_avg_price_delta_raw => working_short_pos == 0 ? double.NaN : working_short_avg_price_raw - short_pnl_price;
+ // net
+ public double working_net_pos => working_long_pos - working_short_pos;
+ public double working_net_avg_price_delta => cpp * working_net_avg_price_delta_raw;
+ public double working_net_avg_price_delta_raw =>
+ MathUtils.weighted_average(
+ working_long_avg_price_delta_raw, working_long_pos,
+ working_short_avg_price_delta_raw, working_short_pos);
+ #endregion
+
+ WaterfallPriceFlags _waterfall_flags() {
+ var flags = WaterfallPriceFlags.None;
+ if (!double.IsNaN(bid_price)) flags |= WaterfallPriceFlags.Bid;
+ if (!double.IsNaN(ask_price)) flags |= WaterfallPriceFlags.Ask;
+ if (!double.IsNaN(last_price)) flags |= WaterfallPriceFlags.Last;
+ if (last_price >= bid_price) flags |= WaterfallPriceFlags.LastGTEBid;
+ if (last_price <= ask_price) flags |= WaterfallPriceFlags.LastLTEAsk;
+ if (!double.IsNaN(settlement_price)) flags |= WaterfallPriceFlags.Settle;
+ if (bid_price >= settlement_price) flags |= WaterfallPriceFlags.BidGTESettle;
+ if (ask_price <= settlement_price) flags |= WaterfallPriceFlags.AskLTESettle;
+ return flags;
+ }
+
+ double _waterfall_price() {
+ var flags = _waterfall_flags();
+ // return price for the best match
+ for (int i = 0; i < _waterfall_preferences.Length; i++) {
+ if ((_waterfall_preferences[i] & flags) == _waterfall_preferences[i])
+ return _waterfall_price(_waterfall_preferences[i]);
+ }
+ return double.NaN;
+ }
+
+ double _waterfall_price(WaterfallPriceFlags ltp) {
+ switch (ltp) {
+ case WaterfallPriceFlags.Last:
+ case WaterfallPriceFlags.LastInsideSpread:
+ case WaterfallPriceFlags.LastGTEBid:
+ case WaterfallPriceFlags.LastLTEAsk: return last_price;
+ case WaterfallPriceFlags.Mid: return mid_price;
+ case WaterfallPriceFlags.Bid:
+ case WaterfallPriceFlags.BidGTESettle: return bid_price;
+ case WaterfallPriceFlags.Ask:
+ case WaterfallPriceFlags.AskLTESettle: return ask_price;
+ case WaterfallPriceFlags.Settle: return settlement_price;
+ default: return double.NaN;
+ }
+ }
+
+ public bool Equals(PNLRowData other) =>
+ key == other.key &&
+ cpp == other.cpp &&
+ security.HasValue == other.security.HasValue &&
+ account_name == other.account_name &&
+ sod == other.sod &&
+ day == other.day &&
+ raw_day == other.raw_day &&
+ working.summary == other.working.summary;
+
+ public override bool Equals(object obj) =>
+ obj is PNLRowData other && Equals(other);
+
+ // assuming callers will not combine different values with the same key,
+ // the other components shouldn't be included in the hash calculation.
+ public override int GetHashCode() =>
+ key.GetHashCode();
+
+ public static bool operator ==(PNLRowData a, PNLRowData b) => a.Equals(b);
+ public static bool operator !=(PNLRowData a, PNLRowData b) => !a.Equals(b);
+ }
+
+ static class PNLRowDataFactory {
+ public static PNLRowData create((SecurityImmutable? sec, PNLUnitImmutable value) t) =>
+ new PNLRowData(new PNLKey(t.value.Pos.AccountId, t.value.Pos.SecurityId),
+ t.value.CashValue,
+ t.value.BidPrice,
+ t.value.AskPrice,
+ t.value.LastPrice,
+ t.value.SettlementPrice,
+ new PositionPriceSize(t.value.Pos.SodLongPos, t.value.Pos.SodLongAvgPrice, t.value.Pos.SodShortPos, t.value.Pos.SodShortAvgPrice),
+ new PositionPriceSize(t.value.Pos.DayLongPos, t.value.Pos.DayLongAvgPrice, t.value.Pos.DayShortPos, t.value.Pos.DayShortAvgPrice),
+ t.value.Pos.raw_day_pps(),
+ WorkingOrderData.Empty,
+ t.sec,
+ t.value.Pos.Account);
+ }
+
+ static class PNLDataExtensions {
+ // Note: PNLRowData is passed by ref because it is fairly large struct, and since it is a readonly struct, we know it cannot be modified (so might as well avoid excessive copying).
+ public static PNLRowData with(this PNLRowData pnl_data, SecurityImmutable? security = null, string account_name = null, WorkingOrderData? working = null, PNLCalculationType? calc_type = null) =>
+ new PNLRowData(
+ pnl_data.key,
+ pnl_data.cpp,
+ pnl_data.bid_price,
+ pnl_data.ask_price,
+ pnl_data.last_price,
+ pnl_data.settlement_price,
+ pnl_data.sod,
+ pnl_data.day,
+ pnl_data.raw_day,
+ working ?? pnl_data.working,
+ security ?? pnl_data.security,
+ account_name ?? pnl_data.account_name,
+ calc_type ?? pnl_data.calc_type);
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/Data/PNLKey.cs b/src/client/spark/Modules/Trading/PNL/Data/PNLKey.cs
new file mode 100644
index 000000000..a3891a2d2
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/Data/PNLKey.cs
@@ -0,0 +1,40 @@
+using bts.utils;
+using System;
+
+namespace bts.shell.pnl {
+ readonly struct PNLKey : IEquatable, IComparable, IComparable {
+ public readonly uint account_id, security_id;
+
+ public PNLKey(uint account_id, uint security_id) {
+ this.account_id = account_id;
+ this.security_id = security_id;
+ }
+
+ public int CompareTo(PNLKey other) {
+ int c = account_id.CompareTo(other.account_id);
+ if (c == 0)
+ c = security_id.CompareTo(other.security_id);
+ return c;
+ }
+
+ int IComparable.CompareTo(object obj) =>
+ obj is PNLKey other ? CompareTo(other) : 1;
+
+ public bool Equals(PNLKey other) =>
+ security_id == other.security_id &&
+ account_id == other.account_id;
+
+ public override bool Equals(object obj) =>
+ obj is PNLKey other && Equals(other);
+
+ public override int GetHashCode() =>
+ (security_id.GetHashCode() % MathUtils.Primes.P_65449) |
+ ((account_id.GetHashCode() % MathUtils.Primes.P_65449) << 16);
+
+ public override string ToString() =>
+ $"Account: {account_id}, Security: {security_id}";
+
+ public static bool operator ==(PNLKey a, PNLKey b) => a.Equals(b);
+ public static bool operator !=(PNLKey a, PNLKey b) => !a.Equals(b);
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/Data/PNLNormalizedData.cs b/src/client/spark/Modules/Trading/PNL/Data/PNLNormalizedData.cs
new file mode 100644
index 000000000..5d8e7f10a
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/Data/PNLNormalizedData.cs
@@ -0,0 +1,120 @@
+using bts.utils;
+using System;
+
+namespace bts.shell.pnl {
+ readonly struct PNLNormalizedData : IEquatable {
+ public static readonly PNLNormalizedData zero =
+ new PNLNormalizedData(0, 0, 0, 0, 0, 0, 0, 0);
+
+ public PNLNormalizedData(
+ decimal day_pnl,
+ decimal day_long_pos,
+ decimal day_short_pos,
+ decimal raw_day_long_pos,
+ decimal raw_day_short_pos,
+ decimal sod_pnl,
+ decimal sod_long_pos,
+ decimal sod_short_pos,
+ decimal working_long_pos = 0,
+ decimal working_short_pos = 0) {
+ //
+ this.day_pnl = day_pnl;
+ this.day_long_pos = day_long_pos;
+ this.day_short_pos = day_short_pos;
+ this.raw_day_long_pos = raw_day_long_pos;
+ this.raw_day_short_pos = raw_day_short_pos;
+ this.sod_pnl = sod_pnl;
+ this.sod_long_pos = sod_long_pos;
+ this.sod_short_pos = sod_short_pos;
+ this.working_long_pos = working_long_pos;
+ this.working_short_pos = working_short_pos;
+ }
+
+ // sod
+ public decimal sod_pnl { get; }
+ public decimal sod_long_pos { get; }
+ public decimal sod_short_pos { get; }
+ public decimal sod_net_pos => sod_long_pos - sod_short_pos;
+ // day
+ public decimal day_pnl { get; }
+ public decimal day_long_pos { get; }
+ public decimal day_short_pos { get; }
+ public decimal day_net_pos => day_long_pos - day_short_pos;
+ // raw day
+ public decimal raw_day_long_pos { get; }
+ public decimal raw_day_short_pos { get; }
+ public decimal raw_day_net_pos => raw_day_long_pos - raw_day_short_pos;
+ // total
+ public decimal total_pnl => sod_pnl + day_pnl;
+ public decimal total_net_pos => total_long_pos - total_short_pos;
+ public decimal total_long_pos => sod_long_pos + day_long_pos;
+ public decimal total_short_pos => sod_short_pos + day_short_pos;
+ // working
+ public decimal working_long_pos { get; }
+ public decimal working_net_pos => working_long_pos - working_short_pos;
+ public decimal working_short_pos { get; }
+
+ public bool Equals(PNLNormalizedData other) =>
+ day_pnl == other.day_pnl &&
+ day_long_pos == other.day_long_pos &&
+ day_short_pos == other.day_short_pos &&
+ raw_day_long_pos == other.raw_day_long_pos &&
+ raw_day_short_pos == other.raw_day_short_pos &&
+ sod_pnl == other.sod_pnl &&
+ sod_long_pos == other.sod_long_pos &&
+ sod_short_pos == other.sod_short_pos &&
+ working_long_pos == other.working_long_pos &&
+ working_short_pos == other.working_short_pos;
+
+ public override bool Equals(object obj) =>
+ obj is PNLNormalizedData other && Equals(other);
+
+ public override int GetHashCode() =>
+ EqualityComparer.aggregate_hash(
+ day_pnl.GetHashCode(),
+ sod_pnl.GetHashCode());
+
+ public override string ToString() =>
+ string.Join(",", new[] {
+ $"SOD PNL : {sod_pnl}",
+ $"SOD Long : {sod_long_pos}",
+ $"SOD Short: {sod_short_pos}",
+ $"Day PNL : {day_pnl}",
+ $"Day Long : {day_long_pos}",
+ $"Day Short: {day_short_pos}",
+ $"Raw Day Long : {raw_day_long_pos}",
+ $"Raw Day Short: {raw_day_short_pos}",
+ $"Work Long : {working_long_pos}",
+ $"Work Short: {working_short_pos}",
+ });
+
+ public static bool operator ==(PNLNormalizedData a, PNLNormalizedData b) => a.Equals(b);
+ public static bool operator !=(PNLNormalizedData a, PNLNormalizedData b) => !a.Equals(b);
+
+ public static PNLNormalizedData operator +(PNLNormalizedData a, PNLNormalizedData b) =>
+ new PNLNormalizedData(
+ a.day_pnl + b.day_pnl,
+ a.day_long_pos + b.day_long_pos,
+ a.day_short_pos + b.day_short_pos,
+ a.raw_day_long_pos + b.raw_day_long_pos,
+ a.raw_day_short_pos + b.raw_day_short_pos,
+ a.sod_pnl + b.sod_pnl,
+ a.sod_long_pos + b.sod_long_pos,
+ a.sod_short_pos + b.sod_short_pos,
+ a.working_long_pos + b.working_long_pos,
+ a.working_short_pos + b.working_short_pos);
+
+ public static PNLNormalizedData operator -(PNLNormalizedData a, PNLNormalizedData b) =>
+ new PNLNormalizedData(
+ a.day_pnl - b.day_pnl,
+ a.day_long_pos - b.day_long_pos,
+ a.day_short_pos - b.day_short_pos,
+ a.raw_day_long_pos - b.raw_day_long_pos,
+ a.raw_day_short_pos - b.raw_day_short_pos,
+ a.sod_pnl - b.sod_pnl,
+ a.sod_long_pos - b.sod_long_pos,
+ a.sod_short_pos - b.sod_short_pos,
+ a.working_long_pos - b.working_long_pos,
+ a.working_short_pos - b.working_short_pos);
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/PNLWindowFactory.cs b/src/client/spark/Modules/Trading/PNL/PNLWindowFactory.cs
new file mode 100644
index 000000000..638c629f5
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/PNLWindowFactory.cs
@@ -0,0 +1,375 @@
+using bts.api;
+using bts.collections;
+using bts.settings;
+using bts.shell.pnl;
+using bts.spark;
+using bts.utils;
+using mbts;
+using mbts.config;
+using mbts.persist;
+using mbts.spark;
+using mbts.ui;
+using mbts.ui.controls;
+using mbts.ui.settings;
+using mbts.ui.spark;
+using mbts.ui.utility;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.ComponentModel.Composition;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media;
+
+namespace bts.shell {
+ class PNLWindowFactory : ShellWindowFactory {
+ const string _window_type = "PNL", _window_title = "PNL";
+ readonly IBus _bus;
+ readonly OrdersModel _orders_model;
+ readonly UserSettingsHub _settings_hub;
+ readonly PNLConfig _pnl_conf;
+ readonly IShellWindowThreadIDProvider _thread_id_provider;
+
+ public PNLWindowFactory(IShellModule owner, IBus bus, UserSettingsHub settings_hub, OrdersModel orders_model) : base(owner, _window_type) {
+ _bus = bus;
+ _orders_model = orders_model;
+ _settings_hub = settings_hub;
+ _pnl_conf = new PNLConfig(Configuration.get());
+ _thread_id_provider = ShellWindowThreadIDFactory.create(_window_type, Configuration.get().pnl);
+ _dispose = bus.subscribe(SparkTags.ShowPNLTag).OnDispatcher().Subscribe(_show);
+ }
+
+ public override Task load(PNLSaveState state) =>
+ Task.FromResult(_create(state.settings));
+
+ void _show(PNLSettings settings) =>
+ _bus.post(SparkTags.ShowWindow, _create(settings));
+
+ IShellWindow _create(PNLSettings settings) {
+ var settings_manager = _settings_hub.create_pnl_settings_manager(settings);
+ // Need to keep a local copy of the columns, since they are defined in xaml (not the viewmodel), and get_save_state may be called on a non-dispatcher thread.
+ // If that happens, we would be unable to access _grid.Columns, and thus unable to get the current column settings.
+ // Use an ImmutableList to avoid any threading issues when responding to CollectionChanged events on the dispatcher thread.
+ ImmutableList cached_columns = ImmutableList.Empty;
+ return SparkWindow.create(_window_type, _window_title, _bus, this, Icons.Accounting, _thread_id_provider.next_id(), () => {
+ var vm = new PNLVM(_bus, _orders_model, settings ?? PNLSettings.Default);
+ var content = new PNLView {
+ DataContext = vm
+ };
+ vm.sorting_changed += sh => {
+ try {
+ DIYGridSortHelper.set_sort_directions(sh, content._grid.Columns);
+ } catch { }
+ };
+ vm.SubscribeDisposed(
+ DIYGridSortHelper.observe_active_comparers(content._grid, PNLVM.get_column_comparer)
+ .OnDispatcher()
+ .Subscribe(sh => vm.sorting_hierarchy = sh.Select(s => (s.key, s.direction)).ToList()));
+ cached_columns = ImmutableList.Empty.AddRange(content._grid.Columns);
+
+ Func get_save_state = () => {
+ var cols = cached_columns.ToArray(c => c.create());
+ var filters = vm.get_filters_states();
+ var sorting_criterion = vm.sorting_hierarchy.Select(tup => new SortingCriteria(tup.key.ToString(), tup.direction == ListSortDirection.Ascending)).ToArray();
+ var calc_type = vm.calculation_type;
+ var state = settings_manager.instance_settings;
+ if (state == null) {
+ // don't use defaults if the user manipulated the window state outside of the settings dialog (e.g., resized column(s) via drag, or changed sort/filter)
+ var defaults = settings_manager.default_settings;
+ if (calc_type == defaults.calculation_type &&
+ defaults.sorting_criterion.SequenceEqual(sorting_criterion) &&
+ defaults.grid.columns.SequenceEqual(cols) && defaults.filters.safe_equals(filters)) {
+ // the user's current state still matches the defaults (i.e., no outside manipulation was performed); return null so this window will use the latest default settings when restored
+ return new PNLSaveState { use_defaults = true, settings = null };
+ }
+ state = defaults;
+ }
+ // assign latest values, as they may have be modified outside of the settings dialog (in which case the settings manager would be out of date)
+ state = state.with(
+ sorting_criterion,
+ vm.anchors,
+ filters,
+ state.grid.with(columns: cols, background: vm.grid_background_color.rgb_color()),
+ calc_type,
+ vm.header_row_display);
+ return new PNLSaveState { use_defaults = false, settings = state };
+ };
+ IEnumerable commands = new[] {
+ new SparkCommandCommand("Collapse All", Icons.RightArrow, new DelegateCommand(() => vm.set_all_expanded(false))),
+ new SparkCommandCommand("Expand All", Icons.DownArrow, new DelegateCommand(() => vm.set_all_expanded(true))),
+ new SparkCommandCommand("Play", Icons.Play, new DelegateCommand(() => vm.is_paused = false)) {
+ show_in_context_menu = _pnl_conf.show_pause_resume,
+ show_in_toolbar = _pnl_conf.show_pause_resume
+ },
+ new SparkCommandCommand("Pause", Icons.Pause, new DelegateCommand(() => vm.is_paused = true)) {
+ show_in_context_menu = _pnl_conf.show_pause_resume,
+ show_in_toolbar = _pnl_conf.show_pause_resume
+ },
+ SparkCommands.window_settings_command(new DialogCommand(() => {
+ settings_manager.instance_settings = get_save_state().settings;
+ var dialog_vm = new ShellSettingsDialogVM(
+ settings_manager,
+ us => us.pnl,
+ UserSettings.FileExtensions.PNL,
+ s => new PNLSettingsVM(s));
+ var dialog = new ShellSettingsDialog { DataContext = dialog_vm };
+ dialog_vm.RequestClose += on_request_close;
+ return dialog;
+ void on_request_close(object sender, EventArgs e) =>
+ WindowUtilities.force_close(dialog);
+ }))
+ };
+ IDisposable dispose = Disposable.Create(
+ settings_manager.subscribe_current().OnDispatcher().Subscribe(s => {
+ vm.load_from(s);
+ var col_setting_map = s.grid.columns.ToDictionary(c => c.id);
+ var fallback_family = new FontFamily(s.grid.font_family);
+ // group
+ var group_col_setting_map = s.group_columns.ToDictionary(c => c.id);
+ var group_appearance = s.group_cell_appearance.to_appearance();
+ // header
+ var header_col_setting_map = s.header_columns.ToDictionary(c => c.id);
+ var header_appearance = s.header_cell_appearance.to_appearance();
+ //
+ foreach (var c in content._grid.Columns.OfType()) {
+ if (col_setting_map.TryGetValue(c.id, out var cs)) {
+ c.load_from(cs);
+ }
+ if (group_col_setting_map.TryGetValue(c.id, out var gcs)) {
+ c.load_group_params(
+ group_appearance.font_size,
+ gcs.font_weight_override ?? group_appearance.font_weight,
+ gcs.font_color_override ?? group_appearance.foreground,
+ group_appearance.font_family);
+ }
+ if (header_col_setting_map.TryGetValue(c.id, out var hcs)) {
+ c.load_header_params(
+ header_appearance.font_size,
+ hcs.font_weight_override ?? header_appearance.font_weight,
+ hcs.font_color_override ?? header_appearance.foreground,
+ header_appearance.font_family);
+ }
+ }
+ CollectionHelper.sync_with_never_duplicate(content._grid.Columns, s.grid.columns, cs => {
+ throw new InvalidOperationException();
+ }, c => c.id.ToLower(), cs => cs.id.ToLower());
+ }),
+ content._grid.Columns.Subscribe((s, e) => {
+ switch (e.Action) {
+ case NotifyCollectionChangedAction.Add: add_new(); break;
+ case NotifyCollectionChangedAction.Remove: remove_old(); break;
+ case NotifyCollectionChangedAction.Replace:
+ case NotifyCollectionChangedAction.Move:
+ remove_old();
+ add_new();
+ break;
+ case NotifyCollectionChangedAction.Reset:
+ cached_columns = ImmutableList.Empty.AddRange(content._grid.Columns);
+ break;
+ }
+ void add_new() =>
+ cached_columns = e.NewStartingIndex >= 0 ?
+ cached_columns.InsertRange(e.NewStartingIndex, e.NewItems.OfType()) :
+ cached_columns.AddRange(e.NewItems.OfType());
+
+ void remove_old() =>
+ cached_columns = e.OldStartingIndex >= 0 ?
+ cached_columns.RemoveRange(e.OldStartingIndex, e.OldItems.Count) :
+ cached_columns.RemoveRange(e.OldItems.OfType());
+ }),
+ Disposable.wrap_collection(commands.OfType()),
+ vm);
+ return (content, commands, get_save_state, dispose);
+ },
+ min_width_offset: SystemParameters.HorizontalScrollBarButtonWidth + 8,
+ min_height_offset: 60);
+ }
+
+ readonly struct PNLConfig {
+ public readonly bool
+ enable_animations,
+ show_pause_resume;
+
+ public PNLConfig(bts.config.PNLOptions options) {
+ enable_animations = options.enable_animations;
+ show_pause_resume = options.show_pause_resume;
+ }
+ }
+
+ [Export(typeof(IPNLSettingsMigrationRule))]
+ class AddMissingAnimationsMigrationRule : IPNLSettingsMigrationRule {
+ public bool apply(PNLSettings settings, out PNLSettings new_settings) {
+ if (settings != null && (
+ _apply(ref settings, settings.animations, PNLSettings.default_animations, (s, anims) => s.with(animations: anims)) |
+ _apply(ref settings, settings.group_header_animations, PNLSettings.default_group_header_animations, (s, anims) => s.with(group_header_animations: anims)) |
+ _apply(ref settings, settings.header_row_animations, PNLSettings.default_header_row_animations, (s, anims) => s.with(header_row_animations: anims)))) {
+ //
+ new_settings = settings;
+ return true;
+ }
+ new_settings = null;
+ return false;
+ }
+
+ static bool _apply(ref PNLSettings settings, IEnumerable actual_triggers, IEnumerable default_triggers, Func set_triggers) {
+ if (_apply(actual_triggers, default_triggers, out var result)) {
+ settings = set_triggers(settings, actual_triggers.Concat(result).ToArray());
+ return true;
+ }
+ return false;
+ }
+
+ static bool _apply(IEnumerable actual_triggers, IEnumerable default_triggers, out IEnumerable result) {
+ var default_trigger_map = default_triggers.ToDictionary(t => t.expression);
+ var actual_trigger_map = actual_triggers.ToImmutableDictionary(t => t.expression);
+ var snapshot = actual_trigger_map;
+ foreach (var kv in snapshot) {
+ if (default_trigger_map.TryGetValue(kv.Key, out var default_anims)) {
+ // assume 1 animation per column
+ var actual_col_anims = kv.Value.animations.ToDictionaryCrushed(a => a.column);
+ var default_col_anims = default_anims.animations.ToDictionaryCrushed(a => a.column);
+ actual_col_anims.Difference(default_col_anims,
+ out var exclusive_actual,
+ out var exclusive_defaults,
+ out var diff);
+ var new_col_anims = exclusive_defaults.ToList();
+ if (new_col_anims.Count > 0) {
+ // add the original col animations to the new ones (combine them)
+ new_col_anims.AddRange(actual_col_anims);
+ actual_trigger_map = actual_trigger_map.SetItem(kv.Key, kv.Value.with(animations: new_col_anims.Select(col_anim => col_anim.Value).ToArray()));
+ }
+ }
+ }
+ foreach (var kv in default_trigger_map) {
+ if (!actual_trigger_map.ContainsKey(kv.Key))
+ actual_trigger_map = actual_trigger_map.Add(kv.Key, kv.Value);
+ }
+ if (actual_trigger_map != snapshot) {
+ result = actual_trigger_map.Values;
+ return true;
+ }
+ result = null;
+ return false;
+ }
+ }
+
+ [Export(typeof(IPNLSettingsMigrationRule))]
+ class AddMissingColumnsMigrationRule : IPNLSettingsMigrationRule {
+ public bool apply(PNLSettings settings, out PNLSettings new_settings) {
+ if (settings != null) {
+ var defaults = PNLSettings.Default;
+ if (_apply(ref settings, settings.grid.columns, defaults.grid.columns, (s, cols) => s.with(grid: s.grid.with(cols))) |
+ _apply(ref settings, settings.group_columns, defaults.group_columns, (s, cols) => s.with(group_columns: cols)) |
+ _apply(ref settings, settings.header_columns, defaults.header_columns, (s, cols) => s.with(header_columns: cols))) {
+ new_settings = settings;
+ return true;
+ }
+ }
+ new_settings = null;
+ return false;
+ }
+
+ static bool _apply(ref PNLSettings settings, IEnumerable actual_columns, IEnumerable default_columns, Func, PNLSettings> set_columns) {
+ if (GridSettingsHelper.add_missing_columns(actual_columns, default_columns, out var new_cols)) {
+ settings = set_columns(settings, new_cols);
+ return true;
+ }
+ return false;
+ }
+ }
+
+ [Export(typeof(IPNLSettingsMigrationRule))]
+ class RemoveColumnsMigrationRule : IPNLSettingsMigrationRule {
+ public bool apply(PNLSettings settings, out PNLSettings new_settings) {
+ if (settings != null) {
+ if (_apply(ref settings, settings.grid.columns, (s, cols) => s.with(grid: s.grid.with(cols))) |
+ _apply(ref settings, settings.group_columns, (s, cols) => s.with(group_columns: cols)) |
+ _apply(ref settings, settings.header_columns, (s, cols) => s.with(header_columns: cols))) {
+ new_settings = settings;
+ return true;
+ }
+ }
+ new_settings = null;
+ return false;
+ }
+
+ bool _apply(ref PNLSettings settings, IEnumerable columns, Func, PNLSettings> set_columns) {
+ if (_apply(columns, out var new_cols)) {
+ settings = set_columns(settings, new_cols);
+ return true;
+ }
+ return false;
+ }
+
+ bool _apply(IEnumerable columns, out IEnumerable result) {
+ var col_list = columns.ToList();
+ int orig_count = col_list.Count;
+ col_list.RemoveWhere(c => !Enum.TryParse(c.id, true, out var _));
+ if (col_list.Count < orig_count) {
+ result = col_list;
+ return true;
+ }
+ result = null;
+ return false;
+ }
+ }
+
+ [Export(typeof(IPNLSettingsMigrationRule))]
+ class RemoveColumnAnimationsMigrationRule : IPNLSettingsMigrationRule {
+ public bool apply(PNLSettings settings, out PNLSettings new_settings) {
+ if (settings != null) {
+ if (_apply(ref settings, settings.animations, (s, t) => s.with(animations: t)) |
+ _apply(ref settings, settings.group_header_animations, (s, t) => s.with(group_header_animations: t)) |
+ _apply(ref settings, settings.header_row_animations, (s, t) => s.with(header_row_animations: t))) {
+ new_settings = settings;
+ return true;
+ }
+ }
+ new_settings = null;
+ return false;
+ }
+
+ bool _apply(ref PNLSettings settings, IEnumerable triggers, Func, PNLSettings> set_triggers) {
+ if (_apply(triggers, out var new_triggers)) {
+ settings = set_triggers(settings, new_triggers);
+ return true;
+ }
+ return false;
+ }
+
+ bool _apply(IEnumerable triggers, out IEnumerable result) {
+ var trigger_map = triggers.ToImmutableDictionary(t => t.expression);
+ var snapshot = trigger_map;
+ foreach (var t in trigger_map.Values) {
+ var anims = t.animations.ToList();
+ int orig_count = anims.Count;
+ anims.RemoveWhere(a => !Enum.IsDefined(typeof(PNLView.Columns), a.column));
+ if (anims.Count < orig_count)
+ trigger_map = trigger_map.SetItem(t.expression, t.with(animations: anims.ToArray()));
+ }
+ if (trigger_map != snapshot) {
+ result = trigger_map.Values;
+ return true;
+ }
+ result = null;
+ return false;
+ }
+ }
+
+ [Export(typeof(IPNLSettingsMigrationRule))]
+ class EnableGridBackgroundColorMigrationRule : IPNLSettingsMigrationRule {
+ public bool apply(PNLSettings settings, out PNLSettings new_settings) {
+ if (settings != null && !settings.grid.enable_background_color) {
+ new_settings = settings.with(grid: settings.grid.with(enable_background_color: true));
+ return true;
+ }
+ new_settings = null;
+ return false;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/Settings/PNLAnimationTrigger.cs b/src/client/spark/Modules/Trading/PNL/Settings/PNLAnimationTrigger.cs
new file mode 100644
index 000000000..f7c55805f
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/Settings/PNLAnimationTrigger.cs
@@ -0,0 +1,94 @@
+using bts.utils;
+using mbts.expression;
+using mbts.ui;
+using ProtoBuf;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using static bts.shell.pnl.PNLView;
+
+namespace bts.shell.pnl {
+ interface IPNLAnimationTrigger {
+ IReadOnlyDictionary trigger(T value);
+ }
+
+ readonly struct PNLAnimationTrigger : IPNLAnimationTrigger {
+ public readonly Func predicate;
+ public readonly IReadOnlyDictionary animations;
+
+ public PNLAnimationTrigger(Func predicate, IReadOnlyDictionary animations) {
+ this.predicate = predicate;
+ this.animations = animations;
+ }
+
+ public IReadOnlyDictionary trigger(T value) =>
+ predicate(value) ? animations : DictionaryHelper.empty();
+ }
+
+ [ProtoContract]
+ class PNLAnimationTriggerData : IEquatable {
+ static readonly int _type_hash = typeof(PNLAnimationTriggerData).GetHashCode();
+
+ [ProtoMember(1)]
+ public string expression { get; set; }
+ [ProtoMember(2)]
+ public PNLAnimation[] animations { get; set; }
+
+ public IPNLAnimationTrigger to_trigger() =>
+ new PNLAnimationTrigger(
+ CoreExpressionEvaluator.try_create(expression, out var eval) ?
+ eval.apply : new Func(_ => true),
+ animations.ToDictionary(a => a.column, a => a.to_appearance()));
+
+ public PNLAnimationTriggerData with(string expression = null, PNLAnimation[] animations = null) =>
+ new PNLAnimationTriggerData {
+ expression = expression ?? this.expression,
+ animations = animations ?? this.animations
+ };
+
+ public bool Equals(PNLAnimationTriggerData other) =>
+ other != null &&
+ expression == other.expression &&
+ EqualityComparer.safe_sequence_equals(animations, other.animations);
+
+ public override bool Equals(object obj) =>
+ Equals(obj as PNLAnimationTriggerData);
+
+ public override int GetHashCode() =>
+ _type_hash;
+ }
+
+ [ProtoContract]
+ class PNLAnimation : IEquatable {
+ static readonly int _type_hash = typeof(PNLAnimation).GetHashCode();
+
+ [ProtoMember(1)]
+ public Columns column { get; set; }
+ [ProtoMember(2)]
+ public int? font_weight { get; set; }
+ [ProtoMember(3)]
+ public uint? foreground { get; set; }
+ [ProtoMember(4)]
+ public uint? background { get; set; }
+
+ public PNLCellAppearance to_appearance() =>
+ new PNLCellAppearance(
+ foreground?.argb_color(),
+ background?.argb_color(),
+ font_weight.HasValue ? FontWeight.FromOpenTypeWeight(font_weight.Value) : (FontWeight?)null);
+
+ public bool Equals(PNLAnimation other) =>
+ other != null &&
+ column == other.column &&
+ font_weight == other.font_weight &&
+ foreground == other.foreground &&
+ background == other.background;
+
+ public override bool Equals(object obj) =>
+ Equals(obj as PNLAnimation);
+
+ public override int GetHashCode() =>
+ _type_hash;
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/Settings/PNLCellAppearance.cs b/src/client/spark/Modules/Trading/PNL/Settings/PNLCellAppearance.cs
new file mode 100644
index 000000000..2aa13c44b
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/Settings/PNLCellAppearance.cs
@@ -0,0 +1,99 @@
+using bts.proto;
+using bts.utils;
+using mbts;
+using mbts.ui;
+using mbts.ui.utility.text;
+using ProtoBuf;
+using System;
+using System.Windows;
+using System.Windows.Media;
+using FontFamily = System.Windows.Media.FontFamily;
+
+namespace bts.shell.pnl {
+ readonly struct PNLCellAppearance : IEquatable {
+ public readonly FontWeight? font_weight;
+ public readonly Color? foreground, background;
+ public readonly double font_size;
+ public readonly FontFamily font_family;
+
+ public PNLCellAppearance(Color? foreground = null, Color? background = null, FontWeight? font_weight = null, FontFamily font_family = null, double font_size = double.NaN) {
+ this.foreground = foreground;
+ this.background = background;
+ this.font_weight = font_weight;
+ this.font_family = font_family;
+ this.font_size = font_size;
+ }
+
+ ///
+ /// Uses the specified appearance to replace null/absent values.
+ ///
+ public PNLCellAppearance merge(PNLCellAppearance other) =>
+ new PNLCellAppearance(
+ foreground ?? other.foreground,
+ background ?? other.background,
+ font_weight ?? other.font_weight,
+ font_family ?? other.font_family,
+ double.IsNaN(font_size) || font_size == 0 ? other.font_size : font_size);
+
+ public bool Equals(PNLCellAppearance other) =>
+ font_weight == other.font_weight &&
+ foreground == other.foreground &&
+ background == other.background &&
+ font_size.Equals(other.font_size) &&
+ Equals(font_family, other.font_family);
+
+ public override bool Equals(object obj) =>
+ obj is PNLCellAppearance other && Equals(other);
+
+ public override int GetHashCode() =>
+ EqualityComparer.auto_phase(
+ font_weight?.GetHashCode() ?? 0,
+ foreground?.GetHashCode() ?? 0,
+ background?.GetHashCode() ?? 0,
+ font_size.GetHashCode(),
+ font_family?.GetHashCode() ?? 0);
+ }
+
+ [ProtoContract]
+ class PNLCellAppearanceProto : IEquatable {
+ static readonly int _type_hash = typeof(PNLCellAppearanceProto).GetHashCode();
+
+ [ProtoMember(1)]
+ public FontParamsProto font_params { get; set; }
+ [ProtoMember(2)]
+ public uint? background { get; set; }
+
+ public static PNLCellAppearanceProto from_appearance(PNLCellAppearance cell_appearance) =>
+ new PNLCellAppearanceProto {
+ font_params = new FontParamsProto {
+ typeface = new TypefaceProto(
+ cell_appearance.font_family?.name(),
+ (cell_appearance.font_weight ?? FontWeights.Normal).ToOpenTypeWeight()),
+ font_color = cell_appearance.foreground?.rgb_color() ?? 0,
+ font_size = cell_appearance.font_size,
+ },
+ background = cell_appearance.background?.rgb_color()
+ };
+
+ public PNLCellAppearance to_appearance() {
+ var font = font_params?.to_wpf_params();
+ return new PNLCellAppearance(
+ font?.color,
+ background?.argb_color(),
+ font?.weight,
+ font?.family,
+ font?.size ?? double.NaN);
+ }
+
+ public bool Equals(PNLCellAppearanceProto other) =>
+ other != null &&
+ background == other.background &&
+ font_params.safe_equals(other.font_params);
+
+ public override bool Equals(object obj) =>
+ Equals(obj as PNLCellAppearanceProto);
+
+ public override int GetHashCode() =>
+ _type_hash;
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/Settings/PNLFilterStates.cs b/src/client/spark/Modules/Trading/PNL/Settings/PNLFilterStates.cs
new file mode 100644
index 000000000..1927dd332
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/Settings/PNLFilterStates.cs
@@ -0,0 +1,255 @@
+using bts.api;
+using mbts;
+using mbts.spark;
+using mbts.spark.filters;
+using ProtoBuf;
+using System;
+using System.Linq;
+
+namespace bts.shell.pnl {
+ [ProtoContract]
+ class FilterStates : IEquatable {
+ static readonly int _type_hash = typeof(FilterStates).GetHashCode();
+
+ // account
+ [ProtoMember(1)]
+ uint[] _account;
+ public uint[] account {
+ get => _account ?? Array.Empty();
+ set => _account = value;
+ }
+ // exchange
+ [ProtoMember(2)]
+ Venue[] _exchange;
+ public Venue[] exchange {
+ get => _exchange ?? Array.Empty();
+ set => _exchange = value;
+ }
+ // symbol
+ [ProtoMember(3)]
+ string[] _symbol;
+ public string[] symbol {
+ get => _symbol ?? Array.Empty();
+ set => _symbol = value;
+ }
+ // security type
+ [ProtoMember(4)]
+ Security.ContractOneofCase[] _security_type;
+ public Security.ContractOneofCase[] security_type {
+ get => _security_type ?? Array.Empty();
+ set => _security_type = value;
+ }
+ // security
+ [ProtoMember(5)]
+ public string security { get; set; }
+ [ProtoMember(6)]
+ public string security_key { get; set; }
+ // cpp
+ [ProtoMember(7)]
+ public DoubleMinMaxState cpp { get; set; }
+
+ /// sod
+ [ProtoMember(8)]
+ public DoubleMinMaxState sod_pnl { get; set; }
+ // sod long
+ [ProtoMember(9)]
+ public DoubleMinMaxState sod_long_pos { get; set; }
+ [ProtoMember(10)]
+ public DoubleMinMaxState sod_long_avg_price { get; set; }
+ // sod short
+ [ProtoMember(11)]
+ public DoubleMinMaxState sod_short_pos { get; set; }
+ [ProtoMember(12)]
+ public DoubleMinMaxState sod_short_avg_price { get; set; }
+ // sod net
+ [ProtoMember(13)]
+ public DoubleMinMaxState sod_net_pos { get; set; }
+
+ /// day
+ [ProtoMember(14)]
+ public DoubleMinMaxState day_pnl { get; set; }
+ // day long
+ [ProtoMember(15)]
+ public DoubleMinMaxState day_long_pos { get; set; }
+ [ProtoMember(16)]
+ public DoubleMinMaxState day_long_avg_price { get; set; }
+ // day short
+ [ProtoMember(17)]
+ public DoubleMinMaxState day_short_pos { get; set; }
+ [ProtoMember(18)]
+ public DoubleMinMaxState day_short_avg_price { get; set; }
+ // day net
+ [ProtoMember(19)]
+ public DoubleMinMaxState day_net_pos { get; set; }
+ // has day trades
+ [ProtoMember(20)]
+ bool[] _has_day_trades;
+ public bool[] has_day_trades {
+ get => _has_day_trades ?? Array.Empty();
+ set => _has_day_trades = value;
+ }
+
+ /// raw day
+ [ProtoMember(21)]
+ public DoubleMinMaxState raw_day_long_pos { get; set; }
+ [ProtoMember(22)]
+ public DoubleMinMaxState raw_day_short_pos { get; set; }
+ [ProtoMember(23)]
+ public DoubleMinMaxState raw_day_net_pos { get; set; }
+
+ /// working (long)
+ [ProtoMember(24)]
+ public DoubleMinMaxState working_long_pos { get; set; }
+ [ProtoMember(25)]
+ public DoubleMinMaxState working_long_avg_price { get; set; }
+ [ProtoMember(26)]
+ // working short
+ public DoubleMinMaxState working_short_pos { get; set; }
+ [ProtoMember(27)]
+ public DoubleMinMaxState working_short_avg_price { get; set; }
+ // working net
+ [ProtoMember(28)]
+ public DoubleMinMaxState working_net_pos { get; set; }
+
+ /// total
+ [ProtoMember(29)]
+ public DoubleMinMaxState total_pnl { get; set; }
+ // total long
+ [ProtoMember(30)]
+ public DoubleMinMaxState total_long_pos { get; set; }
+ [ProtoMember(31)]
+ public DoubleMinMaxState total_long_avg_price { get; set; }
+ // total short
+ [ProtoMember(32)]
+ public DoubleMinMaxState total_short_pos { get; set; }
+ [ProtoMember(33)]
+ public DoubleMinMaxState total_short_avg_price { get; set; }
+ // total net
+ [ProtoMember(34)]
+ public DoubleMinMaxState total_net_pos { get; set; }
+
+ /// market
+ [ProtoMember(35)]
+ public DoubleMinMaxState bid_price { get; set; }
+ [ProtoMember(36)]
+ public DoubleMinMaxState mid_price { get; set; }
+ [ProtoMember(37)]
+ public DoubleMinMaxState ask_price { get; set; }
+ [ProtoMember(38)]
+ public DoubleMinMaxState last_price { get; set; }
+ [ProtoMember(39)]
+ public DoubleMinMaxState settlement_price { get; set; }
+ [ProtoMember(40)]
+ public DoubleMinMaxState pnl_price { get; set; }
+
+ public bool Equals(FilterStates other) =>
+ other != null &&
+ account.SequenceEqual(other.account) &&
+ exchange.SequenceEqual(other.exchange) &&
+ symbol.SequenceEqual(other.symbol) &&
+ security_type.SequenceEqual(other.security_type) &&
+ security == other.security &&
+ security_key == other.security_key &&
+ cpp.safe_equals(other.cpp) &&
+ /// sod
+ sod_pnl.safe_equals(other.sod_pnl) &&
+ sod_long_pos.safe_equals(other.sod_long_pos) &&
+ sod_long_avg_price.safe_equals(other.sod_long_avg_price) &&
+ sod_short_pos.safe_equals(other.sod_short_pos) &&
+ sod_short_avg_price.safe_equals(other.sod_short_avg_price) &&
+ sod_net_pos.safe_equals(other.sod_net_pos) &&
+ /// day
+ day_pnl.safe_equals(other.day_pnl) &&
+ day_long_pos.safe_equals(other.day_long_pos) &&
+ day_long_avg_price.safe_equals(other.day_long_avg_price) &&
+ day_short_pos.safe_equals(other.day_short_pos) &&
+ day_short_avg_price.safe_equals(other.day_short_avg_price) &&
+ day_net_pos.safe_equals(other.day_net_pos) &&
+ has_day_trades.SequenceEqual(other.has_day_trades) &&
+ /// raw day
+ raw_day_long_pos.safe_equals(other.raw_day_long_pos) &&
+ raw_day_short_pos.safe_equals(other.raw_day_short_pos) &&
+ raw_day_net_pos.safe_equals(other.raw_day_net_pos) &&
+ /// working
+ working_long_pos.safe_equals(other.working_long_pos) &&
+ working_long_avg_price.safe_equals(other.working_long_avg_price) &&
+ working_short_pos.safe_equals(other.working_short_pos) &&
+ working_short_avg_price.safe_equals(other.working_short_avg_price) &&
+ working_net_pos.safe_equals(other.working_net_pos) &&
+ /// total
+ total_pnl.safe_equals(other.total_pnl) &&
+ total_long_pos.safe_equals(other.total_long_pos) &&
+ total_long_avg_price.safe_equals(other.total_long_avg_price) &&
+ total_short_pos.safe_equals(other.total_short_pos) &&
+ total_short_avg_price.safe_equals(other.total_short_avg_price) &&
+ total_net_pos.safe_equals(other.total_net_pos) &&
+ /// market
+ bid_price.safe_equals(other.bid_price) &&
+ ask_price.safe_equals(other.ask_price) &&
+ mid_price.safe_equals(other.mid_price) &&
+ last_price.safe_equals(other.last_price) &&
+ settlement_price.safe_equals(other.settlement_price) &&
+ pnl_price.safe_equals(other.pnl_price);
+
+ public override bool Equals(object obj) =>
+ Equals(obj as FilterStates);
+
+ public override int GetHashCode() =>
+ _type_hash;
+ }
+
+ static class PNLFilterStatesExtensions {
+ public static Func build_predicate(this FilterStates fs) {
+ var bd = new ColumnPredicateBuilder();
+ // impl (add all)
+ bd.add_discrete_values(fs.account, d => d.key.account_id);
+ bd.add_discrete_values(fs.exchange, d => d.security.exchange_or_default());
+ bd.add_discrete_values(fs.symbol, d => d.security.symbol_or_default());
+ bd.add_discrete_values(fs.security_type, d => d.security.HasValue ? d.security.Value.ContractCase : Security.ContractOneofCase.None);
+ bd.add_regex(fs.security, d => d.security.ToString());
+ bd.add_regex(fs.security_key, d => d.key.security_id.ToString());
+ bd.add_numeric(fs.cpp, d => d.cpp);
+ /// sod
+ bd.add_numeric(fs.sod_pnl, d => d.sod_pnl);
+ bd.add_numeric(fs.sod_long_pos, d => d.sod_long_pos);
+ bd.add_numeric(fs.sod_long_avg_price, d => d.sod_long_avg_price_raw);
+ bd.add_numeric(fs.sod_short_pos, d => d.sod_short_pos);
+ bd.add_numeric(fs.sod_short_avg_price, d => d.sod_short_avg_price_raw);
+ bd.add_numeric(fs.sod_net_pos, d => d.sod_net_pos);
+ /// day
+ bd.add_numeric(fs.day_pnl, d => d.day_pnl);
+ bd.add_numeric(fs.day_long_pos, d => d.day_long_pos);
+ bd.add_numeric(fs.day_long_avg_price, d => d.day_long_avg_price_raw);
+ bd.add_numeric(fs.day_short_pos, d => d.day_short_pos);
+ bd.add_numeric(fs.day_short_avg_price, d => d.day_short_avg_price_raw);
+ bd.add_numeric(fs.day_net_pos, d => d.day_net_pos);
+ bd.add_discrete_values(fs.has_day_trades, d => d.has_day_trades);
+ /// raw day
+ bd.add_numeric(fs.raw_day_long_pos, d => d.raw_day_long_pos);
+ bd.add_numeric(fs.raw_day_short_pos, d => d.raw_day_short_pos);
+ bd.add_numeric(fs.raw_day_net_pos, d => d.raw_day_net_pos);
+ /// working
+ bd.add_numeric(fs.working_long_pos, d => d.working_long_pos);
+ bd.add_numeric(fs.working_long_avg_price, d => d.working_long_avg_price_raw);
+ bd.add_numeric(fs.working_short_pos, d => d.working_short_pos);
+ bd.add_numeric(fs.working_short_avg_price, d => d.working_short_avg_price_raw);
+ bd.add_numeric(fs.working_net_pos, d => d.working_net_pos);
+ /// total
+ bd.add_numeric(fs.total_pnl, d => d.total_pnl);
+ bd.add_numeric(fs.total_long_pos, d => d.total_long_pos);
+ bd.add_numeric(fs.total_long_avg_price, d => d.total_long_avg_price_raw);
+ bd.add_numeric(fs.total_short_pos, d => d.total_short_pos);
+ bd.add_numeric(fs.total_short_avg_price, d => d.total_short_avg_price_raw);
+ bd.add_numeric(fs.total_net_pos, d => d.total_net_pos);
+ /// market
+ bd.add_numeric(fs.bid_price, d => d.bid_price);
+ bd.add_numeric(fs.ask_price, d => d.ask_price);
+ bd.add_numeric(fs.mid_price, d => d.mid_price);
+ bd.add_numeric(fs.last_price, d => d.last_price);
+ bd.add_numeric(fs.settlement_price, d => d.settlement_price);
+ bd.add_numeric(fs.pnl_price, d => d.pnl_price);
+ //
+ return bd.to_predicate();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/Settings/PNLSettings.cs b/src/client/spark/Modules/Trading/PNL/Settings/PNLSettings.cs
new file mode 100644
index 000000000..5dcbf04ab
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/Settings/PNLSettings.cs
@@ -0,0 +1,489 @@
+using bts.api;
+using bts.proto;
+using mbts;
+using mbts.ui;
+using mbts.ui.settings;
+using ProtoBuf;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Media;
+using static bts.shell.pnl.PNLView;
+using static mbts.ui.controls.DIYGrid;
+using Headers = mbts.ui.controls.DIYGrid.DefaultColumnHeaders.PNLHeaders;
+using Widths = mbts.ui.controls.DIYGrid.DefaultColumnWidths.PNL;
+
+namespace bts.shell.pnl {
+ [ProtoContract]
+ class PNLSaveState : IEquatable {
+ [ProtoMember(1)]
+ public bool use_defaults { get; set; }
+ [ProtoMember(2)]
+ public PNLSettings settings { get; set; }
+
+ public bool Equals(PNLSaveState other) =>
+ other != null &&
+ use_defaults == other.use_defaults &&
+ (use_defaults || settings.safe_equals(other.settings));
+ }
+
+ [ProtoContract]
+ class PNLSettings : IEquatable {
+ const double _default_group_font_size = double.NaN;
+ // bold
+ const int _default_group_font_weight = 700;
+
+ public static readonly IReadOnlyList header_row_display_options =
+ new[] {
+ PNLHeaderRowDisplay.None,
+ PNLHeaderRowDisplay.Total,
+ PNLHeaderRowDisplay.SelectedTotal,
+ PNLHeaderRowDisplay.Total | PNLHeaderRowDisplay.SelectedTotal
+ };
+
+ public static readonly IReadOnlyList anchorable_columns =
+ new[] {
+ Columns.Account,
+ Columns.Exchange,
+ Columns.Symbol,
+ Columns.SecurityType,
+ Columns.Security
+ };
+
+ [ProtoMember(1)]
+ SortingCriteria[] _sorting_criterion;
+ [ProtoMember(5)]
+ Columns[] _anchors;
+ [ProtoMember(7)]
+ PNLCellAppearanceProto _group_cell_appearance;
+ [ProtoMember(8)]
+ PNLCellAppearanceProto _header_cell_appearance;
+ // don't store in proto yet (this type may change)
+ [ProtoMember(9)]
+ PNLAnimationTriggerData[] _animations;
+ [ProtoMember(10)]
+ PNLAnimationTriggerData[] _group_header_animations;
+ [ProtoMember(11)]
+ GridColumnSettings[] _group_columns;
+ [ProtoMember(12)]
+ GridColumnSettings[] _header_columns;
+ [ProtoMember(13)]
+ PNLAnimationTriggerData[] _header_row_animations;
+ [ProtoMember(14)]
+ List _group_background_colors;
+
+ GridSettings _grid_backing;
+ PNLCellAppearanceProto _grid_cell_appearance_backing;
+
+ public static PNLSettings Default =>
+ new PNLSettings {
+ _sorting_criterion = new[] {
+ new SortingCriteria(nameof(Columns.Account), true),
+ new SortingCriteria(nameof(Columns.Security), true)
+ },
+ filters = new FilterStates {
+ security_type = new Security.ContractOneofCase[] {
+ Security.ContractOneofCase.Future
+ },
+ has_day_trades = new[] { true }
+ },
+ grid = DefaultGridSettings,
+ calculation_type = PNLCalculationType.Mid,
+ header_row_display = PNLHeaderRowDisplay.None,
+ _anchors = new[] { Columns.Account, Columns.Symbol },
+ _group_background_colors = BTSColors.PNL.group_alternating_background_colors.Select(c => c.rgb_color()).ToList(),
+ _group_cell_appearance = new PNLCellAppearanceProto {
+ font_params = new FontParamsProto {
+ typeface = new TypefaceProto(
+ GridSettings.Default.font_family,
+ FontWeights.Bold.ToOpenTypeWeight()),
+ font_color = Colors.Black.rgb_color(),
+ font_size = 11
+ },
+ background = Colors.Transparent.rgb_color()
+ },
+ _header_cell_appearance = new PNLCellAppearanceProto {
+ font_params = new FontParamsProto {
+ typeface = new TypefaceProto(
+ GridSettings.Default.font_family,
+ FontWeights.Bold.ToOpenTypeWeight()),
+ font_color = Colors.Black.rgb_color(),
+ font_size = 12
+ },
+ background = BTSColors.PNL.header_row_background_color.rgb_color()
+ }
+ };
+
+ public static GridSettings DefaultGridSettings =>
+ GridSettings.Default.with(
+ DefaultColumns.all,
+ DefaultColumns.default_sorting_criterion,
+ enable_background_color: true);
+
+ public static fills.FillsSettings DefaultAuxiliaryFills {
+ get {
+ var grid = fills.FillsSettings.MiniGridSettings;
+ if (grid.columns.TryGetFirst(c => c.id == nameof(mbts.ui.spark.FillsView.Columns.Side), out var side_col, out int side_col_pos)) {
+ var cols = grid.columns.ToList();
+ cols[side_col_pos] = side_col.with(is_visible: false);
+ grid = grid.with(cols);
+ }
+ var rv = fills.FillsSettings.Default();
+ rv.grid = grid;
+ return rv;
+ }
+ }
+
+ public static IEnumerable default_animations {
+ get {
+ yield return _trigger($"{nameof(PNLRowData.sod_pnl)} > 0", _animation(foreground: BTSColors.PNL.profit_color, font_weight: FontWeights.Bold, column: Columns.SODPNL));
+ yield return _trigger($"{nameof(PNLRowData.sod_pnl)} < 0", _animation(foreground: BTSColors.PNL.loss_color, font_weight: FontWeights.Bold, column: Columns.SODPNL));
+ yield return _trigger($"{nameof(PNLRowData.sod_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.SODNetPos));
+ yield return _trigger($"{nameof(PNLRowData.sod_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.SODNetPos));
+ // day
+ yield return _trigger($"{nameof(PNLRowData.day_pnl)} > 0", _animation(foreground: BTSColors.PNL.profit_color, font_weight: FontWeights.Bold, column: Columns.DayPNL));
+ yield return _trigger($"{nameof(PNLRowData.day_pnl)} < 0", _animation(foreground: BTSColors.PNL.loss_color, font_weight: FontWeights.Bold, column: Columns.DayPNL));
+ yield return _trigger($"{nameof(PNLRowData.day_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.DayNetPos));
+ yield return _trigger($"{nameof(PNLRowData.day_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.DayNetPos));
+ // raw day
+ yield return _trigger($"{nameof(PNLRowData.raw_day_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.RawDayNetPos));
+ yield return _trigger($"{nameof(PNLRowData.raw_day_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.RawDayNetPos));
+ // total
+ yield return _trigger($"{nameof(PNLRowData.total_pnl)} > 0", _animation(foreground: BTSColors.PNL.profit_color, font_weight: FontWeights.Bold, column: Columns.TotalPNL));
+ yield return _trigger($"{nameof(PNLRowData.total_pnl)} < 0", _animation(foreground: BTSColors.PNL.loss_color, font_weight: FontWeights.Bold, column: Columns.TotalPNL));
+ yield return _trigger($"{nameof(PNLRowData.total_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.TotalNetPos));
+ yield return _trigger($"{nameof(PNLRowData.total_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.TotalNetPos));
+ // working
+ yield return _trigger($"{nameof(PNLRowData.working_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.WorkingNetPos));
+ yield return _trigger($"{nameof(PNLRowData.working_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.WorkingNetPos));
+ }
+ }
+
+ public static IEnumerable default_group_header_animations {
+ get {
+ yield return _trigger($"{nameof(PNLNormalizedData.sod_pnl)} > 0", _animation(foreground: BTSColors.PNL.profit_color, column: Columns.SODPNL));
+ yield return _trigger($"{nameof(PNLNormalizedData.sod_pnl)} < 0", _animation(foreground: BTSColors.PNL.loss_color, column: Columns.SODPNL));
+ yield return _trigger($"{nameof(PNLNormalizedData.sod_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.SODNetPos));
+ yield return _trigger($"{nameof(PNLNormalizedData.sod_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.SODNetPos));
+ // day
+ yield return _trigger($"{nameof(PNLNormalizedData.day_pnl)} > 0", _animation(foreground: BTSColors.PNL.profit_color, column: Columns.DayPNL));
+ yield return _trigger($"{nameof(PNLNormalizedData.day_pnl)} < 0", _animation(foreground: BTSColors.PNL.loss_color, column: Columns.DayPNL));
+ yield return _trigger($"{nameof(PNLNormalizedData.day_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.DayNetPos));
+ yield return _trigger($"{nameof(PNLNormalizedData.day_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.DayNetPos));
+ // raw day
+ yield return _trigger($"{nameof(PNLNormalizedData.raw_day_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.RawDayNetPos));
+ yield return _trigger($"{nameof(PNLNormalizedData.raw_day_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.RawDayNetPos));
+ // total
+ yield return _trigger($"{nameof(PNLNormalizedData.total_pnl)} > 0", _animation(foreground: BTSColors.PNL.profit_color, column: Columns.TotalPNL));
+ yield return _trigger($"{nameof(PNLNormalizedData.total_pnl)} < 0", _animation(foreground: BTSColors.PNL.loss_color, column: Columns.TotalPNL));
+ yield return _trigger($"{nameof(PNLNormalizedData.total_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.TotalNetPos));
+ yield return _trigger($"{nameof(PNLNormalizedData.total_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.TotalNetPos));
+ // working
+ yield return _trigger($"{nameof(PNLNormalizedData.working_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.WorkingNetPos));
+ yield return _trigger($"{nameof(PNLNormalizedData.working_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.WorkingNetPos));
+ }
+ }
+
+ public static IEnumerable default_header_row_animations {
+ get {
+ yield return _trigger($"{nameof(PNLNormalizedData.sod_pnl)} > 0", _animation(foreground: BTSColors.PNL.profit_color, column: Columns.SODPNL));
+ yield return _trigger($"{nameof(PNLNormalizedData.sod_pnl)} < 0", _animation(foreground: BTSColors.PNL.loss_color, column: Columns.SODPNL));
+ yield return _trigger($"{nameof(PNLNormalizedData.sod_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.SODNetPos));
+ yield return _trigger($"{nameof(PNLNormalizedData.sod_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.SODNetPos));
+ // day
+ yield return _trigger($"{nameof(PNLNormalizedData.day_pnl)} > 0", _animation(foreground: BTSColors.PNL.profit_color, column: Columns.DayPNL));
+ yield return _trigger($"{nameof(PNLNormalizedData.day_pnl)} < 0", _animation(foreground: BTSColors.PNL.loss_color, column: Columns.DayPNL));
+ yield return _trigger($"{nameof(PNLNormalizedData.day_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.DayNetPos));
+ yield return _trigger($"{nameof(PNLNormalizedData.day_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.DayNetPos));
+ // raw day
+ yield return _trigger($"{nameof(PNLNormalizedData.raw_day_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.RawDayNetPos));
+ yield return _trigger($"{nameof(PNLNormalizedData.raw_day_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.RawDayNetPos));
+ // total
+ yield return _trigger($"{nameof(PNLNormalizedData.total_pnl)} > 0", _animation(foreground: BTSColors.PNL.profit_color, column: Columns.TotalPNL));
+ yield return _trigger($"{nameof(PNLNormalizedData.total_pnl)} < 0", _animation(foreground: BTSColors.PNL.loss_color, column: Columns.TotalPNL));
+ yield return _trigger($"{nameof(PNLNormalizedData.total_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.TotalNetPos));
+ yield return _trigger($"{nameof(PNLNormalizedData.total_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.TotalNetPos));
+ // working
+ yield return _trigger($"{nameof(PNLNormalizedData.working_net_pos)} > 0", _animation(foreground: BTSColors.MarketData.bid_color, column: Columns.WorkingNetPos));
+ yield return _trigger($"{nameof(PNLNormalizedData.working_net_pos)} < 0", _animation(foreground: BTSColors.MarketData.ask_color, column: Columns.WorkingNetPos));
+ }
+ }
+
+ [ProtoMember(2)]
+ public FilterStates filters { get; set; }
+ [ProtoMember(3)]
+ public PNLCalculationType calculation_type { get; set; }
+ [ProtoMember(4)]
+ public GridSettings grid {
+ get => _grid_backing;
+ set {
+ _grid_backing = value;
+ _grid_cell_appearance_backing = null;
+ }
+ }
+ [ProtoMember(6)]
+ public PNLHeaderRowDisplay header_row_display { get; set; }
+
+ public IReadOnlyList anchors => _anchors ?? (_anchors = Array.Empty());
+ public IReadOnlyList animations => _animations ?? (_animations = default_animations.ToArray());
+
+ public PNLCellAppearance grid_defaults =>
+ new PNLCellAppearance(
+ font_family: new FontFamily(grid.font_family),
+ font_size: grid.font_size,
+ font_weight: grid.font_weight,
+ background: grid.background,
+ foreground: grid.font_color.rgb_color());
+
+ // Group
+ public List group_background_colors => _group_background_colors ?? (_group_background_colors = new List(0));
+ public PNLCellAppearanceProto group_cell_appearance { get => _group_cell_appearance ?? _grid_cell_appearance; set => _group_cell_appearance = value; }
+ public IReadOnlyList group_columns => _group_columns ?? (_group_columns = DefaultColumns.group_columns.ToArray());
+ public PNLCellAppearance group_defaults => group_cell_appearance.to_appearance().merge(grid_defaults);
+ public IReadOnlyList group_header_animations => _group_header_animations ?? (_group_header_animations = default_group_header_animations.ToArray());
+ // Header
+ public Color header_background_color => header_cell_appearance.background?.argb_color() ?? Colors.Transparent;
+ public PNLCellAppearanceProto header_cell_appearance { get => _header_cell_appearance ?? _grid_cell_appearance; set => _header_cell_appearance = value; }
+ public IReadOnlyList header_columns => _header_columns ?? (_header_columns = DefaultColumns.header_columns.ToArray());
+ public PNLCellAppearance header_defaults => header_cell_appearance.to_appearance().merge(grid_defaults);
+ public IReadOnlyList header_row_animations => _header_row_animations ?? (_header_row_animations = default_header_row_animations.ToArray());
+ //
+ public IReadOnlyList sorting_criterion =>
+ _sorting_criterion ?? (_sorting_criterion = DefaultColumns.default_sorting_criterion.ToArray());
+
+ PNLCellAppearanceProto _grid_cell_appearance => _grid_cell_appearance_backing ?? (
+ _grid_cell_appearance_backing = new PNLCellAppearanceProto {
+ background = grid.background.rgb_color(),
+ font_params = new FontParamsProto {
+ font_color = grid.font_color,
+ typeface = new TypefaceProto(
+ grid.font_family,
+ grid.font_weight.ToOpenTypeWeight()),
+ font_size = grid.font_size
+ }
+ });
+
+ public PNLSettings with(
+ IEnumerable sorting_criterion = null,
+ IEnumerable anchors = null,
+ FilterStates filters = null,
+ GridSettings grid = null,
+ PNLCalculationType? calculation_type = null,
+ PNLHeaderRowDisplay? header_row_display = null,
+ IEnumerable group_columns = null,
+ IEnumerable animations = null,
+ IEnumerable group_header_animations = null,
+ IEnumerable header_row_animations = null,
+ IEnumerable header_columns = null) =>
+ new PNLSettings {
+ calculation_type = calculation_type ?? this.calculation_type,
+ header_row_display = header_row_display ?? this.header_row_display,
+ // row operators (anchors, sorting, filters)
+ _anchors = (anchors ?? _anchors.empty_if_null()).ToArray(),
+ _sorting_criterion = (sorting_criterion ?? _sorting_criterion.empty_if_null()).ToArray(),
+ filters = filters ?? this.filters,
+ // cell appearance (group/header)
+ _group_background_colors = _group_background_colors?.ToList(),
+ _group_cell_appearance = _group_cell_appearance,
+ _header_cell_appearance = _header_cell_appearance,
+ // columns (group/header)
+ _group_columns = group_columns?.ToArray() ?? _group_columns,
+ _header_columns = header_columns?.ToArray() ?? _header_columns,
+ // animations
+ _animations = animations?.ToArray() ?? _animations,
+ _group_header_animations = group_header_animations?.ToArray() ?? _group_header_animations,
+ _header_row_animations = header_row_animations?.ToArray() ?? _header_row_animations,
+ // grid
+ grid = grid ?? this.grid
+ };
+
+ public bool Equals(PNLSettings other) =>
+ other != null &&
+ calculation_type == other.calculation_type &&
+ header_row_display == other.header_row_display &&
+ // row operators (anchors, sorting, filters)
+ anchors.SequenceEqual(other.anchors) &&
+ sorting_criterion.SequenceEqual(other.sorting_criterion) &&
+ filters.safe_equals(other.filters) &&
+ // cell appearance (group/header)
+ group_background_colors.SequenceEqual(other.group_background_colors) &&
+ group_cell_appearance.safe_equals(other.group_cell_appearance) &&
+ header_cell_appearance.safe_equals(other.header_cell_appearance) &&
+ // columns (group/header)
+ group_columns.SequenceEqual(other.group_columns) &&
+ header_columns.SequenceEqual(other.header_columns) &&
+ // animations
+ animations.SequenceEqual(other.animations) &&
+ group_header_animations.SequenceEqual(other.group_header_animations) &&
+ header_row_animations.SequenceEqual(other.header_row_animations) &&
+ // grid
+ grid.safe_equals(other.grid);
+
+ static PNLAnimationTriggerData _trigger(string expression, params PNLAnimation[] animations) =>
+ new PNLAnimationTriggerData {
+ expression = expression,
+ animations = animations
+ };
+
+ static PNLAnimation _animation(
+ Columns column,
+ Color? foreground = null,
+ Color? background = null,
+ FontWeight? font_weight = null) =>
+ new PNLAnimation {
+ column = column,
+ foreground = foreground?.rgb_color(),
+ background = background?.rgb_color(),
+ font_weight = font_weight?.ToOpenTypeWeight()
+ };
+
+ static class DefaultColumns {
+ public static GridColumnSettings account => new GridColumnSettings(nameof(Columns.Account), DefaultColumnHeaders.Account, width: Widths.Account);
+ public static GridColumnSettings exchange => new GridColumnSettings(nameof(Columns.Exchange), DefaultColumnHeaders.Exchange, false, width: Widths.Exchange);
+ public static GridColumnSettings symbol => new GridColumnSettings(nameof(Columns.Symbol), DefaultColumnHeaders.Symbol, width: Widths.Symbol);
+ public static GridColumnSettings security_type => new GridColumnSettings(nameof(Columns.SecurityType), Headers.SecurityType, width: Widths.SecurityType);
+ public static GridColumnSettings security => new GridColumnSettings(nameof(Columns.Security), DefaultColumnHeaders.Security, width: Widths.Security);
+ public static GridColumnSettings security_key => new GridColumnSettings(nameof(Columns.SecurityKey), DefaultColumnHeaders.SecurityKey, false, width: DefaultColumnWidths.SecurityKey);
+ public static GridColumnSettings cpp => new GridColumnSettings(nameof(Columns.CPP), "CPP", false, width: 50, horizontal_alignment: HorizontalAlignment.Right);
+ // sod
+ public static GridColumnSettings sod_pnl => new GridColumnSettings(nameof(Columns.SODPNL), Headers.SOD.PNL, false, width: Widths.PriceBig, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings sod_long_pos => new GridColumnSettings(nameof(Columns.SODLongPos), Headers.SOD.Long, false, width: Widths.Qty, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings sod_long_avg_price => new GridColumnSettings(nameof(Columns.SODLongAvgPrice), Headers.SOD.LongAvg, false, width: Widths.Price, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings sod_short_pos => new GridColumnSettings(nameof(Columns.SODShortPos), Headers.SOD.Short, false, width: Widths.Qty, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings sod_short_avg_price => new GridColumnSettings(nameof(Columns.SODShortAvgPrice), Headers.SOD.ShortAvg, false, width: Widths.Price, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings sod_net_pos => new GridColumnSettings(nameof(Columns.SODNetPos), Headers.SOD.Net, false, width: Widths.Qty, horizontal_alignment: HorizontalAlignment.Right);
+ // day
+ public static GridColumnSettings day_pnl => new GridColumnSettings(nameof(Columns.DayPNL), Headers.Day.PNL, width: Widths.PriceBig, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings day_long_pos => new GridColumnSettings(nameof(Columns.DayLongPos), Headers.Day.Long, false, width: Widths.Qty, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings day_long_avg_price => new GridColumnSettings(nameof(Columns.DayLongAvgPrice), Headers.Day.LongAvg, false, width: Widths.Price, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings day_short_pos => new GridColumnSettings(nameof(Columns.DayShortPos), Headers.Day.Short, false, width: Widths.Qty, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings day_short_avg_price => new GridColumnSettings(nameof(Columns.DayShortAvgPrice), Headers.Day.ShortAvg, false, width: Widths.Price, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings day_net_pos => new GridColumnSettings(nameof(Columns.DayNetPos), Headers.Day.Net, width: Widths.Qty, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings has_day_trades => new GridColumnSettings(nameof(Columns.HasDayTrades), Headers.HasDayTrades, width: Widths.HasDayTrades, horizontal_alignment: HorizontalAlignment.Right);
+ // raw day
+ public static GridColumnSettings raw_day_long_pos => new GridColumnSettings(nameof(Columns.RawDayLongPos), Headers.RawDay.Long, false, width: Widths.RawDayQty, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings raw_day_short_pos => new GridColumnSettings(nameof(Columns.RawDayShortPos), Headers.RawDay.Short, false, width: Widths.RawDayQty, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings raw_day_net_pos => new GridColumnSettings(nameof(Columns.RawDayNetPos), Headers.RawDay.Net, false, width: Widths.RawDayQty, horizontal_alignment: HorizontalAlignment.Right);
+ // working
+ public static GridColumnSettings working_long_pos => new GridColumnSettings(nameof(Columns.WorkingLongPos), Headers.Working.Long, false, width: Widths.WorkingQty, font_color_override: BTSColors.MarketData.bid, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings working_long_avg_price => new GridColumnSettings(nameof(Columns.WorkingLongAvgPrice), Headers.Working.LongAvg, false, width: Widths.Price, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings working_short_pos => new GridColumnSettings(nameof(Columns.WorkingShortPos), Headers.Working.Short, false, width: Widths.WorkingQty, font_color_override: BTSColors.MarketData.ask, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings working_short_avg_price => new GridColumnSettings(nameof(Columns.WorkingShortAvgPrice), Headers.Working.ShortAvg, false, width: Widths.Price, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings working_net_pos => new GridColumnSettings(nameof(Columns.WorkingNetPos), Headers.Working.Net, width: Widths.WorkingQty, horizontal_alignment: HorizontalAlignment.Right);
+ // total
+ public static GridColumnSettings total_pnl => new GridColumnSettings(nameof(Columns.TotalPNL), Headers.Total.PNL, false, width: Widths.PriceBig, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings total_long_pos => new GridColumnSettings(nameof(Columns.TotalLongPos), Headers.Total.Long, false, width: Widths.Qty, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings total_long_avg_price => new GridColumnSettings(nameof(Columns.TotalLongAvgPrice), Headers.Total.LongAvg, false, width: Widths.Price, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings total_short_pos => new GridColumnSettings(nameof(Columns.TotalShortPos), Headers.Total.Short, false, width: Widths.Qty, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings total_short_avg_price => new GridColumnSettings(nameof(Columns.TotalShortAvgPrice), Headers.Total.ShortAvg, false, width: Widths.Price, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings total_net_pos => new GridColumnSettings(nameof(Columns.TotalNetPos), Headers.Total.Net, false, width: Widths.Qty, horizontal_alignment: HorizontalAlignment.Right);
+ // market
+ public static GridColumnSettings bid_price => new GridColumnSettings(nameof(Columns.BidPrice), DefaultColumnHeaders.Bid, false, width: DefaultColumnWidths.Price, font_color_override: BTSColors.MarketData.bid, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings ask_price => new GridColumnSettings(nameof(Columns.AskPrice), DefaultColumnHeaders.Ask, false, width: DefaultColumnWidths.Price, font_color_override: BTSColors.MarketData.ask, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings mid_price => new GridColumnSettings(nameof(Columns.MidPrice), DefaultColumnHeaders.Mid, false, width: DefaultColumnWidths.Price, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings last_price => new GridColumnSettings(nameof(Columns.LastPrice), DefaultColumnHeaders.Last, false, width: DefaultColumnWidths.Price, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings settlement_price => new GridColumnSettings(nameof(Columns.SettlementPrice), DefaultColumnHeaders.Settlement, false, width: DefaultColumnWidths.Settlement, horizontal_alignment: HorizontalAlignment.Right);
+ public static GridColumnSettings pnl_price => new GridColumnSettings(nameof(Columns.PNLPrice), DefaultColumnHeaders.PnLPrice, width: DefaultColumnWidths.Price, horizontal_alignment: HorizontalAlignment.Right);
+
+ public static IEnumerable default_sorting_criterion {
+ get {
+ yield return new SortingCriteria(account.id, true);
+ yield return new SortingCriteria(security.id, true);
+ }
+ }
+
+ public static IEnumerable all {
+ get {
+ yield return account;
+ yield return exchange;
+ yield return symbol;
+ yield return security_type;
+ yield return security;
+ yield return security_key; // hidden
+
+ yield return total_pnl; // hidden
+ yield return sod_pnl;
+ yield return day_pnl;
+ /// total
+ yield return total_net_pos;
+ // total long
+ yield return total_long_pos; // hidden
+ yield return total_long_avg_price; // hidden
+ // total short
+ yield return total_short_pos; // hidden
+ yield return total_short_avg_price; // hidden
+ /// sod
+ yield return sod_net_pos;
+ // sod long
+ yield return sod_long_pos; // hidden
+ yield return sod_long_avg_price; // hidden
+ // sod short
+ yield return sod_short_pos; // hidden
+ yield return sod_short_avg_price; // hidden
+ /// day
+ yield return day_net_pos;
+ // day long
+ yield return day_long_pos; // hidden
+ yield return day_long_avg_price; // hidden
+ // day short
+ yield return day_short_pos; // hidden
+ yield return day_short_avg_price; // hidden
+ /// raw day
+ yield return raw_day_long_pos; // hidden
+ yield return raw_day_short_pos; // hidden
+ yield return raw_day_net_pos; // hidden
+
+ yield return has_day_trades;
+ /// working
+ // working net
+ yield return working_net_pos;
+ // working long
+ yield return working_long_pos;
+ yield return working_long_avg_price;
+ // working short
+ yield return working_short_pos;
+ yield return working_short_avg_price;
+ /// market
+ yield return bid_price;
+ yield return ask_price;
+ yield return mid_price;
+ yield return last_price;
+ yield return settlement_price;
+ yield return pnl_price;
+ yield return cpp;
+ }
+ }
+
+ public static IEnumerable group_columns {
+ get {
+ var rv = all.Select(cs => cs.with(font_weight_override: new NullableFontWeightProto(FontWeights.Bold))).ToList();
+ GridSettingsHelper.try_replace_column(rv, Columns.SODPNL, _override_color);
+ GridSettingsHelper.try_replace_column(rv, Columns.DayPNL, _override_color);
+ return rv;
+ }
+ }
+
+ public static IEnumerable header_columns {
+ get {
+ var rv = all.Select(cs => cs.with(font_weight_override: new NullableFontWeightProto(FontWeights.Bold))).ToList();
+ GridSettingsHelper.try_replace_column(rv, Columns.SODPNL, _override_color);
+ GridSettingsHelper.try_replace_column(rv, Columns.DayPNL, _override_color);
+ return rv;
+ }
+ }
+
+ static GridColumnSettings _override_color(GridColumnSettings col_settings) =>
+ _override_color(col_settings, 0);
+
+ static GridColumnSettings _override_color(GridColumnSettings col_settings, uint color) =>
+ col_settings.with(font_color_override: new NullableColorProto(color));
+ }
+ }
+
+ static class PNLSettingsExtensions {
+ public static IReadOnlyList> triggers(this PNLSettings settings) => settings.animations.Select(a => a.to_trigger()).ToList();
+ public static IReadOnlyList> group_triggers(this PNLSettings settings) => settings.group_header_animations.Select(a => a.to_trigger()).ToList();
+ public static IReadOnlyList> header_triggers(this PNLSettings settings) => settings.header_row_animations.Select(a => a.to_trigger()).ToList();
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLCellAppearanceOverrideVM.cs b/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLCellAppearanceOverrideVM.cs
new file mode 100644
index 000000000..3a4048680
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLCellAppearanceOverrideVM.cs
@@ -0,0 +1,122 @@
+using bts.proto;
+using mbts.ui;
+using mbts.ui.controls;
+using mbts.ui.settings;
+using mbts.ui.shell;
+using mbts.ui.utility.text;
+using System.Windows;
+using System.Windows.Media;
+using FontFamily = System.Windows.Media.FontFamily;
+
+namespace bts.shell.pnl {
+ class PNLCellAppearanceOverrideVM : ViewModelBase {
+ bool
+ _is_background_overridden,
+ _is_font_color_overridden,
+ _is_font_weight_overridden,
+ _is_font_family_overridden,
+ _is_font_size_overridden;
+
+ FontWeight _font_weight_override;
+ FontFamily _font_family_override;
+ double _font_size_override = double.NaN;
+
+ // background
+ public bool is_background_overridden { get => _is_background_overridden; set => Set(ref _is_background_overridden, value); }
+ public ColorPickerPopupVM background_override { get; } = new ColorPickerPopupVM {
+ bind_opacity_to_alpha = true,
+ opacity = 1
+ };
+ // font color
+ public bool is_font_color_overridden { get => _is_font_color_overridden; set => Set(ref _is_font_color_overridden, value); }
+ public ColorPickerPopupVM font_color_override { get; } = new ColorPickerPopupVM();
+ // font weight
+ public bool is_font_weight_overridden { get => _is_font_weight_overridden; set => Set(ref _is_font_weight_overridden, value); }
+ public FontWeight font_weight_override { get => _font_weight_override; set => Set(ref _font_weight_override, value); }
+ // font family
+ public bool is_font_family_overriden { get => _is_font_family_overridden; set => Set(ref _is_font_family_overridden, value); }
+ public FontFamily font_family_override { get => _font_family_override; set => Set(ref _font_family_override, value); }
+ // font size
+ public bool is_font_size_overriden { get => _is_font_size_overridden; set => Set(ref _is_font_size_overridden, value); }
+ public double font_size_override { get => _font_size_override; set => Set(ref _font_size_override, value); }
+
+ public GridColumnSettings apply_to(GridColumnSettings target) =>
+ target.with(
+ font_weight_override: new NullableFontWeightProto(is_font_weight_overridden ? font_weight_override : (FontWeight?)null),
+ font_color_override: new NullableColorProto(is_font_color_overridden ? font_color_override.color : (Color?)null),
+ background_color_override: new NullableColorProto(is_background_overridden ? background_override.color : (Color?)null));
+
+ public void load(GridColumnSettings settings) {
+ if (settings != null)
+ load(settings.font_weight_override, settings.font_color_override, settings.background_color_override);
+ }
+
+ public void load(FontParamsProto font_params) {
+ if (font_params == null)
+ return;
+ // font weight
+ is_font_weight_overridden = font_params.font_weight > 0;
+ if (is_font_weight_overridden)
+ font_weight_override = FontWeight.FromOpenTypeWeight(font_params.font_weight);
+ // font color
+ is_font_color_overridden = font_params.font_color > 0;
+ if (is_font_color_overridden)
+ font_color_override.color = font_params.font_color.rgb_color();
+ // font family
+ if (!string.IsNullOrEmpty(font_params.font_family)) {
+ font_family_override = new FontFamily(font_params.font_family);
+ }
+ if (!double.IsNaN(font_params.font_size) && font_params.font_size > 0) {
+ font_size_override = font_params.font_size;
+ } else {
+ font_size_override = double.NaN;
+ }
+ }
+
+ public void load(PNLAnimation animation) {
+ if (animation != null)
+ load(
+ animation.font_weight.HasValue ? FontWeight.FromOpenTypeWeight(animation.font_weight.Value) : (FontWeight?)null,
+ animation.foreground?.argb_color(),
+ animation.background?.argb_color());
+ }
+
+ public void load(FontWeight? font_weight, Color? font_color, Color? background) {
+ // font weight
+ is_font_weight_overridden = font_weight.HasValue;
+ if (is_font_weight_overridden)
+ font_weight_override = font_weight.Value;
+ // font color
+ is_font_color_overridden = font_color.HasValue;
+ if (is_font_color_overridden)
+ font_color_override.color = font_color.Value;
+ // background
+ is_background_overridden = background.HasValue;
+ if (background.HasValue)
+ background_override.color = background.Value;
+ }
+
+ public PNLAnimation to_animation(PNLView.Columns key) =>
+ new PNLAnimation {
+ column = key,
+ foreground = is_font_color_overridden ? font_color_override.color.rgb_color() : (uint?)null,
+ background = is_background_overridden ? background_override.color.rgb_color() : (uint?)null,
+ font_weight = is_font_weight_overridden ? font_weight_override.ToOpenTypeWeight() : (int?)null
+ };
+
+ public PNLCellAppearanceProto to_appearance_proto() =>
+ new PNLCellAppearanceProto {
+ background = is_background_overridden ? background_override.color.rgb_color() : (uint?)null,
+ font_params = to_font_params()
+ };
+
+ public FontParamsProto to_font_params() =>
+ new FontParamsProto {
+ typeface = new TypefaceProto(
+ font_family_override?.name(),
+ is_font_weight_overridden ? font_weight_override.ToOpenTypeWeight() : 0),
+ font_color = is_font_color_overridden ? font_color_override.color.rgb_color() : 0,
+ font_size = font_size_override
+ };
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLCellAppearanceVM.cs b/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLCellAppearanceVM.cs
new file mode 100644
index 000000000..9d692b544
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLCellAppearanceVM.cs
@@ -0,0 +1,34 @@
+using mbts.ui.controls;
+using mbts.ui.shell;
+using System.Windows;
+using FontFamily = System.Windows.Media.FontFamily;
+
+namespace bts.shell.pnl {
+ class PNLCellAppearanceVM : ViewModelBase {
+ FontWeight _font_weight;
+ FontFamily _font_family;
+ double _font_size = double.NaN;
+
+ public ColorPickerPopupVM background { get; } = new ColorPickerPopupVM { bind_opacity_to_alpha = true, opacity = 1 };
+ public ColorPickerPopupVM font_color { get; } = new ColorPickerPopupVM();
+ public FontWeight font_weight { get => _font_weight; set => Set(ref _font_weight, value); }
+ public FontFamily font_family { get => _font_family; set => Set(ref _font_family, value); }
+ public double font_size { get => _font_size; set => Set(ref _font_size, value); }
+
+ public PNLCellAppearance to_appearance() =>
+ new PNLCellAppearance(font_color.color, background.color, font_weight, font_family, font_size);
+
+ public void load(PNLCellAppearance appearance) {
+ if (appearance.background.HasValue)
+ background.color = appearance.background.Value;
+ if (appearance.foreground.HasValue)
+ font_color.color = appearance.foreground.Value;
+ if (appearance.font_family != null)
+ font_family = appearance.font_family;
+ if (appearance.font_weight.HasValue)
+ font_weight = appearance.font_weight.Value;
+ if (appearance.font_size > 0)
+ font_size = appearance.font_size;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLColumnVM.cs b/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLColumnVM.cs
new file mode 100644
index 000000000..1c0183349
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLColumnVM.cs
@@ -0,0 +1,133 @@
+using bts.collections;
+using mbts.spark;
+using mbts.ui.controls;
+using mbts.ui.settings;
+using mbts.ui.shell;
+using mbts.utils;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Reactive.Linq;
+using System.Windows;
+
+namespace bts.shell.pnl {
+ class PNLColumnVM : ViewModelBase, ISimpleColumnVM {
+ readonly SimpleGridSettingsVM _owner;
+ readonly PNLView.Columns _pnl_id;
+ object _selected_item;
+ string _display_name;
+ bool _is_visible;
+ double _width;
+ HorizontalAlignment _horizontal_alignment;
+
+ public PNLColumnVM(SimpleGridSettingsVM owner, PNLView.Columns id) {
+ _owner = owner;
+ _pnl_id = id;
+ default_column_vm.PropertyChanged += echo;
+ void echo(object sender, PropertyChangedEventArgs e) {
+ switch (e.PropertyName) {
+ case nameof(is_font_weight_overridden):
+ case nameof(is_font_color_overridden):
+ RaisePropertyChanged(e.PropertyName);
+ break;
+ }
+ }
+ }
+
+ public PNLCellAppearanceOverrideVM default_column_vm { get; } = new PNLCellAppearanceOverrideVM();
+ public PNLCellAppearanceOverrideVM group_column_vm { get; } = new PNLCellAppearanceOverrideVM();
+ public PNLCellAppearanceOverrideVM header_column_vm { get; } = new PNLCellAppearanceOverrideVM();
+ //
+ public ObservableCollection rule_columns { get; } = new ObservableCollection();
+
+ public object selected_item {
+ get => _selected_item;
+ set {
+ if (value != null)
+ Set(ref _selected_item, value);
+ }
+ }
+
+ public string id { get => _pnl_id.ToString(); set => Log.assert(value == _pnl_id.ToString()); }
+ public string display_name { get => _display_name; set => Set(ref _display_name, value); }
+ public double width { get => _width; set => Set(ref _width, value); }
+ public bool is_visible { get => _is_visible; set => Set(ref _is_visible, value); }
+ public bool is_font_color_overridden {
+ get => default_column_vm.is_font_color_overridden;
+ set => default_column_vm.is_font_color_overridden = value;
+ }
+ public HorizontalAlignment horizontal_alignment { get => _horizontal_alignment; set => Set(ref _horizontal_alignment, value); }
+
+ public ColorPickerPopupVM font_color_override => default_column_vm.font_color_override;
+
+ public bool is_font_weight_overridden { get => default_column_vm.is_font_weight_overridden; set => default_column_vm.is_font_weight_overridden = value; }
+ public FontWeight font_weight_override { get => default_column_vm.font_weight_override; set => default_column_vm.font_weight_override = value; }
+
+ public void apply_flags(GridColumnSettingsFeatureFlags flags) { }
+
+ public GridColumnSettings create() {
+ var result = new GridColumnSettings(id: id, display_name: display_name, is_visible: is_visible, horizontal_alignment: horizontal_alignment, width: width);
+ result = default_column_vm.apply_to(result);
+ return result;
+ }
+
+ public void load_from(GridColumnSettings value) {
+ _assert_id(value.id);
+ default_column_vm.load(value);
+ display_name = value.display_name;
+ width = value.width;
+ is_visible = value.is_visible;
+ horizontal_alignment = value.horizontal_alignment;
+ }
+
+ public void load_from(GridColumnSettings value, IReadOnlyDictionary triggers, GridColumnSettings group, IReadOnlyDictionary group_triggers, IReadOnlyDictionary header_triggers, GridColumnSettings header) {
+ _assert_id(value.id);
+ load_from(value);
+ if (group != null)
+ group_column_vm.load(group);
+ if (header != null)
+ header_column_vm.load(header);
+ rule_columns.SetItems(triggers.Select(kv => {
+ var rule_col = new PNLRuleColumnVM(kv.Key);
+ rule_col.load_from(kv.Value, group_triggers.GetValueOrDefault(kv.Key), header_triggers.GetValueOrDefault(kv.Key));
+ return rule_col;
+ }));
+ }
+
+ public IEnumerable<(string expression, PNLAnimation row, PNLAnimation group, PNLAnimation header)> get_triggers() {
+ foreach (var col in rule_columns)
+ yield return (col.rule_text, col.row_params.to_animation(_pnl_id), col.group_params.to_animation(_pnl_id), col.header_params.to_animation(_pnl_id));
+ }
+
+ void _assert_id(string id) =>
+ Log.assert(id == _pnl_id.ToString(), $"PNLColumn id string '{id}' does not match the expected {typeof(PNLView.Columns)} key '{_pnl_id}.'");
+
+ public override string ToString() => "Default";
+ }
+
+ class PNLRuleColumnVM : ViewModelBase, IEquatable {
+ public PNLRuleColumnVM(string rule_text) =>
+ this.rule_text = rule_text;
+
+ public string rule_text { get; }
+
+ public PNLCellAppearanceOverrideVM row_params { get; } = new PNLCellAppearanceOverrideVM();
+ public PNLCellAppearanceOverrideVM group_params { get; } = new PNLCellAppearanceOverrideVM();
+ public PNLCellAppearanceOverrideVM header_params { get; } = new PNLCellAppearanceOverrideVM();
+
+ public void load_from(PNLAnimation row, PNLAnimation group, PNLAnimation header) {
+ row_params.load(row);
+ group_params.load(group);
+ header_params.load(header);
+ }
+
+ public bool Equals(PNLRuleColumnVM other) =>
+ other != null && rule_text == other.rule_text;
+
+ public override bool Equals(object obj) => Equals(obj as PNLRuleColumnVM);
+ public override int GetHashCode() => rule_text.GetHashCode();
+ public override string ToString() => rule_text;
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLGroupRowAppearanceVM.cs b/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLGroupRowAppearanceVM.cs
new file mode 100644
index 000000000..8c5bcaf8b
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLGroupRowAppearanceVM.cs
@@ -0,0 +1,58 @@
+using bts.collections;
+using mbts.spark;
+using mbts.ui;
+using mbts.ui.controls;
+using mbts.ui.shell;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media;
+using FontFamily = System.Windows.Media.FontFamily;
+
+namespace bts.shell.pnl {
+ class PNLGroupRowAppearanceVM : ViewModelBase, IValueFactory<(PNLCellAppearance appearance, IReadOnlyList background_colors)> {
+ FontWeight _font_weight;
+ FontFamily _font_family;
+ double _font_size = double.NaN;
+
+ public PNLGroupRowAppearanceVM() {
+ add_background_cmd = new DelegateCommand(_add_background);
+ // 4 elements is enough to alternate through any reasonable number of groups,
+ // and clicking to add new backgrounds seems awkward
+ for (int i = 0; i < 4; i++)
+ _add_background();
+ }
+
+ public ObservableCollection background_colors { get; } = new ObservableCollection();
+ public ColorPickerPopupVM font_color { get; } = new ColorPickerPopupVM();
+ public FontWeight font_weight { get => _font_weight; set => Set(ref _font_weight, value); }
+ public FontFamily font_family { get => _font_family; set => Set(ref _font_family, value); }
+ public double font_size { get => _font_size; set => Set(ref _font_size, value); }
+ public ICommand add_background_cmd { get; }
+
+ public (PNLCellAppearance appearance, IReadOnlyList background_colors) create() =>
+ (new PNLCellAppearance(font_color.color, Colors.Transparent, font_weight, font_family, font_size),
+ background_colors.WrapSelectorRO(cp => cp.color));
+
+ public void load_from((PNLCellAppearance appearance, IReadOnlyList background_colors) value) {
+ var (app, bg_colors) = value;
+ // background colors
+ while (background_colors.Count < bg_colors.Count)
+ _add_background();
+ for (int i = 0; i < bg_colors.Count; i++)
+ background_colors[i].color = bg_colors[i];
+ //
+ if (app.foreground.HasValue) font_color.color = app.foreground.Value;
+ if (app.font_family != null) font_family = app.font_family;
+ if (app.font_weight.HasValue) font_weight = app.font_weight.Value;
+ if (app.font_size > 0) font_size = app.font_size;
+ }
+
+ void _add_background() =>
+ background_colors.Add(new NamedColorPickerPopupVM {
+ bind_opacity_to_alpha = true,
+ name = $"Background {background_colors.Count + 1}"
+ });
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLSettingsVM.cs b/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLSettingsVM.cs
new file mode 100644
index 000000000..47a36196f
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/Settings/VM/PNLSettingsVM.cs
@@ -0,0 +1,220 @@
+using bts.collections;
+using bts.utils;
+using mbts;
+using mbts.collections;
+using mbts.expression;
+using mbts.spark;
+using mbts.ui;
+using mbts.ui.settings;
+using mbts.ui.shell;
+using mbts.ui.spark;
+using mbts.ui.utility;
+using mbts.utils;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.Dynamic;
+using System.Linq;
+using ColumnKeys = bts.shell.pnl.PNLView.Columns;
+
+namespace bts.shell.pnl {
+ class PNLSettingsVM : DisposableViewModelBase, IWindowSettingsVM, IValueFactory, IObservable, ITemplateSelectorKey {
+ readonly IReadOnlyDictionary _anchor_cache;
+ readonly DeferrableActionWrapper _sync_anchors;
+
+ PNLCalculationType _calculation_type;
+ PNLHeaderRowDisplay _header_row_display;
+ PNLSettings _last_loaded;
+
+ public PNLSettingsVM(PNLSettings settings) {
+ // init anchor cache, deferrable resync
+ _anchor_cache = PNLSettings.anchorable_columns.ToDictionary(k => k, k => new AnchorItemVM(this, k));
+ _sync_anchors = new DeferrableActionWrapper(() => {
+ for (int i = 0; i < anchor_items.Count; i++) {
+ anchor_items[i].anchor_index = i + 1;
+ anchor_items[i].refresh();
+ }
+ });
+ core_settings_vm = new SimpleGridSettingsVM(column_factory: col_settings => {
+ var col_vm = new PNLColumnVM(core_settings_vm, EnumHelper.parse(col_settings.id));
+ col_vm.load_from(col_settings);
+ return col_vm;
+ });
+ core_settings_vm.selection_highlight.bind_opacity_to_alpha = true;
+ _dispose = Disposable.Create(
+ anchor_items.Subscribe((s, e) => _sync_anchors.execute()));
+ load(settings);
+ }
+
+ public IEnumerable anchor_item_headers => _anchor_cache.Values;
+ public ObservableCollection anchor_items { get; } = new ObservableCollection();
+ public SimpleGridSettingsVM core_settings_vm { get; }
+ public PNLGroupRowAppearanceVM group_row_defaults { get; } = new PNLGroupRowAppearanceVM();
+ public PNLCellAppearanceVM header_row_defaults { get; } = new PNLCellAppearanceVM();
+ public PNLCalculationType calculation_type { get => _calculation_type; set => Set(ref _calculation_type, value); }
+ public IEnumerable calculation_types => EnumHelper.get_values_except(PNLCalculationType.None, PNLCalculationType.Same, PNLCalculationType.Opposite);
+ public PNLHeaderRowDisplay header_row_display { get => _header_row_display; set => Set(ref _header_row_display, value); }
+ public IEnumerable header_row_display_options => PNLSettings.header_row_display_options;
+
+ string ITemplateSelectorKey.key => GridSettingsTemplateKeys.PNL;
+
+ public PNLSettings get_result() {
+ var s = _last_loaded == null ? new PNLSettings() : SparkUtils.clone_proto(_last_loaded);
+ s.calculation_type = _calculation_type;
+ s.grid = core_settings_vm.create();
+ // move anchor cols to the left, order wrt grouping hierarchy
+ var new_cols = new Lazy>(() => s.grid.columns.ToList());
+ for (int i = 0; i < s.grid.columns.Count; i++) {
+ var key = s.grid.columns[i].strong_id();
+ if (_anchor_cache.TryGetValue(key, out var a) && a.anchor_index.HasValue) {
+ // anchor index is 1 based, subtract 1 to get 0 based
+ int anchor_index = a.anchor_index.Value - 1;
+ if (anchor_index != i && anchor_index >= 0 && anchor_index < s.grid.columns.Count) {
+ new_cols.Value.RemoveAt(i);
+ new_cols.Value.Insert(anchor_index, s.grid.columns[i]);
+ }
+ }
+ }
+ // rule-based animations
+ var trigger_anims = core_settings_vm.columns
+ .OfType()
+ .SelectMany(c => c.get_triggers())
+ .GroupBy(tup => tup.expression)
+ .Where(g => CoreExpressionEvaluator.validate(g.Key))
+ .Select(g => (
+ expression: g.Key,
+ animations: g.ToArray()))
+ .ToList();
+
+ var normalized_anims = trigger_anims
+ .Where(tup => CoreExpressionEvaluator.validate(tup.expression))
+ .ToList();
+
+ s = s.with(anchors: anchor_items.Select(vm => vm.key),
+ grid: new_cols.IsValueCreated ? s.grid.with(columns: new_cols.Value) : null,
+ group_columns: core_settings_vm.columns.OfType().Select(c => {
+ var col_settings = c.create();
+ col_settings = c.group_column_vm.apply_to(col_settings);
+ return col_settings;
+ }),
+ header_columns: core_settings_vm.columns.OfType().Select(c => {
+ var col_settings = c.create();
+ col_settings = c.header_column_vm.apply_to(col_settings);
+ return col_settings;
+ }),
+ animations: trigger_anims.Select(
+ ta => new PNLAnimationTriggerData {
+ expression = ta.expression,
+ animations = Array.ConvertAll(ta.animations, t => t.row)
+ }),
+ group_header_animations: normalized_anims
+ .Select(
+ ta => new PNLAnimationTriggerData {
+ expression = ta.expression,
+ animations = Array.ConvertAll(ta.animations, t => t.group)
+ }),
+ header_row_animations: normalized_anims.Select(
+ ta => new PNLAnimationTriggerData {
+ expression = ta.expression,
+ animations = Array.ConvertAll(ta.animations, t => t.header)
+ }));
+ s.header_row_display = header_row_display;
+ s.header_cell_appearance = PNLCellAppearanceProto.from_appearance(header_row_defaults.to_appearance());
+ // group
+ var (group_cell_appearance, group_row_background_colors) = group_row_defaults.create();
+ s.group_cell_appearance = PNLCellAppearanceProto.from_appearance(group_cell_appearance);
+ s.group_background_colors.SetItems(group_row_background_colors.Select(c => c.rgb_color()));
+ //
+ return s;
+ }
+
+ public void load(PNLSettings value) {
+ _last_loaded = value;
+ header_row_defaults.load(value.header_cell_appearance.to_appearance());
+ group_row_defaults.load_from((value.group_cell_appearance.to_appearance(), value.group_background_colors.WrapSelectorRO(c => c.argb_color())));
+ var column_map = _map_column_data(value.grid.columns, value.animations);
+ var group_column_map = _map_column_data(value.group_columns, value.group_header_animations);
+ var header_column_map = _map_column_data(value.header_columns, value.header_row_animations);
+
+ core_settings_vm.load_from(value.grid);
+
+ for (int i = 0; i < core_settings_vm.columns.Count; i++) {
+ var col_vm = core_settings_vm.columns[i] as PNLColumnVM ?? throw new InvalidOperationException($"In {nameof(PNLSettingsVM)}, all columns should be of type {typeof(PNLColumnVM)}.");
+ var key = EnumHelper.parse(col_vm.id);
+ var (col_settings, trigger_animations) = column_map[key];
+ var group_data = group_column_map.GetNullable(key);
+ var header_data = header_column_map.GetNullable(key);
+ col_vm.load_from(col_settings, trigger_animations, group_data?.settings, group_data?.triggers, header_data?.triggers, header_data?.settings);
+ }
+ using (_sync_anchors.defer_execution())
+ anchor_items.WrapSelector(a => a.key, k => _anchor_cache[k]).sync_with(value.anchors.Intersect(PNLSettings.anchorable_columns));
+ header_row_display = value.header_row_display;
+ calculation_type = value.calculation_type;
+ }
+
+ PNLSettings IValueFactory.create() => get_result();
+ void IValueFactory.load_from(PNLSettings value) => load(value);
+ IDisposable IObservable.Subscribe(IObserver observer) => throw new NotImplementedException();
+
+ static Dictionary triggers)> _map_column_data(IEnumerable columns, IEnumerable triggers) {
+ var map = columns.ToDictionary(
+ c => c.strong_id(),
+ c => (settings: c, triggers: new Dictionary()));
+ foreach (var trig in triggers) {
+ foreach (var anim in trig.animations) {
+ if (map.TryGetValue(anim.column, out var col_data))
+ col_data.triggers[trig.expression] = anim;
+ }
+ }
+ return map;
+ }
+
+ void _append_or_remove_anchor(ColumnKeys key, bool include) {
+ if (!_anchor_cache.TryGetValue(key, out var vm))
+ throw new KeyNotFoundException($"Column key '{key}' is not anchorable (expected one of: {string.Join(", ", PNLSettings.anchorable_columns)}).");
+ if (vm.include == include)
+ return;
+ if (include) {
+ if (anchor_items.Any(a => a.key == key))
+ throw new InvalidOperationException($"{nameof(anchor_items)} already contains an element with key '{key}.'");
+ anchor_items.Add(vm);
+ vm.anchor_index = anchor_items.Count;
+ } else {
+ if (!anchor_items.Remove(vm))
+ throw new InvalidOperationException($"{nameof(anchor_items)} does not contain an element with key '{key}.'");
+ vm.anchor_index = null;
+ }
+ _sync_anchors.execute();
+ }
+
+ public class AnchorItemVM : ViewModelBase, IEquatable {
+ readonly PNLSettingsVM _owner;
+ int? _anchor_index;
+
+ public AnchorItemVM(PNLSettingsVM owner, ColumnKeys key) {
+ _owner = owner;
+ this.key = key;
+ }
+
+ public ColumnKeys key { get; }
+ public bool include { get => anchor_index.HasValue; set => _owner._append_or_remove_anchor(key, value); }
+ public int? anchor_index { get => _anchor_index; set => Set(ref _anchor_index, value); }
+
+ public void refresh() =>
+ RaisePropertyChanged(nameof(include), nameof(anchor_index));
+
+ public bool Equals(AnchorItemVM other) =>
+ other != null && key == other.key;
+
+ public override bool Equals(object obj) =>
+ Equals(obj as AnchorItemVM);
+
+ public override int GetHashCode() =>
+ key.GetHashCode();
+
+ public override string ToString() =>
+ EnumHelper.get_display_name(key);
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLCellEmbeddedAnimator.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLCellEmbeddedAnimator.cs
new file mode 100644
index 000000000..4d10a2fee
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/VM/PNLCellEmbeddedAnimator.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using ColumnKeys = bts.shell.pnl.PNLView.Columns;
+
+namespace bts.shell.pnl {
+ class PNLCellEmbeddedAnimationModel {
+ IReadOnlyList> _triggers;
+ ImmutableDictionary _defaults;
+ TRow _row;
+
+ public PNLCellEmbeddedAnimationModel(ImmutableDictionary defaults, IReadOnlyList> triggers) {
+ _defaults = defaults;
+ _triggers = triggers;
+ }
+
+ public IReadOnlyDictionary cell_appearances { get; private set; }
+
+ public void on_settings(ImmutableDictionary defaults, IReadOnlyList> triggers) {
+ _defaults = defaults;
+ _triggers = triggers;
+ on_row(_row);
+ }
+
+ public void on_row(TRow data) {
+ _row = data;
+ var bd = _defaults.ToBuilder();
+ foreach (var t in _triggers) {
+ foreach (var kv in t.trigger(data)) {
+ if (!bd.TryGetValue(kv.Key, out var app)) {
+ app = _defaults[kv.Key];
+ }
+ app = kv.Value.merge(app);
+ bd[kv.Key] = app;
+ }
+ }
+ cell_appearances = bd.ToImmutable();
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLCellIndexBuilder.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLCellIndexBuilder.cs
new file mode 100644
index 000000000..e6dbb4607
--- /dev/null
+++ b/src/client/spark/Modules/Trading/PNL/VM/PNLCellIndexBuilder.cs
@@ -0,0 +1,151 @@
+using bts.utils;
+using mbts.spark;
+using mbts.spark.utilities;
+using mbts.ui;
+using mbts.ui.spark;
+using mbts.utils;
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Windows.Media;
+
+namespace bts.shell.pnl {
+ class PNLCellIndexBuilder {
+ public readonly DIYGridAnimationModel animation_model = new DIYGridAnimationModel