From b169bedbb2a23eab21867fcd16d192cb409732c6 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Mon, 11 Nov 2024 16:07:51 -0500 Subject: [PATCH] fix build: Update protobuf namespaces in c# --- .../VolSurfaceAutoFitSettingsVM.cs | 2 +- src/client/spark/Daemons/AboutDaemon.cs | 2 +- src/client/spark/Daemons/OopsDaemon.cs | 2 +- .../spark/Daemons/ShellLatencyDaemon.cs | 4 +- src/client/spark/Init/ReleaseNotesParade.cs | 2 +- .../Market/MarketView/MarketViewRow.cs | 8 +-- .../Settings/TimeAndSalesFilterSettings.cs | 2 +- .../Market/TimeAndSales/TimeAndSalesRowVM.cs | 2 +- .../Market/TimeAndSales/TimeAndSalesVM.cs | 10 ++- .../Modules/Support/Browser/BrowserWindow.cs | 6 +- .../Trading/DayFills/DayFillsRowData.cs | 4 +- .../Modules/Trading/DayFills/DayFillsRowVM.cs | 2 +- .../spark/Modules/Trading/Fills/FillsRowVM.cs | 2 +- .../Trading/Ladder/View/LadderGridHost.cs | 2 +- .../Trading/ManualFills/ManualFillRow.cs | 2 +- .../Trading/OpenOrders/OpenOrdersRowData.cs | 4 +- .../Trading/OpenOrders/OpenOrdersRowVM.cs | 2 +- .../Trading/OrderBook/OrderBookColumns.cs | 2 +- .../Trading/OrderBook/OrderBookRowVM.cs | 2 +- .../Trading/OrderBook/OrderParamsVM.cs | 2 +- .../Trading/PNL/VM/PNLCellIndexBuilder.cs | 2 +- .../spark/Modules/Trading/PNL/VM/PNLRowVM.cs | 4 +- .../ReconcileReport/ReconcileReportRowData.cs | 2 +- .../ReconcileReport/ReconcileReportRowVM.cs | 2 +- .../NMSheets/Settings/NMSheetSettingGrid.cs | 2 +- .../UIComponents/MainSheet/NMSheetTheoGrid.cs | 2 +- .../spark/Notifications/ToastNotification.cs | 2 +- .../spark/Orders/ExistingOrderTicketVM.cs | 2 +- src/client/spark/Orders/NewOrderTicketVM.cs | 2 +- .../spark/Orders/OrderActivitySummarizer.cs | 2 +- .../Orders/OrderTypeVMs/IcebergOrderVM.cs | 2 +- src/client/spark/Orders/OrderUtils.cs | 6 +- .../Risk/Slide/SlideReportGridSettingsVM.cs | 2 +- .../Risk/Slide/SlideReportPriceSettingsVM.cs | 2 +- .../spark/Risk/VolSurfaceSlideCalculator.cs | 2 +- .../spark/core/NativeMethods/NativeMethods.cs | 4 +- .../Controls/TickUpDown/TickUpDownHelper.cs | 2 +- .../TickUpDown/TickUpDownNullableNumeric.cs | 2 +- .../view/Converters/TickDisplayConverter.cs | 2 +- .../view/Extensions/HighDpiExtensions.cs | 2 +- .../MarkupExtensions/BrushBlendExtension.cs | 67 +++++++++++++++++++ .../MarkupExtensions/ColorBlendExtension.cs | 47 +++++++++++++ src/client/spark/view/Shell/ShellModel.cs | 2 +- .../view/Shell/Workspaces/WorkspacesModel.cs | 2 +- .../spark/view/Spark/Shell/CalculatorLogic.cs | 2 +- .../spark/view/Utility/MDDisplayHelper.cs | 2 +- .../spark/view/Utility/ScreenCapture.cs | 2 +- 47 files changed, 173 insertions(+), 63 deletions(-) create mode 100644 src/client/spark/view/Extensions/MarkupExtensions/BrushBlendExtension.cs create mode 100644 src/client/spark/view/Extensions/MarkupExtensions/ColorBlendExtension.cs diff --git a/src/client/spark/AW2/ViewModel/SettingsEditors/VolSurfaceAutoFitSettingsVM.cs b/src/client/spark/AW2/ViewModel/SettingsEditors/VolSurfaceAutoFitSettingsVM.cs index 3148b598c..cb1a73ee7 100644 --- a/src/client/spark/AW2/ViewModel/SettingsEditors/VolSurfaceAutoFitSettingsVM.cs +++ b/src/client/spark/AW2/ViewModel/SettingsEditors/VolSurfaceAutoFitSettingsVM.cs @@ -1,7 +1,7 @@ #nullable enable namespace mbts.spark { - using bts.api.domain; + using bts.domain.protobufs; using mbts.analytics; using mbts.ui.shell; diff --git a/src/client/spark/Daemons/AboutDaemon.cs b/src/client/spark/Daemons/AboutDaemon.cs index 52107b439..2d19c39a7 100644 --- a/src/client/spark/Daemons/AboutDaemon.cs +++ b/src/client/spark/Daemons/AboutDaemon.cs @@ -39,7 +39,7 @@ namespace bts.ui { enable_crash_on_dblclick(about); if (about != null) { about.DataContext = new { - Version = Configuration.get().Version, + Version = Configuration.get().Version, User = _user }; about.Topmost = true; diff --git a/src/client/spark/Daemons/OopsDaemon.cs b/src/client/spark/Daemons/OopsDaemon.cs index a87cfa47d..5f8d65faf 100644 --- a/src/client/spark/Daemons/OopsDaemon.cs +++ b/src/client/spark/Daemons/OopsDaemon.cs @@ -25,7 +25,7 @@ namespace bts.spark { void handle_unclean_shutdown(ErrorReporter e, int oldpid) { string extra = ""; try { - var conf = mbts.config.Configuration.get(); + var conf = mbts.config.Configuration.get(); extra = JsonConvert.SerializeObject(conf, Formatting.Indented); } catch { } Task.Run(() => e.report_silently( diff --git a/src/client/spark/Daemons/ShellLatencyDaemon.cs b/src/client/spark/Daemons/ShellLatencyDaemon.cs index 806575cdc..0322ea1df 100644 --- a/src/client/spark/Daemons/ShellLatencyDaemon.cs +++ b/src/client/spark/Daemons/ShellLatencyDaemon.cs @@ -25,7 +25,7 @@ namespace bts.perf { [ImportingConstructor] public ShellLatencyDaemon(ShellLatencyService service, Lazy user) { _service = service; - _version = Configuration.get().Version; + _version = Configuration.get().Version; _username = user.Value.name; _hostname = Environment.MachineName; @@ -50,7 +50,7 @@ namespace bts.perf { async void _forever_ping_host(Ping pinger) { var config = Configuration.get(); - string server_ip = Configuration.get().ConfigIp; + string server_ip = Configuration.get().ConfigIp; int delay = config.WorkloopMillisecondsInterval; int _current_missed_ping_count = 0; diff --git a/src/client/spark/Init/ReleaseNotesParade.cs b/src/client/spark/Init/ReleaseNotesParade.cs index 044b70fb4..6d1b76949 100644 --- a/src/client/spark/Init/ReleaseNotesParade.cs +++ b/src/client/spark/Init/ReleaseNotesParade.cs @@ -28,7 +28,7 @@ namespace bts.shell { } } bool check_version() { - string current = Configuration.get().Version; + string current = Configuration.get().Version; if (!string.IsNullOrWhiteSpace(current) && current != "private") { using (var key = Registry.CurrentUser.CreateSubKey(@"Software\BTS")) { var value = key.GetValue("version"); diff --git a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs index 4e211b4f7..818375ad0 100644 --- a/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs +++ b/src/client/spark/Modules/Market/MarketView/MarketViewRow.cs @@ -1,10 +1,10 @@ namespace mbts.spark { using bts.api; using bts.api.core; - using bts.api.domain; using bts.api.orderman; using bts.api.position; using bts.collections; + using bts.domain.protobufs; using bts.utils; using mbts.analytics; @@ -31,8 +31,6 @@ using System.Reactive.Linq; using System.Windows.Input; - using TickFactors = bts.api.domain.TickFactorsImmutable; - partial class MarketViewVM { public class Row : DisposableViewModelBase, IEquatable, DIYGrid.IRowVM, DIYGrid.IActionableRowVM { readonly IBus _bus; @@ -486,7 +484,7 @@ OrderDataHelper.CompareUtils.ask_price_comparer, OrderDataHelper.CompareUtils.order_record_id_eq_comparer); - readonly TickFactors _tick_factors; + readonly TickFactorsImmutable _tick_factors; double _best_bid_working_qty; double _best_ask_working_qty; @@ -494,7 +492,7 @@ double _working_bid_qty; double _working_ask_qty; - public MyOrderSummarizer(TickFactors tick_factors) => + public MyOrderSummarizer(TickFactorsImmutable tick_factors) => _tick_factors = tick_factors; // bid diff --git a/src/client/spark/Modules/Market/TimeAndSales/Settings/TimeAndSalesFilterSettings.cs b/src/client/spark/Modules/Market/TimeAndSales/Settings/TimeAndSalesFilterSettings.cs index 489fbd8af..1c7b83b1a 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/Settings/TimeAndSalesFilterSettings.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/Settings/TimeAndSalesFilterSettings.cs @@ -1,6 +1,6 @@ #nullable enable namespace bts.shell.time_and_sales { - using bts.co2; + using bts.domain.protobufs; using bts.utils; using mbts.spark.filters; diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesRowVM.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesRowVM.cs index d672ec309..90fde049a 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesRowVM.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesRowVM.cs @@ -1,7 +1,7 @@ namespace bts.shell.time_and_sales { using bts.api; - using bts.api.domain; using bts.co2; + using bts.domain.protobufs; using bts.utils; using mbts; diff --git a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs index 78d90181d..0ccf833d1 100644 --- a/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs +++ b/src/client/spark/Modules/Market/TimeAndSales/TimeAndSalesVM.cs @@ -1,7 +1,6 @@ namespace bts.shell.time_and_sales { - using bts.api; - using bts.co2; using bts.collections; + using bts.domain.protobufs; using bts.utils; using mbts; @@ -14,7 +13,6 @@ using mbts.ui.settings; using mbts.ui.shell; using mbts.ui.utility; - using mbts.user.settings; using mbts.utils; using Spark.Core; @@ -141,13 +139,13 @@ static string fmt_time(TimeAndSalesRowVM row) => row.time.ToString("h:mm:ss.ffffff"); static string fmt_price(TimeAndSalesRowVM row) => row.security.spec_or_default().format(row.price); static string fmt_aggressor(TimeAndSalesRowVM row) => row.aggressor_side.ToString(); - static string fmt_volume(TimeAndSalesRowVM row) => new TickFactors(1, 100).format(row.volume); - static string fmt_vol(TimeAndSalesRowVM row) => new TickFactors(1, 100).format(row.display_vol); + static string fmt_volume(TimeAndSalesRowVM row) => new mbts.user.settings.TickFactors(1, 100).format(row.volume); + static string fmt_vol(TimeAndSalesRowVM row) => new mbts.user.settings.TickFactors(1, 100).format(row.display_vol); static string fmt_driver(TimeAndSalesRowVM row) => row.security.spec_or_default().format(row.driver); static string fmt_theo(TimeAndSalesRowVM row) => row.security.spec_or_default().format(row.theo); static string fmt_buy_edge(TimeAndSalesRowVM row) => row.security.spec_or_default().format(row.buy_edge); static string fmt_sell_edge(TimeAndSalesRowVM row) => row.security.spec_or_default().format(row.sell_edge); - static string fmt_delta(TimeAndSalesRowVM row) => new TickFactors(1, 100).format(row.display_delta); + static string fmt_delta(TimeAndSalesRowVM row) => new mbts.user.settings.TickFactors(1, 100).format(row.display_delta); static string fmt_sec_key(TimeAndSalesRowVM row) => row.security_key.ToString(); void add_col( diff --git a/src/client/spark/Modules/Support/Browser/BrowserWindow.cs b/src/client/spark/Modules/Support/Browser/BrowserWindow.cs index 2428ae762..8ec0ed84d 100644 --- a/src/client/spark/Modules/Support/Browser/BrowserWindow.cs +++ b/src/client/spark/Modules/Support/Browser/BrowserWindow.cs @@ -44,8 +44,8 @@ namespace bts.shell { string uristr = uri.ToString(); string http_base = "http://{0}:{1}/".fmt( - Configuration.get().ConfigHost, - Configuration.get().ConfigPort); + Configuration.get().ConfigHost, + Configuration.get().ConfigPort); string temp = uristr; if (uristr.StartsWith("bts://m/")) { temp = uristr.Replace("bts://m/", http_base + "docs/"); @@ -94,7 +94,7 @@ namespace bts.shell { emulation_key = Microsoft.Win32.Registry.CurrentUser.CreateSubKey(ke_name); } - var process_name = Configuration.get().ProcessName; + var process_name = Configuration.get().ProcessName; emulation_key.SetValue(process_name, 11001); // IE11 } #endregion diff --git a/src/client/spark/Modules/Trading/DayFills/DayFillsRowData.cs b/src/client/spark/Modules/Trading/DayFills/DayFillsRowData.cs index 71dac2f92..0345e9e59 100644 --- a/src/client/spark/Modules/Trading/DayFills/DayFillsRowData.cs +++ b/src/client/spark/Modules/Trading/DayFills/DayFillsRowData.cs @@ -73,8 +73,8 @@ namespace Spark.Trading { public double pos_theta => trade.pos_theta; public double pos_oev => trade.pos_oev; - public bts.api.domain.TickDisplaySettingsImmutable price_display( - bts.api.domain.SecurityMetadataItemImmutable? meta = null) { + public bts.domain.protobufs.TickDisplaySettingsImmutable price_display( + bts.domain.protobufs.SecurityMetadataItemImmutable? meta = null) { var rv = meta.HasValue && meta.Value.HasValue && meta.Value.Value.HasPriceDisplay ? meta.Value.Value.PriceDisplay : Security.Defaults.price_display_settingsi; if (security.HasValue) { diff --git a/src/client/spark/Modules/Trading/DayFills/DayFillsRowVM.cs b/src/client/spark/Modules/Trading/DayFills/DayFillsRowVM.cs index 1cf947a0c..8f2597bfe 100644 --- a/src/client/spark/Modules/Trading/DayFills/DayFillsRowVM.cs +++ b/src/client/spark/Modules/Trading/DayFills/DayFillsRowVM.cs @@ -13,7 +13,7 @@ namespace Spark.Trading { using System; using System.Collections.Generic; - using TickDisplaySettingsImmutable = bts.api.domain.TickDisplaySettingsImmutable; + using TickDisplaySettingsImmutable = bts.domain.protobufs.TickDisplaySettingsImmutable; class DayFillsRowVM : DisposableViewModelBase, DIYGrid.IRowVM, IEquatable { // guarentees deterministic sorting if the rows in the collection have unique row_keys diff --git a/src/client/spark/Modules/Trading/Fills/FillsRowVM.cs b/src/client/spark/Modules/Trading/Fills/FillsRowVM.cs index 8b54fe7e6..4ef7ddde5 100644 --- a/src/client/spark/Modules/Trading/Fills/FillsRowVM.cs +++ b/src/client/spark/Modules/Trading/Fills/FillsRowVM.cs @@ -1,8 +1,8 @@ #nullable enable namespace mbts.spark { using bts.api; - using bts.api.domain; using bts.api.orderman; + using bts.domain.protobufs; using bts.spark; using bts.utils; diff --git a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs index ceb552f06..2673fab76 100644 --- a/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs +++ b/src/client/spark/Modules/Trading/Ladder/View/LadderGridHost.cs @@ -402,7 +402,7 @@ namespace mbts.spark { int _row_count => _price_list?.Count ?? 0; - bts.api.domain.TickDisplaySettingsImmutable _qty_display => + bts.domain.protobufs.TickDisplaySettingsImmutable _qty_display => _vm is null ? Security.Defaults.quantity_display_settingsi : _vm.model.security_md.quantity_display; diff --git a/src/client/spark/Modules/Trading/ManualFills/ManualFillRow.cs b/src/client/spark/Modules/Trading/ManualFills/ManualFillRow.cs index 60aad0efa..0fde95b8e 100644 --- a/src/client/spark/Modules/Trading/ManualFills/ManualFillRow.cs +++ b/src/client/spark/Modules/Trading/ManualFills/ManualFillRow.cs @@ -15,7 +15,7 @@ using System.Reactive.Linq; using System.Reflection; using System.Runtime.CompilerServices; -using TickDisplaySettingsImmutable = bts.api.domain.TickDisplaySettingsImmutable; +using TickDisplaySettingsImmutable = bts.domain.protobufs.TickDisplaySettingsImmutable; namespace bts.shell.manual_fills { class ManualFillRow : DisposableViewModelBase, ISelectable, IEquatable { diff --git a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersRowData.cs b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersRowData.cs index f8d5b99f5..c9a68df1e 100644 --- a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersRowData.cs +++ b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersRowData.cs @@ -67,8 +67,8 @@ namespace Spark.Trading { } } - public bts.api.domain.TickDisplaySettingsImmutable price_display( - bts.api.domain.SecurityMetadataItemImmutable? meta = null) { + public bts.domain.protobufs.TickDisplaySettingsImmutable price_display( + bts.domain.protobufs.SecurityMetadataItemImmutable? meta = null) { var rv = meta.HasValue && meta.Value.HasValue && meta.Value.Value.HasPriceDisplay ? meta.Value.Value.PriceDisplay : Security.Defaults.price_display_settingsi; if (security.HasValue) { diff --git a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersRowVM.cs b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersRowVM.cs index b9c2859dc..492e753b4 100644 --- a/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersRowVM.cs +++ b/src/client/spark/Modules/Trading/OpenOrders/OpenOrdersRowVM.cs @@ -13,7 +13,7 @@ namespace Spark.Trading { using System; using System.Collections.Generic; - using TickDisplaySettingsImmutable = bts.api.domain.TickDisplaySettingsImmutable; + using TickDisplaySettingsImmutable = bts.domain.protobufs.TickDisplaySettingsImmutable; class OpenOrdersRowVM : DisposableViewModelBase, DIYGrid.IRowVM, IEquatable { // guarentees deterministic sorting if the rows in the collection have unique row_keys diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs index f02bfb6f9..86ea21375 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookColumns.cs @@ -1255,7 +1255,7 @@ namespace mbts.spark { TickUpDownNullableDouble.ValueProperty, nameof(OrderBookRowVM.prospective_quantity)); tick_up_down.SetBinding( TickUpDownNullableDouble.IncrementProperty, new Binding(nameof(OrderBookRowVM.quantity_display_settings)) { - Converter = ValueConverter.create( + Converter = ValueConverter.create( t => t.HasTickFactors ? t.TickFactors.to_tick_factors().tick_unit_frac() : 1D) }); tick_up_down.InputBindings.Add(_create_keyinput_binding(Key.Enter, nameof(OrderBookRowVM.modify_order_cmd))); diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs index 2af345e5e..20d202eae 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderBookRowVM.cs @@ -21,7 +21,7 @@ using System.Windows.Input; using System.Windows.Media; using Columns = mbts.spark.OrderBookGridView.ColumnKeys; -using TickDisplaySettingsImmutable = bts.api.domain.TickDisplaySettingsImmutable; +using TickDisplaySettingsImmutable = bts.domain.protobufs.TickDisplaySettingsImmutable; namespace mbts.spark { partial class OrderBookRowVM : IEquatable, DIYGrid.IRowVM, IHierarchicalRow, INotifyPropertyChanged { diff --git a/src/client/spark/Modules/Trading/OrderBook/OrderParamsVM.cs b/src/client/spark/Modules/Trading/OrderBook/OrderParamsVM.cs index 211961ddb..8181e3f6b 100644 --- a/src/client/spark/Modules/Trading/OrderBook/OrderParamsVM.cs +++ b/src/client/spark/Modules/Trading/OrderBook/OrderParamsVM.cs @@ -24,7 +24,7 @@ namespace mbts.spark { using System.Windows.Input; using CompositeDisposable = System.Reactive.Disposables.CompositeDisposable; - using TickDisplaySettingsImmutable = bts.api.domain.TickDisplaySettingsImmutable; + using TickDisplaySettingsImmutable = bts.domain.protobufs.TickDisplaySettingsImmutable; class OrderParamsVM : DisposableViewModelBase { readonly OrdersModel _model; diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLCellIndexBuilder.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLCellIndexBuilder.cs index 58b5e6fda..7c5ae10eb 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLCellIndexBuilder.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLCellIndexBuilder.cs @@ -1,4 +1,4 @@ -using bts.api.domain; +using bts.domain.protobufs; using bts.utils; using mbts.spark; diff --git a/src/client/spark/Modules/Trading/PNL/VM/PNLRowVM.cs b/src/client/spark/Modules/Trading/PNL/VM/PNLRowVM.cs index f43927472..192cd7477 100644 --- a/src/client/spark/Modules/Trading/PNL/VM/PNLRowVM.cs +++ b/src/client/spark/Modules/Trading/PNL/VM/PNLRowVM.cs @@ -28,7 +28,7 @@ namespace bts.shell.pnl { readonly ISecurityMetadataStore _sec_meta_store; bool _refresh_normalized_data = true, _is_selected; PNLNormalizedData _normalized_data; - api.domain.TickDisplaySettingsImmutable? _quantity_display_backing; + domain.protobufs.TickDisplaySettingsImmutable? _quantity_display_backing; public PNLRowVM( PNLRowData data, @@ -291,7 +291,7 @@ namespace bts.shell.pnl { public PNLCellVM pnl_price { get; } // display - public api.domain.TickDisplaySettingsImmutable quantity_display { + public domain.protobufs.TickDisplaySettingsImmutable quantity_display { get { if (_quantity_display_backing.HasValue) { return _quantity_display_backing.Value; diff --git a/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportRowData.cs b/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportRowData.cs index e91efd425..a27032b24 100644 --- a/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportRowData.cs +++ b/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportRowData.cs @@ -2,9 +2,9 @@ namespace Spark.Trading { using bts; using bts.api; - using bts.api.domain; using bts.api.orderman; using bts.api.position; + using bts.domain.protobufs; using bts.utils; using mbts; diff --git a/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportRowVM.cs b/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportRowVM.cs index a7108c94e..2e8a078dc 100644 --- a/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportRowVM.cs +++ b/src/client/spark/Modules/Trading/ReconcileReport/ReconcileReportRowVM.cs @@ -14,7 +14,7 @@ namespace Spark.Trading { using System; using System.Collections.Generic; - using TickDisplaySettingsImmutable = bts.api.domain.TickDisplaySettingsImmutable; + using TickDisplaySettingsImmutable = bts.domain.protobufs.TickDisplaySettingsImmutable; class ReconcileReportRowVM : DisposableViewModelBase, DIYGrid.IRowVM, IEquatable { // key comparer guarentees deterministic sorting diff --git a/src/client/spark/NMSheets/Settings/NMSheetSettingGrid.cs b/src/client/spark/NMSheets/Settings/NMSheetSettingGrid.cs index fd6eb4279..19822e459 100644 --- a/src/client/spark/NMSheets/Settings/NMSheetSettingGrid.cs +++ b/src/client/spark/NMSheets/Settings/NMSheetSettingGrid.cs @@ -27,7 +27,7 @@ namespace BCG } private readonly bool _is_remoted = - mbts.config.Configuration.get().IsRemoteApp; + mbts.config.Configuration.get().IsRemoteApp; [Category("Grid Lines")] [DisplayName("Row Seperator Line Color")] diff --git a/src/client/spark/NMSheets/UIComponents/MainSheet/NMSheetTheoGrid.cs b/src/client/spark/NMSheets/UIComponents/MainSheet/NMSheetTheoGrid.cs index 69732308c..d5c1fef7a 100644 --- a/src/client/spark/NMSheets/UIComponents/MainSheet/NMSheetTheoGrid.cs +++ b/src/client/spark/NMSheets/UIComponents/MainSheet/NMSheetTheoGrid.cs @@ -23,7 +23,7 @@ namespace BCG { } private readonly bool _is_remoted = - mbts.config.Configuration.get().IsRemoteApp; + mbts.config.Configuration.get().IsRemoteApp; private readonly PerfStatsLogger _recorder = new PerfStatsLogger(); private System.ComponentModel.Container components = null; diff --git a/src/client/spark/Notifications/ToastNotification.cs b/src/client/spark/Notifications/ToastNotification.cs index 94ec08f8c..f8a748df0 100644 --- a/src/client/spark/Notifications/ToastNotification.cs +++ b/src/client/spark/Notifications/ToastNotification.cs @@ -1,6 +1,6 @@ using bts.api; -using bts.api.domain; using bts.api.orderman; +using bts.domain.protobufs; using bts.spark; using bts.utils; diff --git a/src/client/spark/Orders/ExistingOrderTicketVM.cs b/src/client/spark/Orders/ExistingOrderTicketVM.cs index ab6fc7d84..14c08cd9c 100644 --- a/src/client/spark/Orders/ExistingOrderTicketVM.cs +++ b/src/client/spark/Orders/ExistingOrderTicketVM.cs @@ -1,7 +1,7 @@ using bts; using bts.api; -using bts.api.domain; using bts.api.orderman; +using bts.domain.protobufs; using mbts.ui; using mbts.ui.shell; diff --git a/src/client/spark/Orders/NewOrderTicketVM.cs b/src/client/spark/Orders/NewOrderTicketVM.cs index 92f7394e6..b4fe4625b 100644 --- a/src/client/spark/Orders/NewOrderTicketVM.cs +++ b/src/client/spark/Orders/NewOrderTicketVM.cs @@ -1,7 +1,7 @@ using bts; using bts.api; -using bts.api.domain; using bts.api.orderman; +using bts.domain.protobufs; using mbts.ui; using mbts.ui.shell; diff --git a/src/client/spark/Orders/OrderActivitySummarizer.cs b/src/client/spark/Orders/OrderActivitySummarizer.cs index b517568d4..fb7b02f88 100644 --- a/src/client/spark/Orders/OrderActivitySummarizer.cs +++ b/src/client/spark/Orders/OrderActivitySummarizer.cs @@ -20,7 +20,7 @@ using System.Text; using System.Threading.Tasks; using OrderPair = System.ValueTuple; -using TickDisplaySettingsImmutable = bts.api.domain.TickDisplaySettingsImmutable; +using TickDisplaySettingsImmutable = bts.domain.protobufs.TickDisplaySettingsImmutable; namespace bts.spark { internal class Activity { diff --git a/src/client/spark/Orders/OrderTypeVMs/IcebergOrderVM.cs b/src/client/spark/Orders/OrderTypeVMs/IcebergOrderVM.cs index e33323f30..5505d50f9 100644 --- a/src/client/spark/Orders/OrderTypeVMs/IcebergOrderVM.cs +++ b/src/client/spark/Orders/OrderTypeVMs/IcebergOrderVM.cs @@ -1,6 +1,6 @@ using bts.api; -using bts.api.domain; using bts.api.orderman; +using bts.domain.protobufs; using mbts.ui.shell; diff --git a/src/client/spark/Orders/OrderUtils.cs b/src/client/spark/Orders/OrderUtils.cs index 46deda01e..ed1d23197 100644 --- a/src/client/spark/Orders/OrderUtils.cs +++ b/src/client/spark/Orders/OrderUtils.cs @@ -1,7 +1,7 @@ using bts; using bts.api; -using bts.api.domain; using bts.api.orderman; +using bts.domain.protobufs; using bts.spark; using mbts.ui; @@ -65,8 +65,8 @@ namespace mbts.spark { OrderRecordImmutable order, double? new_price = null, double? new_quantity = null, - bts.api.domain.TickDisplaySettingsImmutable? price_display = null, - bts.api.domain.TickDisplaySettingsImmutable? quantity_display = null) => + bts.domain.protobufs.TickDisplaySettingsImmutable? price_display = null, + bts.domain.protobufs.TickDisplaySettingsImmutable? quantity_display = null) => OrdersExtensions.update_description( order, new_price, new_quantity, price_display, quantity_display); diff --git a/src/client/spark/Risk/Slide/SlideReportGridSettingsVM.cs b/src/client/spark/Risk/Slide/SlideReportGridSettingsVM.cs index 408dfdfed..363b79ac3 100644 --- a/src/client/spark/Risk/Slide/SlideReportGridSettingsVM.cs +++ b/src/client/spark/Risk/Slide/SlideReportGridSettingsVM.cs @@ -103,7 +103,7 @@ namespace mbts.analytics { } } - public bts.api.domain.TickDisplaySettingsImmutable tick_display_settings { get; } + public bts.domain.protobufs.TickDisplaySettingsImmutable tick_display_settings { get; } public bool show_commas { get => top_selected_greek?.result?.show_commas ?? false; diff --git a/src/client/spark/Risk/Slide/SlideReportPriceSettingsVM.cs b/src/client/spark/Risk/Slide/SlideReportPriceSettingsVM.cs index 431a9dc08..2b01a3dc2 100644 --- a/src/client/spark/Risk/Slide/SlideReportPriceSettingsVM.cs +++ b/src/client/spark/Risk/Slide/SlideReportPriceSettingsVM.cs @@ -56,7 +56,7 @@ namespace mbts.analytics { } } - public bts.api.domain.TickDisplaySettingsImmutable tick_display_settings { get; } + public bts.domain.protobufs.TickDisplaySettingsImmutable tick_display_settings { get; } public PriceDisplayFactors result => _result.Value; diff --git a/src/client/spark/Risk/VolSurfaceSlideCalculator.cs b/src/client/spark/Risk/VolSurfaceSlideCalculator.cs index d6e55f60d..e76bec4c4 100644 --- a/src/client/spark/Risk/VolSurfaceSlideCalculator.cs +++ b/src/client/spark/Risk/VolSurfaceSlideCalculator.cs @@ -547,7 +547,7 @@ namespace mbts.analytics { } public static HashSet get_sec_tups( - bts.api.domain.SecurityCriteriaImmutable sc) { + bts.domain.protobufs.SecurityCriteriaImmutable sc) { var rv = new HashSet(); foreach (var c in sc.Clauses) foreach (var s in c.Symbols) diff --git a/src/client/spark/core/NativeMethods/NativeMethods.cs b/src/client/spark/core/NativeMethods/NativeMethods.cs index 4efd440a3..92b3b53e8 100644 --- a/src/client/spark/core/NativeMethods/NativeMethods.cs +++ b/src/client/spark/core/NativeMethods/NativeMethods.cs @@ -202,7 +202,7 @@ namespace mbts.ui.native { private static extern bool SetWorkArea_SystemParametersInfo(SPI action, uint zero, Win32Rect param, uint winini); public static void SetWorkArea(Rect workarea) { - var dpi_ratio = config.Configuration.get().DpiRatio; + var dpi_ratio = config.Configuration.get().DpiRatio; workarea = new Rect(workarea.Left * dpi_ratio, workarea.Top * dpi_ratio, (workarea.Right - workarea.Left) * dpi_ratio, (workarea.Bottom - workarea.Top) * dpi_ratio); //const uint SPIF_SENDWININICHANGE = 2; const uint SPIF_UPDATEINIFILE = 1; @@ -220,7 +220,7 @@ namespace mbts.ui.native { // Get the work area for monitor where the specified window is currently. // The work area is the area of the window not covered by the task bar or a docked shell public static Rect GetWorkArea(IntPtr window) { - var dpi_ratio = config.Configuration.get().DpiRatio; + var dpi_ratio = config.Configuration.get().DpiRatio; IntPtr monitor = MonitorFromWindow(window, MONITOR_DEFAULTONNEAREST); MONITORINFO info = new MONITORINFO(); info.cbSize = Marshal.SizeOf(info); diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDownHelper.cs b/src/client/spark/view/Controls/TickUpDown/TickUpDownHelper.cs index 5e5b56c3b..016ba9fce 100644 --- a/src/client/spark/view/Controls/TickUpDown/TickUpDownHelper.cs +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDownHelper.cs @@ -1,6 +1,6 @@ #nullable enable namespace mbts.ui.controls { - using bts.api.domain; + using bts.domain.protobufs; using bts.utils; using System; diff --git a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableNumeric.cs b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableNumeric.cs index 374c74da2..84277e91f 100644 --- a/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableNumeric.cs +++ b/src/client/spark/view/Controls/TickUpDown/TickUpDownNullableNumeric.cs @@ -1,6 +1,6 @@ #nullable enable namespace mbts.ui.controls { - using bts.api.domain; + using bts.domain.protobufs; using bts.utils; using mbts.ui.extensions; diff --git a/src/client/spark/view/Converters/TickDisplayConverter.cs b/src/client/spark/view/Converters/TickDisplayConverter.cs index 44c85bff2..5886ae67d 100644 --- a/src/client/spark/view/Converters/TickDisplayConverter.cs +++ b/src/client/spark/view/Converters/TickDisplayConverter.cs @@ -23,7 +23,7 @@ namespace mbts.ui.converters { } public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) { var price = get_val(values, 0); - if (values.Length == 2 && values[1] is bts.api.domain.TickDisplaySettingsImmutable tdsi) { + if (values.Length == 2 && values[1] is bts.domain.protobufs.TickDisplaySettingsImmutable tdsi) { return tdsi.to_tick_display_settings().format(price); } var spec = get_val(values, 1); diff --git a/src/client/spark/view/Extensions/HighDpiExtensions.cs b/src/client/spark/view/Extensions/HighDpiExtensions.cs index 9d14d3cbd..ab5542acf 100644 --- a/src/client/spark/view/Extensions/HighDpiExtensions.cs +++ b/src/client/spark/view/Extensions/HighDpiExtensions.cs @@ -24,7 +24,7 @@ namespace mbts.ui.dpi { public static readonly float fdpi_ratio; static HighDpiExtensions() { - dpi_ratio = Configuration.get().DpiRatio; + dpi_ratio = Configuration.get().DpiRatio; pixel_unit = 1.0 / dpi_ratio; fdpi_ratio = (float)dpi_ratio; } diff --git a/src/client/spark/view/Extensions/MarkupExtensions/BrushBlendExtension.cs b/src/client/spark/view/Extensions/MarkupExtensions/BrushBlendExtension.cs new file mode 100644 index 000000000..7c9f235fd --- /dev/null +++ b/src/client/spark/view/Extensions/MarkupExtensions/BrushBlendExtension.cs @@ -0,0 +1,67 @@ +namespace mbts.ui; + +using System; +using System.Linq; +using System.Windows.Markup; +using System.Windows.Media; + +[MarkupExtensionReturnType(typeof(Brush))] +public class BrushBlendExtension : MarkupExtension { + public BrushBlendExtension() { } + + public BrushBlendExtension(string Expression) => + this.Expression = Expression; + + [ConstructorArgument(nameof(Expression))] + public string Expression { get; set; } + + public override object ProvideValue(IServiceProvider serviceProvider) { + if (string.IsNullOrEmpty(Expression)) { + throw new InvalidOperationException("Expression is null/empty"); + } + var parts = Expression.Split("+").Select(parseWeightedColor).ToList(); + var totalWeight = parts.Select(p => p.Weight * (double)p.Color.A / byte.MaxValue).Sum(); + var blend = parts.Aggregate(Colors.Transparent, (b, p) => { + var weightPct = (double)p.Weight / totalWeight; + var weightedAlpha = (byte)(p.Color.A * weightPct); + var rv = b.blend(p.Color.with(alpha: weightedAlpha)); + var tmp = b.blend(p.Color.with(alpha: weightedAlpha)); + return rv; + }); + return new SolidColorBrush(blend); + + static (Color Color, int Weight) parseWeightedColor(string term) { + var parts = term?.Split('*') ?? Array.Empty(); + return parts.Length switch { + 1 => (get_core_color(parts[0]), 1), + 2 => (get_core_color(parts[1]), int.Parse(parts[0])), + _ => (Colors.Transparent, 0), + }; + } + + static Color get_core_color(string name) { + if (string.IsNullOrEmpty(name)) return Colors.Black; + string ln = name.ToLower(); + foreach (var tup in DefinedColors.known_colors.Value) { + if (tup.Item1.ToLower() == ln) { + return tup.Item2; + } + } + foreach (var tup in DefinedColors.known_btscolors.Value) { + if (tup.Item1.ToLower() == ln) { + return tup.Item2; + } + } + return BTSColorExtension.get_color(name) ?? Colors.Black; + } + // static Color get_core_color(string name) { + // if (string.IsNullOrEmpty(name)) { + // return Colors.Black; + // } + // return DefinedColors.known_colors.Value.Concat(DefinedColors.known_btscolors.Value) + // .FirstOrDefault(tup => string.Equals(tup.Item1, name, StringComparison.CurrentCultureIgnoreCase)) + // ?.Item2 + // ?? Colors.Black; + // } + } +} diff --git a/src/client/spark/view/Extensions/MarkupExtensions/ColorBlendExtension.cs b/src/client/spark/view/Extensions/MarkupExtensions/ColorBlendExtension.cs new file mode 100644 index 000000000..d36b80c8a --- /dev/null +++ b/src/client/spark/view/Extensions/MarkupExtensions/ColorBlendExtension.cs @@ -0,0 +1,47 @@ +namespace mbts.ui; + +using System; +using System.Linq; +using System.Windows.Markup; +using System.Windows.Media; + +[MarkupExtensionReturnType(typeof(Color))] +public class ColorBlendExtension : MarkupExtension { + public ColorBlendExtension() { } + + public ColorBlendExtension(string Expression) => + this.Expression = Expression; + + [ConstructorArgument(nameof(Expression))] + public string Expression { get; set; } + + public override object ProvideValue(IServiceProvider serviceProvider) { + if (string.IsNullOrEmpty(Expression)) { + throw new InvalidOperationException("Expression is null/empty"); + } + var parts = Expression.Split("+").Select(parseWeightedColor); + var totalWeight = parts.Select(p => p.Weight).Sum(); + var blend = parts.Aggregate(Colors.Transparent, (b, p) => + b.blend(p.Color.with(alpha: (byte)((double)(p.Weight / totalWeight) * byte.MaxValue)))); + return blend; + + static (Color Color, int Weight) parseWeightedColor(string term) { + var parts = term?.Split('*') ?? Array.Empty(); + return parts.Length switch { + 1 => (get_core_color(parts[0]), 1), + 2 => (get_core_color(parts[1]), int.Parse(parts[0])), + _ => (Colors.Transparent, 0), + }; + } + + static Color get_core_color(string name) { + if (string.IsNullOrEmpty(name)) { + return Colors.Black; + } + return DefinedColors.known_colors.Value.Concat(DefinedColors.known_btscolors.Value) + .FirstOrDefault(tup => string.Equals(tup.Item1, name, StringComparison.CurrentCultureIgnoreCase)) + ?.Item2 + ?? Colors.Black; + } + } +} diff --git a/src/client/spark/view/Shell/ShellModel.cs b/src/client/spark/view/Shell/ShellModel.cs index 726c771df..60e7ebcd0 100644 --- a/src/client/spark/view/Shell/ShellModel.cs +++ b/src/client/spark/view/Shell/ShellModel.cs @@ -84,7 +84,7 @@ .WithParts(types) .WithDefaultConventions(rules); - string plugin_path = Configuration.get().DataPath + "/plugins/"; + string plugin_path = Configuration.get().DataPath + "/plugins/"; if (Directory.Exists(plugin_path)) { var assemblies = Directory.GetFiles(plugin_path, "*.dll") .Select(AssemblyLoadContext.Default.LoadFromAssemblyPath); diff --git a/src/client/spark/view/Shell/Workspaces/WorkspacesModel.cs b/src/client/spark/view/Shell/Workspaces/WorkspacesModel.cs index 3c4d8a775..783a61adc 100644 --- a/src/client/spark/view/Shell/Workspaces/WorkspacesModel.cs +++ b/src/client/spark/view/Shell/Workspaces/WorkspacesModel.cs @@ -153,7 +153,7 @@ namespace mbts.ui.shell { #region Static local save methods private static string local_workspace_path() { - var system = Configuration.get(); + var system = Configuration.get(); return @"{0}/{1}/{2}".fmt(system.DataPath, WORKSPACE_NAMESPACE, "recover_workspace"); } private static void save_workspace_locally(WorkspaceDefinition workspace) { diff --git a/src/client/spark/view/Spark/Shell/CalculatorLogic.cs b/src/client/spark/view/Spark/Shell/CalculatorLogic.cs index ea3740108..195844b7e 100644 --- a/src/client/spark/view/Spark/Shell/CalculatorLogic.cs +++ b/src/client/spark/view/Spark/Shell/CalculatorLogic.cs @@ -1,6 +1,6 @@ namespace mbts.spark { using bts.api; - using bts.api.domain; + using bts.domain.protobufs; using bts.utils; using mbts.ui; diff --git a/src/client/spark/view/Utility/MDDisplayHelper.cs b/src/client/spark/view/Utility/MDDisplayHelper.cs index 2d9c84164..a5481310f 100644 --- a/src/client/spark/view/Utility/MDDisplayHelper.cs +++ b/src/client/spark/view/Utility/MDDisplayHelper.cs @@ -1,5 +1,5 @@ using bts.api; -using bts.api.domain; +using bts.domain.protobufs; using bts.utils; using mbts.co2; diff --git a/src/client/spark/view/Utility/ScreenCapture.cs b/src/client/spark/view/Utility/ScreenCapture.cs index 4ba380c33..49b0dd7b5 100644 --- a/src/client/spark/view/Utility/ScreenCapture.cs +++ b/src/client/spark/view/Utility/ScreenCapture.cs @@ -46,7 +46,7 @@ namespace mbts.ui.utility { } static Int32Rect screen_size() { - var config = Configuration.get(); + var config = Configuration.get(); var dpi = config.DpiRatio; return new Int32Rect( (int)(SystemParameters.VirtualScreenLeft * dpi),