diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index ef38cd540..51f411bda 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -37,6 +37,8 @@ "${localappdata}/lxss/rootfs/usr/include" ], "defines": [ + "__linux__", + "__x86_64__" ], "browse": { "path": [ @@ -47,7 +49,7 @@ "${localappdata}/lxss/rootfs/usr/local/include", "${localappdata}/lxss/rootfs/usr/lib/gcc/x86_64-linux-gnu/6/include-fixed", "${localappdata}/lxss/rootfs/usr/include/x86_64-linux-gnu", - "${localappdata}/lxss/rootfs/usr/include" + "${localappdata}/lxss/rootfs/usr/include/*" ], "limitSymbolsToIncludedHeaders": true, "databaseFilename": "" diff --git a/.vscode/launch.json b/.vscode/launch.json index 957a898cc..08d7b39bb 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -87,6 +87,23 @@ "/bts/": "${workspaceRoot}" } }, + { + "name": "Docker attach", + "type": "cppdbg", + "request": "attach", + "program": "/bts/build/gcc_debug/src/server/sparkd/sparkd", + "processId": "${command:pickRemoteProcess}", + "MIMode": "gdb", + "pipeTransport": { + "pipeCwd": "${workspaceRoot}", + "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", + "pipeArgs": ["-p 2000","root@localhost"], + "debuggerPath": "/usr/bin/gdb" + }, + "sourceFileMap": { + "/bts/": "${workspaceRoot}" + } + }, { "name": "eh-3 launch", "type": "cppdbg", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 36dc44cd9..1af76a72f 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -20,10 +20,14 @@ } }, { - "taskName": "server_build", + "taskName": "server_build", "type": "shell", - "command": ".\\tools\\serverbuild.cmd", - "problemMatcher":"$gcc", + "command": ".\\tools\\ssh_serverbuild.cmd", + + "problemMatcher": { + "base": "$gcc", + "fileLocation": "relative" + }, "presentation": { "echo": true, "reveal": "always", diff --git a/CMakeLists.txt b/CMakeLists.txt index dbff069e6..2b0a7faae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ if (WIN32) add_subdirectory(src/lib) else () set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} \ - -Wall -pedantic -Wextra -Werror -Wno-missing-braces --std=c++14") + -Wall -pedantic -Wextra -Werror -Wno-missing-braces --std=c++14 -fdiagnostics-color") set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -DNDEBUG -O3") add_subdirectory(src/lib) add_subdirectory(src/server/sparkd) diff --git a/docker/linux b/docker/linux index d43f6c8df..d4a32d325 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit d43f6c8df03cdcc6eef41263adb0a573bbe312f0 +Subproject commit d4a32d32592c688c3a1f042750fd3323bcdfd38a diff --git a/src/client/spark/core/GlobalExtensions/TickExtensions.cs b/src/client/spark/core/GlobalExtensions/TickExtensions.cs index e1f893daa..775de1783 100644 --- a/src/client/spark/core/GlobalExtensions/TickExtensions.cs +++ b/src/client/spark/core/GlobalExtensions/TickExtensions.cs @@ -7,7 +7,6 @@ namespace mbts public static class TickExtensions { #region Public Extensions (is_valid, format, parse, tick_up, tick_down) - public static bool is_valid(this TickFactors tick) { return tick.tick_unit > 0 && tick.tick_unit <= (tick.tick_base * 0.5); } public static bool is_valid(this RegionalTickFactors regional_tick) { return regional_tick.low_tick.is_valid() && regional_tick.high_tick.is_valid(); /*&& regional_tick.low_tick.tick_base == regional_tick.high_tick.tick_base;*/ } @@ -34,25 +33,76 @@ namespace mbts return _parse(regional_tick, text); } - public static double tick_up(this TickFactors tick, double input) { - if (DoubleHelper.IsNaNOrInfinity(input) || !tick.is_valid()) return input; - return _tick(tick, input, true); - } - public static double tick_up(this RegionalTickFactors regional_tick, double input) { - if (DoubleHelper.IsNaNOrInfinity(input) || !regional_tick.is_valid()) return input; - return input <= regional_tick.low_tick_inclusive_end ? regional_tick.low_tick.tick_up(input) : regional_tick.high_tick.tick_up(input); - } - public static double tick_down(this TickFactors tick, double input) { - if (DoubleHelper.IsNaNOrInfinity(input) || !tick.is_valid()) return input; - return _tick(tick, input, false); - } - public static double tick_down(this RegionalTickFactors regional_tick, double input) { - if (DoubleHelper.IsNaNOrInfinity(input) || !regional_tick.is_valid()) return input; - return input <= regional_tick.low_tick_inclusive_end ? regional_tick.low_tick.tick_down(input) : regional_tick.high_tick.tick_down(input); + public static double tickup(this TickFactors tick, double input) { return tick.tickup(input, 1); } + public static double tickup(this TickFactors tick, double input, uint count) { + if (DoubleHelper.IsNaNOrInfinity(input)) return input; + double tuf = tick.tick_unit_frac(); + input -= input % tuf; + double val = input + tuf * count; + return _round_tick(tuf, val); } + public static double tickup(this RegionalTickFactors regional_tick, double input) { return regional_tick.tickup(input, 1); } + public static double tickup(this RegionalTickFactors regional_tick, double input, uint count) { + if (DoubleHelper.IsNaNOrInfinity(input)) return input; + double val, tuf; + if (input < regional_tick.low_tick_inclusive_end) { + tuf = regional_tick.low_tick.tick_unit_frac(); + input -= input % tuf; + val = input + tuf * count; + if (val > regional_tick.low_tick_inclusive_end) { + count -= (uint)Math.Ceiling((regional_tick.low_tick_inclusive_end - input) / tuf); + tuf = regional_tick.high_tick.tick_unit_frac(); + val = regional_tick.low_tick_inclusive_end + tuf * count; + } + } else { + tuf = regional_tick.high_tick.tick_unit_frac(); + input -= input % tuf; + val = input + tuf * count; + } + return _round_tick(tuf, val); + } + + public static double tickdown(this TickFactors tick, double input) { return tick.tickdown(input, 1); } + public static double tickdown(this TickFactors tick, double input, uint count) { + if (DoubleHelper.IsNaNOrInfinity(input)) return input; + double tuf = tick.tick_unit_frac(); + double remainder = input % tuf; + if (remainder > 0) input += tuf - remainder; + double val = input - tuf * count; + return _round_tick(tuf, val); + } + + public static double tickdown(this RegionalTickFactors regional_tick, double input) { return regional_tick.tickdown(input, 1); } + public static double tickdown(this RegionalTickFactors regional_tick, double input, uint count) { + if (DoubleHelper.IsNaNOrInfinity(input)) return input; + double val, tuf; + if (input > regional_tick.low_tick_inclusive_end) { + tuf = regional_tick.high_tick.tick_unit_frac(); + double remainder = input % tuf; + if (remainder > 0) input += tuf - remainder; + val = input - count * tuf; + if (val < regional_tick.low_tick_inclusive_end) { + count -= (uint)Math.Ceiling((input - regional_tick.low_tick_inclusive_end) / tuf); + tuf = regional_tick.low_tick.tick_unit_frac(); + return regional_tick.low_tick_inclusive_end - tuf * count; + } + } else { + tuf = regional_tick.low_tick.tick_unit_frac(); + val = input - tuf * count; + } + return _round_tick(tuf, val); + } #endregion + #region Private Members + private static decimal tick_unit_frac_dec(this TickFactors tick) { return new decimal(tick.tick_unit / tick.tick_base); } + private static double tick_unit_frac(this TickFactors tick) { return tick.tick_unit / tick.tick_base; } + private static char separator(this TickFactors tick) { + double tb_log10 = Math.Log10(tick.tick_base); + return tb_log10 >= 1 && tb_log10 % 1 == 0 ? '.' : '-'; + } + private static string _format_no_tick(double value, double display_multiplier, bool show_commas) { if (!double.IsNaN(display_multiplier)) value *= display_multiplier; return value.ToString(show_commas ? "#,0" : "0"); @@ -64,13 +114,6 @@ namespace mbts return double.IsNaN(display_multiplier) || display_multiplier == 0.0 ? result : result / display_multiplier; } - private static decimal tick_unit_frac_dec(this TickFactors tick) { return new decimal(tick.tick_unit / tick.tick_base); } - private static double tick_unit_frac(this TickFactors tick) { return tick.tick_unit / tick.tick_base; } - private static char separator(this TickFactors tick) { - double tb_log10 = Math.Log10(tick.tick_base); - return tb_log10 >= 1 && tb_log10 % 1 == 0 ? '.' : '-'; - } - private static double _parsed_or_nan(string text) { return double.TryParse(text, out double d) ? d : double.NaN; } private static double _get_integer_part(string integer_text) { return string.IsNullOrEmpty(integer_text) ? 0 : int.TryParse(integer_text, NumberStyles.Any, CultureInfo.CurrentCulture, out int result) ? result : double.NaN; @@ -115,21 +158,6 @@ namespace mbts return integer_part + numerator_part / tick.tick_base; } - private const double _precision_const = 0.000000001; - - private static double _tick(TickFactors tick, double input, bool tick_up) { - if (double.IsNaN(input)) return double.NaN; - if (input < 0) return -(_tick(tick, -input, !tick_up)); - else { - double unit = tick.tick_unit / tick.tick_base; - // IEEERemainder represents the shortest distance to a multiple of the unit, can be negative or positive - // makes it easy to check if the input is ~= unit multiple (within the precision const) - double ieeer = Math.IEEERemainder(input, unit); - if (Math.Abs(ieeer) <= _precision_const) return tick_up ? (input - ieeer) + unit : (input - ieeer) - unit; - else return ieeer < 0 ? (tick_up ? input - ieeer : input + ieeer) : (tick_up ? input - ieeer + unit : input + ieeer - unit); - } - } - private static string _format_tick(TickFactors tick, double value, bool show_commas) { if (value < 0) return "-" + _format_tick(tick, Math.Abs(value), show_commas); int integer_part = (int)Math.Floor(value); @@ -146,11 +174,16 @@ namespace mbts return integer_part_text + tick.separator() + decimal_part.ToString(new string('0', _n_display_digits(tick.tick_base))); } + private static double _round_tick(double tick_unit_frac, double input) { + return input + Math.IEEERemainder(input, tick_unit_frac); + } + private static int _n_display_digits(double tick_base) { double log_tick_base = Math.Log10(tick_base); int floor = (int)Math.Floor(log_tick_base); double dec = log_tick_base - floor; return Math.Max(1, dec > 0 ? ++floor : floor); } + #endregion } } \ No newline at end of file diff --git a/src/client/spark/mspark/Core/TickUtils.cs b/src/client/spark/mspark/Core/TickUtils.cs index 47b82aa73..7f679bd42 100644 --- a/src/client/spark/mspark/Core/TickUtils.cs +++ b/src/client/spark/mspark/Core/TickUtils.cs @@ -1,7 +1,7 @@ using bts.api; -using mbts.collections.extensions; using mbts.user.settings; using System; +using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; @@ -34,18 +34,11 @@ namespace mbts.spark { return mid; } - - public static double tickup(this ContractSpecification contract, double value) { return tick(contract, value, true, 1); } - public static double tickup(this ContractSpecification contract, double value, int count) { return tick(contract, value, true, count); } - public static double tickdown(this ContractSpecification contract, double value) { return tick(contract, value, false, 1); } - public static double tickdown(this ContractSpecification contract, double value, int count) { return tick(contract, value, false, count); } - static double tick(ContractSpecification spec, double value, bool up, int count) { - double factor = up ? 1 : -1; - for (int x = 0; x < count; ++x) { - value += spec.ticksize(value) * factor; - } - return value; - } + + public static double tickup(this ContractSpecification contract, double value) { return _get_regional_ticks(contract).tickup(value); } + public static double tickup(this ContractSpecification contract, double value, int count) { return _get_regional_ticks(contract).tickup(value, (uint)count); } + public static double tickdown(this ContractSpecification contract, double value) { return _get_regional_ticks(contract).tickdown(value); } + public static double tickdown(this ContractSpecification contract, double value, int count) { return _get_regional_ticks(contract).tickdown(value, (uint)count); } public static double round_to_tick(this ContractSpecification spec, double value) { double intpart = (long)value; @@ -66,9 +59,20 @@ namespace mbts.spark { return count; } - public static int[] get_tick_jump_quantities(ContractSpecification spec) { return _ticks_cache.TryGetValue(spec.LowTick, out (TickFactors tf, int[] jumps) result) ? result.jumps : new[] { 1, 5, 10, 25, 50, 100 }; } - private static TickFactors _get_tick_factors(double tick) { return _ticks_cache.TryGetValue(tick, out (TickFactors tick_factors, int[] preset_price_ticks) result) ? result.tick_factors : _default_tick; } + public static int[] get_tick_jump_quantities(ContractSpecification spec) { + return _ticks_cache.TryGetValue(spec.LowTick, out (TickFactors tf, int[] jumps) result) ? result.jumps : new[] { 1, 5, 10, 25, 50, 100 }; + } + public static RegionalTickFactors _get_regional_ticks(ContractSpecification spec) { + return _regional_ticks_cache.GetOrAdd((spec.LowTick, spec.HighTick, spec.PriceBreak), _create_regional_ticks); + } + private static RegionalTickFactors _create_regional_ticks((double low_tick, double high_tick, double price_break) def) { + return new RegionalTickFactors { low_tick = _get_tick_factors(def.low_tick), high_tick = _get_tick_factors(def.high_tick), low_tick_inclusive_end = def.price_break }; + } + private static TickFactors _get_tick_factors(double tick) { + return _ticks_cache.TryGetValue(tick, out (TickFactors tick_factors, int[] preset_price_ticks) result) ? result.tick_factors : _default_tick; + } private static readonly TickFactors _default_tick = new TickFactors(100, 1); + private static readonly ConcurrentDictionary<(double low_tick, double high_tick, double price_break), RegionalTickFactors> _regional_ticks_cache = new ConcurrentDictionary<(double low_tick, double high_tick, double price_break), RegionalTickFactors>(); private static readonly IReadOnlyDictionary _ticks_cache = new ReadOnlyDictionary(new[] { new { tick_unit = 0.05, tick_factors = new TickFactors(100, 5), jump_quantities = new[] { 1, 5, 10, 20, 100, 200 } }, new { tick_unit = 0.10, tick_factors = new TickFactors(100, 10), jump_quantities = new[] { 1, 5, 10, 20, 100, 200 } }, diff --git a/src/client/spark/mspark/Ladder/LadderVM.cs b/src/client/spark/mspark/Ladder/LadderVM.cs index 1939e7c98..f4a1bbbf9 100644 --- a/src/client/spark/mspark/Ladder/LadderVM.cs +++ b/src/client/spark/mspark/Ladder/LadderVM.cs @@ -22,14 +22,14 @@ namespace mbts.spark { class LadderVM : DisposableViewModelBase, IKeyListener { readonly LadderModel _model; readonly DispatcherTimer _timer; - Order _order_template = new Order(); + Order _order_template; LadderSettings _settings; public const string SAVE_NAME = "SparkLadder"; public LadderVM(LadderModel model, IObservable settings) { _model = model; - _order_template.Security = model.security; + _order_template = OrderDataHelper.Defaults.Order(_model.security); _timer = new DispatcherTimer() { Interval = TimeSpan.FromMilliseconds(100), IsEnabled = true @@ -53,6 +53,7 @@ namespace mbts.spark { _selected_order_type = backing(nameof(selected_order_type), Order.Types.TimeInForce.Day); algo_types = OrderDataHelper.Defaults.Algos.SelectMany(wrap_order).ToArray(); _revert = backing(nameof(revert), false); + show_ticket_command = new DelegateCommand(show_ticket); // Orders _internal_orders = new ObservableCollection(); @@ -129,23 +130,12 @@ namespace mbts.spark { public ICommand cancel_command { get; } public ICommand send_order_command { get; } + public ICommand show_ticket_command { get; } - internal void show_ticket(object _) { - var bmp = new System.Windows.Media.Imaging.BitmapImage(); - bmp.BeginInit(); - bmp.UriSource = new Uri("http://edge-qa2/OrderTicket.png"); - bmp.EndInit(); - new System.Windows.Window() { - Width = 255, - Height = 177, - Content = new System.Windows.Controls.Image() { - Source = bmp - } - }.Show(); + internal void show_ticket() { + _model.order_gateway.show_order_ticket(_order_template.Clone()); } - public ICommand show_ticket_command => new DelegateCommand(show_ticket); - public void send_order((double price,Side? side) args) { if (args.side.HasValue) { Order order = _order_template.Clone(); @@ -167,7 +157,7 @@ namespace mbts.spark { Property _revert; public bool revert { get => _revert.Value; set => _revert.set(value); } - public string[] accounts { get; } = new[] { "Account1", "Account2", "Account3", "Account4" }; + public string[] accounts { get; } = ImportedResources.Accounts; public string account { get => _order_template.Account; set => _order_template.Account = value; } public Order.Types.TimeInForce[] order_types => Enum.GetValues(typeof(Order.Types.TimeInForce)).Cast().ToArray(); Property _selected_order_type; diff --git a/src/client/spark/mspark/Ladder/LadderView.xaml b/src/client/spark/mspark/Ladder/LadderView.xaml index 3df56cd2d..cdd1ad3c2 100644 --- a/src/client/spark/mspark/Ladder/LadderView.xaml +++ b/src/client/spark/mspark/Ladder/LadderView.xaml @@ -29,6 +29,9 @@ + + + @@ -51,9 +54,6 @@ - - - @@ -75,7 +75,7 @@ - + diff --git a/src/client/spark/mspark/Ladder/OrderVM.cs b/src/client/spark/mspark/Ladder/OrderVM.cs index 8512c094a..c7989c580 100644 --- a/src/client/spark/mspark/Ladder/OrderVM.cs +++ b/src/client/spark/mspark/Ladder/OrderVM.cs @@ -85,7 +85,7 @@ namespace mbts.spark { public ICommand shatter_command => new DelegateCommand(_ => model.order_gateway.shatter(_order.order().Id), _ => !has_parent); public ICommand cancel_command => new DelegateCommand(_ => model.order_gateway.cancel_order(new OrderID[] {_order.order().Id}), _ => !has_parent); - public ICommand modify_command => new DelegateCommand(_parent.show_ticket, _ => !has_parent); + public ICommand modify_command => new DelegateCommand(() => model.order_gateway.show_order_modify(_order.order().Clone()), () => !has_parent); public Brush foreground => Brushes.Black; public Brush background { get; private set; } diff --git a/src/client/spark/mspark/MarketView/MarketViewModel.cs b/src/client/spark/mspark/MarketView/MarketViewModel.cs index 6930d7a20..1432aa998 100644 --- a/src/client/spark/mspark/MarketView/MarketViewModel.cs +++ b/src/client/spark/mspark/MarketView/MarketViewModel.cs @@ -37,7 +37,7 @@ namespace mbts.spark public IObservable security_position(SecurityKey key) { return _positions_demuxer.subscribe(key).DistinctUntilChanged(); } public void show_ladder(Security security) { _bus.post(ShowLadderTag, new ShowLadderMessage(security)); } public void show_order_modify(Order order) { _bus.post(ShowOrderModifyTag, new ShowOrderModifyMessage(order)); } - public void show_order_ticket(Order order) { _bus.post(ShowOrderTicketTag, new ShowOrderTicketMessage(order)); } + public void show_order_ticket(Order order) { _orders_model.show_order_ticket(order); } public void set_securities(IEnumerable securities) { _securities_subject.OnNext(new HashSet(securities.Select(s => s.Id))); } public void Dispose() { Disposable.dispose(_subs); diff --git a/src/client/spark/mspark/MarketView/MarketViewVM.cs b/src/client/spark/mspark/MarketView/MarketViewVM.cs index 467a0bda1..5c6a201ba 100644 --- a/src/client/spark/mspark/MarketView/MarketViewVM.cs +++ b/src/client/spark/mspark/MarketView/MarketViewVM.cs @@ -85,7 +85,9 @@ namespace mbts.spark private static Security _get_security(DataGridCellInfo cell) { return (cell.Item as Row)?.security.value; } private static Order _create_order(DataGridCellInfo cell) { return _create_order((Row)cell.Item, (Columns)DataGridEx.GetArgument(cell.Column)); } private static Order _create_order(Row row, Columns col) { - var order = new Order { Security = row.security.value, MarketOrder = new MarketOrder(), Price = 0, Size = 1 }; + var order = OrderDataHelper.Defaults.Order(row.security.value, Order.AlgoOrderTypeOneofCase.MarketOrder); + order.Price = 0; + order.Size = 1; switch(col) { case Columns.Bid: order.Price = row.bid_price.output; break; case Columns.BidSize: order.Price = row.bid_price.output; order.Size = row.bid_size.output; break; diff --git a/src/client/spark/mspark/Orders/OrderModificationControl.xaml b/src/client/spark/mspark/Orders/OrderModificationControl.xaml index c481909cb..409b9fe23 100644 --- a/src/client/spark/mspark/Orders/OrderModificationControl.xaml +++ b/src/client/spark/mspark/Orders/OrderModificationControl.xaml @@ -1,7 +1,6 @@  _order.Account; set => _order.Account = value; } public ObservableCollection algo_types { get; } public OrderTypeVM algo_type { diff --git a/src/client/spark/mspark/Utilities/ImportedResources.cs b/src/client/spark/mspark/Utilities/ImportedResources.cs index 49b31c956..c6df8bb03 100644 --- a/src/client/spark/mspark/Utilities/ImportedResources.cs +++ b/src/client/spark/mspark/Utilities/ImportedResources.cs @@ -13,6 +13,7 @@ namespace mbts.spark.utilities { public static IBus Bus => _instance.bus; public static string UserName => _instance.user_name; + public static readonly string[] Accounts = new[] { "Account1", "Account2", "Account3", "Account4" }; #region Misc Extensions (should put these in a more appropriate place eventually) public static IObservable ToSecurity(this IObservable securityKey) { diff --git a/src/client/spark/mspark/Utilities/OrderDataHelper.cs b/src/client/spark/mspark/Utilities/OrderDataHelper.cs index d11846aa8..493907091 100644 --- a/src/client/spark/mspark/Utilities/OrderDataHelper.cs +++ b/src/client/spark/mspark/Utilities/OrderDataHelper.cs @@ -2,6 +2,7 @@ using bts.spark; using Google.Protobuf; using System; +using System.Linq; namespace mbts.spark.utilities { @@ -38,12 +39,22 @@ namespace mbts.spark.utilities BTSIcebergOrder }; - public static Order Order(Security security) { - return new Order { + public static Order Order(Security security) { return Order(security, bts.spark.Order.AlgoOrderTypeOneofCase.LimitOrder); } + public static Order Order(Security security, Order.AlgoOrderTypeOneofCase algo_type) { + var rv = new Order { + Account = ImportedResources.Accounts.FirstOrDefault(), User = ImportedResources.UserName, Security = security, - LimitOrder = new LimitOrder() }; + switch (algo_type) { + case bts.spark.Order.AlgoOrderTypeOneofCase.LimitOrder: rv.LimitOrder = new LimitOrder(); break; + case bts.spark.Order.AlgoOrderTypeOneofCase.MarketOrder: rv.MarketOrder = new MarketOrder(); break; + case bts.spark.Order.AlgoOrderTypeOneofCase.StopLimitOrder: rv.StopLimitOrder = new StopLimitOrder(); break; + case bts.spark.Order.AlgoOrderTypeOneofCase.StopMarketOrder: rv.StopMarketOrder = new StopMarketOrder(); break; + case bts.spark.Order.AlgoOrderTypeOneofCase.BtsStopOrder: rv.BtsStopOrder = BTSStopOrder; break; + case bts.spark.Order.AlgoOrderTypeOneofCase.BtsIcebergOrder: rv.BtsIcebergOrder = BTSIcebergOrder; break; + } + return rv; } } } diff --git a/src/client/spark/view/Controls/Algo/AbsolutePriceTriggerControl.xaml b/src/client/spark/view/Controls/Algo/AbsolutePriceTriggerControl.xaml index c56f85d75..a59b25ae4 100644 --- a/src/client/spark/view/Controls/Algo/AbsolutePriceTriggerControl.xaml +++ b/src/client/spark/view/Controls/Algo/AbsolutePriceTriggerControl.xaml @@ -1,6 +1,6 @@  diff --git a/src/client/spark/view/Controls/Algo/AlgoDetailsPopupControl.xaml b/src/client/spark/view/Controls/Algo/AlgoDetailsPopupControl.xaml index e2eda42b0..4baa9aac3 100644 --- a/src/client/spark/view/Controls/Algo/AlgoDetailsPopupControl.xaml +++ b/src/client/spark/view/Controls/Algo/AlgoDetailsPopupControl.xaml @@ -1,6 +1,6 @@  diff --git a/src/client/spark/view/Controls/Algo/PriceTriggerControl.xaml b/src/client/spark/view/Controls/Algo/PriceTriggerControl.xaml index 0feda5023..3e2789da5 100644 --- a/src/client/spark/view/Controls/Algo/PriceTriggerControl.xaml +++ b/src/client/spark/view/Controls/Algo/PriceTriggerControl.xaml @@ -1,6 +1,6 @@  diff --git a/src/client/spark/view/Controls/Algo/QuantityMeasureControl.xaml b/src/client/spark/view/Controls/Algo/QuantityMeasureControl.xaml index 809db1e95..076daf9fe 100644 --- a/src/client/spark/view/Controls/Algo/QuantityMeasureControl.xaml +++ b/src/client/spark/view/Controls/Algo/QuantityMeasureControl.xaml @@ -1,6 +1,6 @@  diff --git a/src/client/spark/view/Controls/Algo/TrailingPriceTriggerControl.xaml b/src/client/spark/view/Controls/Algo/TrailingPriceTriggerControl.xaml index c6860dae3..32c9502c0 100644 --- a/src/client/spark/view/Controls/Algo/TrailingPriceTriggerControl.xaml +++ b/src/client/spark/view/Controls/Algo/TrailingPriceTriggerControl.xaml @@ -1,6 +1,6 @@  diff --git a/src/client/spark/view/Resources/Buttons.xaml b/src/client/spark/view/Resources/Buttons.xaml index 287beacd4..cf39c0f74 100644 --- a/src/client/spark/view/Resources/Buttons.xaml +++ b/src/client/spark/view/Resources/Buttons.xaml @@ -234,7 +234,7 @@