diff --git a/.gitignore b/.gitignore index cdb810783..28d0ac524 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +nohup.out build/ cmake-build-debug/ .idea/ diff --git a/src/client/spark/Daemons/ShellServices.cs b/src/client/spark/Daemons/ShellServices.cs index b07aa43d0..5425fb7ef 100644 --- a/src/client/spark/Daemons/ShellServices.cs +++ b/src/client/spark/Daemons/ShellServices.cs @@ -8,6 +8,7 @@ using System.Threading.Tasks; using bts.api.user; using bts.api.persistence; using bts.support; +using bts.api.orderman2; namespace Spark { @@ -28,6 +29,8 @@ namespace Spark [Export] public ErrorReportService error_service => context.locate(); + [Export] + public OrderService order_service => context.locate(); } } diff --git a/src/client/spark/Modules/Trading/TradingShellModule.cs b/src/client/spark/Modules/Trading/TradingShellModule.cs index a8f56e25e..a3de778bd 100644 --- a/src/client/spark/Modules/Trading/TradingShellModule.cs +++ b/src/client/spark/Modules/Trading/TradingShellModule.cs @@ -41,7 +41,7 @@ namespace bts.shell { public IEnumerable actions => new [] { SparkCommands.ShowOrders, SparkCommands.PickFills, - SparkCommands.ShowPAndL, + //SparkCommands.ShowPAndL, SparkCommands.PickLadder, SparkCommands.PickOrderTicket }; diff --git a/src/client/spark/core/Bus/SparkTags.cs b/src/client/spark/core/Bus/SparkTags.cs index 1f11632ab..7091bc6ff 100644 --- a/src/client/spark/core/Bus/SparkTags.cs +++ b/src/client/spark/core/Bus/SparkTags.cs @@ -7,6 +7,7 @@ using System.Collections.Generic; using static mbts.spark.SparkBusData; using SecurityList = System.Collections.Generic.IEnumerable; using security_key = System.UInt32; +using bts.api.orderman2; namespace mbts.spark { @@ -14,12 +15,22 @@ namespace mbts.spark { public class Nothing { private Nothing() { } } - internal class SparkTag : ITag { private readonly string Name; public SparkTag(string name) { Name = name; } public override string ToString() { return Name; } } + internal class SparkTag : ITag { private readonly string Name; public SparkTag(string name="") { Name = name; } public override string ToString() { return Name; } } #region Core Data public static ITag> SecuritiesTag { get; } = new SparkTag>("Securities"); public static ITag SyntheticSecuritiesTag { get; } = new SparkTag("SyntheticSecuritiesTag"); public static ITag PositionsTag { get; } = new SparkTag(nameof(PositionsTag)); + + #region Orders + + public static ITag<(OrderDefinitionImmutable definition, double price, uint size)> CreateOrder { get; } = new SparkTag<(OrderDefinitionImmutable, double, uint)>(); + public static ITag> CancelOrders { get; } = new SparkTag>(); + public static ITag> CrackOrders { get; } = new SparkTag>(); + public static ITag<(OrderKey key, double price, uint size)> UpdateOrder { get; } = new SparkTag<(OrderKey,double,uint)>(); + + + #endregion #endregion #region Show Window @@ -63,6 +74,7 @@ namespace mbts.spark { public static ITag PersistedItemsTag { get; }= new SparkTag("PersistedItemsTag"); #endregion + public static ITag ClockTag { get; } = new SparkTag("ClockTag"); } } \ No newline at end of file diff --git a/src/client/spark/view/Resources/WindowStyle.xaml b/src/client/spark/view/Resources/WindowStyle.xaml index 46d69ba51..e77a05db7 100644 --- a/src/client/spark/view/Resources/WindowStyle.xaml +++ b/src/client/spark/view/Resources/WindowStyle.xaml @@ -28,7 +28,7 @@ - +