diff --git a/.vscode/launch.json b/.vscode/launch.json index f198012d5..66f59625d 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,6 +1,23 @@ { "version": "0.2.0", "configurations": [ + { + "name": "Python", + "type": "python", + "request": "launch", + "stopOnEntry": false, + "pythonPath": "${config:python.pythonPath}", + "program": "${file}", + "cwd": "${workspaceRoot}", + "env": {}, + "envFile": "${workspaceRoot}/.env", + "args": [ "DEBUG" ], + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit", + "RedirectOutput" + ] + }, { "name": "WSL Launch", "type": "cppdbg", diff --git a/externals b/externals index d71750db2..56d97f6b2 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit d71750db2a78c0688752dc591ff1198f95fb2e52 +Subproject commit 56d97f6b28ada78be20089008191f4cb386e8c3f diff --git a/src/client/spark/mspark/Ladder/LadderModel.cs b/src/client/spark/mspark/Ladder/LadderModel.cs index 3f15afcab..eaebf7479 100644 --- a/src/client/spark/mspark/Ladder/LadderModel.cs +++ b/src/client/spark/mspark/Ladder/LadderModel.cs @@ -32,20 +32,6 @@ namespace mbts.spark { Logger.info(bts.log.Subsystem.ui, $"Cancel {ct}"); } - public IMessage[] default_orders { - get { - return new IMessage[] { - new MarketOrder (), - new LimitOrder (), - new StopMarketOrder (), - new StopLimitOrder (), - new IcebergOrder(), - new BTSStopOrder (), - new BTSIcebergOrder () - }; - } - } - public OrdersModel order_gateway => _order_gateway; } } \ No newline at end of file diff --git a/src/client/spark/mspark/Ladder/LadderVM.cs b/src/client/spark/mspark/Ladder/LadderVM.cs index fb2c02963..7e8d516d8 100644 --- a/src/client/spark/mspark/Ladder/LadderVM.cs +++ b/src/client/spark/mspark/Ladder/LadderVM.cs @@ -16,6 +16,7 @@ using bts.spark; using Google.Protobuf; using bts.api; using mbts.ui.utility; +using mbts.spark.utilities; namespace mbts.spark { class LadderVM : DisposableViewModelBase, IKeyListener { @@ -50,7 +51,7 @@ namespace mbts.spark { // Order _selected_order_type = backing(nameof(selected_order_type), Order.Types.TimeInForce.Day); - algo_types = _model.default_orders.SelectMany(wrap_order).ToArray(); + algo_types = OrderDataHelper.Defaults.Algos.SelectMany(wrap_order).ToArray(); _revert = backing(nameof(revert), false); // Orders @@ -166,6 +167,8 @@ 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 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; public Order.Types.TimeInForce selected_order_type { get => _selected_order_type.Value; set => _selected_order_type.Value = value; } diff --git a/src/client/spark/mspark/Ladder/LadderView.xaml b/src/client/spark/mspark/Ladder/LadderView.xaml index 7598ea8eb..973ebd010 100644 --- a/src/client/spark/mspark/Ladder/LadderView.xaml +++ b/src/client/spark/mspark/Ladder/LadderView.xaml @@ -5,58 +5,38 @@ xmlns:controls="clr-namespace:mbts.ui.controls" xmlns:spark="clr-namespace:mbts.spark" xmlns:usp="clr-namespace:mbts.ui.spark" + xmlns:uag="clr-namespace:mbts.ui.spark.algo" xmlns:sys="clr-namespace:System;assembly=mscorlib" Height="600" Width="400" TextElement.FontSize="11"> + + + + + + + - + - - - - - - - - - - - + + + Revert - - - - - - - - - - - - - - - - - - - @@ -71,8 +51,11 @@ + + + -