Compare commits
261
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2f12b8c4b1 | ||
|
|
30b6719c2d | ||
|
|
a502c365e5 | ||
|
|
fdacd8b543 | ||
|
|
3d1de9a0c7 | ||
|
|
b2b3fa5949 | ||
|
|
86ecf69820 | ||
|
|
8f537a8fda | ||
|
|
01b9ff6b47 | ||
|
|
2609663d3e | ||
|
|
fd89241611 | ||
|
|
a69118c5d3 | ||
|
|
5accd0e2b4 | ||
|
|
df5ad61cd2 | ||
|
|
4a7674eb29 | ||
|
|
5a458287f4 | ||
|
|
5921f9f6b5 | ||
|
|
4c73a63ae8 | ||
|
|
42b1c921a8 | ||
|
|
fab3334b1e | ||
|
|
7239dd3ade | ||
|
|
dd4c8eb649 | ||
|
|
76a29bdc8a | ||
|
|
06d708f3ea | ||
|
|
e2f70cbc19 | ||
|
|
9d54e47a03 | ||
|
|
faccdf581e | ||
|
|
1a64714a54 | ||
|
|
3ba6792a85 | ||
|
|
c32a7f1d62 | ||
|
|
10e75f30e6 | ||
|
|
20eac19c4f | ||
|
|
8c0765a2c7 | ||
|
|
7a1f88e813 | ||
|
|
3420f14c8a | ||
|
|
86277dfbfe | ||
|
|
4839e464c6 | ||
|
|
dc2ad071a9 | ||
|
|
65e49992f9 | ||
|
|
afbb9ae92d | ||
|
|
ff088142d9 | ||
|
|
93b7cf346b | ||
|
|
f0edeadd50 | ||
|
|
8ee9b84488 | ||
|
|
e3648f5373 | ||
|
|
facd3a9d81 | ||
|
|
84969cb481 | ||
|
|
6d521e77db | ||
|
|
82c49f8f49 | ||
|
|
e074309da1 | ||
|
|
2d622a5f39 | ||
|
|
d51d20e84c | ||
|
|
2ccdef9dc5 | ||
|
|
42e62a30bf | ||
|
|
c233c607fa | ||
|
|
462cb930f7 | ||
|
|
2c0f920422 | ||
|
|
5ee26065ca | ||
|
|
550a4e8d50 | ||
|
|
99b8221efc | ||
|
|
19e74c30f8 | ||
|
|
26693a4c98 | ||
|
|
d8bdb69a7c | ||
|
|
6d357a74e1 | ||
|
|
73f4e4814c | ||
|
|
312bc4be15 | ||
|
|
a0c3ba449a | ||
|
|
d5a2a7f3f0 | ||
|
|
eda8c94def | ||
|
|
9a8e80e149 | ||
|
|
6a7e3d739d | ||
|
|
e6b8274813 | ||
|
|
9783520c62 | ||
|
|
7e7f0bc37f | ||
|
|
b9e2ecdffa | ||
|
|
f1c021a474 | ||
|
|
6fda54ffa1 | ||
|
|
bdb0adc16c | ||
|
|
4b19b0ea14 | ||
|
|
fab1b4dd0f | ||
|
|
f3ed3075cf | ||
|
|
742af36b93 | ||
|
|
c573b5fbb2 | ||
|
|
2d6d4af594 | ||
|
|
2dcfad979c | ||
|
|
ba7e35649e | ||
|
|
cda4a870b7 | ||
|
|
b3a8564365 | ||
|
|
1e0114a4cf | ||
|
|
3a6e95ef05 | ||
|
|
6875263743 | ||
|
|
eac828f323 | ||
|
|
1635d6f649 | ||
|
|
2da535e9ff | ||
|
|
a98be44a40 | ||
|
|
6210ac2ee6 | ||
|
|
cfebab0488 | ||
|
|
eacd766359 | ||
|
|
8fb8f8ff58 | ||
|
|
f4b22816a2 | ||
|
|
1029a464d7 | ||
|
|
fd8b8e03ea | ||
|
|
41cf66a943 | ||
|
|
1c57c9a012 | ||
|
|
8ccab66120 | ||
|
|
e2b2f7ec9c | ||
|
|
b3c897bf0f | ||
|
|
87c9f54c8b | ||
|
|
df56b76ab6 | ||
|
|
28ff13db11 | ||
|
|
2957075769 | ||
|
|
a6477824a8 | ||
|
|
17431f5ac0 | ||
|
|
8708f02fe0 | ||
|
|
752fb2bc4a | ||
|
|
6efb78ecf9 | ||
|
|
75c1970aef | ||
|
|
c2583518d7 | ||
|
|
8792871387 | ||
|
|
68a593af7b | ||
|
|
17c2321a82 | ||
|
|
0affc8a942 | ||
|
|
ce36ea4109 | ||
|
|
7c29a3d1d8 | ||
|
|
90bc20575a | ||
|
|
cb268f505a | ||
|
|
dfd93b836b | ||
|
|
28e9c66675 | ||
|
|
c0520d6a31 | ||
|
|
1ba6e3280c | ||
|
|
3a6f50dfea | ||
|
|
d711f99548 | ||
|
|
07ace80871 | ||
|
|
93c6277bfc | ||
|
|
7ac9d05ae2 | ||
|
|
5a4b31ccc0 | ||
|
|
fb568aab39 | ||
|
|
64416de10d | ||
|
|
46953cb639 | ||
|
|
7e68a235ee | ||
|
|
85f2285ac0 | ||
|
|
70e0979836 | ||
|
|
08bdd9c8c7 | ||
|
|
1f80c3366e | ||
|
|
886b606093 | ||
|
|
b70510b614 | ||
|
|
6db9a227b1 | ||
|
|
a819eb921d | ||
|
|
af4317a7f9 | ||
|
|
5edd7d5467 | ||
|
|
60d2cb5bc1 | ||
|
|
f26e3d27c4 | ||
|
|
31dab6ca09 | ||
|
|
1498bf17bb | ||
|
|
1cafe23bd0 | ||
|
|
25290df798 | ||
|
|
20ca48e365 | ||
|
|
78dfb03b8e | ||
|
|
19e66a1c32 | ||
|
|
a1f71153c8 | ||
|
|
b1d260d98c | ||
|
|
a81aafefe0 | ||
|
|
454330e360 | ||
|
|
995159b365 | ||
|
|
fd1a33e9d2 | ||
|
|
e9615bc3aa | ||
|
|
b1b1597686 | ||
|
|
bc2eb65c0a | ||
|
|
7baa7ca8a1 | ||
|
|
9bbc73b48c | ||
|
|
b07a379ee1 | ||
|
|
af2c6174e8 | ||
|
|
6e5444709d | ||
|
|
831aa43f0e | ||
|
|
50a8592e5e | ||
|
|
cb7b6ef5cd | ||
|
|
b7c72d1607 | ||
|
|
cb2747528b | ||
|
|
52ad4ad2c9 | ||
|
|
93c81089f6 | ||
|
|
d7d23a7a93 | ||
|
|
5525e35d1a | ||
|
|
cdd7856ba0 | ||
|
|
7a6de46b17 | ||
|
|
1fcccc674a | ||
|
|
c0e6b5556d | ||
|
|
8aa2a7e44e | ||
|
|
0303d999ed | ||
|
|
914a817ddb | ||
|
|
4873e523a9 | ||
|
|
672ef518e2 | ||
|
|
d22cb150f6 | ||
|
|
8605b4f11f | ||
|
|
20eb661fb0 | ||
|
|
fad1ca2b6e | ||
|
|
747a687fe5 | ||
|
|
e34c63382c | ||
|
|
4b5c744ba5 | ||
|
|
8e6a17cd0c | ||
|
|
cbde36e9e0 | ||
|
|
6fc20924bd | ||
|
|
381b8064fc | ||
|
|
fc1a3ff7dc | ||
|
|
5fd3d13cfe | ||
|
|
1b38822459 | ||
|
|
8b7ecc430b | ||
|
|
d9d7a08fd6 | ||
|
|
2383c00bb9 | ||
|
|
dcce738d53 | ||
|
|
0daa3e0685 | ||
|
|
e06daa349c | ||
|
|
13aa693da1 | ||
|
|
f8afa7fc57 | ||
|
|
2f6a66a2ce | ||
|
|
b4674a9120 | ||
|
|
d76eb1153b | ||
|
|
0934c0014d | ||
|
|
19da3e1390 | ||
|
|
61d0ae5257 | ||
|
|
ebea6a8f50 | ||
|
|
f0b3baaf3f | ||
|
|
956837d3f3 | ||
|
|
a5f27d0d35 | ||
|
|
ce7ff0d14f | ||
|
|
d08571e862 | ||
|
|
a4694462ed | ||
|
|
f404b0e936 | ||
|
|
2df1e94fb3 | ||
|
|
acd0d7c343 | ||
|
|
1e8a7f09dd | ||
|
|
b65d50a9c7 | ||
|
|
909b4b6cfe | ||
|
|
2fbc238ecc | ||
|
|
7c73024919 | ||
|
|
0d85aa1644 | ||
|
|
df16acc4af | ||
|
|
7ad0c23704 | ||
|
|
e85e0322e3 | ||
|
|
1a6a31c857 | ||
|
|
65b09c6802 | ||
|
|
148dae32d5 | ||
|
|
9c116fa3d6 | ||
|
|
2eba014203 | ||
|
|
37d022251e | ||
|
|
04cc1da4d9 | ||
|
|
56bba90fdb | ||
|
|
a95841b0e9 | ||
|
|
9c6be9e87c | ||
|
|
7c830786ef | ||
|
|
9eb9047249 | ||
|
|
f7847b7767 | ||
|
|
ae720e4966 | ||
|
|
3b77bc99b6 | ||
|
|
b69a0c245e | ||
|
|
14bcef4c0e | ||
|
|
a23fe74cdc | ||
|
|
7b48f71dec | ||
|
|
c334c1f636 | ||
|
|
8572ff273f | ||
|
|
e6ddc71c75 | ||
|
|
81a0f9193d |
No files matched your search
@@ -18,6 +18,7 @@ src/client/spark/Properties/launchSettings.json
|
|||||||
compile_commands.json
|
compile_commands.json
|
||||||
.cquery_cached_index/
|
.cquery_cached_index/
|
||||||
src/client/sparkcmd/Properties/launchSettings.json
|
src/client/sparkcmd/Properties/launchSettings.json
|
||||||
|
src/sdk/examples/client_sdk/bts.api.csharp/src/Properties/launchSettings.json
|
||||||
node_modules
|
node_modules
|
||||||
paket-files
|
paket-files
|
||||||
project.lock.json
|
project.lock.json
|
||||||
@@ -34,3 +35,5 @@ trace_data/
|
|||||||
/doc/user/public/*
|
/doc/user/public/*
|
||||||
.ionide/*
|
.ionide/*
|
||||||
/.ignore
|
/.ignore
|
||||||
|
/build
|
||||||
|
.clangd/
|
||||||
Vendored
+24
@@ -1,6 +1,30 @@
|
|||||||
{
|
{
|
||||||
"version": "0.2.0",
|
"version": "0.2.0",
|
||||||
"configurations": [
|
"configurations": [
|
||||||
|
{
|
||||||
|
"name": "Spark Local",
|
||||||
|
"type": "cppdbg",
|
||||||
|
"request": "launch",
|
||||||
|
"program": "${workspaceRoot}/build/ninja_debug/server/sparkd",
|
||||||
|
"args": [
|
||||||
|
"run",
|
||||||
|
// "test",
|
||||||
|
// "-a",
|
||||||
|
// "[ilink3]"
|
||||||
|
],
|
||||||
|
"stopAtEntry": false,
|
||||||
|
"cwd": "${workspaceRoot}/build/ninja_debug/server/",
|
||||||
|
"environment": [],
|
||||||
|
"externalConsole": false,
|
||||||
|
"MIMode": "gdb",
|
||||||
|
"setupCommands": [
|
||||||
|
{
|
||||||
|
"description": "Enable pretty-printing for gdb",
|
||||||
|
"text": "-enable-pretty-printing",
|
||||||
|
"ignoreFailures": true
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "SparkVM Launch",
|
"name": "SparkVM Launch",
|
||||||
"type": "cppdbg",
|
"type": "cppdbg",
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ weight = 10
|
|||||||
|
|
||||||
# C#/.NET
|
# C#/.NET
|
||||||
|
|
||||||
We target [.NET Standard 2.0](https://docs.microsoft.com/en-us/dotnet/standard/net-standard) so you can use .NET Framework 4.6.1+ or .NET Core 2.0+. Simply add a reference to the [Spark Nuget package](https://nuget.org) to get started.
|
We target [.NET Standard 2.0](https://docs.microsoft.com/en-us/dotnet/standard/net-standard) so you can use .NET Framework 4.6.1+ or .NET Core 2.0+. Simply add a reference to the [Spark Nuget package](https://www.nuget.org/packages/spark_sdk/) to get started.
|
||||||
|
|
||||||
```
|
```
|
||||||
dotnet new console -lang c#
|
dotnet new console -lang c#
|
||||||
|
|||||||
@@ -124,4 +124,17 @@ service OrderService {
|
|||||||
```
|
```
|
||||||
### C++ Example
|
### C++ Example
|
||||||
```cpp
|
```cpp
|
||||||
|
#include "lib/api/public/ServiceContext.h"
|
||||||
|
#include "lib/api/services/OrderService.client.pb.h"
|
||||||
|
using namespace bts::api;
|
||||||
|
ServiceContext ctx;
|
||||||
|
auto orders = ctx.locate<orderman::OrderService>();
|
||||||
|
auto unsub = orders.subscribe_fills().subscribe([](const auto& update) {
|
||||||
|
std::cout
|
||||||
|
<< "Added " << update.added().size() << " items, "
|
||||||
|
<< "Removed " << update.removed().size() << " items, "
|
||||||
|
<< "Updated " << update.updated().size() << " items, "
|
||||||
|
<< "Total items " << update.all().size() << std::endl;
|
||||||
|
});
|
||||||
|
std::this_thread::sleep_for(std::chrono::minutes(5));
|
||||||
```
|
```
|
||||||
@@ -1,3 +1,51 @@
|
|||||||
+++
|
+++
|
||||||
title = "Market Data"
|
title = "Market Data"
|
||||||
+++
|
+++
|
||||||
|
|
||||||
|
|
||||||
|
Use the MarketDataService to subscribe enumerate all available securities.
|
||||||
|
|
||||||
|
```cs
|
||||||
|
using System;
|
||||||
|
using System.Threading;
|
||||||
|
using bts.api;
|
||||||
|
using bts.api.core;
|
||||||
|
|
||||||
|
namespace sample {
|
||||||
|
class Program {
|
||||||
|
static void Main(string[] args) {
|
||||||
|
using var context = new ServiceContext();
|
||||||
|
var md = context.locate<MarketDataService>();
|
||||||
|
using var sub = md.subscribe_securities().Subscribe(update => {
|
||||||
|
foreach (var security in update.added) {
|
||||||
|
Console.WriteLine($"Added security {security.Id}: {security.Symbol}");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
Thread.Sleep(TimeSpan.FromMinutes(5));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
```cpp
|
||||||
|
#include "lib/api/public/ServiceContext.h"
|
||||||
|
#include "spark/lib/domain_model/Security.h"
|
||||||
|
#include "lib/api/services/MarketDataService.client.pb.h"
|
||||||
|
#include <thread>
|
||||||
|
|
||||||
|
using namespace bts::api;
|
||||||
|
|
||||||
|
int main(int argc, char** argv) {
|
||||||
|
ServiceContext ctx;
|
||||||
|
auto md_service = ctx.locate<bts::api::MarketDataService>();
|
||||||
|
auto sub = md_service.subscribe_securities().subscribe([](const auto& update) {
|
||||||
|
for (const auto& s : update.added()) {
|
||||||
|
std::cout << "Added security: " << s->id() << ": " << s->symbol() << std::endl;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
std::this_thread::sleep_for(std::chrono::minutes(5));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
```
|
||||||
@@ -68,12 +68,21 @@ To update your Spark SDK simply download an unzip a new [spark_sdk.zip](https://
|
|||||||
|
|
||||||
To preserve the old image so you can go back to it later run `docker tag spark_sdk spark_sdk:your_custom_tag` before loading the new SDK image.
|
To preserve the old image so you can go back to it later run `docker tag spark_sdk spark_sdk:your_custom_tag` before loading the new SDK image.
|
||||||
|
|
||||||
<!--
|
### Re-build the Dev Container
|
||||||
Then stop, remove and restart spark_sdk.
|
|
||||||
|
If you are using Visual Studio Code you also need to rebuild the dev-container so it picks up the new image.
|
||||||
|
|
||||||
|
#### Inside VSCode
|
||||||
|
To re-build from inside Visual Studio Code. Click the 'Remote Explorer' icon on the left hand side.
|
||||||
|
You should see your spark_sdk project listed under the Containers section. Right click on it and select **rebuild-container**.
|
||||||
|
|
||||||
|
#### Command Line
|
||||||
|
To re-build from the command line run `docker ps -a` and find the row with the spark_sdk image.
|
||||||
```
|
```
|
||||||
c:\bts> docker stop spark_sdk
|
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
|
||||||
c:\bts> docker rm spark_sdk
|
54d96cfa3888 spark_sdk "/bin/sh -c 'echo Co…" About a minute ago Up About a minute 127.0.0.1:9000-9001->9000-9001/tcp quizzical_lichterman
|
||||||
c:\bts> docker run -d -v %cd%:/sdk --name spark_sdk bluetradingsytems/spark_sdk
|
```
|
||||||
|
Then run `docker rm 54d96cfa3888` (use your container id instead of 54d96cfa3888) or `docker rm quizzical_lichterman` (use your container name).
|
||||||
|
|
||||||
|
|
||||||
``` -->
|
|
||||||
|
|
||||||
@@ -73,7 +73,7 @@
|
|||||||
<p>
|
<p>
|
||||||
The Spark client SDK allows you to integrate spark with your existing ecosystem. The Spark Client is built entirely on this simple, powerful API.
|
The Spark client SDK allows you to integrate spark with your existing ecosystem. The Spark Client is built entirely on this simple, powerful API.
|
||||||
</p>
|
</p>
|
||||||
<a href="" class="button">Get started</a>
|
<a href="{{ get_url(path="@/client/_index.md") }}" class="button">Get started</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
set(sources /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)
|
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)
|
||||||
@@ -1,9 +1,29 @@
|
|||||||
+++
|
+++
|
||||||
title = "Release notes"
|
title = "Release notes"
|
||||||
weight = 3
|
weight = 3
|
||||||
sort_by = "weight"
|
sort_by = "weight"
|
||||||
insert_anchor_links = "right"
|
insert_anchor_links = "right"
|
||||||
+++
|
+++
|
||||||
|
## 2.16.2
|
||||||
|
### User Visible Change
|
||||||
|
- Synthetic creation dialog has a "fractional" checkbox next to the tick settings. Users may uncheck this box to enter integer tick sizes, so the synthetic security's prices will be displayed without decimals, or fractional units.
|
||||||
|
## 2.16.1
|
||||||
|
### Bug Fixes
|
||||||
|
- OrderBook's algo state parameters (in the panel on the right side) are sorted alphabetically
|
||||||
|
## 2.16.0
|
||||||
|
### Bug Fixes
|
||||||
|
- Solved an issue that could result in incorrect ladder levels
|
||||||
|
- Solved an issue that could lead to incorrect routing of orders in the event of certain MSGW changes
|
||||||
|
### API Changes
|
||||||
|
- Add C# client side API samples for order entry, position monitoring and market data observation
|
||||||
|
|
||||||
|
## 2.15.10
|
||||||
|
### Bug Fixes
|
||||||
|
- Solved an issue that could cause the user interface to fail when playing some alert sounds
|
||||||
|
### API Changes
|
||||||
|
- Added settlement and position information to the API
|
||||||
|
- Added the ability for user algos to report custom state to the user interface
|
||||||
|
- Added the ability for algos to discover all active securities
|
||||||
## 2.15.3
|
## 2.15.3
|
||||||
### Bug Fixes
|
### Bug Fixes
|
||||||
- Fixed a bug where some CME currency spreads exhibited incorrect tick values
|
- Fixed a bug where some CME currency spreads exhibited incorrect tick values
|
||||||
@@ -708,3 +728,4 @@ insert_anchor_links = "right"
|
|||||||
- Start, Day and Total PnL columns are painted with a red or green background color based on if the pnl value is negative or positive respectively
|
- Start, Day and Total PnL columns are painted with a red or green background color based on if the pnl value is negative or positive respectively
|
||||||
- Corrected cash per point values, used in pnl calculations, for a number of products
|
- Corrected cash per point values, used in pnl calculations, for a number of products
|
||||||
- PnL report will now remember any customizations you make to filtering and/or sorting criteria
|
- PnL report will now remember any customizations you make to filtering and/or sorting criteria
|
||||||
|
|
||||||
+1
-1
Submodule docker/linux updated: 68f43cef8d...0df20ec20a.
+1
-1
Submodule externals updated: 6d8f64ca5c...a558597a1a.
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"sdk": {
|
||||||
|
"version": "2.1.508",
|
||||||
|
"rollForward": "latestMajor"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -22,6 +22,10 @@
|
|||||||
<GenDir>$(BaseOutputPath)\gen\$(MSBuildProjectName)</GenDir>
|
<GenDir>$(BaseOutputPath)\gen\$(MSBuildProjectName)</GenDir>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<PropertyGroup Condition="'$(VCTargetsPath)'==''">
|
||||||
|
<VCTargetsPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\Common7\IDE\VC\VCTargets</VCTargetsPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
<Import Project="$(ComputerSpecificConfig)" Condition="Exists($(ComputerSpecificConfig))" />
|
<Import Project="$(ComputerSpecificConfig)" Condition="Exists($(ComputerSpecificConfig))" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ namespace mbts.ui.shell
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\";
|
string path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\";
|
||||||
if (File.Exists(path + "config\\stunnel.conf"))
|
if (File.Exists(path + "config\\stunnel.conf"))
|
||||||
{
|
{
|
||||||
uint job_error = BTSUINativeMethods.setup_process_job_object();
|
uint job_error = BTSUINativeMethods.setup_process_job_object();
|
||||||
@@ -124,6 +124,15 @@ namespace mbts.ui.shell
|
|||||||
kill_stunnel();
|
kill_stunnel();
|
||||||
start_stunnel(path, job_error);
|
start_stunnel(path, job_error);
|
||||||
}
|
}
|
||||||
|
path = AppDomain.CurrentDomain.BaseDirectory + "\\..\\stunnel\\";
|
||||||
|
if (File.Exists(path + "config\\stunnel.conf"))
|
||||||
|
{
|
||||||
|
uint job_error = BTSUINativeMethods.setup_process_job_object();
|
||||||
|
//if we can't put this process and stunnel into a job, try to stop stunnel then restart
|
||||||
|
if (job_error != 0)
|
||||||
|
kill_stunnel();
|
||||||
|
start_stunnel(path, job_error);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch(Exception ex)
|
catch(Exception ex)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -3,11 +3,13 @@ using bts.api.core;
|
|||||||
using bts.api.orderman;
|
using bts.api.orderman;
|
||||||
using bts.spark;
|
using bts.spark;
|
||||||
using mbts;
|
using mbts;
|
||||||
|
using mbts.config;
|
||||||
using mbts.spark;
|
using mbts.spark;
|
||||||
using mbts.ui;
|
using mbts.ui;
|
||||||
using mbts.ui.spark;
|
using mbts.ui.spark;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.Immutable;
|
||||||
using System.ComponentModel.Composition;
|
using System.ComponentModel.Composition;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
@@ -19,20 +21,26 @@ namespace bts.shell {
|
|||||||
readonly IBus _bus;
|
readonly IBus _bus;
|
||||||
readonly OrdersModel _model;
|
readonly OrdersModel _model;
|
||||||
readonly ErrorReporter _error_reporter;
|
readonly ErrorReporter _error_reporter;
|
||||||
|
readonly bool _close_on_send;
|
||||||
IReadOnlyDictionary<uint, SecurityMD> _md_map;
|
IReadOnlyDictionary<uint, SecurityMD> _md_map;
|
||||||
TableUpdate<(SecurityImmutable? sec, OrderRecordImmutable order), uint> _orders;
|
TableUpdate<(SecurityImmutable? sec, OrderRecordImmutable order), uint> _orders;
|
||||||
IDisposable _dispose;
|
IDisposable _dispose;
|
||||||
|
|
||||||
[ImportingConstructor]
|
[ImportingConstructor]
|
||||||
public OrderTicketDaemon(IBus bus, OrdersModel model, ErrorReporter error_reporter) {
|
public OrderTicketDaemon(IBus bus, OrdersModel model, ErrorReporter error_reporter)
|
||||||
|
: this(bus, model, error_reporter, Configuration.get<bts.config.OrderTicketOptions>().close_on_send) { }
|
||||||
|
|
||||||
|
public OrderTicketDaemon(IBus bus, OrdersModel model, ErrorReporter error_reporter, bool close_on_send) {
|
||||||
_bus = bus;
|
_bus = bus;
|
||||||
_model = model;
|
_model = model;
|
||||||
_error_reporter = error_reporter;
|
_error_reporter = error_reporter;
|
||||||
|
_close_on_send = close_on_send;
|
||||||
_dispose = Disposable.Create(
|
_dispose = Disposable.Create(
|
||||||
model.on_orders.OnDispatcher().Subscribe(o => _orders = o),
|
model.on_orders.OnDispatcher().Subscribe(o => _orders = o),
|
||||||
bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(m =>_md_map = m),
|
bus.subscribe(SparkTags.SecuritiesTag).OnDispatcher().Subscribe(m =>_md_map = m),
|
||||||
bus.subscribe(SparkTags.ShowOrderTicketFromSecurityTag).OnDispatcher().Subscribe(_show_order_ticket),
|
bus.subscribe(SparkTags.ShowOrderTicketFromSecurityTag).OnDispatcher().Subscribe(_show_order_ticket),
|
||||||
bus.subscribe(SparkTags.ShowOrderTicketTag).OnDispatcher().Subscribe(_show_order_ticket),
|
bus.subscribe(SparkTags.ShowOrderTicketTag).OnDispatcher().Subscribe(_show_order_ticket),
|
||||||
|
bus.subscribe(SparkTags.ShowOrderTicketAutoLookupTag).Subscribe(_show_order_tickets),
|
||||||
bus.subscribe(SparkTags.ShowModifyOrderTag).OnDispatcher().Subscribe(_show_modify_order)
|
bus.subscribe(SparkTags.ShowModifyOrderTag).OnDispatcher().Subscribe(_show_modify_order)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -54,17 +62,28 @@ namespace bts.shell {
|
|||||||
void _show_order_ticket(SecurityMD smd) =>
|
void _show_order_ticket(SecurityMD smd) =>
|
||||||
_show_order_window(new OrderTicket {
|
_show_order_window(new OrderTicket {
|
||||||
DataContext = new NewOrderTicketVM(_model, smd,
|
DataContext = new NewOrderTicketVM(_model, smd,
|
||||||
Observable.Return(LadderSettings.Default))
|
Observable.Return(LadderSettings.Default)) {
|
||||||
|
close_on_send = _close_on_send
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
void _show_order_ticket((OrderDefinitionImmutable def, double price, uint size) ops) {
|
void _show_order_ticket((OrderDefinitionImmutable def, double price, uint size) ops) {
|
||||||
if (_md_map.TryGetValue(ops.def.SecurityKey, out SecurityMD smd))
|
if (_md_map.TryGetValue(ops.def.SecurityKey, out SecurityMD smd))
|
||||||
_show_order_window(new OrderTicket {
|
_show_order_window(new OrderTicket {
|
||||||
DataContext = new NewOrderTicketVM(_model, smd, ops.def, ops.price, ops.size,
|
DataContext = new NewOrderTicketVM(_model, smd, ops.def, ops.price, ops.size,
|
||||||
Observable.Return(LadderSettings.Default.calculator_buttons))
|
Observable.Return(LadderSettings.Default.calculator_buttons)) {
|
||||||
|
close_on_send = _close_on_send
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _show_order_tickets(IImmutableSet<uint> securities) {
|
||||||
|
foreach (var id in securities.empty_if_null()) {
|
||||||
|
if (_md_map.TryGetValue(id, out var smd))
|
||||||
|
_show_order_ticket(smd);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void _show_modify_order(uint order_key) {
|
void _show_modify_order(uint order_key) {
|
||||||
if (_orders.state.TryGetValue(order_key, out var ori) && ori.sec.HasValue
|
if (_orders.state.TryGetValue(order_key, out var ori) && ori.sec.HasValue
|
||||||
&& (ori.order.HasDef && ori.order.Def.HasCustomDef && !(ori.order.Def.CustomDef.HasStop || ori.order.Def.CustomDef.HasStopLimit))) {
|
&& (ori.order.HasDef && ori.order.Def.HasCustomDef && !(ori.order.Def.CustomDef.HasStop || ori.order.Def.CustomDef.HasStopLimit))) {
|
||||||
@@ -78,4 +97,4 @@ namespace bts.shell {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -26,6 +26,7 @@ namespace mbts.ui {
|
|||||||
AttachAlgosKey = nameof(AttachAlgosKey),
|
AttachAlgosKey = nameof(AttachAlgosKey),
|
||||||
CheckMarkGeometryKey = nameof(CheckMarkGeometryKey),
|
CheckMarkGeometryKey = nameof(CheckMarkGeometryKey),
|
||||||
CopyWFGeometryKey = nameof(CopyWFGeometryKey),
|
CopyWFGeometryKey = nameof(CopyWFGeometryKey),
|
||||||
|
CopyBoxesGeometryKey = nameof(CopyBoxesGeometryKey),
|
||||||
DataEditGeometryKey = nameof(DataEditGeometryKey),
|
DataEditGeometryKey = nameof(DataEditGeometryKey),
|
||||||
DetachAlgosKey = nameof(DetachAlgosKey),
|
DetachAlgosKey = nameof(DetachAlgosKey),
|
||||||
DiskGeometryKey = nameof(DiskGeometryKey),
|
DiskGeometryKey = nameof(DiskGeometryKey),
|
||||||
@@ -45,6 +46,7 @@ namespace mbts.ui {
|
|||||||
KeyGeometryKey = nameof(KeyGeometryKey),
|
KeyGeometryKey = nameof(KeyGeometryKey),
|
||||||
LetterAKey = nameof(LetterAKey),
|
LetterAKey = nameof(LetterAKey),
|
||||||
LetterDKey = nameof(LetterDKey),
|
LetterDKey = nameof(LetterDKey),
|
||||||
|
MenuOrientationGeometryKey = nameof(MenuOrientationGeometryKey),
|
||||||
OrdersGeometryKey = nameof(OrdersGeometryKey),
|
OrdersGeometryKey = nameof(OrdersGeometryKey),
|
||||||
PauseGeometryKey = nameof(PauseGeometryKey),
|
PauseGeometryKey = nameof(PauseGeometryKey),
|
||||||
PaymentGeometryKey = nameof(PaymentGeometryKey),
|
PaymentGeometryKey = nameof(PaymentGeometryKey),
|
||||||
@@ -62,6 +64,8 @@ namespace mbts.ui {
|
|||||||
|
|
||||||
public static Geometry PlayGeometry => Geometry.Parse(get_geometric_path(PlayGeometryKey).FirstOrDefault() ?? string.Empty);
|
public static Geometry PlayGeometry => Geometry.Parse(get_geometric_path(PlayGeometryKey).FirstOrDefault() ?? string.Empty);
|
||||||
|
|
||||||
|
static readonly Pen _copy_boxes_pen = new Pen(Brushes.Black, HighDpiExtensions.RoundLayoutValue(5)).frozen();
|
||||||
|
|
||||||
static readonly string base_uri = "pack://application:,,,/Images/Icons/";
|
static readonly string base_uri = "pack://application:,,,/Images/Icons/";
|
||||||
private static ResourceDictionary _resources = (ResourceDictionary)Application.LoadComponent(new Uri("/Images/Vector/Icons.xaml", UriKind.RelativeOrAbsolute));
|
private static ResourceDictionary _resources = (ResourceDictionary)Application.LoadComponent(new Uri("/Images/Vector/Icons.xaml", UriKind.RelativeOrAbsolute));
|
||||||
|
|
||||||
@@ -156,6 +160,7 @@ namespace mbts.ui {
|
|||||||
public static ImageSource CheckMark => create_icon(CheckMarkGeometryKey);
|
public static ImageSource CheckMark => create_icon(CheckMarkGeometryKey);
|
||||||
public static ImageSource Clock { get { return load_resource_and_freeze("Clock"); } }
|
public static ImageSource Clock { get { return load_resource_and_freeze("Clock"); } }
|
||||||
public static ImageSource CopyWF => create_icon(CopyWFGeometryKey);
|
public static ImageSource CopyWF => create_icon(CopyWFGeometryKey);
|
||||||
|
public static ImageSource CopyBoxes => create_icon(CopyBoxesGeometryKey, null, _copy_boxes_pen);
|
||||||
public static ImageSource DataEdit => create_icon(DataEditGeometryKey);
|
public static ImageSource DataEdit => create_icon(DataEditGeometryKey);
|
||||||
public static ImageSource Defrag { get { return load_resource_and_freeze("Defrag"); } }
|
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 DetachAlgos => create_icon_and_rotate(DetachAlgosKey, Brushes.Red);
|
||||||
@@ -179,6 +184,7 @@ namespace mbts.ui {
|
|||||||
public static ImageSource Import => load_resource_and_freeze("Import");
|
public static ImageSource Import => load_resource_and_freeze("Import");
|
||||||
public static ImageSource Key => create_icon(KeyGeometryKey);
|
public static ImageSource Key => create_icon(KeyGeometryKey);
|
||||||
public static ImageSource Knight { get { return load_resource_and_freeze("Knight"); } }
|
public static ImageSource Knight { get { return load_resource_and_freeze("Knight"); } }
|
||||||
|
public static ImageSource MenuOrientation => create_icon(MenuOrientationGeometryKey);
|
||||||
public static ImageSource Pause => create_icon(PauseGeometryKey);
|
public static ImageSource Pause => create_icon(PauseGeometryKey);
|
||||||
public static ImageSource Payment => create_icon(PaymentGeometryKey);
|
public static ImageSource Payment => create_icon(PaymentGeometryKey);
|
||||||
public static ImageSource Pencil => create_icon(PencilGeometryKey);
|
public static ImageSource Pencil => create_icon(PencilGeometryKey);
|
||||||
|
|||||||
@@ -46,6 +46,18 @@
|
|||||||
</sys:String>
|
</sys:String>
|
||||||
</x:Array>
|
</x:Array>
|
||||||
|
|
||||||
|
<x:Array x:Key="{x:Static mbts:Icons.CopyBoxesGeometryKey}" Type="{x:Type sys:String}">
|
||||||
|
<sys:String>
|
||||||
|
M-55,5 L-55,55 L-5,55
|
||||||
|
</sys:String>
|
||||||
|
<sys:String>
|
||||||
|
M-40,-10 L-40,40 L10,40 L10,-10 L-40,-10
|
||||||
|
</sys:String>
|
||||||
|
<sys:String>
|
||||||
|
M-10,10 L40,10 L40,-40 L-10,-40 L-10,10
|
||||||
|
</sys:String>
|
||||||
|
</x:Array>
|
||||||
|
|
||||||
<sys:String x:Key="{x:Static mbts:Icons.CopyWFGeometryKey}">
|
<sys:String x:Key="{x:Static mbts:Icons.CopyWFGeometryKey}">
|
||||||
M14.733902,12.084991L9.751783,17.388992 12.982842,17.436005C13.569886,17.462997 14.5229,17.350998 14.876848,17.005005 14.954852,16.929993 15.031879,16.824005 15.02486,16.593002 14.986895,15.457993 14.838883,13.438004 14.733902,12.084991z M22.507753,11.134453C22.480678,11.134323,22.467085,11.135494,22.469961,11.136993L20.64694,11.145004 16.291904,11.192993C16.388891,12.405991 16.596901,15.100998 16.647928,16.539001 16.668924,17.177994 16.448888,17.742004 16.007904,18.168991 15.210897,18.947998 13.893864,19.065002 13.179865,19.065002L9.2818066,19.005005 9.3258129,25.522003 9.3728109,25.528 9.3278271,25.882996 9.3317944,26.395996 9.3107983,26.397995C9.3167797,26.789993,9.3378369,27.552994,9.3958212,29.065994L9.4068075,29.393005C9.4207855,29.819992 9.5648295,29.994995 9.6707884,30.089005 9.9807898,30.365997 10.539817,30.390991 10.717799,30.369003L10.717799,30.375C10.88284,30.354996 11.280855,30.356003 12.823844,30.365997 13.867863,30.371002 15.206869,30.376999 16.594886,30.376999 20.757965,30.376999 23.270998,30.354996 23.862007,30.311005 24.454971,30.268005 24.661029,29.154999 24.690021,28.729996 24.690021,28.729996 24.677997,27.876999 24.661029,26.582993 24.612016,22.671005 24.51198,14.697998 24.472002,12.802002 24.461013,12.302994 24.316969,11.929993 24.034008,11.662003 23.547475,11.200003 22.697284,11.13536 22.507753,11.134453z M8.8867823,2.8410034L2.5417312,10.296997 6.4037791,10.356995C6.8917614,10.390991 8.3258005,10.341003 8.9567896,9.7299957 9.1738335,9.5189972 9.2667919,9.2659912 9.2558046,8.9089966 9.2067934,7.3889923 9.0258213,4.7480011 8.8867823,2.8410034z M10.424826,1.6239929C10.551842,3.302002 10.816799,6.951004 10.876797,8.8560028 10.903836,9.6750031 10.636804,10.360992 10.083818,10.897995 9.0667769,11.882004 7.3527657,11.987991 6.6627546,11.987991 6.4657918,11.987991 6.3367616,11.979004 6.3177796,11.977005L1.6477377,11.905991C1.6387044,14.278992 1.6236895,20.283997 1.6496909,22.358994 1.651705,22.569992 1.6437093,22.780991 1.6366904,22.992004 1.6117265,23.593994 1.5926833,24.112991 1.8537338,24.386002 2.0716933,24.612991 2.6497034,24.886002 4.1457549,24.886002 6.0127832,24.886002 7.0867711,24.876999 7.6967641,24.867004L7.6457993,17.259995 14.853899,9.5849915 16.681924,9.5650024 16.681924,9.5429993 19.454908,9.5289917 19.406934,2.6210022C19.323925,2.3549957,18.960945,1.6239929,17.387928,1.6239929z M9.1738335,0L17.387928,0C19.94692,0,20.874971,1.5299988,21.022983,2.4329987L21.077976,9.5209961 22.446951,9.5139923C22.43395,9.5130005 24.031017,9.4250031 25.148035,10.481995 25.753999,11.054001 26.071996,11.822998 26.092992,12.766998 26.142006,15.065994 26.281044,26.268997 26.307047,28.412003L26.311014,28.764999C26.279029,29.817993 25.750032,31.802002 23.979013,31.931 23.342958,31.977005 20.887972,32 16.683878,32 13.798893,32 11.107818,31.988998 10.808803,31.987991 10.789821,31.990997 9.5147806,32.112 8.6008288,31.309006 8.0858074,30.854996 7.8107797,30.229004 7.7838017,29.444992L7.7728153,29.126999C7.721789,27.759995 7.6978022,26.970993 7.6898061,26.490005 7.0547882,26.5 5.9867817,26.509003 4.1457549,26.509003 2.4377257,26.509003 1.3387128,26.192001 0.68367504,25.509003 -0.055286743,24.742004 -0.017322397,23.742004 0.012707477,22.938004 0.020702986,22.744003 0.028698692,22.559998 0.026684528,22.378998 -0.00029337304,20.240997 0.016674615,13.856995 0.026684528,11.212997L0.026684528,10.867004 0.14167619,10.610992 8.7147823,0.54100037 8.7088009,0.45899963 8.8018194,0.43800354z
|
M14.733902,12.084991L9.751783,17.388992 12.982842,17.436005C13.569886,17.462997 14.5229,17.350998 14.876848,17.005005 14.954852,16.929993 15.031879,16.824005 15.02486,16.593002 14.986895,15.457993 14.838883,13.438004 14.733902,12.084991z M22.507753,11.134453C22.480678,11.134323,22.467085,11.135494,22.469961,11.136993L20.64694,11.145004 16.291904,11.192993C16.388891,12.405991 16.596901,15.100998 16.647928,16.539001 16.668924,17.177994 16.448888,17.742004 16.007904,18.168991 15.210897,18.947998 13.893864,19.065002 13.179865,19.065002L9.2818066,19.005005 9.3258129,25.522003 9.3728109,25.528 9.3278271,25.882996 9.3317944,26.395996 9.3107983,26.397995C9.3167797,26.789993,9.3378369,27.552994,9.3958212,29.065994L9.4068075,29.393005C9.4207855,29.819992 9.5648295,29.994995 9.6707884,30.089005 9.9807898,30.365997 10.539817,30.390991 10.717799,30.369003L10.717799,30.375C10.88284,30.354996 11.280855,30.356003 12.823844,30.365997 13.867863,30.371002 15.206869,30.376999 16.594886,30.376999 20.757965,30.376999 23.270998,30.354996 23.862007,30.311005 24.454971,30.268005 24.661029,29.154999 24.690021,28.729996 24.690021,28.729996 24.677997,27.876999 24.661029,26.582993 24.612016,22.671005 24.51198,14.697998 24.472002,12.802002 24.461013,12.302994 24.316969,11.929993 24.034008,11.662003 23.547475,11.200003 22.697284,11.13536 22.507753,11.134453z M8.8867823,2.8410034L2.5417312,10.296997 6.4037791,10.356995C6.8917614,10.390991 8.3258005,10.341003 8.9567896,9.7299957 9.1738335,9.5189972 9.2667919,9.2659912 9.2558046,8.9089966 9.2067934,7.3889923 9.0258213,4.7480011 8.8867823,2.8410034z M10.424826,1.6239929C10.551842,3.302002 10.816799,6.951004 10.876797,8.8560028 10.903836,9.6750031 10.636804,10.360992 10.083818,10.897995 9.0667769,11.882004 7.3527657,11.987991 6.6627546,11.987991 6.4657918,11.987991 6.3367616,11.979004 6.3177796,11.977005L1.6477377,11.905991C1.6387044,14.278992 1.6236895,20.283997 1.6496909,22.358994 1.651705,22.569992 1.6437093,22.780991 1.6366904,22.992004 1.6117265,23.593994 1.5926833,24.112991 1.8537338,24.386002 2.0716933,24.612991 2.6497034,24.886002 4.1457549,24.886002 6.0127832,24.886002 7.0867711,24.876999 7.6967641,24.867004L7.6457993,17.259995 14.853899,9.5849915 16.681924,9.5650024 16.681924,9.5429993 19.454908,9.5289917 19.406934,2.6210022C19.323925,2.3549957,18.960945,1.6239929,17.387928,1.6239929z M9.1738335,0L17.387928,0C19.94692,0,20.874971,1.5299988,21.022983,2.4329987L21.077976,9.5209961 22.446951,9.5139923C22.43395,9.5130005 24.031017,9.4250031 25.148035,10.481995 25.753999,11.054001 26.071996,11.822998 26.092992,12.766998 26.142006,15.065994 26.281044,26.268997 26.307047,28.412003L26.311014,28.764999C26.279029,29.817993 25.750032,31.802002 23.979013,31.931 23.342958,31.977005 20.887972,32 16.683878,32 13.798893,32 11.107818,31.988998 10.808803,31.987991 10.789821,31.990997 9.5147806,32.112 8.6008288,31.309006 8.0858074,30.854996 7.8107797,30.229004 7.7838017,29.444992L7.7728153,29.126999C7.721789,27.759995 7.6978022,26.970993 7.6898061,26.490005 7.0547882,26.5 5.9867817,26.509003 4.1457549,26.509003 2.4377257,26.509003 1.3387128,26.192001 0.68367504,25.509003 -0.055286743,24.742004 -0.017322397,23.742004 0.012707477,22.938004 0.020702986,22.744003 0.028698692,22.559998 0.026684528,22.378998 -0.00029337304,20.240997 0.016674615,13.856995 0.026684528,11.212997L0.026684528,10.867004 0.14167619,10.610992 8.7147823,0.54100037 8.7088009,0.45899963 8.8018194,0.43800354z
|
||||||
</sys:String>
|
</sys:String>
|
||||||
@@ -280,6 +292,10 @@
|
|||||||
M22.399981,2.4000006C22.099982,2.4000006 21.899982,2.5 21.599982,2.6999998 21.199983,3.1000004 21.199983,3.8000002 21.599982,4.2000003L26.199979,8.9000001C26.599978,9.3000002 27.299977,9.3000002 27.699977,8.9000001 28.099977,8.5000002 28.099977,7.8000002 27.699977,7.4000006L23.099981,2.6999998C22.899981,2.5,22.699981,2.4000006,22.399981,2.4000006z M21.499982,0C22.299982,0,23.199981,0.30000019,23.79998,0.90000057L29.299976,6.4000001C30.599975,7.7000003,30.599975,9.7000003,29.299976,11L22.599981,17.7C21.299983,19,19.299984,19,17.999985,17.7L17.299985,17 12.699989,21.6 10.399991,20.900001 10.899991,23.400001 8.4999928,22.8 8.9999924,25.5 6.2999945,25.1 6.7999945,27.6 4.2999964,27 4.7999954,29.6 2.4999971,32 0,26.6 13.499989,13.1 16.999986,16.6 12.699989,12.3C11.399991,11,11.399991,9.0000002,12.699989,7.7000003L19.399984,1C19.899983,0.30000019,20.699983,0,21.499982,0z
|
M22.399981,2.4000006C22.099982,2.4000006 21.899982,2.5 21.599982,2.6999998 21.199983,3.1000004 21.199983,3.8000002 21.599982,4.2000003L26.199979,8.9000001C26.599978,9.3000002 27.299977,9.3000002 27.699977,8.9000001 28.099977,8.5000002 28.099977,7.8000002 27.699977,7.4000006L23.099981,2.6999998C22.899981,2.5,22.699981,2.4000006,22.399981,2.4000006z M21.499982,0C22.299982,0,23.199981,0.30000019,23.79998,0.90000057L29.299976,6.4000001C30.599975,7.7000003,30.599975,9.7000003,29.299976,11L22.599981,17.7C21.299983,19,19.299984,19,17.999985,17.7L17.299985,17 12.699989,21.6 10.399991,20.900001 10.899991,23.400001 8.4999928,22.8 8.9999924,25.5 6.2999945,25.1 6.7999945,27.6 4.2999964,27 4.7999954,29.6 2.4999971,32 0,26.6 13.499989,13.1 16.999986,16.6 12.699989,12.3C11.399991,11,11.399991,9.0000002,12.699989,7.7000003L19.399984,1C19.899983,0.30000019,20.699983,0,21.499982,0z
|
||||||
</sys:String>
|
</sys:String>
|
||||||
|
|
||||||
|
<sys:String x:Key="{x:Static mbts:Icons.MenuOrientationGeometryKey}">
|
||||||
|
M14.997001,19.999038L15.000001,23.499012C15.000001,24.327005,14.327008,25,13.500016,25L9.9970522,25 9.9970522,23.000015 13.000022,23.000015 12.997022,20.001038z M9.000001,19.000006L9.000001,30.000006 30.000001,30.000006 30.000001,19.000006z M2,2L2,23 7.000001,23 7.000001,18.500006C7.000001,17.673006,7.6730013,17.000006,8.500001,17.000006L13.000001,17.000006 13.000001,2z M1.5,0L13.500001,0C14.327001,0,15.000001,0.67300034,15.000001,1.5L15.000001,17.000006 26.956518,17.000006 23.162404,13.207182C22.772376,12.816143 22.772376,12.184205 23.162404,11.793225 23.357907,11.597736 23.613928,11.499992 23.869827,11.499992 24.125725,11.499992 24.381502,11.597736 24.576517,11.793225L25.889371,13.105454 25.866285,12.914201C25.554945,10.547287 24.699391,8.7684691 23.308905,7.6089654 21.974919,6.4954615 20.356436,6.1229606 19.066825,6.0297103L19.059648,6.0292783 20.545799,7.5160289C20.936786,7.9070184 20.936786,8.5390015 20.545799,8.929991 20.350807,9.1249857 20.094815,9.2229831 19.838825,9.2229831 19.582834,9.2229831 19.326843,9.1249857 19.131849,8.929991L15.185988,4.9830971 18.981854,1.1871986C19.371841,0.79620934 20.004819,0.79620934 20.395805,1.1871986 20.785791,1.5771885 20.785791,2.2101717 20.395805,2.601161L18.976535,4.020443 18.999199,4.0214248C20.641604,4.1119318 22.785724,4.567862 24.590892,6.0739603 26.493747,7.660778 27.606404,10.054969 27.91277,13.209869L27.913735,13.221022 29.341699,11.793225C29.536714,11.597736 29.792459,11.499992 30.048328,11.499992 30.304196,11.499992 30.560187,11.597736 30.75569,11.793225 31.146694,12.184205 31.146694,12.816143 30.75569,13.207182L26.962552,17.000006 30.500001,17.000006C31.327001,17.000006,32.000001,17.673006,32.000001,18.500006L32.000001,30.500006C32.000001,31.327005,31.327001,32.000006,30.500001,32.000006L8.500001,32.000006C7.6730013,32.000006,7.000001,31.327005,7.000001,30.500006L7.000001,25 1.5,25C0.67300034,25,0,24.327001,0,23.5L0,1.5C0,0.67300034,0.67300034,0,1.5,0z
|
||||||
|
</sys:String>
|
||||||
|
|
||||||
<sys:String x:Key="{x:Static mbts:Icons.OrdersGeometryKey}">
|
<sys:String x:Key="{x:Static mbts:Icons.OrdersGeometryKey}">
|
||||||
M50.14375,33.389126C50.416863,33.394688,50.653496,33.587773,50.705998,33.864617L50.015995,45.114388C49.810295,46.291462,49.130394,45.097489,49.130394,45.097489L47.65659,42.640538C42.747776,49.635197 34.633152,54.221001 25.433924,54.221001 14.884193,54.221001 5.7437552,48.204125 1.2449617,39.419205 0.80087067,38.552021 0.21358696,37.705738 0.052086769,36.736958 -0.49735315,33.490925 3.4507786,32.901036 4.8049124,34.432404 5.3674143,35.067692 6.034036,36.16407 6.5079177,37.026051 10.106778,43.799416 17.2321,48.413819 25.433924,48.413819 32.656544,48.413819 39.026364,44.826695 42.903977,39.351506L40.229367,38.854115C40.229367,38.854115,38.677464,38.647118,39.742466,37.996033L50.024895,33.398526C50.064972,33.391365,50.104733,33.388333,50.14375,33.389126z M23.030291,9.0310004L27.889918,9.0310004 27.889918,13.028299C30.539786,13.205498,32.324932,13.958096,33.464161,14.528294L33.964176,14.775793 32.417435,20.038878 31.706417,19.68068C30.579987,19.11958 28.839241,18.244583 26.149073,18.244583 24.006916,18.244583 22.723183,19.122181 22.723183,20.590876 22.723183,21.894272 23.943314,22.804369 27.551308,24.187165 32.706444,26.124659 34.911,28.702853 34.911,32.817341 34.911,36.892929 32.090527,40.05172 27.673611,40.989117L27.673611,45.540001 22.767485,45.540001 22.767485,41.330414C20.252919,41.155815,17.695551,40.424118,16.101811,39.404721L15.683999,39.137619 17.221739,33.731438 17.969059,34.180634C19.088988,34.851235 21.402748,35.97873 24.340325,35.97873 26.734886,35.97873 28.276728,34.921635 28.276728,33.291336 28.276728,31.986641 27.547409,30.853846 23.986016,29.57255 20.083815,28.144253 16.095511,26.04406 16.095511,21.239174 16.095511,17.280985 18.737379,14.291395 23.030291,13.329098z M25.268765,0C35.819447,2.7347414E-07 44.961449,6.0155495 49.458798,14.804573 49.902695,15.669173 50.490094,16.516972 50.651287,17.48427 51.198281,20.734265 47.255726,21.318962 45.901341,19.789065 45.336346,19.153567 44.669552,18.051968 44.19566,17.19517 40.5957,10.421881 33.473275,5.8072398 25.268765,5.8072393 18.047545,5.8072398 11.678013,9.3918336 7.8003562,14.867073L10.474627,15.367072C10.474627,15.367072,12.026909,15.574172,10.962921,16.223872L0.67933281,20.826762C0.36037083,20.880062,0.057029126,20.669165,0.00099972012,20.354063L0.69093342,9.1118043C0.89552094,7.9296158,1.5738537,9.124924,1.5738539,9.124924L3.0452772,11.583379C7.9566038,4.584462,16.073666,2.7347414E-07,25.268765,0z
|
M50.14375,33.389126C50.416863,33.394688,50.653496,33.587773,50.705998,33.864617L50.015995,45.114388C49.810295,46.291462,49.130394,45.097489,49.130394,45.097489L47.65659,42.640538C42.747776,49.635197 34.633152,54.221001 25.433924,54.221001 14.884193,54.221001 5.7437552,48.204125 1.2449617,39.419205 0.80087067,38.552021 0.21358696,37.705738 0.052086769,36.736958 -0.49735315,33.490925 3.4507786,32.901036 4.8049124,34.432404 5.3674143,35.067692 6.034036,36.16407 6.5079177,37.026051 10.106778,43.799416 17.2321,48.413819 25.433924,48.413819 32.656544,48.413819 39.026364,44.826695 42.903977,39.351506L40.229367,38.854115C40.229367,38.854115,38.677464,38.647118,39.742466,37.996033L50.024895,33.398526C50.064972,33.391365,50.104733,33.388333,50.14375,33.389126z M23.030291,9.0310004L27.889918,9.0310004 27.889918,13.028299C30.539786,13.205498,32.324932,13.958096,33.464161,14.528294L33.964176,14.775793 32.417435,20.038878 31.706417,19.68068C30.579987,19.11958 28.839241,18.244583 26.149073,18.244583 24.006916,18.244583 22.723183,19.122181 22.723183,20.590876 22.723183,21.894272 23.943314,22.804369 27.551308,24.187165 32.706444,26.124659 34.911,28.702853 34.911,32.817341 34.911,36.892929 32.090527,40.05172 27.673611,40.989117L27.673611,45.540001 22.767485,45.540001 22.767485,41.330414C20.252919,41.155815,17.695551,40.424118,16.101811,39.404721L15.683999,39.137619 17.221739,33.731438 17.969059,34.180634C19.088988,34.851235 21.402748,35.97873 24.340325,35.97873 26.734886,35.97873 28.276728,34.921635 28.276728,33.291336 28.276728,31.986641 27.547409,30.853846 23.986016,29.57255 20.083815,28.144253 16.095511,26.04406 16.095511,21.239174 16.095511,17.280985 18.737379,14.291395 23.030291,13.329098z M25.268765,0C35.819447,2.7347414E-07 44.961449,6.0155495 49.458798,14.804573 49.902695,15.669173 50.490094,16.516972 50.651287,17.48427 51.198281,20.734265 47.255726,21.318962 45.901341,19.789065 45.336346,19.153567 44.669552,18.051968 44.19566,17.19517 40.5957,10.421881 33.473275,5.8072398 25.268765,5.8072393 18.047545,5.8072398 11.678013,9.3918336 7.8003562,14.867073L10.474627,15.367072C10.474627,15.367072,12.026909,15.574172,10.962921,16.223872L0.67933281,20.826762C0.36037083,20.880062,0.057029126,20.669165,0.00099972012,20.354063L0.69093342,9.1118043C0.89552094,7.9296158,1.5738537,9.124924,1.5738539,9.124924L3.0452772,11.583379C7.9566038,4.584462,16.073666,2.7347414E-07,25.268765,0z
|
||||||
</sys:String>
|
</sys:String>
|
||||||
|
|||||||
@@ -48,5 +48,5 @@ namespace mbts.ui.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class MarketViewRowView : DIYGrid.HighPerformanceRow<MarketViewVM.Row, MarketViewView.Columns> { }
|
class MarketViewRowView : DIYGrid.HighPerformanceRow<MarketViewVM.Row> { }
|
||||||
}
|
}
|
||||||
@@ -4,10 +4,10 @@ using bts.shell;
|
|||||||
using bts.shell.fills;
|
using bts.shell.fills;
|
||||||
using bts.spark;
|
using bts.spark;
|
||||||
using bts.utils;
|
using bts.utils;
|
||||||
|
using bts.view;
|
||||||
using mbts.persist;
|
using mbts.persist;
|
||||||
using mbts.ui;
|
using mbts.ui;
|
||||||
using mbts.ui.settings;
|
using mbts.ui.settings;
|
||||||
using mbts.ui.shell;
|
|
||||||
using mbts.ui.spark;
|
using mbts.ui.spark;
|
||||||
using mbts.ui.utility;
|
using mbts.ui.utility;
|
||||||
using mbts.utils;
|
using mbts.utils;
|
||||||
@@ -32,6 +32,7 @@ namespace mbts.spark {
|
|||||||
SecurityCriteria
|
SecurityCriteria
|
||||||
_selected_security_criteria_backing,
|
_selected_security_criteria_backing,
|
||||||
_sorted_selected_security_criteria_backing;
|
_sorted_selected_security_criteria_backing;
|
||||||
|
SparkMenuDisplayVM _menu_display_vm;
|
||||||
|
|
||||||
public MarketViewWindow(MarketViewWindowFactory factory, IBus bus, OrdersModel orders_model, MarketViewWindowFactory.StartupData state, IWindowSettingsManager<GridSettings> settings_manager)
|
public MarketViewWindow(MarketViewWindowFactory factory, IBus bus, OrdersModel orders_model, MarketViewWindowFactory.StartupData state, IWindowSettingsManager<GridSettings> settings_manager)
|
||||||
: base("Market View", bus, factory, SparkCommands.ShowMarketView.icon) {
|
: base("Market View", bus, factory, SparkCommands.ShowMarketView.icon) {
|
||||||
@@ -48,7 +49,9 @@ namespace mbts.spark {
|
|||||||
public override UIElement Content => _view;
|
public override UIElement Content => _view;
|
||||||
public override IEnumerable<SparkCommand> Commands => _commands;
|
public override IEnumerable<SparkCommand> Commands => _commands;
|
||||||
public override MarketViewWindowFactory.StartupData SaveState =>
|
public override MarketViewWindowFactory.StartupData SaveState =>
|
||||||
_state = new MarketViewWindowFactory.StartupData(_state.security_criteria, _vm.get_filter_states(), _vm.get_grid_save_state(), _vm.rows_view.get_sorting_criteria(_vm.columns));
|
_state = new MarketViewWindowFactory.StartupData(_state.security_criteria, _vm.get_filter_states(), _vm.get_grid_save_state(), _vm.rows_view.get_sorting_criteria(_vm.columns)) {
|
||||||
|
menu_display = _menu_display_vm.safe_create()
|
||||||
|
};
|
||||||
|
|
||||||
public override double MinWidth => MarketViewWindowFactory.StartupData.DefaultGridSettings.columns.Where(c => c.is_visible).Sum(gcs => gcs.width)
|
public override double MinWidth => MarketViewWindowFactory.StartupData.DefaultGridSettings.columns.Where(c => c.is_visible).Sum(gcs => gcs.width)
|
||||||
+ SPARK_MENU_COLLAPSED_WIDTH
|
+ SPARK_MENU_COLLAPSED_WIDTH
|
||||||
@@ -101,6 +104,8 @@ namespace mbts.spark {
|
|||||||
public void thread_init() {
|
public void thread_init() {
|
||||||
_init_guard.check_access();
|
_init_guard.check_access();
|
||||||
Log.notnull(_state);
|
Log.notnull(_state);
|
||||||
|
_menu_display_vm = new SparkMenuDisplayVM();
|
||||||
|
_menu_display_vm.load_from(_state.menu_display);
|
||||||
var state_src = Observable.FromEvent<Action<MarketViewWindowFactory.StartupData>, MarketViewWindowFactory.StartupData>(cb => _state_changed += cb, cb => _state_changed -= cb).StartWith(_state);
|
var state_src = Observable.FromEvent<Action<MarketViewWindowFactory.StartupData>, MarketViewWindowFactory.StartupData>(cb => _state_changed += cb, cb => _state_changed -= cb).StartWith(_state);
|
||||||
_vm = new MarketViewVM(_bus, _orders_model, state_src, _settings_manager);
|
_vm = new MarketViewVM(_bus, _orders_model, state_src, _settings_manager);
|
||||||
_view = new MarketViewView { DataContext = _vm };
|
_view = new MarketViewView { DataContext = _vm };
|
||||||
@@ -160,7 +165,8 @@ namespace mbts.spark {
|
|||||||
var dialog = new ShellSettingsDialog { DataContext = vm };
|
var dialog = new ShellSettingsDialog { DataContext = vm };
|
||||||
vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);
|
vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);
|
||||||
return dialog;
|
return dialog;
|
||||||
}))
|
})),
|
||||||
|
_menu_display_vm.spark_cmd
|
||||||
};
|
};
|
||||||
//
|
//
|
||||||
_vm.selection_changed += on_selection_changed;
|
_vm.selection_changed += on_selection_changed;
|
||||||
@@ -190,5 +196,8 @@ namespace mbts.spark {
|
|||||||
_vm.Dispose();
|
_vm.Dispose();
|
||||||
Commands.OfType<IDisposable>().DisposeAll();
|
Commands.OfType<IDisposable>().DisposeAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override void OnParentViewCreated(SparkWindowView parent_view) =>
|
||||||
|
_menu_display_vm.safe_bind_to_view(parent_view);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.proto;
|
using bts.proto;
|
||||||
using bts.settings;
|
using bts.settings;
|
||||||
|
using bts.view;
|
||||||
using mbts.persist;
|
using mbts.persist;
|
||||||
using mbts.spark;
|
using mbts.spark;
|
||||||
using mbts.spark.filters;
|
using mbts.spark.filters;
|
||||||
@@ -53,6 +54,8 @@ namespace bts.shell {
|
|||||||
public readonly FilterStates filters;
|
public readonly FilterStates filters;
|
||||||
[ProtoMember(4)]
|
[ProtoMember(4)]
|
||||||
public GridSettings grid;
|
public GridSettings grid;
|
||||||
|
[ProtoMember(5)]
|
||||||
|
public SparkMenuDisplaySettings menu_display;
|
||||||
|
|
||||||
public StartupData() { }
|
public StartupData() { }
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
using mbts.spark.filters;
|
||||||
|
using mbts.ui;
|
||||||
|
using ProtoBuf;
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace bts.shell.time_and_sales {
|
||||||
|
[ProtoContract]
|
||||||
|
class FilterStates {
|
||||||
|
[ProtoMember(1)]
|
||||||
|
public TimeFilterTuple time;
|
||||||
|
[ProtoMember(2)]
|
||||||
|
public string security;
|
||||||
|
[ProtoMember(3)]
|
||||||
|
public DoubleMinMaxState price;
|
||||||
|
[ProtoMember(4)]
|
||||||
|
public UIntMinMaxState size;
|
||||||
|
// [ProtoMember(5)]
|
||||||
|
// ProtoMember 5 cannot be used further
|
||||||
|
[ProtoMember(6)]
|
||||||
|
public string security_key;
|
||||||
|
[ProtoMember(7)]
|
||||||
|
public co2.AggressorSide[] aggressor_sides;
|
||||||
|
}
|
||||||
|
|
||||||
|
static class TimeAndSalesFilterStatesExtensions {
|
||||||
|
public static Func<TimeAndSalesRowVM, bool> build_predicate(this FilterStates fs) {
|
||||||
|
var pb = new ColumnPredicateBuilder<TimeAndSalesRowVM>();
|
||||||
|
pb.add_regex(fs.security, r => r.security.ToString());
|
||||||
|
pb.add_time_filter(fs.time, r => r.time);
|
||||||
|
pb.add_price(fs.price, r => r.price, r => r.security);
|
||||||
|
pb.add_numeric(fs.size, r => r.size);
|
||||||
|
pb.add_discrete_values(fs.aggressor_sides, r => r.aggressor_side);
|
||||||
|
return pb.to_predicate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
using mbts.spark;
|
||||||
|
using mbts.ui;
|
||||||
|
using mbts.ui.settings;
|
||||||
|
using ProtoBuf;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using static mbts.ui.controls.DIYGrid;
|
||||||
|
using Columns = bts.shell.time_and_sales.TimeAndSalesView.Columns;
|
||||||
|
|
||||||
|
namespace bts.shell.time_and_sales {
|
||||||
|
[ProtoContract]
|
||||||
|
class TimeAndSalesSettings {
|
||||||
|
[ProtoMember(1)]
|
||||||
|
public readonly SecurityCriteria security_criteria;
|
||||||
|
[ProtoMember(2)]
|
||||||
|
List<SortingCriteria> _sorting_criterion;
|
||||||
|
[ProtoMember(3)]
|
||||||
|
public FilterStates filters;
|
||||||
|
[ProtoMember(4)]
|
||||||
|
public GridSettings grid;
|
||||||
|
[ProtoMember(5)]
|
||||||
|
public SparkMenuDisplaySettings menu_display;
|
||||||
|
[ProtoMember(6)]
|
||||||
|
public bool use_defaults;
|
||||||
|
|
||||||
|
public TimeAndSalesSettings() { }
|
||||||
|
|
||||||
|
public TimeAndSalesSettings(SecurityCriteria security_criteria) :
|
||||||
|
this(security_criteria, new FilterStates(), null, null) { }
|
||||||
|
|
||||||
|
public TimeAndSalesSettings(SecurityCriteria security_criteria, FilterStates filters, GridSettings grid = default, List<SortingCriteria> sorting_criterion = null) {
|
||||||
|
this.security_criteria = security_criteria;
|
||||||
|
this.filters = filters;
|
||||||
|
this.grid = grid;
|
||||||
|
_sorting_criterion = sorting_criterion;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion);
|
||||||
|
|
||||||
|
public List<SortingCriteria> sorting_criterion => _sorting_criterion ?? (_sorting_criterion = DefaultColumns.default_sorting_criterion.ToList());
|
||||||
|
|
||||||
|
public static TimeAndSalesSettings Default(SecurityCriteria security_criteria) =>
|
||||||
|
new TimeAndSalesSettings(security_criteria, new FilterStates(), null, DefaultColumns.default_sorting_criterion.ToList());
|
||||||
|
|
||||||
|
public TimeAndSalesSettings with(SecurityCriteria security_criteria) =>
|
||||||
|
new TimeAndSalesSettings(security_criteria, filters, grid);
|
||||||
|
|
||||||
|
public static class DefaultColumns {
|
||||||
|
public static GridColumnSettings security => new GridColumnSettings(Columns.Security.col_id(), DefaultColumnHeaders.Security, width: DefaultColumnWidths.Security);
|
||||||
|
public static GridColumnSettings time => new GridColumnSettings(Columns.Time.col_id(), DefaultColumnHeaders.Time, width: DefaultColumnWidths.TimeOfDay);
|
||||||
|
public static GridColumnSettings price => new GridColumnSettings(Columns.Price.col_id(), DefaultColumnHeaders.Price, width: DefaultColumnWidths.Price, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
|
||||||
|
public static GridColumnSettings size => new GridColumnSettings(Columns.Size.col_id(), DefaultColumnHeaders.Size, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
|
||||||
|
public static GridColumnSettings aggressor => new GridColumnSettings(Columns.Aggressor.col_id(), DefaultColumnHeaders.Aggressor, width: DefaultColumnWidths.Aggressor);
|
||||||
|
public static GridColumnSettings security_key => new GridColumnSettings(Columns.SecurityKey.col_id(), DefaultColumnHeaders.SecurityKey, is_visible: false, width: DefaultColumnWidths.SecurityKey);
|
||||||
|
|
||||||
|
public static IEnumerable<SortingCriteria> default_sorting_criterion {
|
||||||
|
get {
|
||||||
|
yield return new SortingCriteria(time.id, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static IEnumerable<GridColumnSettings> all {
|
||||||
|
get {
|
||||||
|
yield return security;
|
||||||
|
yield return time;
|
||||||
|
yield return price;
|
||||||
|
yield return size;
|
||||||
|
yield return aggressor;
|
||||||
|
yield return security_key;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,27 +1,26 @@
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.co2;
|
using bts.co2;
|
||||||
|
using mbts;
|
||||||
using mbts.co2;
|
using mbts.co2;
|
||||||
|
using mbts.spark;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
|
|
||||||
namespace mbts.spark {
|
namespace bts.shell.time_and_sales {
|
||||||
class TimeAndSalesModel : IDisposable {
|
class TimeAndSalesModel : IDisposable {
|
||||||
internal readonly SecurityCriteria security_criteria;
|
|
||||||
|
|
||||||
static readonly TimeSpan _poll_interval = TimeSpan.FromSeconds(0.4);
|
static readonly TimeSpan _poll_interval = TimeSpan.FromSeconds(0.4);
|
||||||
Lazy<IObservable<IReadOnlyList<TradeInfo>>> _trades;
|
Lazy<IObservable<IReadOnlyList<TradeInfo>>> _trades;
|
||||||
IDisposable _dispose;
|
IDisposable _dispose;
|
||||||
|
|
||||||
public TimeAndSalesModel(IBus bus, MDConsumer consumer, SecurityCriteria security_criteria) {
|
public TimeAndSalesModel(IBus bus, MDConsumer consumer, IObservable<SecurityCriteria> security_criteria) {
|
||||||
this.security_criteria = security_criteria;
|
var curr_channels = new Dictionary<ChannelKey, ChannelConsumer>();
|
||||||
var curr_channels = new Dictionary<ChannelKey, ChannelConsumer>();
|
|
||||||
_trades = new Lazy<IObservable<IReadOnlyList<TradeInfo>>>(() => Observable.Interval(_poll_interval).Select(_ => {
|
_trades = new Lazy<IObservable<IReadOnlyList<TradeInfo>>>(() => Observable.Interval(_poll_interval).Select(_ => {
|
||||||
var copy = curr_channels;
|
var copy = curr_channels;
|
||||||
return copy.Values.SelectMany(c => c.read_trades()).ToList();
|
return copy.Values.SelectMany(c => c.read_trades()).ToList();
|
||||||
}));
|
}));
|
||||||
_dispose = security_criteria.subscribe_md_map(bus).Subscribe(
|
_dispose = security_criteria.SelectManyInSeries(sc =>sc.subscribe_md_map(bus)).Subscribe(
|
||||||
md_map => {
|
md_map => {
|
||||||
var copy = new Dictionary<ChannelKey, ChannelConsumer>(curr_channels);
|
var copy = new Dictionary<ChannelKey, ChannelConsumer>(curr_channels);
|
||||||
copy.sync_with_demux(md_map, get_channel_key, get_channel_consumer, update_channel_consumer);
|
copy.sync_with_demux(md_map, get_channel_key, get_channel_consumer, update_channel_consumer);
|
||||||
@@ -95,4 +94,4 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
using bts.api;
|
||||||
|
using bts.co2;
|
||||||
|
using bts.utils;
|
||||||
|
using mbts;
|
||||||
|
using mbts.spark;
|
||||||
|
using mbts.ui.controls;
|
||||||
|
using mbts.ui.shell;
|
||||||
|
using mbts.utils;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace bts.shell.time_and_sales {
|
||||||
|
class TimeAndSalesRowVM : ViewModelBase, DIYGrid.IRowVM, ISecurityRow, IEquatable<TimeAndSalesRowVM> {
|
||||||
|
// key comparer guarentees deterministic sorting
|
||||||
|
// if the rows in the collection have unique row_keys.
|
||||||
|
public static readonly IComparer<TimeAndSalesRowVM> key_comparer =
|
||||||
|
new ComparerBuilder<TimeAndSalesRowVM>(new[] {
|
||||||
|
Comparer<DateTime>.Default.wrap<DateTime, TimeAndSalesRowVM>(r => r.time),
|
||||||
|
Comparer<int>.Default.wrap<int, TimeAndSalesRowVM>(r => r.row_key)
|
||||||
|
})
|
||||||
|
.to_comparer()
|
||||||
|
.to_safe();
|
||||||
|
|
||||||
|
readonly TradeMessageImmutable _trade;
|
||||||
|
|
||||||
|
public TimeAndSalesRowVM(int row_key, SecurityImmutable security, TradeMessageImmutable trade) {
|
||||||
|
this.row_key = row_key;
|
||||||
|
this.security = security;
|
||||||
|
_trade = trade;
|
||||||
|
trade_key = trade.Key;
|
||||||
|
}
|
||||||
|
|
||||||
|
public event Action invalidated;
|
||||||
|
|
||||||
|
public int row_key { get; }
|
||||||
|
public uint trade_key { get; }
|
||||||
|
public uint security_key => security.Id;
|
||||||
|
public SecurityImmutable security { get; }
|
||||||
|
public DateTime time => ((ulong)_trade.Time).lldatetime().ToLocalTime();
|
||||||
|
public double price => _trade.price();
|
||||||
|
public uint size => _trade.Size;
|
||||||
|
public AggressorSide aggressor_side => _trade.AggressorSide;
|
||||||
|
|
||||||
|
public void raise_invalidated() =>
|
||||||
|
invalidated?.Invoke();
|
||||||
|
|
||||||
|
public bool Equals(TimeAndSalesRowVM other) =>
|
||||||
|
other != null &&
|
||||||
|
row_key == other.row_key;
|
||||||
|
|
||||||
|
public override bool Equals(object obj) =>
|
||||||
|
Equals(obj as TimeAndSalesRowVM);
|
||||||
|
|
||||||
|
public override int GetHashCode() =>
|
||||||
|
row_key;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,86 +1,363 @@
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.co2;
|
using bts.co2;
|
||||||
using bts.collections;
|
using bts.collections;
|
||||||
|
using bts.utils;
|
||||||
|
using mbts;
|
||||||
using mbts.persist;
|
using mbts.persist;
|
||||||
|
using mbts.spark;
|
||||||
using mbts.spark.filters;
|
using mbts.spark.filters;
|
||||||
using mbts.ui;
|
using mbts.ui;
|
||||||
using mbts.ui.controls;
|
using mbts.ui.controls;
|
||||||
using mbts.ui.settings;
|
using mbts.ui.settings;
|
||||||
using mbts.ui.spark;
|
using mbts.ui.shell;
|
||||||
using mbts.ui.utility;
|
using mbts.ui.utility;
|
||||||
|
using mbts.utils;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.Immutable;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
|
using System.Diagnostics;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading;
|
||||||
|
using System.Windows.Controls;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using static bts.shell.TimeAndSalesWindowFactory;
|
|
||||||
using static mbts.ui.controls.DIYGrid;
|
using static mbts.ui.controls.DIYGrid;
|
||||||
|
|
||||||
namespace mbts.spark {
|
namespace bts.shell.time_and_sales {
|
||||||
class TimeAndSalesVM : SecurityGrid<TimeAndSalesVM.Row, TradeInfo> {
|
class TimeAndSalesVM : DisposableViewModelBase, IHandleGridSorting, IHandleRowSelection {
|
||||||
readonly IBus _bus;
|
const int _max_row_count = 1000;
|
||||||
readonly TimeAndSalesModel _model;
|
static int _id_counter;
|
||||||
IWindowSettingsManager<GridSettings> _settings_manager;
|
static IReadOnlyList<Func<TimeAndSalesVM, IDataGridColumnFilter<TimeAndSalesRowVM>>> _filter_getters =
|
||||||
|
ObjectSnapshot.property_delegates_of_type<TimeAndSalesVM, IDataGridColumnFilter<TimeAndSalesRowVM>>();
|
||||||
|
|
||||||
|
readonly ColumnSortManager _sort_manager;
|
||||||
|
readonly RowFactory _row_factory = new RowFactory();
|
||||||
|
readonly LoggerContext _log;
|
||||||
|
readonly IWindowSettingsManager<GridSettings> _settings_manager;
|
||||||
|
readonly DeferrableActionWrapper
|
||||||
|
_refresh_filter,
|
||||||
|
_refresh_sort,
|
||||||
|
_refresh_selected_rows;
|
||||||
|
IComparer<TimeAndSalesRowVM> _comparer_backing;
|
||||||
|
Func<TimeAndSalesRowVM, bool> _filter_backing;
|
||||||
|
ImmutableHashSet<TimeAndSalesRowVM> _selected_rows = ImmutableHashSet<TimeAndSalesRowVM>.Empty;
|
||||||
|
ImmutableList<TimeAndSalesRowVM> _all_rows = ImmutableList<TimeAndSalesRowVM>.Empty;
|
||||||
|
ImmutableList<TradeInfo> _buffered_trades;
|
||||||
|
/// Although the sorting criteria can be obtained from the <see cref="_sort_manager"/> (<see cref="ColumnSortManager.SortingCriteria"/>),
|
||||||
|
/// a local copy is kept because the settings collector may call <see cref="create"/> from a thread
|
||||||
|
/// other than the dispatcher thread associated with this instance as a viewmodel,
|
||||||
|
/// and the <see cref="ColumnSortManager.SortingCriteria"/> property is not thread-safe.
|
||||||
|
/// Therefore, <see cref="create"/> returns this local copy, and thus avoids accessing the non-thread-safe property.
|
||||||
|
ImmutableList<SortingCriteria> _sorting_criteria = ImmutableList<SortingCriteria>.Empty;
|
||||||
|
TimeAndSalesRowVM _current_row;
|
||||||
|
bool _is_paused;
|
||||||
|
int
|
||||||
|
_load_settings_count,
|
||||||
|
_filter_change_count,
|
||||||
|
_sort_change_count;
|
||||||
|
|
||||||
public TimeAndSalesVM(IBus bus, IWindowSettingsManager<GridSettings> settings_manager, TimeAndSalesModel model, StartupData startup_data)
|
public TimeAndSalesVM(IWindowSettingsManager<GridSettings> settings_manager) {
|
||||||
: base(RXCollection.CreateBuffer(model.trades, 1000), Enumerable.Empty<SortingCriteria>()) {
|
_sort_manager = new ColumnSortManager(columns.WrapSelector(c => c as ISortableDIYGridColumn, null), TimeAndSalesView.Columns.RowKey.ToString());
|
||||||
_bus = bus;
|
_comparer_backing = _sort_manager.BuildComparer(_get_column_comparer);
|
||||||
_model = model;
|
_log = new LoggerContext(Log.Ui, $"Time And Sales VM ({Interlocked.Increment(ref _id_counter)})", null);
|
||||||
_settings_manager = settings_manager;
|
_settings_manager = settings_manager;
|
||||||
show_ladder = DelegateCommandParamObserver.Create(current_row_observable, r => _show_ladder_async(r).ignore(), r => r != null);
|
// deferrable filter/sort refresh
|
||||||
security_filter = new RegexFilterVM<Row>(r => r.security.ToString(), nameof(Row.security));
|
_refresh_filter = new DeferrableActionWrapper(_refresh_filter_impl);
|
||||||
if (startup_data.filters is FilterStates filters) {
|
_refresh_sort = new DeferrableActionWrapper(_refresh_sort_impl);
|
||||||
|
_refresh_selected_rows = new DeferrableActionWrapper(() => selected_rows_changed?.Invoke(_selected_rows));
|
||||||
|
// grid settings
|
||||||
|
grid_settings_manager = new SimpleGridSettingsManager<TimeAndSalesRowVM>(columns, new Dictionary<string, GridColumnSettingsFeatureFlags> { }, rows);
|
||||||
|
grid_settings_manager.load_from(settings_manager.current_settings());
|
||||||
|
// Columns
|
||||||
|
add_column(
|
||||||
|
TimeAndSalesView.Columns.Security,
|
||||||
|
r => r.security.ToString(),
|
||||||
|
DefaultColumnHeaders.Security,
|
||||||
|
DefaultColumnWidths.Security,
|
||||||
|
security_filter,
|
||||||
|
DataGridFilterKnownTemplates.Regex);
|
||||||
|
add_column(
|
||||||
|
TimeAndSalesView.Columns.Time,
|
||||||
|
r => r.time.ToString("h:mm:ss tt"),
|
||||||
|
DefaultColumnHeaders.Time,
|
||||||
|
DefaultColumnWidths.Time,
|
||||||
|
time_filter,
|
||||||
|
DataGridFilterKnownTemplates.TimeFilter);
|
||||||
|
add_column(
|
||||||
|
TimeAndSalesView.Columns.Price,
|
||||||
|
r => r.security.spec_or_default().format(r.price),
|
||||||
|
DefaultColumnHeaders.Price,
|
||||||
|
DefaultColumnWidths.Price,
|
||||||
|
price_filter,
|
||||||
|
DataGridFilterKnownTemplates.DoubleMinMax,
|
||||||
|
System.Windows.HorizontalAlignment.Right);
|
||||||
|
add_column(
|
||||||
|
TimeAndSalesView.Columns.Size,
|
||||||
|
r => r.size.ToString(),
|
||||||
|
DefaultColumnHeaders.Size,
|
||||||
|
DefaultColumnWidths.Size,
|
||||||
|
size_filter,
|
||||||
|
DataGridFilterKnownTemplates.UIntMinMax,
|
||||||
|
System.Windows.HorizontalAlignment.Right);
|
||||||
|
add_column(
|
||||||
|
TimeAndSalesView.Columns.Aggressor,
|
||||||
|
r => r.aggressor_side.ToString(),
|
||||||
|
DefaultColumnHeaders.Aggressor,
|
||||||
|
DefaultColumnWidths.Aggressor,
|
||||||
|
aggressor_filter,
|
||||||
|
DataGridFilterKnownTemplates.EnumValues);
|
||||||
|
add_column(
|
||||||
|
TimeAndSalesView.Columns.SecurityKey,
|
||||||
|
r => r.security_key.ToString(),
|
||||||
|
DefaultColumnHeaders.SecurityKey,
|
||||||
|
DefaultColumnWidths.SecurityKey,
|
||||||
|
security_key_filter,
|
||||||
|
DataGridFilterKnownTemplates.Regex);
|
||||||
|
|
||||||
|
settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager);
|
||||||
|
// commands
|
||||||
|
show_ladder_cmd = new DelegateCommand(() => {
|
||||||
|
if (current_row != null)
|
||||||
|
request_show_ladder?.Invoke(current_row);
|
||||||
|
});
|
||||||
|
// init IDisposable resources
|
||||||
|
var resources = new List<IDisposable>();
|
||||||
|
resources.AddRange(_filters.Select(f => {
|
||||||
|
f.filter_changed += _refresh_filter.execute;
|
||||||
|
return Disposable.Create(() => f.filter_changed -= _refresh_filter.execute);
|
||||||
|
}));
|
||||||
|
_sort_manager.active_sorting_changed += _refresh_sort.execute;
|
||||||
|
resources.Add(Disposable.Create(() => _sort_manager.active_sorting_changed -= _refresh_sort.execute));
|
||||||
|
_dispose = Disposable.Create(resources.ToArray());
|
||||||
|
// local methods
|
||||||
|
void add_column(
|
||||||
|
TimeAndSalesView.Columns col_key,
|
||||||
|
Func<TimeAndSalesRowVM, string> get_cell_text,
|
||||||
|
string header,
|
||||||
|
double width,
|
||||||
|
IDataGridColumnFilter filter,
|
||||||
|
string filter_template,
|
||||||
|
System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) =>
|
||||||
|
columns.Add(new RenderTextColumn<TimeAndSalesRowVM, TimeAndSalesView.Columns>(
|
||||||
|
col_key, get_cell_text, filter, filter_template, _get_aggressor_brush) {
|
||||||
|
id = col_key.col_id(), Header = header, Width = width, horizontal_alignment = h_alignment
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
public event Action<ImmutableHashSet<TimeAndSalesRowVM>> selected_rows_changed;
|
||||||
|
public event Action<TimeAndSalesRowVM> current_row_changed, request_show_ladder;
|
||||||
|
|
||||||
|
public ObservableCollection<ColumnBase> columns { get; } = new ObservableCollection<ColumnBase>();
|
||||||
|
public TimeAndSalesRowVM current_row {
|
||||||
|
get => _current_row;
|
||||||
|
set {
|
||||||
|
if (Set(ref _current_row, value))
|
||||||
|
current_row_changed?.Invoke(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public ObservableCollection<TimeAndSalesRowVM> rows { get; } = new ObservableCollection<TimeAndSalesRowVM>();
|
||||||
|
public ImmutableHashSet<TimeAndSalesRowVM> selected_rows => _selected_rows;
|
||||||
|
public int total_row_count => _all_rows.Count;
|
||||||
|
public SimpleGridSettingsManager<TimeAndSalesRowVM> grid_settings_manager { get; }
|
||||||
|
public bool is_paused {
|
||||||
|
get => _is_paused;
|
||||||
|
set {
|
||||||
|
if (_is_paused != value) {
|
||||||
|
_is_paused = value;
|
||||||
|
if (value) {
|
||||||
|
_buffered_trades = ImmutableList<TradeInfo>.Empty;
|
||||||
|
} else {
|
||||||
|
var resume = _buffered_trades;
|
||||||
|
_buffered_trades = null;
|
||||||
|
on_new_trades(resume);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// filters
|
||||||
|
public IDataGridColumnPersistentFilter<TimeAndSalesRowVM, TimeFilterTuple> time_filter { get; } = new TimeFilterVM<TimeAndSalesRowVM>(r => r.time);
|
||||||
|
public IDataGridColumnPersistentFilter<TimeAndSalesRowVM, string> security_filter { get; } = new RegexFilterVM<TimeAndSalesRowVM>(r => r.security.ToString(), nameof(TimeAndSalesRowVM.security));
|
||||||
|
public IDataGridColumnPersistentFilter<TimeAndSalesRowVM, DoubleMinMaxState> price_filter { get; } = new DoubleMinMax<TimeAndSalesRowVM>(r => r.price);
|
||||||
|
public IDataGridColumnPersistentFilter<TimeAndSalesRowVM, UIntMinMaxState> size_filter { get; } = new UIntMinMax<TimeAndSalesRowVM>(r => r.size, nameof(TimeAndSalesRowVM.size));
|
||||||
|
public IDataGridColumnPersistentFilter<TimeAndSalesRowVM, AggressorSide[]> aggressor_filter { get; } = DiscreteValuesFilterVM.Create<TimeAndSalesRowVM, AggressorSide>(EnumHelper.get_values<AggressorSide>().ToArray(), r => r.aggressor_side);
|
||||||
|
public IDataGridColumnPersistentFilter<TimeAndSalesRowVM, string> security_key_filter { get; } = new RegexFilterVM<TimeAndSalesRowVM>(r => r.security_key.ToString());
|
||||||
|
// commands
|
||||||
|
public ICommand show_ladder_cmd { get; }
|
||||||
|
|
||||||
|
IComparer<TimeAndSalesRowVM> _comparer {
|
||||||
|
get => _comparer_backing;
|
||||||
|
set {
|
||||||
|
if (value == null) {
|
||||||
|
_log.warn("Comparer should not be set to null, will use the default comparer instead (based on trade time, then row key).");
|
||||||
|
_comparer_backing = new ComparerBuilder<TimeAndSalesRowVM>(new[] {
|
||||||
|
Comparer<DateTime>.Default.wrap<DateTime, TimeAndSalesRowVM>(r => r.time),
|
||||||
|
Comparer<int>.Default.wrap<int, TimeAndSalesRowVM>(r => r.row_key)
|
||||||
|
})
|
||||||
|
.to_comparer()
|
||||||
|
.to_safe();
|
||||||
|
} else {
|
||||||
|
_comparer_backing = value;
|
||||||
|
}
|
||||||
|
var sorted_rows = rows.ToArray();
|
||||||
|
var snapshot = _selected_rows;
|
||||||
|
Array.Sort(sorted_rows, _comparer_backing);
|
||||||
|
using (_refresh_selected_rows.defer_execution()) {
|
||||||
|
for (int i = 0; i < sorted_rows.Length; i++) {
|
||||||
|
if (rows[i].row_key != sorted_rows[i].row_key)
|
||||||
|
rows[i] = sorted_rows[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Func<TimeAndSalesRowVM, bool> _filter {
|
||||||
|
get => _filter_backing;
|
||||||
|
set {
|
||||||
|
var old_filter = _filter_backing;
|
||||||
|
var new_filter = value;
|
||||||
|
_filter_backing = new_filter;
|
||||||
|
if (new_filter != null) {
|
||||||
|
for (int i = 0; i < rows.Count; i++) {
|
||||||
|
if (!new_filter(rows[i]))
|
||||||
|
rows.RemoveAt(i);
|
||||||
|
}
|
||||||
|
rows.RemoveWhere(r => !new_filter(r));
|
||||||
|
if (old_filter != null) {
|
||||||
|
foreach (var r in _all_rows) {
|
||||||
|
if (!old_filter(r) && new_filter(r))
|
||||||
|
rows.InsertSorted(r, _comparer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (old_filter != null) {
|
||||||
|
foreach (var r in _all_rows) {
|
||||||
|
if (!old_filter(r))
|
||||||
|
rows.InsertSorted(r, _comparer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
IEnumerable<IDataGridColumnFilter<TimeAndSalesRowVM>> _filters =>
|
||||||
|
_filter_getters.Select(fn => fn(this));
|
||||||
|
|
||||||
|
public (FilterStates filters, IReadOnlyList<SortingCriteria> sorting_criteria, GridSettings grid_settings) create() =>
|
||||||
|
(_get_filter_states(), _sorting_criteria, grid_settings_manager.create());
|
||||||
|
|
||||||
|
public void load(FilterStates filters, IEnumerable<SortingCriteria> sorting_criteria, GridSettings grid_settings) {
|
||||||
|
using (_refresh_filter.defer_execution())
|
||||||
|
using (_refresh_sort.defer_execution()) {
|
||||||
|
_log.info($"begin load settings ({++_load_settings_count})...");
|
||||||
|
var timer = new Stopwatch();
|
||||||
|
timer.Start();
|
||||||
|
grid_settings_manager.load_from(grid_settings);
|
||||||
|
_sort_manager.SortingCriteria = sorting_criteria;
|
||||||
|
// load filters
|
||||||
time_filter.load_state(filters.time);
|
time_filter.load_state(filters.time);
|
||||||
security_filter.load_state(filters.security);
|
security_filter.load_state(filters.security);
|
||||||
price_filter.load_state(filters.price);
|
price_filter.load_state(filters.price);
|
||||||
size_filter.load_state(filters.size);
|
size_filter.load_state(filters.size);
|
||||||
aggressor_filter.load_state(filters.aggressor_sides);
|
aggressor_filter.load_state(filters.aggressor_sides);
|
||||||
security_key_filter.load_state(filters.security_key);
|
security_key_filter.load_state(filters.security_key);
|
||||||
|
//
|
||||||
|
timer.Stop();
|
||||||
|
_log.info($"load settings ({_load_settings_count}) took {timer.ElapsedMilliseconds:0.00}ms.");
|
||||||
}
|
}
|
||||||
// Columns
|
|
||||||
add_column(TimeAndSalesView.Columns.Security, DefaultColumnHeaders.Security, DefaultColumnWidths.Security, nameof(Row.security), security_filter, DataGridFilterKnownTemplates.Regex);
|
|
||||||
add_column(TimeAndSalesView.Columns.Time, DefaultColumnHeaders.Time, DefaultColumnWidths.Time, nameof(Row.time), time_filter, DataGridFilterKnownTemplates.TimeFilter);
|
|
||||||
add_column(TimeAndSalesView.Columns.Price, DefaultColumnHeaders.Price, DefaultColumnWidths.Price, nameof(Row.price), price_filter, DataGridFilterKnownTemplates.DoubleMinMax, System.Windows.HorizontalAlignment.Right);
|
|
||||||
add_column(TimeAndSalesView.Columns.Size, DefaultColumnHeaders.Size, DefaultColumnWidths.Size, nameof(Row.size), size_filter, DataGridFilterKnownTemplates.UIntMinMax, System.Windows.HorizontalAlignment.Right);
|
|
||||||
add_column(TimeAndSalesView.Columns.Aggressor, DefaultColumnHeaders.Aggressor, DefaultColumnWidths.Aggressor, nameof(Row.aggressor_side), aggressor_filter, DataGridFilterKnownTemplates.EnumValues);
|
|
||||||
add_column(TimeAndSalesView.Columns.SecurityKey, DefaultColumnHeaders.SecurityKey, DefaultColumnWidths.SecurityKey, nameof(Row.security_key), security_key_filter, DataGridFilterKnownTemplates.Regex);
|
|
||||||
void add_column(TimeAndSalesView.Columns col_key, string header, double width, string sort_member_path, IDataGridColumnFilter filter, string filter_template, System.Windows.HorizontalAlignment h_alignment = System.Windows.HorizontalAlignment.Left) =>
|
|
||||||
columns.Add(new RenderTextColumn<Row, TimeAndSalesView.Columns>(col_key, r => r[col_key], filter, filter_template, r => _get_aggressor_brush(r))
|
|
||||||
{ id = col_id(col_key), Header = header, Width = width, sort_member_path = sort_member_path, horizontal_alignment = h_alignment }
|
|
||||||
);
|
|
||||||
|
|
||||||
// be sure to load GridSettings AFTER the columns collection has been populated, the grid settings manager looks columns by id to apply the appropriate settings,
|
|
||||||
// if the collection is not populated, the column settings will not be applied
|
|
||||||
grid_settings_manager = new SimpleGridSettingsManager<Row>(columns, new Dictionary<string, GridColumnSettingsFeatureFlags> { }, row_vms);
|
|
||||||
grid_settings_manager.load_from(settings_manager.current_settings());
|
|
||||||
_resources.AddRange(
|
|
||||||
show_ladder,
|
|
||||||
DataGridFilterHelper.hook_filters(
|
|
||||||
rows_view, time_filter, security_filter, price_filter, size_filter, aggressor_filter, security_key_filter),
|
|
||||||
settings_manager.subscribe_current().OnDispatcher().Subscribe(grid_settings_manager)
|
|
||||||
);
|
|
||||||
rows_view.set_sort_descriptions(startup_data.sorting_criterion, columns);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public ObservableCollection<DIYGrid.ColumnBase> columns { get; } = new ObservableCollection<DIYGrid.ColumnBase>();
|
public void on_new_trades(IReadOnlyList<TradeInfo> trades) {
|
||||||
public DelegateCommandParamObserver<Row> show_ladder { get; }
|
/// The total row count is limited by <see cref="_max_row_count"/>;
|
||||||
public SimpleGridSettingsManager<Row> grid_settings_manager { get; }
|
/// trades are kept in a circular buffer (FIFO).
|
||||||
|
/// If paused, just need to add trades to <see cref="_buffered_trades"/>.
|
||||||
public GridSettings get_grid_save_state() {
|
if (is_paused) {
|
||||||
if (_settings_manager.instance_settings == null)
|
if (_buffered_trades == null)
|
||||||
return null;
|
_buffered_trades = ImmutableList<TradeInfo>.Empty;
|
||||||
else
|
if (trades.Count >= _max_row_count) {
|
||||||
return grid_settings_manager.create();
|
_buffered_trades = _buffered_trades
|
||||||
|
.Clear()
|
||||||
|
.AddRange(ReadOnlyListSubRangeWrapper.Create(trades, trades.Count - _max_row_count, _max_row_count));
|
||||||
|
} else {
|
||||||
|
int overflow_count = _buffered_trades.Count + trades.Count - _max_row_count;
|
||||||
|
if (overflow_count > 0) {
|
||||||
|
var rows_to_remove = _buffered_trades.WrapSubRange(0, overflow_count);
|
||||||
|
_buffered_trades = _buffered_trades.RemoveRange(0, overflow_count);
|
||||||
|
}
|
||||||
|
_buffered_trades = _buffered_trades.AddRange(trades);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
/// If not paused, update in the normal fasion:
|
||||||
|
/// add to <see cref="_all_rows"/> and <see cref="rows"/>
|
||||||
|
if (trades.Count >= _max_row_count) {
|
||||||
|
trades = ReadOnlyListSubRangeWrapper.Create(trades, trades.Count - _max_row_count, _max_row_count);
|
||||||
|
_all_rows = _all_rows.Clear();
|
||||||
|
rows.Clear();
|
||||||
|
} else {
|
||||||
|
int overflow_count = _all_rows.Count + trades.Count - _max_row_count;
|
||||||
|
if (overflow_count > 0) {
|
||||||
|
var rows_to_remove = _all_rows.WrapSubRange(0, overflow_count);
|
||||||
|
_all_rows = _all_rows.RemoveRange(0, overflow_count);
|
||||||
|
rows.RemoveSorted(rows_to_remove, _comparer);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
var all_rows_bd = _all_rows.ToBuilder();
|
||||||
|
foreach (var t in trades) {
|
||||||
|
var r = _row_factory.create(t.security, t.trade);
|
||||||
|
all_rows_bd.Add(r);
|
||||||
|
if (_filter_backing == null || _filter_backing(r))
|
||||||
|
rows.InsertSorted(r, _comparer);
|
||||||
|
}
|
||||||
|
_all_rows = all_rows_bd.ToImmutable();
|
||||||
|
RaisePropertyChanged(nameof(total_row_count));
|
||||||
}
|
}
|
||||||
|
|
||||||
public StartupData create() =>
|
public void on_sorting(object sender, DIYGridSortingEventArgs e) {
|
||||||
new StartupData(_model.security_criteria, _get_filter_states(), get_grid_save_state(), rows_view.get_sorting_criteria(columns));
|
try {
|
||||||
|
if (e.Column is ISortableDIYGridColumn sc) {
|
||||||
|
_log.info($"handling sort event for column {sc.id}.");
|
||||||
|
_sort_manager.OnColumnClick(sc, KeyboardExtensions.IsShiftDown());
|
||||||
|
var sorted_rows = rows.ToArray();
|
||||||
|
var snapshot = _selected_rows;
|
||||||
|
_refresh_sort_impl();
|
||||||
|
} else {
|
||||||
|
_log.warn($"ignoring sort event because column '{e.Column?.id}' does not implement {nameof(ISortableDIYGridColumn)}.");
|
||||||
|
}
|
||||||
|
} catch (Exception ex) {
|
||||||
|
_log.error($"error handling sort event: {ex}.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private Brush _get_aggressor_brush(Row r) {
|
public void row_selection_changed(SelectionChangedEventArgs e) {
|
||||||
|
var bd = _selected_rows.ToBuilder();
|
||||||
|
if (e.AddedItems != null)
|
||||||
|
bd.AddRange(e.AddedItems.OfType<TimeAndSalesRowVM>());
|
||||||
|
if (e.RemovedItems != null)
|
||||||
|
bd.removeRange(e.RemovedItems.OfType<TimeAndSalesRowVM>());
|
||||||
|
_selected_rows = bd.ToImmutable();
|
||||||
|
_refresh_selected_rows.execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
static IComparer<TimeAndSalesRowVM> _get_column_comparer(string column_name) =>
|
||||||
|
_get_column_comparer(EnumHelper.parse<TimeAndSalesView.Columns>(column_name));
|
||||||
|
|
||||||
|
static IComparer<TimeAndSalesRowVM> _get_column_comparer(TimeAndSalesView.Columns column) {
|
||||||
|
switch (column) {
|
||||||
|
case TimeAndSalesView.Columns.Aggressor: return wrap(r => r.aggressor_side);
|
||||||
|
case TimeAndSalesView.Columns.Time: return wrap(r => r.time);
|
||||||
|
case TimeAndSalesView.Columns.Security: return wrap(r => r.security);
|
||||||
|
case TimeAndSalesView.Columns.Price: return wrap(r => r.price);
|
||||||
|
case TimeAndSalesView.Columns.Size: return wrap(r => r.size);
|
||||||
|
case TimeAndSalesView.Columns.SecurityKey: return wrap(r => r.security_key);
|
||||||
|
case TimeAndSalesView.Columns.RowKey: return wrap(r => r.row_key);
|
||||||
|
default: throw ExceptionBuilder.Argument.unexpected_case(column, nameof(column));
|
||||||
|
}
|
||||||
|
IComparer<TimeAndSalesRowVM> wrap<T>(Func<TimeAndSalesRowVM, T> selector) =>
|
||||||
|
Comparer<T>.Default.wrap(selector);
|
||||||
|
}
|
||||||
|
|
||||||
|
Brush _get_aggressor_brush(TimeAndSalesRowVM r) {
|
||||||
BTSColor c;
|
BTSColor c;
|
||||||
Brush b;
|
Brush b;
|
||||||
if (r.aggressor_side == AggressorSide.Buy) c = BTSColors.MarketData.bid;
|
if (r.aggressor_side == AggressorSide.Buy) c = BTSColors.MarketData.bid;
|
||||||
@@ -90,14 +367,6 @@ namespace mbts.spark {
|
|||||||
return b;
|
return b;
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Filters
|
|
||||||
public IDataGridColumnPersistentFilter<Row, TimeFilterTuple> time_filter { get; } = new TimeFilterVM<Row>(r => r.time, nameof(Row.time));
|
|
||||||
public IDataGridColumnPersistentFilter<Row, string> security_filter { get; }
|
|
||||||
public IDataGridColumnPersistentFilter<Row, DoubleMinMaxState> price_filter { get; } = new DoubleMinMax<Row>(r => r.price, nameof(Row.price));
|
|
||||||
public IDataGridColumnPersistentFilter<Row, UIntMinMaxState> size_filter { get; } = new UIntMinMax<Row>(r => r.size, nameof(Row.size));
|
|
||||||
public IDataGridColumnPersistentFilter<Row, AggressorSide[]> aggressor_filter { get; } = DiscreteValuesFilterVM.Create<Row, AggressorSide>(EnumHelper.get_values<AggressorSide>().ToArray(), r => r.aggressor_side, nameof(Row.aggressor_side));
|
|
||||||
public IDataGridColumnPersistentFilter<Row, string> security_key_filter { get; } = new RegexFilterVM<Row>(r => r.security_key.ToString(), nameof(Row.security_key));
|
|
||||||
|
|
||||||
FilterStates _get_filter_states() =>
|
FilterStates _get_filter_states() =>
|
||||||
new FilterStates {
|
new FilterStates {
|
||||||
time = time_filter.get_state(),
|
time = time_filter.get_state(),
|
||||||
@@ -107,73 +376,35 @@ namespace mbts.spark {
|
|||||||
security_key = security_key_filter.get_state(),
|
security_key = security_key_filter.get_state(),
|
||||||
aggressor_sides = aggressor_filter.get_state()
|
aggressor_sides = aggressor_filter.get_state()
|
||||||
};
|
};
|
||||||
#endregion
|
|
||||||
|
|
||||||
protected override IEnumerable<SortingCriteria> get_default_sorting() {
|
void _refresh_sort_impl() {
|
||||||
yield return new SortingCriteria(nameof(Row.time), false);
|
_log.info($"begin change sort ({++_sort_change_count})...");
|
||||||
|
var timer = new Stopwatch();
|
||||||
|
timer.Start();
|
||||||
|
_comparer = _sort_manager.BuildComparer(_get_column_comparer, TimeAndSalesRowVM.key_comparer);
|
||||||
|
_sorting_criteria = ImmutableList.CreateRange(_sort_manager.SortingCriteria);
|
||||||
|
timer.Stop();
|
||||||
|
_log.info($"sort change ({_sort_change_count}) took {timer.ElapsedMilliseconds:0.00}ms.");
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override Row row_factory(TradeInfo row_model) =>
|
void _refresh_filter_impl() {
|
||||||
new Row(this, row_model.security, row_model.trade);
|
_log.info($"begin change filter ({++_filter_change_count})...");
|
||||||
|
var timer = new Stopwatch();
|
||||||
|
timer.Start();
|
||||||
async Task _show_ladder_async(Row row) {
|
_filter = _get_filter_states().build_predicate();
|
||||||
var smd_lookup = await SparkUtils.get_security_md_async(_bus, row.security.Id);
|
timer.Stop();
|
||||||
if (smd_lookup.success) _bus.post(SparkTags.ShowLadderTag, smd_lookup.result);
|
_log.info($"filter change ({_filter_change_count}) took {timer.ElapsedMilliseconds:0.00}ms.");
|
||||||
}
|
}
|
||||||
|
|
||||||
public class Row : SecurityRow, DIYGrid.IRowVM {
|
class RowFactory {
|
||||||
readonly uint _trade_key;
|
// the row key must be unique to each row in the collection
|
||||||
|
int _row_id_counter;
|
||||||
|
|
||||||
readonly string
|
public TimeAndSalesRowVM create(TradeInfo trade_info) =>
|
||||||
_security_text,
|
new TimeAndSalesRowVM(_row_id_counter++, trade_info.security, trade_info.trade);
|
||||||
_time_text,
|
|
||||||
_price_text,
|
|
||||||
_size_text,
|
|
||||||
_aggressor_text,
|
|
||||||
_trade_key_text,
|
|
||||||
_security_key_text;
|
|
||||||
|
|
||||||
public Row(TimeAndSalesVM parent, SecurityImmutable security, TradeMessageImmutable trade) : base(security) {
|
public TimeAndSalesRowVM create(SecurityImmutable security, TradeMessageImmutable trade) =>
|
||||||
_trade_key = trade.Key;
|
new TimeAndSalesRowVM(_row_id_counter++, security, trade);
|
||||||
time = ((ulong)trade.Time).lldatetime().ToLocalTime();
|
|
||||||
price = trade.price();
|
|
||||||
size = trade.Size;
|
|
||||||
aggressor_side = trade.AggressorSide;
|
|
||||||
show_ladder = new DelegateCommand(() => parent._show_ladder_async(this).ignore());
|
|
||||||
_security_text = security.ToString();
|
|
||||||
_time_text = time.ToString("M/d h:mm:ss tt");
|
|
||||||
_price_text = security.ContractSpec.format(price);
|
|
||||||
_size_text = size.ToString();
|
|
||||||
_aggressor_text = aggressor_side.ToString();
|
|
||||||
_trade_key_text = _trade_key.ToString();
|
|
||||||
_security_key_text = security_key.ToString();
|
|
||||||
}
|
|
||||||
|
|
||||||
public event Action invalidated;
|
|
||||||
|
|
||||||
public uint trade_key => _trade_key;
|
|
||||||
public DateTime time { get; }
|
|
||||||
public double price { get; }
|
|
||||||
public uint size { get; }
|
|
||||||
public AggressorSide aggressor_side { get; }
|
|
||||||
public ICommand show_ladder { get; }
|
|
||||||
|
|
||||||
public string this[TimeAndSalesView.Columns col] {
|
|
||||||
get {
|
|
||||||
switch (col) {
|
|
||||||
case TimeAndSalesView.Columns.Security: return _security_text;
|
|
||||||
case TimeAndSalesView.Columns.Time: return _time_text;
|
|
||||||
case TimeAndSalesView.Columns.Price: return _price_text;
|
|
||||||
case TimeAndSalesView.Columns.Size: return _size_text;
|
|
||||||
case TimeAndSalesView.Columns.Aggressor: return _aggressor_text;
|
|
||||||
case TimeAndSalesView.Columns.SecurityKey: return _security_key_text;
|
|
||||||
default: return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void raise_invalidated() => invalidated?.Invoke();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
<UserControl
|
<UserControl
|
||||||
x:Class="mbts.ui.spark.TimeAndSalesView"
|
x:Class="bts.shell.time_and_sales.TimeAndSalesView"
|
||||||
x:ClassModifier="internal"
|
x:ClassModifier="internal"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:c="clr-namespace:mbts.ui.controls"
|
xmlns:c="clr-namespace:mbts.ui.controls"
|
||||||
xmlns:usp="clr-namespace:mbts.ui.spark"
|
xmlns:tas="clr-namespace:bts.shell.time_and_sales"
|
||||||
FocusManager.IsFocusScope="True"
|
FocusManager.IsFocusScope="True"
|
||||||
Background="{StaticResource CommonBackground}"
|
Background="{StaticResource CommonBackground}"
|
||||||
>
|
>
|
||||||
@@ -26,13 +26,14 @@
|
|||||||
x:Name="_grid"
|
x:Name="_grid"
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Columns="{Binding columns}"
|
Columns="{Binding columns}"
|
||||||
Rows="{Binding rows_view}"
|
Rows="{Binding rows}"
|
||||||
CurrentRow="{Binding current_row}"
|
CurrentRow="{Binding current_row}"
|
||||||
SelectionHighlight="{Binding grid_settings_manager.selection_highlight, Mode=OneWay}"
|
SelectionHighlight="{Binding grid_settings_manager.selection_highlight, Mode=OneWay}"
|
||||||
>
|
>
|
||||||
<c:DIYGrid.InputBindings>
|
<c:DIYGrid.InputBindings>
|
||||||
<MouseBinding MouseAction="LeftDoubleClick" Command="{x:Static c:DIYGrid.DefaultRowCommand}"/>
|
<MouseBinding MouseAction="LeftDoubleClick" Command="{Binding show_ladder_cmd}"/>
|
||||||
<KeyBinding Key="Return" Command="{x:Static c:DIYGrid.DefaultRowCommand}"/>
|
<KeyBinding Key="Return" Command="{Binding show_ladder_cmd}"/>
|
||||||
|
<KeyBinding Key="A" Modifiers="Ctrl" Command="{Binding select_all_cmd}"/>
|
||||||
</c:DIYGrid.InputBindings>
|
</c:DIYGrid.InputBindings>
|
||||||
<c:DIYGrid.CommandBindings>
|
<c:DIYGrid.CommandBindings>
|
||||||
<CommandBinding
|
<CommandBinding
|
||||||
@@ -43,13 +44,18 @@
|
|||||||
</c:DIYGrid.CommandBindings>
|
</c:DIYGrid.CommandBindings>
|
||||||
<c:DIYGrid.RowTemplate>
|
<c:DIYGrid.RowTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<usp:TimeAndSalesRowView/>
|
<tas:TimeAndSalesRowView/>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</c:DIYGrid.RowTemplate>
|
</c:DIYGrid.RowTemplate>
|
||||||
</c:DIYGrid>
|
</c:DIYGrid>
|
||||||
<StatusBar Grid.Row="1" DockPanel.Dock="Bottom">
|
<StatusBar Grid.Row="1" DockPanel.Dock="Bottom">
|
||||||
<StatusBarItem HorizontalAlignment="Right">
|
<StatusBarItem HorizontalAlignment="Right">
|
||||||
<TextBlock Text=" "/>
|
<TextBlock>
|
||||||
|
<Run Text="Trades:"/>
|
||||||
|
<Run Text="{Binding rows.Count, Mode=OneWay}" />
|
||||||
|
<Run Text="of"/>
|
||||||
|
<Run Text="{Binding total_row_count, Mode=OneWay}" />
|
||||||
|
</TextBlock>
|
||||||
</StatusBarItem>
|
</StatusBarItem>
|
||||||
</StatusBar>
|
</StatusBar>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -1,17 +1,21 @@
|
|||||||
using mbts.spark;
|
using mbts.ui.controls;
|
||||||
using mbts.ui.controls;
|
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
|
|
||||||
namespace mbts.ui.spark {
|
namespace bts.shell.time_and_sales {
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Interaction logic for TimeAndSalesView.xaml
|
/// Interaction logic for TimeAndSalesView.xaml
|
||||||
/// </summary>
|
/// </summary>
|
||||||
partial class TimeAndSalesView : UserControl {
|
partial class TimeAndSalesView : UserControl {
|
||||||
public enum Columns { Time, Security, Price, Size, OrderType, SecurityKey, Aggressor }
|
public enum Columns { Time, Security, Price, Size, SecurityKey, Aggressor, RowKey }
|
||||||
|
|
||||||
public TimeAndSalesView() =>
|
public TimeAndSalesView() =>
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
}
|
}
|
||||||
|
|
||||||
class TimeAndSalesRowView : DIYGrid.HighPerformanceRow<TimeAndSalesVM.Row, TimeAndSalesView.Columns> { }
|
class TimeAndSalesRowView : DIYGrid.HighPerformanceRow<TimeAndSalesRowVM> { }
|
||||||
}
|
|
||||||
|
static class TimeAndSalesViewColumnsExtensions {
|
||||||
|
public static string col_id(this TimeAndSalesView.Columns column) =>
|
||||||
|
column.ToString();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,125 +1,215 @@
|
|||||||
using bts;
|
using bts.api;
|
||||||
using bts.api;
|
|
||||||
using bts.shell;
|
|
||||||
using bts.shell.fills;
|
using bts.shell.fills;
|
||||||
using bts.spark;
|
using bts.spark;
|
||||||
|
using bts.view;
|
||||||
|
using mbts;
|
||||||
using mbts.co2;
|
using mbts.co2;
|
||||||
using mbts.persist;
|
using mbts.persist;
|
||||||
|
using mbts.spark;
|
||||||
using mbts.ui;
|
using mbts.ui;
|
||||||
using mbts.ui.settings;
|
using mbts.ui.settings;
|
||||||
using mbts.ui.shell;
|
|
||||||
using mbts.ui.spark;
|
using mbts.ui.spark;
|
||||||
using mbts.ui.utility;
|
using mbts.ui.utility;
|
||||||
using mbts.utils;
|
using mbts.utils;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.Immutable;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using static bts.shell.TimeAndSalesWindowFactory;
|
|
||||||
|
|
||||||
namespace mbts.spark {
|
namespace bts.shell.time_and_sales {
|
||||||
class TimeAndSalesWindow : SparkWindow<StartupData>, ISharedWindow {
|
class TimeAndSalesWindow : SparkWindow<TimeAndSalesSettings>, ISharedWindow {
|
||||||
const string _window_type = "TimeAndSales", _window_type_display_name = "Time And Sales";
|
const string _window_type = "TimeAndSales", _window_type_display_name = "Time And Sales";
|
||||||
readonly MDConsumer _consumer;
|
readonly MDConsumer _consumer;
|
||||||
readonly TimeAndSalesWindowFactory _factory;
|
readonly TimeAndSalesWindowFactory _factory;
|
||||||
readonly IWindowSettingsManager<GridSettings> _settings_manager;
|
readonly IWindowSettingsManager<GridSettings> _settings_manager;
|
||||||
SingleValuePump<TimeAndSalesVM> _vm;
|
readonly bool _can_pause_updates;
|
||||||
|
TimeAndSalesVM _vm;
|
||||||
TimeAndSalesModel _model;
|
TimeAndSalesModel _model;
|
||||||
StartupData _state;
|
SecurityCriteria _security_criteria_backing;
|
||||||
|
TimeAndSalesSettings _state;
|
||||||
TimeAndSalesView _view;
|
TimeAndSalesView _view;
|
||||||
SparkCommand[] _commands;
|
SparkCommand[] _commands;
|
||||||
|
SparkMenuDisplayVM _menu_display_vm;
|
||||||
IDisposable _subscriptions;
|
IDisposable _subscriptions;
|
||||||
|
|
||||||
public TimeAndSalesWindow(TimeAndSalesWindowFactory factory, IBus bus, MDConsumer consumer, StartupData state, ImageSource icon, IWindowSettingsManager<GridSettings> settings_manager)
|
public TimeAndSalesWindow(TimeAndSalesWindowFactory factory, IBus bus, MDConsumer consumer, TimeAndSalesSettings state, ImageSource icon, IWindowSettingsManager<GridSettings> settings_manager, bool can_pause_updates)
|
||||||
: base("Time And Sales", bus, factory, SparkCommands.ShowTimeAndSales.icon) {
|
: base("Time And Sales", bus, factory, SparkCommands.ShowTimeAndSales.icon) {
|
||||||
Log.assert(state != null);
|
Log.assert(state != null);
|
||||||
_consumer = consumer;
|
_consumer = consumer;
|
||||||
_factory = factory;
|
_factory = factory;
|
||||||
_state = state;
|
_state = state ?? TimeAndSalesSettings.Default(new SecurityCriteria());
|
||||||
|
if (_state.security_criteria == null)
|
||||||
|
_state = _state.with(new SecurityCriteria());
|
||||||
|
_security_criteria_backing = _state.security_criteria;
|
||||||
_settings_manager = settings_manager;
|
_settings_manager = settings_manager;
|
||||||
|
_can_pause_updates = can_pause_updates;
|
||||||
|
thread_id = mbts.config.Configuration.get<bts.config.MultiThreadedWindows>().time_and_sales ? _window_type : null;
|
||||||
Icon.Freeze();
|
Icon.Freeze();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
event Action<SecurityCriteria> _security_criteria_changed;
|
||||||
|
|
||||||
public override string window_type => _window_type;
|
public override string window_type => _window_type;
|
||||||
public override IEnumerable<SparkCommand> Commands => _commands;
|
public override IEnumerable<SparkCommand> Commands => _commands;
|
||||||
public override UIElement Content => _view;
|
public override UIElement Content => _view;
|
||||||
public override double MinWidth => StartupData.DefaultGridSettings.columns.Sum(gcs => gcs.width)
|
public override double MinWidth => TimeAndSalesSettings.DefaultGridSettings.columns.Sum(gcs => gcs.width)
|
||||||
+ SPARK_MENU_COLLAPSED_WIDTH
|
+ SPARK_MENU_COLLAPSED_WIDTH
|
||||||
+ LAUNCHER_BUTTON_BORDER_WIDTH
|
+ LAUNCHER_BUTTON_BORDER_WIDTH
|
||||||
+ EXTRA_FOR_NO_HORIZONTAL_SCROLLBAR_WIDTH;
|
+ EXTRA_FOR_NO_HORIZONTAL_SCROLLBAR_WIDTH;
|
||||||
public string thread_id { get; }
|
public string thread_id { get; }
|
||||||
public override StartupData SaveState => _state = _vm.value.create();
|
public override TimeAndSalesSettings SaveState {
|
||||||
|
get {
|
||||||
|
_ensure_state(true);
|
||||||
|
return _state;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
SecurityCriteria _security_criteria {
|
||||||
|
get => _security_criteria_backing;
|
||||||
|
set {
|
||||||
|
_security_criteria_backing = value;
|
||||||
|
_state = null;
|
||||||
|
_security_criteria_changed?.Invoke(value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public override void Dispose() =>
|
public override void Dispose() =>
|
||||||
_dispose_resources();
|
_dispose_resources();
|
||||||
|
|
||||||
public void thread_init() {
|
public void thread_init() {
|
||||||
_dispose_resources();
|
_dispose_resources();
|
||||||
_vm = new SingleValuePump<TimeAndSalesVM>();
|
_ensure_state();
|
||||||
var connectable_builder = new ConnectableSeriesBuilder<TimeAndSalesVM>(_vm.observable);
|
if (!_state.use_defaults)
|
||||||
|
_settings_manager.instance_settings = _state.grid;
|
||||||
|
_menu_display_vm = new SparkMenuDisplayVM();
|
||||||
|
_menu_display_vm.load_from(_state.menu_display);
|
||||||
|
_vm = new TimeAndSalesVM(_settings_manager);
|
||||||
|
var selected_rows_src = Observable.Create<ImmutableHashSet<TimeAndSalesRowVM>>(o => {
|
||||||
|
_vm.selected_rows_changed += o.OnNext;
|
||||||
|
return Disposable.Create(() => _vm.selected_rows_changed -= o.OnNext);
|
||||||
|
});
|
||||||
|
var current_row_src = Observable.Create<TimeAndSalesRowVM>(o => {
|
||||||
|
if (_vm.current_row != null)
|
||||||
|
o.OnNext(_vm.current_row);
|
||||||
|
_vm.current_row_changed += o.OnNext;
|
||||||
|
return Disposable.Create(() => _vm.current_row_changed -= o.OnNext);
|
||||||
|
});
|
||||||
|
var current_sec_key_src = current_row_src.Select(r => {
|
||||||
|
var result = ImmutableHashSet<uint>.Empty;
|
||||||
|
if (r != null)
|
||||||
|
result = result.Add(r.security_key);
|
||||||
|
return result;
|
||||||
|
});
|
||||||
var update_securities_cmd = SparkCommands.change_securities_callback(_window_type_display_name);
|
var update_securities_cmd = SparkCommands.change_securities_callback(_window_type_display_name);
|
||||||
var current_smd_source = connectable_builder.create(vm => vm.current_security_md_observable(_bus)).OnDispatcher();
|
var security_criteria_changed = new Action<SecurityCriteria>(sc => { });
|
||||||
var selected_secs_source = connectable_builder.create(vm => vm.selected_securities_observable()).OnDispatcher();
|
SparkCommand toggle_is_paused_cmd = null;
|
||||||
|
toggle_is_paused_cmd = new SparkCommandCommand(get_is_paused_cmd_title(), Icons.Pause, new DelegateCommand(() => {
|
||||||
|
_vm.is_paused = !_vm.is_paused;
|
||||||
|
toggle_is_paused_cmd.title = get_is_paused_cmd_title();
|
||||||
|
})) {
|
||||||
|
show_in_toolbar = _can_pause_updates,
|
||||||
|
show_in_context_menu = _can_pause_updates
|
||||||
|
};
|
||||||
_commands = new SparkCommand[] {
|
_commands = new SparkCommand[] {
|
||||||
SparkCommands.ShowLadder(SparkCommands.KeyGestures.ShowLadder).complete(current_smd_source, md => md.HasValue, ConvertUtils.ValueOrDefault),
|
// ladder
|
||||||
SparkCommands.ShowOrderTicketFromSecurity(SparkCommands.KeyGestures.ShowOrderTicket).complete(current_smd_source, md => md.HasValue, ConvertUtils.ValueOrDefault),
|
SparkCommands.ShowLadderAutoLookup(SparkCommands.KeyGestures.ShowLadder)
|
||||||
SparkCommands.ShowFills(SparkCommands.KeyGestures.ShowFills).complete(selected_secs_source, always_true, get_fills_startup_data),
|
.complete(current_sec_key_src, sec_keys => sec_keys.Count > 0),
|
||||||
SparkCommands.ShowMarketView.complete(selected_secs_source, always_true, secs => secs.Count > 0 ? new SecurityCriteria(secs) : _state.security_criteria),
|
// ticket
|
||||||
SparkCommands.change_securities_command(() => (update_securities_cmd, _state.security_criteria)),
|
SparkCommands.ShowOrderTicketAutoLookup(SparkCommands.KeyGestures.ShowOrderTicket)
|
||||||
|
.complete(current_sec_key_src, sec_keys => sec_keys.Count > 0),
|
||||||
|
// fills
|
||||||
|
SparkCommands.ShowFills(SparkCommands.KeyGestures.ShowFills)
|
||||||
|
.complete(selected_rows_src, always_true, get_fills_startup_data),
|
||||||
|
// mview
|
||||||
|
SparkCommands.ShowMarketView
|
||||||
|
.complete(selected_rows_src, always_true, rows => rows.Count > 0 ? new SecurityCriteria(rows.Select(r => r.security)) : _security_criteria),
|
||||||
|
// pause
|
||||||
|
toggle_is_paused_cmd,
|
||||||
|
// change securities
|
||||||
|
SparkCommands.change_securities_command(() => (update_securities_cmd, _security_criteria)),
|
||||||
// wrap the grid settings view factory in a dialogCommand here since the vm is destroyed/recreated when the security criteria changes
|
// wrap the grid settings view factory in a dialogCommand here since the vm is destroyed/recreated when the security criteria changes
|
||||||
SparkCommands.window_settings_command(new DialogCommand(() => {
|
SparkCommands.window_settings_command(new DialogCommand(() => {
|
||||||
var vm = new ShellSettingsDialogVM<GridSettings, SimpleGridSettingsVM>(
|
var vm = new ShellSettingsDialogVM<GridSettings, SimpleGridSettingsVM>(
|
||||||
_settings_manager,
|
_settings_manager,
|
||||||
s => s.time_and_sales_grid,
|
s => s.time_and_sales_grid,
|
||||||
UserSettings.FileExtensions.GRID,
|
UserSettings.FileExtensions.GRID,
|
||||||
s => _vm.value.grid_settings_manager.create_vm(
|
s => _vm.grid_settings_manager.create_vm(
|
||||||
// we need to get the most up to date GridSettings when launching b/c users may
|
// we need to get the most up to date GridSettings when launching b/c users may
|
||||||
// have changed some settings on the grid directly, like column widths.
|
// have changed some settings on the grid directly, like column widths.
|
||||||
s.with(_vm.value.columns.Select(c => c.create()))
|
s.with(_vm.columns.Select(c => c.create()))
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
vm.SubscribeDisposed(literal_title_source.OnDispatcher().Subscribe(t => vm.title = t));
|
vm.SubscribeDisposed(literal_title_source.OnDispatcher().Subscribe(t => vm.title = t));
|
||||||
var dialog = new ShellSettingsDialog { DataContext = vm };
|
var dialog = new ShellSettingsDialog { DataContext = vm };
|
||||||
vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);
|
vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);
|
||||||
return dialog;
|
return dialog;
|
||||||
}))
|
})),
|
||||||
|
_menu_display_vm.spark_cmd
|
||||||
};
|
};
|
||||||
_subscriptions = Disposable.Create(
|
_vm.load(_state.filters, _state.sorting_criterion, _state.grid);
|
||||||
_bus.subscribe(update_securities_cmd.tag).OnDispatcher().Subscribe(update_criteria),
|
_vm.request_show_ladder += show_ladder;
|
||||||
connectable_builder.connect_all());
|
var security_criteria_src = _bus.subscribe(update_securities_cmd.tag);
|
||||||
_initialize();
|
var subs = new List<IDisposable> {
|
||||||
|
security_criteria_src.Subscribe(sc => _security_criteria = sc),
|
||||||
|
Disposable.Create(() => _vm.request_show_ladder -= show_ladder)
|
||||||
|
};
|
||||||
|
_model = new TimeAndSalesModel(_bus, _consumer, Observable.Create<SecurityCriteria>(o => {
|
||||||
|
o.OnNext(_security_criteria);
|
||||||
|
return security_criteria_src.Subscribe(o);
|
||||||
|
}));
|
||||||
|
subs.Add(_model.trades.OnDispatcher().Subscribe(_vm.on_new_trades));
|
||||||
|
_subscriptions = Disposable.Create(subs.ToArray());
|
||||||
|
if (_view == null)
|
||||||
|
_view = new TimeAndSalesView();
|
||||||
|
_view.DataContext = _vm;
|
||||||
|
// local methods
|
||||||
bool always_true<T>(T _) => true;
|
bool always_true<T>(T _) => true;
|
||||||
FillsSettings get_fills_startup_data(IReadOnlyList<SecurityImmutable> secs) =>
|
|
||||||
|
FillsSettings get_fills_startup_data(ImmutableHashSet<TimeAndSalesRowVM> rows) =>
|
||||||
new FillsSettings(new FillsFilterStates {
|
new FillsSettings(new FillsFilterStates {
|
||||||
security = secs.Count > 0 ? new SecurityCriteria(secs) : _state.security_criteria
|
security = rows.Count > 0 ? new SecurityCriteria(rows.Select(r => r.security)) : _security_criteria
|
||||||
});
|
});
|
||||||
void update_criteria(SecurityCriteria c) {
|
|
||||||
_state = _vm.value.create().with(c);
|
string get_is_paused_cmd_title() =>
|
||||||
_initialize();
|
$"{(_vm.is_paused ? "Resume" : "Pause")} Updates";
|
||||||
|
|
||||||
|
void show_ladder(TimeAndSalesRowVM row) {
|
||||||
|
if (row != null)
|
||||||
|
_bus.post(SparkTags.ShowLadderAutoLookupTag, ImmutableHashSet.Create(new[] { row.security_key }));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override void OnParentViewCreated(SparkWindowView parent_view) =>
|
||||||
|
_menu_display_vm.safe_bind_to_view(parent_view);
|
||||||
|
|
||||||
void _dispose_resources() {
|
void _dispose_resources() {
|
||||||
Disposable.dispose(ref _subscriptions);
|
Disposable.dispose(ref _subscriptions);
|
||||||
Disposable.dispose(ref _vm);
|
|
||||||
Disposable.dispose(ref _model);
|
|
||||||
if (_commands != null) {
|
if (_commands != null) {
|
||||||
_commands.OfType<IDisposable>().DisposeAll();
|
_commands.OfType<IDisposable>().DisposeAll();
|
||||||
_commands = null;
|
_commands = null;
|
||||||
}
|
}
|
||||||
|
Disposable.dispose(ref _model);
|
||||||
|
Disposable.dispose(ref _vm);
|
||||||
}
|
}
|
||||||
|
|
||||||
void _initialize() {
|
void _ensure_state(bool force_recreate = false) {
|
||||||
Disposable.dispose(ref _model);
|
if (_state == null || force_recreate) {
|
||||||
_model = new TimeAndSalesModel(_bus, _consumer, _state.security_criteria);
|
if (_vm == null) {
|
||||||
// the previous _vm.value is automatically disposed when _vm.value is set - no need to dispose it here
|
_state = TimeAndSalesSettings.Default(_security_criteria);
|
||||||
_vm.value = new TimeAndSalesVM(_bus, _settings_manager, _model, _state);
|
} else {
|
||||||
if (_view == null)
|
var (filters, sorting, grid) = _vm.create();
|
||||||
_view = new TimeAndSalesView();
|
_state = new TimeAndSalesSettings(_security_criteria, filters, grid, sorting.ToList()) {
|
||||||
_view.DataContext = _vm.value;
|
use_defaults = _settings_manager.instance_settings == null
|
||||||
|
};
|
||||||
|
}
|
||||||
|
// should be safe to assume _menu_display_vm and _vm will either both be null, or both be non null,
|
||||||
|
// but redundant null checks don't hurt, and just may prevent a crash.
|
||||||
|
if (_menu_display_vm != null)
|
||||||
|
_state.menu_display = _menu_display_vm.safe_create();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,33 +1,32 @@
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.spark;
|
using bts.spark;
|
||||||
|
using bts.shell.time_and_sales;
|
||||||
using mbts;
|
using mbts;
|
||||||
using mbts.co2;
|
using mbts.co2;
|
||||||
using mbts.persist;
|
using mbts.persist;
|
||||||
using mbts.spark;
|
using mbts.spark;
|
||||||
using mbts.spark.filters;
|
|
||||||
using mbts.ui;
|
using mbts.ui;
|
||||||
using mbts.ui.settings;
|
using mbts.ui.settings;
|
||||||
using ProtoBuf;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using static mbts.ui.controls.DIYGrid;
|
using Columns = bts.shell.time_and_sales.TimeAndSalesView.Columns;
|
||||||
using static mbts.ui.spark.TimeAndSalesView;
|
using mbts.config;
|
||||||
|
|
||||||
namespace bts.shell {
|
namespace bts.shell {
|
||||||
class TimeAndSalesWindowFactory : ShellWindowFactory<TimeAndSalesWindowFactory.StartupData> {
|
class TimeAndSalesWindowFactory : ShellWindowFactory<TimeAndSalesSettings> {
|
||||||
readonly IBus _bus;
|
readonly IBus _bus;
|
||||||
readonly MDConsumer _consumer;
|
readonly MDConsumer _consumer;
|
||||||
readonly UserSettingsHub _settings_hub;
|
readonly UserSettingsHub _settings_hub;
|
||||||
|
readonly TimeAndSalesConfig _time_and_sales_conf;
|
||||||
IReadOnlyDictionary<uint, SecurityMD> _securities = new Dictionary<uint, SecurityMD>();
|
IReadOnlyDictionary<uint, SecurityMD> _securities = new Dictionary<uint, SecurityMD>();
|
||||||
|
|
||||||
public TimeAndSalesWindowFactory(IShellModule module, IBus bus, MDConsumer consumer, UserSettingsHub settings_hub) : base(module, "TimeAndSales") {
|
public TimeAndSalesWindowFactory(IShellModule module, IBus bus, MDConsumer consumer, UserSettingsHub settings_hub) : base(module, "TimeAndSales") {
|
||||||
_bus = bus;
|
_bus = bus;
|
||||||
_consumer = consumer;
|
_consumer = consumer;
|
||||||
_settings_hub = settings_hub;
|
_settings_hub = settings_hub;
|
||||||
|
_time_and_sales_conf = new TimeAndSalesConfig(Configuration.get<bts.config.TimeAndSalesOptions>());
|
||||||
_dispose = Disposable.Create(
|
_dispose = Disposable.Create(
|
||||||
bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s),
|
bus.subscribe(SparkTags.SecuritiesTag).Subscribe(s => _securities = s),
|
||||||
bus.subscribe(SparkTags.ShowTimeAndSalesTag).OnDispatcher().Subscribe(show)
|
bus.subscribe(SparkTags.ShowTimeAndSalesTag).OnDispatcher().Subscribe(show)
|
||||||
@@ -36,91 +35,21 @@ namespace bts.shell {
|
|||||||
|
|
||||||
public static string col_id(Columns col) => col.ToString();
|
public static string col_id(Columns col) => col.ToString();
|
||||||
|
|
||||||
public override Task<IShellWindow> load(StartupData state) =>
|
public override Task<IShellWindow> load(TimeAndSalesSettings state) =>
|
||||||
Task.FromResult<IShellWindow>(new TimeAndSalesWindow(this, _bus, _consumer, state, SparkCommands.PickTimeAndSales.icon,
|
Task.FromResult<IShellWindow>(new TimeAndSalesWindow(this, _bus, _consumer, state, SparkCommands.PickTimeAndSales.icon,
|
||||||
new WindowSettingsManager<GridSettings>(_settings_hub, state.grid, s => s.time_and_sales_grid, (s, g) => s.with(time_and_sales:g))));
|
new WindowSettingsManager<GridSettings>(_settings_hub, state.grid, s => s.time_and_sales_grid, (s, g) => s.with(time_and_sales:g)),
|
||||||
|
_time_and_sales_conf.can_pause_updates));
|
||||||
|
|
||||||
public async void show(SecurityCriteria criteria) {
|
public async void show(SecurityCriteria criteria) {
|
||||||
var w = await load(new StartupData(criteria));
|
var w = await load(new TimeAndSalesSettings(criteria));
|
||||||
_bus.post(SparkTags.ShowWindow, w);
|
_bus.post(SparkTags.ShowWindow, w);
|
||||||
}
|
}
|
||||||
|
|
||||||
[ProtoContract]
|
readonly struct TimeAndSalesConfig {
|
||||||
public class StartupData {
|
public readonly bool can_pause_updates;
|
||||||
[ProtoMember(1)]
|
|
||||||
public readonly SecurityCriteria security_criteria;
|
|
||||||
[ProtoMember(2)]
|
|
||||||
List<SortingCriteria> _sorting_criterion;
|
|
||||||
[ProtoMember(3)]
|
|
||||||
public FilterStates filters;
|
|
||||||
[ProtoMember(4)]
|
|
||||||
public GridSettings grid;
|
|
||||||
|
|
||||||
public StartupData() { }
|
public TimeAndSalesConfig(bts.config.TimeAndSalesOptions options) =>
|
||||||
|
can_pause_updates = options.can_pause_updates;
|
||||||
public StartupData(SecurityCriteria security_criteria) :
|
|
||||||
this(security_criteria, new FilterStates(), null, null) { }
|
|
||||||
|
|
||||||
public StartupData(SecurityCriteria security_criteria, FilterStates filters, GridSettings grid = default, List<SortingCriteria> sorting_criterion = null) {
|
|
||||||
this.security_criteria = security_criteria;
|
|
||||||
this.filters = filters;
|
|
||||||
this.grid = grid;
|
|
||||||
_sorting_criterion = sorting_criterion;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion);
|
|
||||||
|
|
||||||
public List<SortingCriteria> sorting_criterion => _sorting_criterion ?? (_sorting_criterion = DefaultColumns.default_sorting_criterion.ToList());
|
|
||||||
|
|
||||||
public static StartupData Default(SecurityCriteria security_criteria) =>
|
|
||||||
new StartupData(security_criteria, new FilterStates(), null, DefaultColumns.default_sorting_criterion.ToList());
|
|
||||||
|
|
||||||
public StartupData with(SecurityCriteria security_criteria) =>
|
|
||||||
new StartupData(security_criteria, filters, grid);
|
|
||||||
|
|
||||||
public static class DefaultColumns {
|
|
||||||
public static GridColumnSettings security => new GridColumnSettings(col_id(Columns.Security), DefaultColumnHeaders.Security, width: DefaultColumnWidths.Security);
|
|
||||||
public static GridColumnSettings time => new GridColumnSettings(col_id(Columns.Time), DefaultColumnHeaders.Time, width: DefaultColumnWidths.Time);
|
|
||||||
public static GridColumnSettings price => new GridColumnSettings(col_id(Columns.Price), DefaultColumnHeaders.Price, width: DefaultColumnWidths.Price, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
|
|
||||||
public static GridColumnSettings size => new GridColumnSettings(col_id(Columns.Size), DefaultColumnHeaders.Size, width: DefaultColumnWidths.Size, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
|
|
||||||
public static GridColumnSettings aggressor => new GridColumnSettings(col_id(Columns.Aggressor), DefaultColumnHeaders.Aggressor, width: DefaultColumnWidths.Aggressor);
|
|
||||||
public static GridColumnSettings security_key => new GridColumnSettings(col_id(Columns.SecurityKey), DefaultColumnHeaders.SecurityKey, is_visible:false, width: DefaultColumnWidths.SecurityKey);
|
|
||||||
|
|
||||||
public static IEnumerable<SortingCriteria> default_sorting_criterion {
|
|
||||||
get {
|
|
||||||
yield return new SortingCriteria(time.id, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static IEnumerable<GridColumnSettings> all {
|
|
||||||
get {
|
|
||||||
yield return security;
|
|
||||||
yield return time;
|
|
||||||
yield return price;
|
|
||||||
yield return size;
|
|
||||||
yield return aggressor;
|
|
||||||
yield return security_key;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[ProtoContract]
|
|
||||||
public class FilterStates {
|
|
||||||
[ProtoMember(1)]
|
|
||||||
public TimeFilterTuple time;
|
|
||||||
[ProtoMember(2)]
|
|
||||||
public string security;
|
|
||||||
[ProtoMember(3)]
|
|
||||||
public DoubleMinMaxState price;
|
|
||||||
[ProtoMember(4)]
|
|
||||||
public UIntMinMaxState size;
|
|
||||||
// [ProtoMember(5)]
|
|
||||||
// ProtoMember 5 cannot be used further
|
|
||||||
[ProtoMember(6)]
|
|
||||||
public string security_key;
|
|
||||||
[ProtoMember(7)]
|
|
||||||
public co2.AggressorSide[] aggressor_sides;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -549,24 +549,48 @@
|
|||||||
</u:BindingUpdateGroupCollection>
|
</u:BindingUpdateGroupCollection>
|
||||||
</u:Behavior.BindingUpdateGroups>
|
</u:Behavior.BindingUpdateGroups>
|
||||||
</TextBox>
|
</TextBox>
|
||||||
<TextBlock
|
<StackPanel
|
||||||
x:Name="PART_TickFactors_Label"
|
x:Name="PART_TickFactors_Label"
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
VerticalAlignment="Center"
|
|
||||||
Margin="{StaticResource Margin.LHeaderPanelItem}"
|
|
||||||
Text="Ticks"
|
|
||||||
IsEnabled="True"
|
IsEnabled="True"
|
||||||
|
Orientation="Horizontal"
|
||||||
Visibility="{Binding LegTuples.Count, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IntNotZeroVisibilityConverter}}"
|
Visibility="{Binding LegTuples.Count, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IntNotZeroVisibilityConverter}}"
|
||||||
/>
|
>
|
||||||
<c:TickFactorsPicker
|
<TextBlock
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Margin="{StaticResource Margin.LHeaderPanelItem}"
|
||||||
|
Text="Ticks ("
|
||||||
|
/>
|
||||||
|
<CheckBox
|
||||||
|
Margin="1,0,0,0"
|
||||||
|
IsChecked="{Binding UseFractionalTicks, RelativeSource={RelativeSource TemplatedParent}}"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
VerticalContentAlignment="Center"
|
||||||
|
Padding="0"
|
||||||
|
>
|
||||||
|
fractional
|
||||||
|
</CheckBox>
|
||||||
|
<TextBlock VerticalAlignment="Center" Margin="1,0,0,0">)</TextBlock>
|
||||||
|
</StackPanel>
|
||||||
|
<Grid
|
||||||
x:Name="PART_TickFactors_Picker"
|
x:Name="PART_TickFactors_Picker"
|
||||||
Grid.Column="3"
|
Grid.Column="3"
|
||||||
Margin="{StaticResource Margin.LHeaderPanelItem}"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
IsEnabled="True"
|
IsEnabled="True"
|
||||||
SelectedTickFactors="{Binding TickFactors, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
|
Margin="{StaticResource Margin.LHeaderPanelItem}"
|
||||||
Visibility="{Binding LegTuples.Count, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IntNotZeroVisibilityConverter}}"
|
Visibility="{Binding LegTuples.Count, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IntNotZeroVisibilityConverter}}"
|
||||||
/>
|
>
|
||||||
|
<c:TickFactorsPicker
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
SelectedTickFactors="{Binding TickFactors, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
|
||||||
|
Visibility="{Binding UseFractionalTicks, RelativeSource={RelativeSource TemplatedParent}, Converter={x:Static cv:BooleanToVisibilityConverter.HiddenInstance}}"
|
||||||
|
/>
|
||||||
|
<c:TickUpDownInt
|
||||||
|
HorizontalAlignment="Stretch"
|
||||||
|
Minimum="1"
|
||||||
|
Value="{Binding IntegerTickSize, RelativeSource={RelativeSource TemplatedParent}}"
|
||||||
|
Visibility="{Binding UseFractionalTicks, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource FalseVisibilityConverter}}"
|
||||||
|
/>
|
||||||
|
</Grid>
|
||||||
<TextBlock
|
<TextBlock
|
||||||
x:Name="PART_Pricing_Label"
|
x:Name="PART_Pricing_Label"
|
||||||
Grid.Column="4"
|
Grid.Column="4"
|
||||||
|
|||||||
@@ -52,6 +52,26 @@ namespace mbts.ui.spark {
|
|||||||
public TickFactors TickFactors { get => GetValue(TickFactorsProperty) as TickFactors; set => SetValue(TickFactorsProperty, value); }
|
public TickFactors TickFactors { get => GetValue(TickFactorsProperty) as TickFactors; set => SetValue(TickFactorsProperty, value); }
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
#region UseFractionalTicks
|
||||||
|
public static readonly DependencyProperty UseFractionalTicksProperty = WPFHelper.create_dp<bool, ExecutionStrategyEditor>(
|
||||||
|
nameof(UseFractionalTicks), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, true);
|
||||||
|
|
||||||
|
public bool UseFractionalTicks {
|
||||||
|
get => (bool)GetValue(UseFractionalTicksProperty);
|
||||||
|
set => SetValue(UseFractionalTicksProperty, value);
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
#region IntegerTickSize
|
||||||
|
public static readonly DependencyProperty IntegerTickSizeProperty = WPFHelper.create_dp<int, ExecutionStrategyEditor>(
|
||||||
|
nameof(IntegerTickSize), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, 1);
|
||||||
|
|
||||||
|
public int IntegerTickSize {
|
||||||
|
get => (int)GetValue(IntegerTickSizeProperty);
|
||||||
|
set => SetValue(IntegerTickSizeProperty, value);
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
|
||||||
#region IsNew
|
#region IsNew
|
||||||
public static readonly DependencyProperty IsNewProperty =
|
public static readonly DependencyProperty IsNewProperty =
|
||||||
DependencyProperty.Register(
|
DependencyProperty.Register(
|
||||||
|
|||||||
@@ -36,6 +36,8 @@
|
|||||||
ContractPickerModel="{Binding contract_picker_model}"
|
ContractPickerModel="{Binding contract_picker_model}"
|
||||||
HedgePricing="{Binding hedge_pricing}"
|
HedgePricing="{Binding hedge_pricing}"
|
||||||
HedgePricingItemsSource="{Binding hedge_pricing_options}"
|
HedgePricingItemsSource="{Binding hedge_pricing_options}"
|
||||||
|
UseFractionalTicks="{Binding use_fractional_ticks}"
|
||||||
|
IntegerTickSize="{Binding integer_tick_size}"
|
||||||
/>
|
/>
|
||||||
<c:DialogSkirtOKCancel Grid.Row="1" OKCommand="{Binding commit}" CloseOnOK="False"/>
|
<c:DialogSkirtOKCancel Grid.Row="1" OKCommand="{Binding commit}" CloseOnOK="False"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
|
|||||||
@@ -20,5 +20,5 @@ namespace mbts.ui.spark {
|
|||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
}
|
}
|
||||||
|
|
||||||
class SyntheticManagementRowView : DIYGrid.HighPerformanceRow<SyntheticManagementDialogVM.Row, SyntheticManagementView.Columns> { }
|
class SyntheticManagementRowView : DIYGrid.HighPerformanceRow<SyntheticManagementDialogVM.Row> { }
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@ using bts.api;
|
|||||||
using bts.shell;
|
using bts.shell;
|
||||||
using bts.shell.spreader;
|
using bts.shell.spreader;
|
||||||
using bts.spark;
|
using bts.spark;
|
||||||
|
using bts.view;
|
||||||
using mbts.persist;
|
using mbts.persist;
|
||||||
using mbts.ui;
|
using mbts.ui;
|
||||||
using mbts.ui.settings;
|
using mbts.ui.settings;
|
||||||
@@ -27,6 +28,7 @@ namespace mbts.spark {
|
|||||||
StartupData _state;
|
StartupData _state;
|
||||||
OrdersModel _orders_model;
|
OrdersModel _orders_model;
|
||||||
SyntheticManagementView _view;
|
SyntheticManagementView _view;
|
||||||
|
SparkMenuDisplayVM _menu_display_vm;
|
||||||
IDisposable _subscriptions;
|
IDisposable _subscriptions;
|
||||||
IReadOnlyList<SparkCommand> _commands;
|
IReadOnlyList<SparkCommand> _commands;
|
||||||
readonly IWindowSettingsManager<GridSettings> _settings_manager;
|
readonly IWindowSettingsManager<GridSettings> _settings_manager;
|
||||||
@@ -43,7 +45,7 @@ namespace mbts.spark {
|
|||||||
public override string window_type => _window_type;
|
public override string window_type => _window_type;
|
||||||
public override UIElement Content => _view;
|
public override UIElement Content => _view;
|
||||||
public override IEnumerable<SparkCommand> Commands => _commands;
|
public override IEnumerable<SparkCommand> Commands => _commands;
|
||||||
public override StartupData SaveState => _state = _vm.value.create();
|
public override StartupData SaveState => _state = _vm.value.create().with(menu_display: _menu_display_vm.safe_create());
|
||||||
public override double MinWidth =>
|
public override double MinWidth =>
|
||||||
StartupData.DefaultGridSettings.columns.Sum(gcs => gcs.width)
|
StartupData.DefaultGridSettings.columns.Sum(gcs => gcs.width)
|
||||||
+ SPARK_MENU_COLLAPSED_WIDTH
|
+ SPARK_MENU_COLLAPSED_WIDTH
|
||||||
@@ -53,6 +55,8 @@ namespace mbts.spark {
|
|||||||
|
|
||||||
public void thread_init() {
|
public void thread_init() {
|
||||||
Log.notnull(_state);
|
Log.notnull(_state);
|
||||||
|
_menu_display_vm = new SparkMenuDisplayVM();
|
||||||
|
_menu_display_vm.load_from(_state.menu_display);
|
||||||
|
|
||||||
var vm_connectable_builder = new ConnectableSeriesBuilder<SyntheticManagementDialogVM>(_vm.observable);
|
var vm_connectable_builder = new ConnectableSeriesBuilder<SyntheticManagementDialogVM>(_vm.observable);
|
||||||
var current_row_source = vm_connectable_builder.create(vm => vm.current_row_observable);
|
var current_row_source = vm_connectable_builder.create(vm => vm.current_row_observable);
|
||||||
@@ -97,7 +101,8 @@ namespace mbts.spark {
|
|||||||
new SparkCommandCommand(
|
new SparkCommandCommand(
|
||||||
"Import Synthetics...", Icons.Import, FileDialogCommand.open_file(import, extensions: SyntheticSecurityParser.file_extension)) {
|
"Import Synthetics...", Icons.Import, FileDialogCommand.open_file(import, extensions: SyntheticSecurityParser.file_extension)) {
|
||||||
show_in_toolbar = false
|
show_in_toolbar = false
|
||||||
}
|
},
|
||||||
|
_menu_display_vm.spark_cmd
|
||||||
};
|
};
|
||||||
|
|
||||||
_subscriptions = Disposable.Create(
|
_subscriptions = Disposable.Create(
|
||||||
@@ -129,6 +134,9 @@ namespace mbts.spark {
|
|||||||
Commands.OfType<IDisposable>().DisposeAll();
|
Commands.OfType<IDisposable>().DisposeAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override void OnParentViewCreated(SparkWindowView parent_view) =>
|
||||||
|
_menu_display_vm.safe_bind_to_view(parent_view);
|
||||||
|
|
||||||
struct RowModificationParams {
|
struct RowModificationParams {
|
||||||
public readonly SecurityImmutable security;
|
public readonly SecurityImmutable security;
|
||||||
public readonly bool has_working_orders;
|
public readonly bool has_working_orders;
|
||||||
|
|||||||
@@ -48,14 +48,28 @@ namespace bts.shell {
|
|||||||
public readonly FilterStates filters;
|
public readonly FilterStates filters;
|
||||||
[ProtoMember(3)]
|
[ProtoMember(3)]
|
||||||
public readonly GridSettings grid;
|
public readonly GridSettings grid;
|
||||||
|
[ProtoMember(4)]
|
||||||
|
public readonly SparkMenuDisplaySettings menu_display;
|
||||||
|
|
||||||
public StartupData() : this(new List<SortingCriteria>(), null, null) { }
|
public StartupData() : this(new List<SortingCriteria>(), null, null) { }
|
||||||
public StartupData(List<SortingCriteria> sorting_criteria, FilterStates filters, GridSettings grid = default) {
|
|
||||||
|
public StartupData(List<SortingCriteria> sorting_criteria, FilterStates filters, GridSettings grid = default)
|
||||||
|
: this(sorting_criteria, filters, grid, SparkMenuDisplaySettings.Default) { }
|
||||||
|
|
||||||
|
public StartupData(List<SortingCriteria> sorting_criteria, FilterStates filters, GridSettings grid, SparkMenuDisplaySettings menu_display) {
|
||||||
this.sorting_criteria = sorting_criteria;
|
this.sorting_criteria = sorting_criteria;
|
||||||
this.filters = filters;
|
this.filters = filters;
|
||||||
this.grid = grid;
|
this.grid = grid;
|
||||||
|
this.menu_display = menu_display;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public StartupData with(List<SortingCriteria> sorting_criteria = null, FilterStates filters = null, GridSettings grid = null, SparkMenuDisplaySettings? menu_display = null) =>
|
||||||
|
new StartupData(
|
||||||
|
sorting_criteria ?? this.sorting_criteria,
|
||||||
|
filters ?? this.filters,
|
||||||
|
grid ?? this.grid,
|
||||||
|
menu_display ?? this.menu_display);
|
||||||
|
|
||||||
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion);
|
public static GridSettings DefaultGridSettings => GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criterion);
|
||||||
|
|
||||||
static class DefaultColumns {
|
static class DefaultColumns {
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
using bts.collections;
|
using bts.collections;
|
||||||
using bts.shell;
|
using bts.shell;
|
||||||
using bts.spark;
|
using bts.spark;
|
||||||
using bts.utils;
|
|
||||||
using mbts.ui;
|
using mbts.ui;
|
||||||
using mbts.ui.shell;
|
using mbts.ui.shell;
|
||||||
using mbts.ui.spark;
|
using mbts.ui.spark;
|
||||||
@@ -30,8 +29,16 @@ namespace mbts.spark {
|
|||||||
readonly Property<bool> _has_working_orders, _can_add_leg;
|
readonly Property<bool> _has_working_orders, _can_add_leg;
|
||||||
|
|
||||||
Security _synthetic;
|
Security _synthetic;
|
||||||
bool _set_name_automatically, _set_ticks_automatically, _set_quantities_automatically, _set_price_mults_automatically, _is_setting_quantities, _is_setting_price_mults;
|
bool
|
||||||
|
_set_name_automatically,
|
||||||
|
_set_ticks_automatically,
|
||||||
|
_set_quantities_automatically,
|
||||||
|
_set_price_mults_automatically,
|
||||||
|
_is_setting_quantities,
|
||||||
|
_is_setting_price_mults,
|
||||||
|
_use_fractional_ticks = true;
|
||||||
TickFactors _tick_factors;
|
TickFactors _tick_factors;
|
||||||
|
int _integer_tick_size = 1;
|
||||||
ExecutionStrategyImmutable _strategy;
|
ExecutionStrategyImmutable _strategy;
|
||||||
HedgePricing _hedge_pricing;
|
HedgePricing _hedge_pricing;
|
||||||
|
|
||||||
@@ -44,6 +51,10 @@ namespace mbts.spark {
|
|||||||
: this(synthetic, strategy, false) {
|
: this(synthetic, strategy, false) {
|
||||||
ExceptionAssert.InvalidOperation.That(synthetic.Id != 0, "This constructor may only be used for already-existing synthetic securities (id must be non-zero).");
|
ExceptionAssert.InvalidOperation.That(synthetic.Id != 0, "This constructor may only be used for already-existing synthetic securities (id must be non-zero).");
|
||||||
_tick_factors = TickUtils.get_regional_ticks(synthetic.ContractSpec).low_tick;
|
_tick_factors = TickUtils.get_regional_ticks(synthetic.ContractSpec).low_tick;
|
||||||
|
if (TickUtils.is_integer_tick(synthetic.ContractSpec)) {
|
||||||
|
_use_fractional_ticks = false;
|
||||||
|
_integer_tick_size = DoubleHelper.to_optional_int32(synthetic.ContractSpec.LowTick) ?? 0;
|
||||||
|
}
|
||||||
title = $"Edit '{synthetic.Synthetic.Name}'";
|
title = $"Edit '{synthetic.Synthetic.Name}'";
|
||||||
icon = Icons.ModifySynthetic;
|
icon = Icons.ModifySynthetic;
|
||||||
_has_working_orders = backing(nameof(has_working_orders), security_has_working_orders.OnDispatcher());
|
_has_working_orders = backing(nameof(has_working_orders), security_has_working_orders.OnDispatcher());
|
||||||
@@ -131,14 +142,14 @@ namespace mbts.spark {
|
|||||||
flash_error_msg("Name already taken", SparkUtils.UI.MessageFlashDuration, nameof(name)).ignore();
|
flash_error_msg("Name already taken", SparkUtils.UI.MessageFlashDuration, nameof(name)).ignore();
|
||||||
valid = false;
|
valid = false;
|
||||||
}
|
}
|
||||||
if (_tick_factors == null || !_tick_factors.is_valid()) {
|
if (use_fractional_ticks ? (_tick_factors == null || !_tick_factors.is_valid()) : integer_tick_size == 0) {
|
||||||
flash_error_msg("Please select ticks", SparkUtils.UI.MessageFlashDuration, nameof(tick_factors)).ignore();
|
flash_error_msg("Please select ticks", SparkUtils.UI.MessageFlashDuration, use_fractional_ticks ? nameof(tick_factors) : nameof(integer_tick_size)).ignore();
|
||||||
valid = false;
|
valid = false;
|
||||||
}
|
}
|
||||||
if (valid) {
|
if (valid) {
|
||||||
_synthetic.Synthetic.Legs.SetItems(leg_tuples.Select(l => l.leg));
|
_synthetic.Synthetic.Legs.SetItems(leg_tuples.Select(l => l.leg));
|
||||||
_synthetic.Symbol = _deduce_symbol(_synthetic);
|
_synthetic.Symbol = _deduce_symbol(_synthetic);
|
||||||
_synthetic.ContractSpec = _tick_factors.to_spec();
|
_synthetic.ContractSpec = use_fractional_ticks ? _tick_factors.to_spec() : TickUtils.create_integer_tick_spec(integer_tick_size);
|
||||||
uint? id = await model.create_synthetic(new SecurityImmutable(_synthetic));
|
uint? id = await model.create_synthetic(new SecurityImmutable(_synthetic));
|
||||||
if (id.HasValue && id != 0) {
|
if (id.HasValue && id != 0) {
|
||||||
if (await model.save_strategy(id.Value, get_strategy())) {
|
if (await model.save_strategy(id.Value, get_strategy())) {
|
||||||
@@ -295,6 +306,20 @@ namespace mbts.spark {
|
|||||||
public bool has_working_orders => _has_working_orders.Value;
|
public bool has_working_orders => _has_working_orders.Value;
|
||||||
public bool is_new { get; }
|
public bool is_new { get; }
|
||||||
public bool is_new_leg_popup_open { get; set; }
|
public bool is_new_leg_popup_open { get; set; }
|
||||||
|
public bool use_fractional_ticks {
|
||||||
|
get => _use_fractional_ticks;
|
||||||
|
set {
|
||||||
|
if (Set(ref _use_fractional_ticks, value))
|
||||||
|
_set_ticks_automatically = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public int integer_tick_size {
|
||||||
|
get => _integer_tick_size;
|
||||||
|
set {
|
||||||
|
if (Set(ref _integer_tick_size, value))
|
||||||
|
_set_ticks_automatically = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
public bool can_add_leg => _can_add_leg.Value;
|
public bool can_add_leg => _can_add_leg.Value;
|
||||||
public SyntheticContract.Types.PriceCalc price_calc { get => _synthetic.Synthetic.PriceCalc; set => _synthetic.Synthetic.PriceCalc = value; }
|
public SyntheticContract.Types.PriceCalc price_calc { get => _synthetic.Synthetic.PriceCalc; set => _synthetic.Synthetic.PriceCalc = value; }
|
||||||
public ObservableCollection<LegSpreaderParamsTuple> leg_tuples { get; } = new ObservableCollection<LegSpreaderParamsTuple>();
|
public ObservableCollection<LegSpreaderParamsTuple> leg_tuples { get; } = new ObservableCollection<LegSpreaderParamsTuple>();
|
||||||
@@ -323,6 +348,16 @@ namespace mbts.spark {
|
|||||||
_strategy = strategy;
|
_strategy = strategy;
|
||||||
hedge_pricing = strategy.HedgePricing;
|
hedge_pricing = strategy.HedgePricing;
|
||||||
leg_tuples.SetItems(_get_legs(_synthetic, strategy));
|
leg_tuples.SetItems(_get_legs(_synthetic, strategy));
|
||||||
|
if (synthetic.HasContractSpec) {
|
||||||
|
/// assign the fields <see cref="_use_fractional_ticks"/> and <see cref="_integer_tick_size"/>,
|
||||||
|
/// rather than the properties <see cref="use_fractional_ticks"/> and <see cref="integer_tick_size"/>
|
||||||
|
/// because the setters of the former flip <see cref="_set_ticks_automatically"/> to false if the value changes.
|
||||||
|
/// This behavior causes the ticks to be automatically deduced as legs are added/removed,
|
||||||
|
/// until the user explicitly enters a different value (as the properties are bound to tick input controls in the view).
|
||||||
|
Set(ref _use_fractional_ticks, !TickUtils.is_integer_tick(synthetic.ContractSpec), nameof(use_fractional_ticks));
|
||||||
|
if (!use_fractional_ticks)
|
||||||
|
Set(ref _integer_tick_size, DoubleHelper.to_optional_int32(synthetic.ContractSpec.LowTick) ?? 0, nameof(integer_tick_size));
|
||||||
|
}
|
||||||
RaisePropertyChanged(nameof(name), nameof(tick_factors));
|
RaisePropertyChanged(nameof(name), nameof(tick_factors));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
<sys:Double x:Key="VerticalPush2">8</sys:Double>
|
<sys:Double x:Key="VerticalPush2">8</sys:Double>
|
||||||
<sys:Double x:Key="VerticalPush3">12</sys:Double>
|
<sys:Double x:Key="VerticalPush3">12</sys:Double>
|
||||||
<Thickness x:Key="Margin.LP1" Left="{StaticResource HorizontalPush1}"/>
|
<Thickness x:Key="Margin.LP1" Left="{StaticResource HorizontalPush1}"/>
|
||||||
|
<Thickness x:Key="Margin.LP1_RP1" Left="{StaticResource HorizontalPush1}" Right="{StaticResource HorizontalPush1}"/>
|
||||||
<Thickness x:Key="Margin.LP2" Left="{StaticResource HorizontalPush2}"/>
|
<Thickness x:Key="Margin.LP2" Left="{StaticResource HorizontalPush2}"/>
|
||||||
<Thickness x:Key="Margin.LP3" Left="{StaticResource HorizontalPush3}"/>
|
<Thickness x:Key="Margin.LP3" Left="{StaticResource HorizontalPush3}"/>
|
||||||
<Thickness x:Key="Margin.TP1" Top="{StaticResource VerticalPush1}"/>
|
<Thickness x:Key="Margin.TP1" Top="{StaticResource VerticalPush1}"/>
|
||||||
@@ -130,22 +131,6 @@
|
|||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</UserControl.Resources>
|
</UserControl.Resources>
|
||||||
<VisualStateManager.VisualStateGroups>
|
<VisualStateManager.VisualStateGroups>
|
||||||
<VisualStateGroup Name="{x:Static GroupName, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.EditPane}}">
|
|
||||||
<VisualState Name="{x:Static u:VisualStates.Active}">
|
|
||||||
<Storyboard>
|
|
||||||
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="edit_pane" Storyboard.TargetProperty="(UIElement.Visibility)">
|
|
||||||
<DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{x:Static Visibility.Visible}" />
|
|
||||||
</ObjectAnimationUsingKeyFrames>
|
|
||||||
</Storyboard>
|
|
||||||
</VisualState>
|
|
||||||
<VisualState Name="{x:Static u:VisualStates.Inactive}">
|
|
||||||
<Storyboard>
|
|
||||||
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="edit_pane" Storyboard.TargetProperty="(UIElement.Visibility)">
|
|
||||||
<DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{x:Static Visibility.Hidden}" />
|
|
||||||
</ObjectAnimationUsingKeyFrames>
|
|
||||||
</Storyboard>
|
|
||||||
</VisualState>
|
|
||||||
</VisualStateGroup>
|
|
||||||
</VisualStateManager.VisualStateGroups>
|
</VisualStateManager.VisualStateGroups>
|
||||||
<AdornerDecorator>
|
<AdornerDecorator>
|
||||||
<Grid>
|
<Grid>
|
||||||
@@ -153,13 +138,19 @@
|
|||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<ColumnDefinition Width="*"/>
|
<ColumnDefinition Width="*"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="*"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
<ListBox
|
<ListBox
|
||||||
x:Name="_tree_view"
|
x:Name="_tree_view"
|
||||||
|
Grid.RowSpan="2"
|
||||||
ItemsSource="{Binding definitions_view}"
|
ItemsSource="{Binding definitions_view}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
VerticalAlignment="Stretch"
|
VerticalAlignment="Stretch"
|
||||||
MinWidth="180"
|
MinWidth="180"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
|
BorderThickness="0,0,1,0"
|
||||||
SelectedItem="{Binding selected_definition}"
|
SelectedItem="{Binding selected_definition}"
|
||||||
>
|
>
|
||||||
<ListBox.ItemTemplate>
|
<ListBox.ItemTemplate>
|
||||||
@@ -173,275 +164,176 @@
|
|||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ListBox.ItemTemplate>
|
</ListBox.ItemTemplate>
|
||||||
</ListBox>
|
</ListBox>
|
||||||
<ScrollViewer Grid.Column="1" Grid.IsSharedSizeScope="True" Margin="8,4">
|
<Grid x:Name="edit_pane" Grid.Column="1">
|
||||||
<Grid x:Name="edit_pane">
|
<u:StateManager.VisualState>
|
||||||
<Grid.RowDefinitions>
|
<Binding Path="selected_definition">
|
||||||
<RowDefinition Height="Auto"/>
|
<Binding.Converter>
|
||||||
<RowDefinition Height="Auto"/>
|
<cv:ValueMap Default="{x:Static u:VisualStates.Active}">
|
||||||
<RowDefinition Height="*"/>
|
<cv:KeyValue Key="{x:Null}" Value="{x:Static u:VisualStates.Inactive}"/>
|
||||||
<RowDefinition Height="Auto"/>
|
</cv:ValueMap>
|
||||||
</Grid.RowDefinitions>
|
</Binding.Converter>
|
||||||
<Grid u:StateManager.VisualStateCollection="{Binding content_visual_states}" Margin="{StaticResource Margin.TP1}" >
|
</Binding>
|
||||||
<VisualStateManager.VisualStateGroups>
|
</u:StateManager.VisualState>
|
||||||
<!--Name-->
|
<VisualStateManager.VisualStateGroups>
|
||||||
<VisualStateGroup Name="{x:Static GroupName, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Name}}">
|
<VisualStateGroup>
|
||||||
<VisualState Name="{x:Static Active, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Name}}"/>
|
<VisualState Name="{x:Static u:VisualStates.Active}"/>
|
||||||
<VisualState Name="{x:Static Inactive, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Name}}">
|
<VisualState Name="{x:Static u:VisualStates.Inactive}">
|
||||||
<Storyboard>
|
<Storyboard>
|
||||||
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(UIElement.IsEnabled)">
|
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="custom_badge_color_picker_button" Storyboard.TargetProperty="(UIElement.IsEnabled)">
|
||||||
<DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
|
<DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
|
||||||
</BooleanAnimationUsingKeyFrames>
|
</BooleanAnimationUsingKeyFrames>
|
||||||
</Storyboard>
|
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(UIElement.IsEnabled)">
|
||||||
</VisualState>
|
<DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
|
||||||
<VisualState Name="{x:Static CannotRenameDefinition, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Name}}">
|
</BooleanAnimationUsingKeyFrames>
|
||||||
<Storyboard>
|
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_text_box" Storyboard.TargetProperty="(UIElement.IsEnabled)">
|
||||||
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(TextBox.ToolTip)">
|
<DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
|
||||||
<DiscreteObjectKeyFrame KeyTime="0" Value="Cannot rename definitions."/>
|
</BooleanAnimationUsingKeyFrames>
|
||||||
</ObjectAnimationUsingKeyFrames>
|
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="algo_editor_scroll_viewer" Storyboard.TargetProperty="(UIElement.IsEnabled)">
|
||||||
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(UIElement.IsEnabled)">
|
<DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
|
||||||
<DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
|
</BooleanAnimationUsingKeyFrames>
|
||||||
</BooleanAnimationUsingKeyFrames>
|
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="edit_pane" Storyboard.TargetProperty="(FrameworkElement.ToolTip).(UIElement.Visibility)">
|
||||||
</Storyboard>
|
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}"/>
|
||||||
</VisualState>
|
</ObjectAnimationUsingKeyFrames>
|
||||||
<VisualState Name="{x:Static CannotRenameDefinitionWhileTemplatesPresent, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Name}}">
|
</Storyboard>
|
||||||
<Storyboard>
|
</VisualState>
|
||||||
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(TextBox.ToolTip)">
|
</VisualStateGroup>
|
||||||
<DiscreteObjectKeyFrame KeyTime="0" Value="Cannot rename definition while templates present."/>
|
</VisualStateManager.VisualStateGroups>
|
||||||
</ObjectAnimationUsingKeyFrames>
|
<Grid.ToolTip>
|
||||||
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(UIElement.IsEnabled)">
|
<ToolTip Visibility="Collapsed">
|
||||||
<DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
|
<StackPanel Orientation="Vertical">
|
||||||
</BooleanAnimationUsingKeyFrames>
|
<TextBlock FontStyle="Italic">Select an existing algo to edit from the list to the left.</TextBlock>
|
||||||
</Storyboard>
|
<StackPanel Orientation="Horizontal">
|
||||||
</VisualState>
|
<TextBlock FontStyle="Italic">Or click the</TextBlock>
|
||||||
<VisualState Name="{x:Static CannotRenameTemplate, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Name}}">
|
<Image Source="{x:Static u:Icons.AddBoxes}" Height="20" Margin="2,0"/>
|
||||||
<Storyboard>
|
<TextBlock FontStyle="Italic"> button to create a new one.</TextBlock>
|
||||||
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(TextBox.ToolTip)">
|
</StackPanel>
|
||||||
<DiscreteObjectKeyFrame KeyTime="0" Value="Cannot rename templates."/>
|
</StackPanel>
|
||||||
</ObjectAnimationUsingKeyFrames>
|
</ToolTip>
|
||||||
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="name_text_box" Storyboard.TargetProperty="(UIElement.IsEnabled)">
|
</Grid.ToolTip>
|
||||||
<DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
|
<Grid.RowDefinitions>
|
||||||
</BooleanAnimationUsingKeyFrames>
|
<RowDefinition Height="27"/>
|
||||||
</Storyboard>
|
<RowDefinition Height="*"/>
|
||||||
</VisualState>
|
</Grid.RowDefinitions>
|
||||||
</VisualStateGroup>
|
<Grid.ColumnDefinitions>
|
||||||
<!--Abbreviation-->
|
<ColumnDefinition Width="Auto"/>
|
||||||
<VisualStateGroup Name="{x:Static GroupName, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Abbreviation}}">
|
<ColumnDefinition Width="*"/>
|
||||||
<VisualState Name="{x:Static Populated, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Abbreviation}}">
|
<ColumnDefinition Width="Auto"/>
|
||||||
<Storyboard>
|
</Grid.ColumnDefinitions>
|
||||||
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_active_tooltip" Storyboard.TargetProperty="(FrameworkElement.Visibility)">
|
<Rectangle Grid.ColumnSpan="3" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Fill="{x:Static u:BTSColors.dialog_skirt_brush}" UseLayoutRounding="True"/>
|
||||||
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}"/>
|
<Button
|
||||||
</ObjectAnimationUsingKeyFrames>
|
x:Name="custom_badge_color_picker_button"
|
||||||
</Storyboard>
|
Background="{Binding selected_definition.badge_fill}"
|
||||||
</VisualState>
|
Margin="{StaticResource Margin.LP1}"
|
||||||
<VisualState Name="{x:Static Unpopulated, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Abbreviation}}">
|
ToolTip="Change the icon color used for this algo."
|
||||||
<Storyboard>
|
IsEnabled="True"
|
||||||
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_active_tooltip" Storyboard.TargetProperty="(FrameworkElement.Visibility)">
|
Style="{StaticResource CustomBadgeColorPickerButtonStyle}"
|
||||||
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}"/>
|
/>
|
||||||
</ObjectAnimationUsingKeyFrames>
|
<Popup x:Name="custom_badge_color_picker_popup" StaysOpen="False" PlacementTarget="{Binding ElementName=custom_badge_color_picker_button}" Placement="Right">
|
||||||
<ColorAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_label" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
|
<Border Style="{StaticResource CustomBadgeColorPickerPopupRootStyle}">
|
||||||
<DiscreteColorKeyFrame KeyTime="0" Value="Gray"/>
|
<Grid>
|
||||||
</ColorAnimationUsingKeyFrames>
|
<Grid.RowDefinitions>
|
||||||
</Storyboard>
|
<RowDefinition Height="Auto"/>
|
||||||
</VisualState>
|
<RowDefinition Height="*"/>
|
||||||
<VisualState Name="{x:Static NotSupportedForTemplates, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.Abbreviation}}">
|
</Grid.RowDefinitions>
|
||||||
<Storyboard>
|
<CheckBox
|
||||||
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_root" Storyboard.TargetProperty="(ToolTipService.ShowOnDisabled)">
|
x:Name="default_badge_color_checkbox"
|
||||||
<DiscreteBooleanKeyFrame KeyTime="0" Value="True"/>
|
VerticalAlignment="Center"
|
||||||
</BooleanAnimationUsingKeyFrames>
|
VerticalContentAlignment="Center"
|
||||||
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_root" Storyboard.TargetProperty="(UIElement.IsEnabled)">
|
Margin="6,4,0,4"
|
||||||
<DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
|
IsChecked="{Binding selected_definition.custom_badge_color.enabled, Converter={StaticResource NotConverter}}"
|
||||||
</BooleanAnimationUsingKeyFrames>
|
>
|
||||||
<ColorAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_label" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
|
<CheckBox.ToolTip>
|
||||||
<DiscreteColorKeyFrame KeyTime="0" Value="Gray"/>
|
<TextBlock>
|
||||||
</ColorAnimationUsingKeyFrames>
|
<Run>Use the default icon color for this algo.</Run>
|
||||||
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="abbreviation_not_supported_for_templates_tooltip" Storyboard.TargetProperty="(FrameworkElement.Visibility)">
|
<LineBreak/>
|
||||||
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}"/>
|
<Run FontStyle="Italic">Hint: the default color is that of the algo-root.</Run>
|
||||||
</ObjectAnimationUsingKeyFrames>
|
|
||||||
</Storyboard>
|
|
||||||
</VisualState>
|
|
||||||
</VisualStateGroup>
|
|
||||||
<!--Badge Selector-->
|
|
||||||
<VisualStateGroup Name="{x:Static GroupName, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.BadgeSelector}}">
|
|
||||||
<VisualState Name="{x:Static Active, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.BadgeSelector}}">
|
|
||||||
<Storyboard>
|
|
||||||
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="default_badge" Storyboard.TargetProperty="(UIElement.Opacity)">
|
|
||||||
<DiscreteDoubleKeyFrame KeyTime="0" Value="0.5"/>
|
|
||||||
</DoubleAnimationUsingKeyFrames>
|
|
||||||
</Storyboard>
|
|
||||||
</VisualState>
|
|
||||||
<VisualState Name="{x:Static Inactive, MemberType={u:Nested usp:AlgoStudioView.VisualStateNames.BadgeSelector}}">
|
|
||||||
<Storyboard>
|
|
||||||
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="custom_badge_color_picker_button" Storyboard.TargetProperty="(UIElement.IsEnabled)">
|
|
||||||
<DiscreteBooleanKeyFrame KeyTime="0" Value="False"/>
|
|
||||||
</BooleanAnimationUsingKeyFrames>
|
|
||||||
<BooleanAnimationUsingKeyFrames Storyboard.TargetName="default_badge_radio_button" Storyboard.TargetProperty="(ToggleButton.IsChecked)">
|
|
||||||
<DiscreteBooleanKeyFrame KeyTime="0" Value="True"/>
|
|
||||||
</BooleanAnimationUsingKeyFrames>
|
|
||||||
</Storyboard>
|
|
||||||
</VisualState>
|
|
||||||
</VisualStateGroup>
|
|
||||||
</VisualStateManager.VisualStateGroups>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" SharedSizeGroup="param_name_col"/>
|
|
||||||
<ColumnDefinition Width="3*"/>
|
|
||||||
<ColumnDefinition Width="2*"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock VerticalAlignment="Center">Name:</TextBlock>
|
|
||||||
<TextBox
|
|
||||||
x:Name="name_text_box"
|
|
||||||
Grid.Column="1"
|
|
||||||
ToolTipService.ShowOnDisabled="True"
|
|
||||||
Margin="{StaticResource Margin.LP1}"
|
|
||||||
HorizontalAlignment="Stretch"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Text="{Binding selected_definition.name, UpdateSourceTrigger=PropertyChanged, Delay=25}"
|
|
||||||
/>
|
|
||||||
<Grid x:Name="abbreviation_root" Grid.Column="2">
|
|
||||||
<Grid.ToolTip>
|
|
||||||
<Grid>
|
|
||||||
<TextBlock x:Name="abbreviation_active_tooltip" Visibility="Collapsed">
|
|
||||||
<TextBlock.Inlines>
|
|
||||||
<Run>Specify an abbreviation for this algo to use in ladder algo 'favorite' buttons.</Run>
|
|
||||||
<LineBreak/>
|
|
||||||
<Run FontStyle="Italic">Hint: To add/remove algos from 'favorites', open the ladder settings dialog and select the 'Algo Favorites' tab.</Run>
|
|
||||||
</TextBlock.Inlines>
|
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
<TextBlock x:Name="abbreviation_not_supported_for_templates_tooltip" Visibility="Collapsed">
|
</CheckBox.ToolTip>
|
||||||
Not supported for templates.
|
<Grid x:Name="default_badge_content_root">
|
||||||
</TextBlock>
|
|
||||||
</Grid>
|
|
||||||
</Grid.ToolTip>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
<ColumnDefinition Width="*"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock x:Name="abbreviation_label" FontStyle="Italic" Margin="{StaticResource Margin.LP1}" VerticalAlignment="Center">Abbrev.</TextBlock>
|
|
||||||
<TextBox Grid.Column="1" Margin="{StaticResource Margin.LP1}" Text="{Binding selected_definition.abbreviation, UpdateSourceTrigger=PropertyChanged, Delay=25}"/>
|
|
||||||
</Grid>
|
|
||||||
</Grid>
|
|
||||||
<Grid x:Name="badge_selector_radio_button_root" Grid.Row="1" Margin="{StaticResource Margin.TP2}">
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" SharedSizeGroup="param_name_col"/>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
<ColumnDefinition Width="*"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock>Icon:</TextBlock>
|
|
||||||
<RadioButton
|
|
||||||
x:Name="default_badge_radio_button"
|
|
||||||
Grid.Column="1"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
VerticalContentAlignment="Center"
|
|
||||||
Margin="{StaticResource Margin.LP1}"
|
|
||||||
GroupName="Badge"
|
|
||||||
>
|
|
||||||
<RadioButton.ToolTip>
|
|
||||||
<ToolTip DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Self}}">
|
|
||||||
<StackPanel Orientation="Vertical">
|
|
||||||
<TextBlock>Use the default icon color for this algo.</TextBlock>
|
|
||||||
<StackPanel TextElement.FontStyle="Italic" Orientation="Horizontal">
|
|
||||||
<TextBlock>Hint: the default color is that of the algo-root (</TextBlock>
|
|
||||||
<usp:OrderTypeItem
|
|
||||||
Margin="2,0"
|
|
||||||
BadgeFill="{Binding selected_definition.algo_root.meta.Color, Converter={StaticResource ColorToBrushConverter}}"
|
|
||||||
DisplayName="{Binding selected_definition.algo_root.display_name}"
|
|
||||||
/>
|
|
||||||
<TextBlock>).</TextBlock>
|
|
||||||
</StackPanel>
|
|
||||||
</StackPanel>
|
|
||||||
</ToolTip>
|
|
||||||
</RadioButton.ToolTip>
|
|
||||||
<Grid x:Name="default_badge_content_root">
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
<ColumnDefinition Width="*"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<TextBlock>Default</TextBlock>
|
|
||||||
<Rectangle
|
|
||||||
x:Name="default_badge"
|
|
||||||
Grid.Column="1"
|
|
||||||
Margin="{StaticResource Margin.LP1}"
|
|
||||||
Fill="{Binding selected_definition.algo_root.meta.Color, Converter={StaticResource ColorToBrushConverter}}"
|
|
||||||
Style="{StaticResource RectangleBadgeStyle}"
|
|
||||||
/>
|
|
||||||
</Grid>
|
|
||||||
</RadioButton>
|
|
||||||
<RadioButton
|
|
||||||
Grid.Column="2"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
VerticalContentAlignment="Center"
|
|
||||||
Margin="{StaticResource Margin.LP2}"
|
|
||||||
IsChecked="{Binding selected_definition.custom_badge_color.enabled}"
|
|
||||||
GroupName="Badge"
|
|
||||||
>
|
|
||||||
<RadioButton.ToolTip>
|
|
||||||
<Grid>
|
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="Auto"/>
|
|
||||||
<RowDefinition Height="Auto"/>
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
<ColumnDefinition Width="Auto"/>
|
||||||
<ColumnDefinition Width="*"/>
|
<ColumnDefinition Width="*"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<TextBlock Grid.ColumnSpan="3">Specify a custom icon color for this algo.</TextBlock>
|
<TextBlock>Use Default Icon</TextBlock>
|
||||||
<TextBlock Grid.Row="1" FontStyle="Italic">Hint: Click</TextBlock>
|
|
||||||
<Rectangle
|
<Rectangle
|
||||||
Grid.Row="1"
|
x:Name="default_badge"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
Margin="3,0"
|
Margin="{StaticResource Margin.LP1}"
|
||||||
Fill="{Binding selected_definition.custom_badge_color.value, Converter={StaticResource ColorToBrushConverter}}"
|
Fill="{Binding selected_definition.algo_root.meta.Color, Converter={StaticResource ColorToBrushConverter}}"
|
||||||
Style="{StaticResource RectangleBadgeStyle}"
|
Style="{StaticResource RectangleBadgeStyle}"
|
||||||
/>
|
/>
|
||||||
<TextBlock Grid.Row="1" Grid.Column="2" FontStyle="Italic">to open the color picker popup.</TextBlock>
|
|
||||||
</Grid>
|
</Grid>
|
||||||
</RadioButton.ToolTip>
|
</CheckBox>
|
||||||
<Grid>
|
<cp:ColorPickerControl
|
||||||
<Grid.ColumnDefinitions>
|
Grid.Row="1"
|
||||||
<ColumnDefinition Width="Auto"/>
|
ToolTipService.ShowOnDisabled="True"
|
||||||
<ColumnDefinition Width="*"/>
|
Margin="{StaticResource Margin.TP1}"
|
||||||
</Grid.ColumnDefinitions>
|
Background="Transparent"
|
||||||
<TextBlock>Custom</TextBlock>
|
Palettes="{Binding DataContext.selected_definition.custom_badge_color_palettes, RelativeSource={RelativeSource AncestorType=Popup}}"
|
||||||
<Button
|
SelectedColor="{Binding DataContext.selected_definition.custom_badge_color.value, RelativeSource={RelativeSource AncestorType=Popup}, Mode=TwoWay}"
|
||||||
x:Name="custom_badge_color_picker_button"
|
PreviewMouseDown="_on_badge_color_picker_activated"
|
||||||
Grid.Column="1"
|
PreviewGotKeyboardFocus="_on_badge_color_picker_activated"
|
||||||
Background="{Binding selected_definition.custom_badge_color.value, Converter={StaticResource ColorToBrushConverter}}"
|
/>
|
||||||
Margin="{StaticResource Margin.LP1}"
|
</Grid>
|
||||||
Style="{StaticResource CustomBadgeColorPickerButtonStyle}"
|
</Border>
|
||||||
/>
|
</Popup>
|
||||||
<Popup x:Name="custom_badge_color_picker_popup" StaysOpen="False" PlacementTarget="{Binding ElementName=custom_badge_color_picker_button}" Placement="Right">
|
<TextBox
|
||||||
<Border Style="{StaticResource CustomBadgeColorPickerPopupRootStyle}">
|
x:Name="name_text_box"
|
||||||
<cp:ColorPickerControl
|
Grid.Column="1"
|
||||||
Background="Transparent"
|
u:TextBoxBehavior.TextPrompt="Name"
|
||||||
Palettes="{Binding DataContext.selected_definition.custom_badge_color_palettes, RelativeSource={RelativeSource AncestorType=Popup}}"
|
Margin="{StaticResource Margin.LP1}"
|
||||||
SelectedColor="{Binding DataContext.selected_definition.custom_badge_color.value, RelativeSource={RelativeSource AncestorType=Popup}, Mode=TwoWay}"
|
HorizontalAlignment="Stretch"
|
||||||
/>
|
VerticalAlignment="Center"
|
||||||
</Border>
|
MinWidth="50"
|
||||||
</Popup>
|
IsEnabled="True"
|
||||||
</Grid>
|
Text="{Binding selected_definition.name, UpdateSourceTrigger=PropertyChanged, Delay=25}"
|
||||||
</RadioButton>
|
ToolTip="This algo's full name."
|
||||||
</Grid>
|
/>
|
||||||
|
<TextBox
|
||||||
|
x:Name="abbreviation_text_box"
|
||||||
|
Grid.Column="2"
|
||||||
|
u:TextBoxBehavior.TextPrompt="Abbrev."
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Margin="{StaticResource Margin.LP1_RP1}"
|
||||||
|
MinWidth="50"
|
||||||
|
IsEnabled="True"
|
||||||
|
Text="{Binding selected_definition.abbreviation, UpdateSourceTrigger=PropertyChanged, Delay=25}"
|
||||||
|
>
|
||||||
|
<TextBox.ToolTip>
|
||||||
|
<TextBlock>
|
||||||
|
<TextBlock.Inlines>
|
||||||
|
<Run>Specify an abbreviation for this algo to use in ladder algo 'favorite' buttons.</Run>
|
||||||
|
<LineBreak/>
|
||||||
|
<Run FontStyle="Italic">Hint: To add/remove algos from 'favorites', open the ladder settings dialog and select the 'Algo Favorites' tab.</Run>
|
||||||
|
</TextBlock.Inlines>
|
||||||
|
</TextBlock>
|
||||||
|
</TextBox.ToolTip>
|
||||||
|
</TextBox>
|
||||||
|
<ScrollViewer x:Name="algo_editor_scroll_viewer" Grid.Row="1" Grid.ColumnSpan="3" VerticalScrollBarVisibility="Auto">
|
||||||
<usp:AlgoEditorView
|
<usp:AlgoEditorView
|
||||||
Grid.Row="2"
|
|
||||||
DataContext="{Binding selected_definition}"
|
DataContext="{Binding selected_definition}"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderBrush="{Binding algo_root, Converter={StaticResource OrderTypeBrushConverter}}"
|
BorderBrush="{Binding algo_root, Converter={StaticResource OrderTypeBrushConverter}}"
|
||||||
Margin="0,6,0,0"
|
|
||||||
Padding="12,8"
|
Padding="12,8"
|
||||||
/>
|
/>
|
||||||
<StackPanel Grid.Row="3" HorizontalAlignment="Right" Orientation="Horizontal">
|
</ScrollViewer>
|
||||||
<StackPanel.Margin>
|
</Grid>
|
||||||
<Thickness Left="{StaticResource DialogSkirtPadding.Left}" Top="{StaticResource VerticalPush2}" Right="{StaticResource DialogSkirtButtonPadding.Right}" Bottom="{StaticResource DialogSkirtPadding.Bottom}"/>
|
<c:DialogSkirt
|
||||||
</StackPanel.Margin>
|
Grid.Row="2"
|
||||||
<Button ToolTipService.ShowOnDisabled="True" Margin="{StaticResource DialogSkirtButtonMargin}" Command="{Binding save_cmd}" CommandParameter="{Binding selected_definition}" Width="100" ToolTip="{Binding save_cmd_tooltip}" IsDefault="True">
|
Grid.Column="1"
|
||||||
<TextBlock Text="{Binding selected_definition.name, StringFormat='{}Save {0}'}"/>
|
BorderThickness="0"
|
||||||
|
>
|
||||||
|
<c:DialogSkirt.RightItems>
|
||||||
|
<x:Array Type="{x:Type Button}">
|
||||||
|
<Button ToolTipService.ShowOnDisabled="True" Margin="{StaticResource DialogSkirtButtonMargin}" Command="{Binding save_cmd}" CommandParameter="{Binding selected_definition}" Width="90" ToolTip="{Binding save_cmd_tooltip}" IsDefault="True">
|
||||||
|
Save Algo
|
||||||
</Button>
|
</Button>
|
||||||
<Button ToolTipService.ShowOnDisabled="True" Margin="{StaticResource DialogSkirtButtonMargin}" Command="{Binding revert_cmd}" CommandParameter="{Binding selected_definition}" Width="100" ToolTip="{Binding revert_cmd_tooltip}">
|
<Button ToolTipService.ShowOnDisabled="True" Margin="{StaticResource DialogSkirtButtonMargin}" Command="{Binding revert_cmd}" CommandParameter="{Binding selected_definition}" Width="90" ToolTip="{Binding revert_cmd_tooltip}">
|
||||||
<TextBlock Text="{Binding selected_definition.name, StringFormat='{}Revert {0}'}"/>
|
Revert Algo
|
||||||
</Button>
|
</Button>
|
||||||
</StackPanel>
|
</x:Array>
|
||||||
</Grid>
|
</c:DialogSkirt.RightItems>
|
||||||
</ScrollViewer>
|
</c:DialogSkirt>
|
||||||
</Grid>
|
</Grid>
|
||||||
</AdornerDecorator>
|
</AdornerDecorator>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@@ -19,6 +19,17 @@ namespace mbts.ui.spark {
|
|||||||
Dispatcher.InvokeAsync(() => Keyboard.Focus(name_text_box));
|
Dispatcher.InvokeAsync(() => Keyboard.Focus(name_text_box));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _on_badge_color_picker_activated(object sender, MouseButtonEventArgs e) =>
|
||||||
|
_on_badge_color_picker_activated();
|
||||||
|
|
||||||
|
void _on_badge_color_picker_activated(object sender, KeyboardFocusChangedEventArgs e) =>
|
||||||
|
_on_badge_color_picker_activated();
|
||||||
|
|
||||||
|
void _on_badge_color_picker_activated() {
|
||||||
|
if (DataContext is AlgoStudioVM vm && vm.selected_definition != null)
|
||||||
|
vm.selected_definition.custom_badge_color.enabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
public static class VisualStateNames {
|
public static class VisualStateNames {
|
||||||
public static class EditPane {
|
public static class EditPane {
|
||||||
public const string GroupName = nameof(EditPane);
|
public const string GroupName = nameof(EditPane);
|
||||||
@@ -44,8 +55,7 @@ namespace mbts.ui.spark {
|
|||||||
|
|
||||||
public static readonly string
|
public static readonly string
|
||||||
Populated = $"{GroupName}{nameof(Populated)}",
|
Populated = $"{GroupName}{nameof(Populated)}",
|
||||||
Unpopulated = $"{GroupName}{nameof(Unpopulated)}",
|
Unpopulated = $"{GroupName}{nameof(Unpopulated)}";
|
||||||
NotSupportedForTemplates = $"{GroupName}{nameof(NotSupportedForTemplates)}";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class BadgeSelector {
|
public static class BadgeSelector {
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ using System.Collections.Generic;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reactive.Disposables;
|
using System.Reactive.Disposables;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using StartupData = bts.shell.AlgoStudioWindowFactory.StartupData;
|
using StartupData = bts.shell.AlgoStudioWindowFactory.StartupData;
|
||||||
|
|
||||||
@@ -68,23 +69,12 @@ namespace mbts.spark {
|
|||||||
.Subscribe(sec_map => _view.Resources[ResourceKeys.Securities] = sec_map));
|
.Subscribe(sec_map => _view.Resources[ResourceKeys.Securities] = sec_map));
|
||||||
// add definition
|
// add definition
|
||||||
_commands.Add(new SparkCommandCommand("Add Algo", Icons.AddBoxes, _vm.add_definition_cmd));
|
_commands.Add(new SparkCommandCommand("Add Algo", Icons.AddBoxes, _vm.add_definition_cmd));
|
||||||
// clone definition
|
_commands.Add(new SparkCommandCommand("Clone Algo", Icons.CopyBoxes, _vm.clone_selected_definition_cmd));
|
||||||
var clone_selected_definition_spark_cmd = new SparkCommandCommand(string.Empty, Icons.DocumentCopy, _vm.clone_selected_definition_cmd);
|
_commands.Add(new SparkCommandCommand("Save Algo", Icons.DiskFile, _vm.save_cmd) {
|
||||||
_commands.Add(clone_selected_definition_spark_cmd);
|
show_in_toolbar = _ui_configuration.can_save_specific
|
||||||
_resources.Add(_vm.subscribe_definition().OnDispatcher().Subscribe(
|
});
|
||||||
def => clone_selected_definition_spark_cmd.title = def == null ? $"Clone (None Selected)" : $"Clone '{def.name}'"));
|
_commands.Add(new SparkCommandCommand("Save All", Icons.Disk, ObservantAsyncCommand.create(_vm.save_all, out var save_all_observer)));
|
||||||
// save
|
_resources.Add(_vm.subscribe_dirty().OnDispatcher().Subscribe(save_all_observer));
|
||||||
if (_ui_configuration.can_save_specific) {
|
|
||||||
var content_is_dirty_src = _vm.subscribe_definition().SelectManyInSeries(def => def?.subscribe_is_definition_dirty() ?? Observable.Return(false));
|
|
||||||
_commands.Add(new ReactiveSparkCommand(_vm.subscribe_definition().OnDispatcher().Select(c => $"Save '{c?.name}'"), Icons.DiskFile, () => {
|
|
||||||
if (_vm.selected_definition is AlgoDefinitionVM d)
|
|
||||||
_vm.save_definition(d).ignore();
|
|
||||||
}, content_is_dirty_src));
|
|
||||||
}
|
|
||||||
// save all
|
|
||||||
var save_all_cmd = new ObservantAsyncCommand(_vm.save_all);
|
|
||||||
_commands.Add(new SparkCommandCommand("Save All", Icons.Disk, save_all_cmd));
|
|
||||||
_resources.Add(_vm.subscribe_dirty().OnDispatcher().Subscribe(save_all_cmd));
|
|
||||||
// undo/redo
|
// undo/redo
|
||||||
if (_ui_configuration.can_undo_redo) {
|
if (_ui_configuration.can_undo_redo) {
|
||||||
// undo
|
// undo
|
||||||
@@ -117,30 +107,11 @@ namespace mbts.spark {
|
|||||||
_resources.Add(can_redo_source.Subscribe(redo_cmd));
|
_resources.Add(can_redo_source.Subscribe(redo_cmd));
|
||||||
}
|
}
|
||||||
// remove
|
// remove
|
||||||
var remove_spark_cmd = new ObservantSparkCommandCommand<IAlgoStudioContentVM>(Icons.Trash, v => $"Remove '{v?.name}'", v => v != null, value => {
|
_commands.Add(new SparkCommandCommand("Remove Algo", Icons.Trash, ObservantAsyncCommand.create<AlgoDefinitionVM>(
|
||||||
if (value is AlgoDefinitionVM d) {
|
vm => BTSMessageBox.Confirm($"Are you sure you want to delete '{vm.name}?'", Title) ? _vm.remove_definition(vm) : Task.CompletedTask,
|
||||||
string prompt; MessageBoxImage icon;
|
vm => vm != null,
|
||||||
if (d.key.mode == AlgoKey.Mode.Persisted) {
|
out var remove_cmd_observer)));
|
||||||
prompt = $"Are you sure you want to delete '{d.name}?'";
|
_resources.Add(_vm.subscribe_definition().OnDispatcher().Subscribe(remove_cmd_observer));
|
||||||
icon = MessageBoxImage.Question;
|
|
||||||
} else {
|
|
||||||
// algo hasn't even been created yet (just an unsaved placeholder item), no need to get user confirmation in this case.
|
|
||||||
prompt = null;
|
|
||||||
icon = default;
|
|
||||||
}
|
|
||||||
if (prompt != null) {
|
|
||||||
var resp = BTSMessageBox.Show(prompt, "Algo Studio", BTSMessageBoxButtons.Yes | BTSMessageBoxButtons.No, icon);
|
|
||||||
switch (resp) {
|
|
||||||
case BTSMessageBoxButtons.Yes: break;
|
|
||||||
case BTSMessageBoxButtons.No:
|
|
||||||
default: return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_vm.remove_definition(d).ignore();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
_commands.Add(remove_spark_cmd);
|
|
||||||
_resources.Add(_vm.subscribe_definition().OnDispatcher().Subscribe(remove_spark_cmd));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void _dispose_core() {
|
void _dispose_core() {
|
||||||
@@ -149,4 +120,4 @@ namespace mbts.spark {
|
|||||||
Disposable.dispose(ref _vm);
|
Disposable.dispose(ref _vm);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+10
-23
@@ -6,7 +6,6 @@ using mbts.utils;
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.ComponentModel.Composition;
|
using System.ComponentModel.Composition;
|
||||||
using System.Reactive.Linq;
|
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
@@ -16,7 +15,6 @@ namespace mbts.spark {
|
|||||||
readonly AdminModel _admin_model;
|
readonly AdminModel _admin_model;
|
||||||
readonly ErrorReporter _error_reporter;
|
readonly ErrorReporter _error_reporter;
|
||||||
IReadOnlyDictionary<AlgoKey, AlgoData> _algos = DictionaryHelper.empty<AlgoKey, AlgoData>();
|
IReadOnlyDictionary<AlgoKey, AlgoData> _algos = DictionaryHelper.empty<AlgoKey, AlgoData>();
|
||||||
IReadOnlyDictionary<AlgoKey, AlgoTemplateData> _algo_templates = DictionaryHelper.empty<AlgoKey, AlgoTemplateData>();
|
|
||||||
IDisposable _dispose;
|
IDisposable _dispose;
|
||||||
|
|
||||||
[ImportingConstructor]
|
[ImportingConstructor]
|
||||||
@@ -34,17 +32,13 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public IObservable<TableUpdate<AlgoData, AlgoKey>> definitions { get; }
|
public IObservable<TableUpdate<AlgoData, AlgoKey>> definitions { get; }
|
||||||
public IObservable<TableUpdate<AlgoTemplateData, AlgoKey>> templates => Observable.Empty<TableUpdate<AlgoTemplateData, AlgoKey>>();
|
|
||||||
public IAlgoDefinitionMetadataService metadata_service { get; }
|
public IAlgoDefinitionMetadataService metadata_service { get; }
|
||||||
public bts.config.AlgoStudioOptions ui_configuration { get; } = config.Configuration.get<bts.config.AlgoStudioOptions>();
|
public bts.config.AlgoStudioOptions ui_configuration { get; } = config.Configuration.get<bts.config.AlgoStudioOptions>();
|
||||||
|
|
||||||
public IObservable<TableUpdate<AlgoTemplateData, AlgoKey>> subscribe_definition_templates(AlgoKey definition_key) =>
|
|
||||||
Observable.Return(TableUpdate<AlgoTemplateData, AlgoKey>.mk_empty(t => t.key));
|
|
||||||
|
|
||||||
public async Task<AlgoData?> save_definition(AlgoData definition_data) {
|
public async Task<AlgoData?> save_definition(AlgoData definition_data) {
|
||||||
var (value, success) = await _error_reporter.safe_execute(() => _service.save_algo_definition_async(
|
var (value, success) = await _error_reporter.safe_execute(() => _service.save_algo_definition_async(
|
||||||
_with_key(new AlgoDefinitionUpdateRequest { UserId = _admin_model.user.id, Algo = _template(definition_data) }, definition_data.key)),
|
_with_key(new AlgoDefinitionUpdateRequest { UserId = _admin_model.user.id, Algo = _api_definition(definition_data) }, definition_data.key)),
|
||||||
r => r.Success, r => r.ErrorMessage, "saving template");
|
r => r.Success, r => r.ErrorMessage, "saving definition");
|
||||||
if (success)
|
if (success)
|
||||||
return _definition_data(new AlgoDefinitionRecordImmutable(value.Record));
|
return _definition_data(new AlgoDefinitionRecordImmutable(value.Record));
|
||||||
return null;
|
return null;
|
||||||
@@ -53,23 +47,22 @@ namespace mbts.spark {
|
|||||||
public async Task<bool> remove_definition(AlgoKey definition_key) {
|
public async Task<bool> remove_definition(AlgoKey definition_key) {
|
||||||
var req = new AlgoDefinitionRemoveRequest();
|
var req = new AlgoDefinitionRemoveRequest();
|
||||||
_set_key(ref req, definition_key);
|
_set_key(ref req, definition_key);
|
||||||
(AlgoDefinitionRemoveResponse resp, bool success) = await _error_reporter.safe_execute(() => _service.remove_algo_definition_async(req), r => r.Success, r => r.ErrorMessage, "remove template");
|
(AlgoDefinitionRemoveResponse resp, bool success) = await _error_reporter.safe_execute(
|
||||||
|
() => _service.remove_algo_definition_async(req),
|
||||||
|
r => r.Success,
|
||||||
|
r => r.ErrorMessage,
|
||||||
|
"remove definition");
|
||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<AlgoTemplateData?> save_template(AlgoTemplateData template_data) => Task.FromResult((AlgoTemplateData?)null);
|
|
||||||
|
|
||||||
public Task<bool> remove_template(AlgoKey key) =>
|
|
||||||
Task.FromResult(false);
|
|
||||||
|
|
||||||
public void Dispose() =>
|
public void Dispose() =>
|
||||||
Disposable.dispose(ref _dispose);
|
Disposable.dispose(ref _dispose);
|
||||||
|
|
||||||
static AlgoDefinition _template(AlgoData definition_data) =>
|
static AlgoDefinition _api_definition(AlgoData definition_data) =>
|
||||||
new AlgoDefinition { Name = definition_data.name, Definition = definition_data.value.CloneToMutable() };
|
new AlgoDefinition { Name = definition_data.name, Definition = definition_data.value.CloneToMutable() };
|
||||||
|
|
||||||
static AlgoDefinitionImmutable _templatei(AlgoData definition_data) =>
|
static AlgoDefinitionImmutable _api_definitioni(AlgoData definition_data) =>
|
||||||
new AlgoDefinitionImmutable(_template(definition_data));
|
new AlgoDefinitionImmutable(_api_definition(definition_data));
|
||||||
|
|
||||||
static AlgoData _definition_data(AlgoDefinitionRecordImmutable recordi) =>
|
static AlgoData _definition_data(AlgoDefinitionRecordImmutable recordi) =>
|
||||||
AlgoData.from_record(recordi);
|
AlgoData.from_record(recordi);
|
||||||
@@ -99,11 +92,5 @@ namespace mbts.spark {
|
|||||||
default: throw ExceptionBuilder.Argument.unexpected_case(key.mode, nameof(key));
|
default: throw ExceptionBuilder.Argument.unexpected_case(key.mode, nameof(key));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void _report_error(string present_progressive_desc, string msg) =>
|
|
||||||
_error_reporter.report_error($"Error {present_progressive_desc}: {msg}", AlgoStudioWindow.NAME, System.Windows.MessageBoxImage.Warning);
|
|
||||||
|
|
||||||
void _report_no_user_id(string desc) =>
|
|
||||||
_error_reporter.report_error($"{desc} failed: did not find current user id");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -7,13 +7,9 @@ using System.Threading.Tasks;
|
|||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
interface IAlgoStudioModel {
|
interface IAlgoStudioModel {
|
||||||
IObservable<TableUpdate<AlgoData, AlgoKey>> definitions { get; }
|
IObservable<TableUpdate<AlgoData, AlgoKey>> definitions { get; }
|
||||||
IObservable<TableUpdate<AlgoTemplateData, AlgoKey>> templates { get; }
|
|
||||||
IObservable<TableUpdate<AlgoTemplateData, AlgoKey>> subscribe_definition_templates(AlgoKey definition_key);
|
|
||||||
IAlgoDefinitionMetadataService metadata_service { get; }
|
IAlgoDefinitionMetadataService metadata_service { get; }
|
||||||
Task<AlgoData?> save_definition(AlgoData definition_data);
|
Task<AlgoData?> save_definition(AlgoData definition_data);
|
||||||
Task<AlgoTemplateData?> save_template(AlgoTemplateData template_data);
|
|
||||||
Task<bool> remove_definition(AlgoKey definition_key);
|
Task<bool> remove_definition(AlgoKey definition_key);
|
||||||
Task<bool> remove_template(AlgoKey template_key);
|
|
||||||
bts.config.AlgoStudioOptions ui_configuration { get; }
|
bts.config.AlgoStudioOptions ui_configuration { get; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -68,7 +68,13 @@ namespace mbts.spark {
|
|||||||
editing_permissions_mask ^= (AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure);
|
editing_permissions_mask ^= (AlgoEditingPermissions.AllowEditStructure | AlgoEditingPermissions.AllowSaveStructure);
|
||||||
key = def_data.key;
|
key = def_data.key;
|
||||||
algos_view = ObservableAutoWrapper.create_sorted_wrapper(_algo_roots, AlgoCollectionHelper.algo_vm_comparer);
|
algos_view = ObservableAutoWrapper.create_sorted_wrapper(_algo_roots, AlgoCollectionHelper.algo_vm_comparer);
|
||||||
custom_badge_color_palettes.AddRange(ColorPalette.all_presets(model.factory).Select(p => new ColorPaletteVM(p)));
|
// badge color picker palettes
|
||||||
|
custom_badge_color_palettes.AddRange(ColorPalette.all_presets().Select(p => new ColorPaletteVM(p)));
|
||||||
|
var root_algo_color_item = new NamedColorVM(new NamedColor { name = "(Root Algo Type)" }, false);
|
||||||
|
var algo_type_color_palette = new ColorPaletteVM(ColorPalette.factory_order_colors_palette(model.factory));
|
||||||
|
algo_type_color_palette.named_colors.Insert(0, root_algo_color_item);
|
||||||
|
custom_badge_color_palettes.Insert(0, algo_type_color_palette);
|
||||||
|
//
|
||||||
_version = new VersionContainer<Snapshot>(_snapshot);
|
_version = new VersionContainer<Snapshot>(_snapshot);
|
||||||
var conf = _model.algo_model.ui_configuration;
|
var conf = _model.algo_model.ui_configuration;
|
||||||
// init backing props
|
// init backing props
|
||||||
@@ -91,6 +97,7 @@ namespace mbts.spark {
|
|||||||
_can_undo = backing(nameof(can_undo), () => _edit_stack.get_can_undo(_version.value));
|
_can_undo = backing(nameof(can_undo), () => _edit_stack.get_can_undo(_version.value));
|
||||||
_can_redo.Changed += on_can_redo_changed;
|
_can_redo.Changed += on_can_redo_changed;
|
||||||
_can_undo.Changed += on_can_undo_changed;
|
_can_undo.Changed += on_can_undo_changed;
|
||||||
|
custom_badge_color.enabled_changed += on_use_custom_badge_color_changed;
|
||||||
_refresh_on_local_changes = new DeferrableActionWrapper(on_local_changed);
|
_refresh_on_local_changes = new DeferrableActionWrapper(on_local_changed);
|
||||||
// load initial state
|
// load initial state
|
||||||
// visible_algo_root is selected_template.algo_root if user can add templates, otherwise algo_root
|
// visible_algo_root is selected_template.algo_root if user can add templates, otherwise algo_root
|
||||||
@@ -103,16 +110,13 @@ namespace mbts.spark {
|
|||||||
as_demuxer().subscribe_many(_refresh_on_local_changes.execute, nameof(this.name), nameof(abbreviation), nameof(badge_fill)),
|
as_demuxer().subscribe_many(_refresh_on_local_changes.execute, nameof(this.name), nameof(abbreviation), nameof(badge_fill)),
|
||||||
_edit_pane_vs_model.add_source(VisualStateNames.BadgeSelector.GroupName, custom_badge_color.observe_nullable(true).Select(t => t.HasValue ? VisualStateNames.BadgeSelector.Active : VisualStateNames.BadgeSelector.Inactive)),
|
_edit_pane_vs_model.add_source(VisualStateNames.BadgeSelector.GroupName, custom_badge_color.observe_nullable(true).Select(t => t.HasValue ? VisualStateNames.BadgeSelector.Active : VisualStateNames.BadgeSelector.Inactive)),
|
||||||
_edit_pane_vs_model.add_source(VisualStateNames.Abbreviation.GroupName, _abbreviation.observe_current(true).Select(a => string.IsNullOrEmpty(a) ? VisualStateNames.Abbreviation.Unpopulated : VisualStateNames.Abbreviation.Populated)),
|
_edit_pane_vs_model.add_source(VisualStateNames.Abbreviation.GroupName, _abbreviation.observe_current(true).Select(a => string.IsNullOrEmpty(a) ? VisualStateNames.Abbreviation.Unpopulated : VisualStateNames.Abbreviation.Populated)),
|
||||||
_algo_root.observe_current(true).SubscribeEach(vm =>
|
_algo_root.observe_current(true).SubscribeEach(vm => {
|
||||||
vm == null ? null :
|
if (vm != null) {
|
||||||
Disposable.Create(
|
root_algo_color_item.assign_color(vm.meta.Color.argb_color());
|
||||||
vm.subscribe_is_dirty().Subscribe(v => {
|
return vm.subscribe_definition().Subscribe(_ => _refresh_on_local_changes.execute());
|
||||||
if (!v) {
|
}
|
||||||
_version.increment_version();
|
return null;
|
||||||
_on_committed_changed();
|
}),
|
||||||
}
|
|
||||||
}),
|
|
||||||
vm.subscribe_definition().Subscribe(_ => _refresh_on_local_changes.execute()))),
|
|
||||||
ObservableAutoWrapper.connect_item_hooks(algo_roots, a => a as IDisposable ?? Disposable.empty, true),
|
ObservableAutoWrapper.connect_item_hooks(algo_roots, a => a as IDisposable ?? Disposable.empty, true),
|
||||||
Disposable.Create(() => {
|
Disposable.Create(() => {
|
||||||
_can_redo.Changed -= on_can_redo_changed;
|
_can_redo.Changed -= on_can_redo_changed;
|
||||||
@@ -153,6 +157,10 @@ namespace mbts.spark {
|
|||||||
// local methods
|
// local methods
|
||||||
void on_can_redo_changed(bool oldval, bool newval) => can_redo_changed?.Invoke();
|
void on_can_redo_changed(bool oldval, bool newval) => can_redo_changed?.Invoke();
|
||||||
void on_can_undo_changed(bool oldval, bool newval) => can_undo_changed?.Invoke();
|
void on_can_undo_changed(bool oldval, bool newval) => can_undo_changed?.Invoke();
|
||||||
|
void on_use_custom_badge_color_changed() {
|
||||||
|
if (!custom_badge_color.enabled && algo_root != null)
|
||||||
|
custom_badge_color.value = algo_root.meta.Color.argb_color();
|
||||||
|
}
|
||||||
void on_local_changed() {
|
void on_local_changed() {
|
||||||
_version.increment_version();
|
_version.increment_version();
|
||||||
if (algo_root != null)
|
if (algo_root != null)
|
||||||
@@ -190,6 +198,7 @@ namespace mbts.spark {
|
|||||||
public AlgoDisplayGroup group => key.display_group();
|
public AlgoDisplayGroup group => key.display_group();
|
||||||
public bool can_redo => _can_redo.Value;
|
public bool can_redo => _can_redo.Value;
|
||||||
public bool can_undo => _can_undo.Value;
|
public bool can_undo => _can_undo.Value;
|
||||||
|
//public bool use_custom_badge_color
|
||||||
public EnabledValueVM<Color> custom_badge_color { get; } = new EnabledValueVM<Color>();
|
public EnabledValueVM<Color> custom_badge_color { get; } = new EnabledValueVM<Color>();
|
||||||
public ObservableCollection<ColorPaletteVM> custom_badge_color_palettes { get; } = new ObservableCollection<ColorPaletteVM>();
|
public ObservableCollection<ColorPaletteVM> custom_badge_color_palettes { get; } = new ObservableCollection<ColorPaletteVM>();
|
||||||
public Brush badge_fill => _badge_fill;
|
public Brush badge_fill => _badge_fill;
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ using System.Linq;
|
|||||||
using System.Reactive.Disposables;
|
using System.Reactive.Disposables;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
using StartupData = bts.shell.AlgoStudioWindowFactory.StartupData;
|
using StartupData = bts.shell.AlgoStudioWindowFactory.StartupData;
|
||||||
|
|
||||||
@@ -82,18 +81,19 @@ namespace mbts.spark {
|
|||||||
_persisted_meta = meta;
|
_persisted_meta = meta;
|
||||||
definitions_view.Refresh();
|
definitions_view.Refresh();
|
||||||
}),
|
}),
|
||||||
ObservableAutoWrapper.connect(subscribe_definition().Select(def => def?.edit_pane_visual_states ?? new ObservableCollection<string>()), content_visual_states),
|
|
||||||
subscribe_definition().SelectManyInSeries(def => def?.subscribe_is_definition_dirty() ?? Observable.Return(false)).OnDispatcher()
|
subscribe_definition().SelectManyInSeries(def => def?.subscribe_is_definition_dirty() ?? Observable.Return(false)).OnDispatcher()
|
||||||
.Subscribe(new CompositeObserver<bool>(save_cmd, revert_cmd) { val => {
|
.Subscribe(new CompositeObserver<bool>(save_cmd, revert_cmd) {
|
||||||
_save_cmd_tooltip.refresh();
|
val => {
|
||||||
_revert_cmd_tooltip.refresh();
|
_save_cmd_tooltip.refresh();
|
||||||
} }),
|
_revert_cmd_tooltip.refresh();
|
||||||
|
}
|
||||||
|
}),
|
||||||
ObservableAutoWrapper.connect_item_hooks(definitions, d => new CompositeDisposable(_any_dirty_monitor.join(d), d), true));
|
ObservableAutoWrapper.connect_item_hooks(definitions, d => new CompositeDisposable(_any_dirty_monitor.join(d), d), true));
|
||||||
// local methods
|
// local methods
|
||||||
string get_revert_tooltip() {
|
string get_revert_tooltip() {
|
||||||
var def = selected_definition;
|
var def = selected_definition;
|
||||||
return def != null && def.key.mode == AlgoKey.Mode.Persisted ?
|
return def != null && def.key.mode == AlgoKey.Mode.Persisted ?
|
||||||
(def.is_dirty ? $"Revert changes to '{def.name}' templates" : "No changes to revert") :
|
(def.is_dirty ? $"Revert changes to '{def.name}'" : "No changes to revert") :
|
||||||
null;
|
null;
|
||||||
}
|
}
|
||||||
async Task save_async(IAlgoStudioContentVM content) {
|
async Task save_async(IAlgoStudioContentVM content) {
|
||||||
@@ -105,7 +105,7 @@ namespace mbts.spark {
|
|||||||
if (def != null) {
|
if (def != null) {
|
||||||
switch (def.key.mode) {
|
switch (def.key.mode) {
|
||||||
case AlgoKey.Mode.Unpersisted: return def.is_dirty ? $"Save '{def.name}'" : $"Cannot Save '{def.name}'";
|
case AlgoKey.Mode.Unpersisted: return def.is_dirty ? $"Save '{def.name}'" : $"Cannot Save '{def.name}'";
|
||||||
case AlgoKey.Mode.Persisted: return def.is_dirty ? $"Save changes to '{def.name}' templates" : "No changes to save";
|
case AlgoKey.Mode.Persisted: return def.is_dirty ? $"Save changes to '{def.name}'" : "No changes to save";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
@@ -31,5 +31,5 @@ namespace mbts.ui.spark {
|
|||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
}
|
}
|
||||||
|
|
||||||
class FillsRowView : DIYGrid.HighPerformanceRow<FillsVM.Row, FillsView.Columns> { }
|
class FillsRowView : DIYGrid.HighPerformanceRow<FillsVM.Row> { }
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@ using bts.api;
|
|||||||
using bts.shell;
|
using bts.shell;
|
||||||
using bts.shell.fills;
|
using bts.shell.fills;
|
||||||
using bts.spark;
|
using bts.spark;
|
||||||
|
using bts.view;
|
||||||
using mbts.persist;
|
using mbts.persist;
|
||||||
using mbts.ui;
|
using mbts.ui;
|
||||||
using mbts.ui.settings;
|
using mbts.ui.settings;
|
||||||
@@ -24,6 +25,7 @@ namespace mbts.spark {
|
|||||||
FillsVM _vm;
|
FillsVM _vm;
|
||||||
FillsView _view;
|
FillsView _view;
|
||||||
FillsSettings _state;
|
FillsSettings _state;
|
||||||
|
SparkMenuDisplayVM _menu_display_vm;
|
||||||
IReadOnlyList<SparkCommand> _commands;
|
IReadOnlyList<SparkCommand> _commands;
|
||||||
|
|
||||||
public FillsWindow(FillsWindowFactory factory, IBus bus, OrdersModel orders_model, FillsSettings state, WindowSettingsManager<GridSettings> settings_manager)
|
public FillsWindow(FillsWindowFactory factory, IBus bus, OrdersModel orders_model, FillsSettings state, WindowSettingsManager<GridSettings> settings_manager)
|
||||||
@@ -38,7 +40,10 @@ namespace mbts.spark {
|
|||||||
public override UIElement Content => _view;
|
public override UIElement Content => _view;
|
||||||
public override IEnumerable<SparkCommand> Commands => _commands;
|
public override IEnumerable<SparkCommand> Commands => _commands;
|
||||||
|
|
||||||
public override FillsSettings SaveState => _state = new FillsSettings(_state.orders, _vm.get_sorting_criterion().ToList(), _vm.get_filters(), _vm.get_grid_save_state());
|
public override FillsSettings SaveState => _state = new FillsSettings(_state.orders, _vm.get_sorting_criterion().ToList(), _vm.get_filters(), _vm.get_grid_save_state()) {
|
||||||
|
menu_display = _menu_display_vm.safe_create()
|
||||||
|
};
|
||||||
|
|
||||||
public override double MinWidth =>
|
public override double MinWidth =>
|
||||||
FillsSettings.DefaultGridSettings.columns.Sum(gcs => gcs.width)
|
FillsSettings.DefaultGridSettings.columns.Sum(gcs => gcs.width)
|
||||||
+ SPARK_MENU_COLLAPSED_WIDTH
|
+ SPARK_MENU_COLLAPSED_WIDTH
|
||||||
@@ -50,6 +55,8 @@ namespace mbts.spark {
|
|||||||
public void thread_init() {
|
public void thread_init() {
|
||||||
_init_guard.check_access();
|
_init_guard.check_access();
|
||||||
Log.notnull(_state);
|
Log.notnull(_state);
|
||||||
|
_menu_display_vm = new SparkMenuDisplayVM();
|
||||||
|
_menu_display_vm.load_from(_state.menu_display);
|
||||||
_vm = new FillsVM(_bus, _orders_model, _state, _settings_manager);
|
_vm = new FillsVM(_bus, _orders_model, _state, _settings_manager);
|
||||||
_view = new FillsView { DataContext = _vm };
|
_view = new FillsView { DataContext = _vm };
|
||||||
|
|
||||||
@@ -70,7 +77,8 @@ namespace mbts.spark {
|
|||||||
var dialog = new ShellSettingsDialog { DataContext = vm };
|
var dialog = new ShellSettingsDialog { DataContext = vm };
|
||||||
vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);
|
vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);
|
||||||
return dialog;
|
return dialog;
|
||||||
}))
|
})),
|
||||||
|
_menu_display_vm.spark_cmd
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -78,5 +86,8 @@ namespace mbts.spark {
|
|||||||
Disposable.dispose(ref _vm);
|
Disposable.dispose(ref _vm);
|
||||||
Commands.OfType<IDisposable>().DisposeAll();
|
Commands.OfType<IDisposable>().DisposeAll();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override void OnParentViewCreated(SparkWindowView parent_view) =>
|
||||||
|
_menu_display_vm.safe_bind_to_view(parent_view);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -21,6 +21,8 @@ namespace bts.shell.fills {
|
|||||||
public FillsFilterStates filters;
|
public FillsFilterStates filters;
|
||||||
[ProtoMember(4)]
|
[ProtoMember(4)]
|
||||||
public GridSettings grid;
|
public GridSettings grid;
|
||||||
|
[ProtoMember(5)]
|
||||||
|
public SparkMenuDisplaySettings menu_display;
|
||||||
|
|
||||||
public FillsSettings() { }
|
public FillsSettings() { }
|
||||||
public FillsSettings(uint[] orders) : this(orders, null, null) { }
|
public FillsSettings(uint[] orders) : this(orders, null, null) { }
|
||||||
|
|||||||
@@ -1,15 +1,18 @@
|
|||||||
using bts.api.orderman;
|
using bts.api.orderman;
|
||||||
using mbts.ui;
|
using bts.collections;
|
||||||
|
using bts.persist.algo;
|
||||||
|
using bts.proto;
|
||||||
using bts.utils;
|
using bts.utils;
|
||||||
|
using mbts.ui;
|
||||||
|
using mbts.ui.settings;
|
||||||
|
using mbts.ui.spark;
|
||||||
using ProtoBuf;
|
using ProtoBuf;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.Immutable;
|
||||||
|
using System.ComponentModel;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using bts.proto;
|
|
||||||
using mbts.ui.spark;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using mbts.ui.settings;
|
|
||||||
|
|
||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
// IMPORTANT: BE SURE TO ADD ANY NEW PROPERTIES TO THE EQUALS FUNCTION!
|
// IMPORTANT: BE SURE TO ADD ANY NEW PROPERTIES TO THE EQUALS FUNCTION!
|
||||||
@@ -182,33 +185,97 @@ namespace mbts.spark {
|
|||||||
_type_hash;
|
_type_hash;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Flags]
|
||||||
|
enum LadderFavoriteAlgoFlags {
|
||||||
|
Sticky = 1,
|
||||||
|
AutoRevert = 2,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// This struct contains properties for a single algo favorite item.
|
||||||
|
/// The various <see cref="AlgoPersistedKey"/> arrays in <see cref="LadderFavoriteAlgosSettings"/>,
|
||||||
|
/// can be used to create a collection of <see cref="LadderFavoriteAlgoItem"/>s.
|
||||||
|
/// In fact, the method <see cref="LadderFavoriteAlgosSettings.to_algo_items"/> does just that.
|
||||||
|
/// </summary>
|
||||||
|
readonly struct LadderFavoriteAlgoItem : IEquatable<LadderFavoriteAlgoItem> {
|
||||||
|
public readonly AlgoKey key;
|
||||||
|
public readonly int sort_index;
|
||||||
|
public readonly LadderFavoriteAlgoFlags flags;
|
||||||
|
|
||||||
|
public LadderFavoriteAlgoItem(AlgoKey key, int sort_index, LadderFavoriteAlgoFlags flags) {
|
||||||
|
this.key = key;
|
||||||
|
this.sort_index = sort_index;
|
||||||
|
this.flags = flags;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool Equals(LadderFavoriteAlgoItem other) =>
|
||||||
|
key == other.key &&
|
||||||
|
flags == other.flags;
|
||||||
|
|
||||||
|
public override bool Equals(object obj) =>
|
||||||
|
obj is LadderFavoriteAlgoItem other && Equals(other);
|
||||||
|
|
||||||
|
public override int GetHashCode() =>
|
||||||
|
key.GetHashCode();
|
||||||
|
}
|
||||||
|
|
||||||
[ProtoContract]
|
[ProtoContract]
|
||||||
struct LadderFavoriteAlgosSettings : IEquatable<LadderFavoriteAlgosSettings> {
|
struct LadderFavoriteAlgosSettings : IEquatable<LadderFavoriteAlgosSettings> {
|
||||||
[ProtoMember(1)]
|
[ProtoMember(1)]
|
||||||
readonly bts.persist.algo.AlgoPersistedKey[] _favorite_algos;
|
readonly AlgoPersistedKey[] _favorite_algos;
|
||||||
[ProtoMember(2)]
|
[ProtoMember(2)]
|
||||||
public readonly int column_count;
|
public readonly int column_count;
|
||||||
[ProtoMember(3)]
|
[ProtoMember(3)]
|
||||||
readonly bts.persist.algo.AlgoPersistedKey[] _stickied_algos;
|
readonly AlgoPersistedKey[] _stickied_algos;
|
||||||
|
[ProtoMember(4)]
|
||||||
|
readonly AlgoPersistedKey[] _auto_revert_algos;
|
||||||
|
|
||||||
public LadderFavoriteAlgosSettings(AlgoKey[] favorite_algos, int column_count, AlgoKey[] stickied_algos)
|
public LadderFavoriteAlgosSettings(AlgoKey[] favorite_algos, int column_count, AlgoKey[] stickied_algos, AlgoKey[] auto_revert_algos)
|
||||||
: this(ArrayHelper.safe_convert(favorite_algos, k => new bts.persist.algo.AlgoPersistedKey(k.persisted)),
|
: this(ArrayHelper.safe_convert(favorite_algos, k => new AlgoPersistedKey(k.persisted)),
|
||||||
column_count,
|
ArrayHelper.safe_convert(stickied_algos, k => new AlgoPersistedKey(k.persisted)),
|
||||||
ArrayHelper.safe_convert(stickied_algos, k => new bts.persist.algo.AlgoPersistedKey(k.persisted))) { }
|
ArrayHelper.safe_convert(auto_revert_algos, k => new AlgoPersistedKey(k.persisted)),
|
||||||
|
column_count) { }
|
||||||
|
|
||||||
LadderFavoriteAlgosSettings(bts.persist.algo.AlgoPersistedKey[] favorite_algos, int column_count, bts.persist.algo.AlgoPersistedKey[] stickied_algos) {
|
LadderFavoriteAlgosSettings(AlgoPersistedKey[] favorite_algos, AlgoPersistedKey[] stickied_algos, AlgoPersistedKey[] auto_revert_algos, int column_count) {
|
||||||
_favorite_algos = favorite_algos;
|
_favorite_algos = favorite_algos;
|
||||||
this.column_count = column_count;
|
|
||||||
_stickied_algos = stickied_algos;
|
_stickied_algos = stickied_algos;
|
||||||
|
_auto_revert_algos = auto_revert_algos;
|
||||||
|
this.column_count = column_count;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IReadOnlyList<AlgoKey> favorite_algos => ArrayHelper.safe_convert(_favorite_algos, k => k.to_algo_key());
|
public IReadOnlyList<AlgoKey> favorite_algos => _favorite_algos?.WrapSelectorRO(pk => pk.to_algo_key()) ?? Array.Empty<AlgoKey>();
|
||||||
public IReadOnlyList<AlgoKey> stickied_algos => ArrayHelper.safe_convert(_stickied_algos, k => k.to_algo_key());
|
public IReadOnlyList<AlgoKey> stickied_algos => _stickied_algos?.WrapSelectorRO(pk => pk.to_algo_key()) ?? Array.Empty<AlgoKey>();
|
||||||
|
public IReadOnlyList<AlgoKey> auto_revert_algos => _auto_revert_algos?.WrapSelectorRO(pk => pk.to_algo_key()) ?? Array.Empty<AlgoKey>();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// A more sane representation of the data contained in this proto,
|
||||||
|
/// so callers don't need to join the various key lists together to determine which algos are sticky, auto revert, etc.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>An immutable dictionary of favorite algo data.</returns>
|
||||||
|
public ImmutableDictionary<AlgoKey, LadderFavoriteAlgoItem> build_map() {
|
||||||
|
var map = ImmutableDictionary.CreateBuilder<AlgoKey, LadderFavoriteAlgoItem>();
|
||||||
|
if (_favorite_algos != null) {
|
||||||
|
var stickied_algo_set = new HashSet<AlgoKey>(stickied_algos);
|
||||||
|
var auto_revert_algo_set = new HashSet<AlgoKey>(auto_revert_algos);
|
||||||
|
for (int i = 0; i < _favorite_algos.Length; i++) {
|
||||||
|
var pk = _favorite_algos[i];
|
||||||
|
var k = pk.to_algo_key();
|
||||||
|
var flags = (LadderFavoriteAlgoFlags)0;
|
||||||
|
if (stickied_algo_set.Contains(k))
|
||||||
|
flags |= LadderFavoriteAlgoFlags.Sticky;
|
||||||
|
if (auto_revert_algo_set.Contains(k))
|
||||||
|
flags |= LadderFavoriteAlgoFlags.AutoRevert;
|
||||||
|
map[k] = new LadderFavoriteAlgoItem(k, i, flags);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return map.ToImmutable();
|
||||||
|
}
|
||||||
|
|
||||||
public bool Equals(LadderFavoriteAlgosSettings other) =>
|
public bool Equals(LadderFavoriteAlgosSettings other) =>
|
||||||
column_count == other.column_count &&
|
column_count == other.column_count &&
|
||||||
favorite_algos.SequenceEqual(other.favorite_algos) &&
|
favorite_algos.SequenceEqual(other.favorite_algos) &&
|
||||||
stickied_algos.SequenceEqual(other.stickied_algos);
|
stickied_algos.SequenceEqual(other.stickied_algos) &&
|
||||||
|
auto_revert_algos.SequenceEqual(other.auto_revert_algos);
|
||||||
|
|
||||||
public override bool Equals(object obj) =>
|
public override bool Equals(object obj) =>
|
||||||
EqualityComparer.equals_obj(this, obj);
|
EqualityComparer.equals_obj(this, obj);
|
||||||
@@ -217,7 +284,8 @@ namespace mbts.spark {
|
|||||||
EqualityComparer.aggregate_hash(
|
EqualityComparer.aggregate_hash(
|
||||||
column_count,
|
column_count,
|
||||||
EqualityComparer.aggregate_hash_limited(favorite_algos),
|
EqualityComparer.aggregate_hash_limited(favorite_algos),
|
||||||
EqualityComparer.aggregate_hash_limited(stickied_algos));
|
EqualityComparer.aggregate_hash_limited(stickied_algos),
|
||||||
|
EqualityComparer.aggregate_hash_limited(auto_revert_algos));
|
||||||
|
|
||||||
public static bool operator ==(LadderFavoriteAlgosSettings a, LadderFavoriteAlgosSettings b) => a.Equals(b);
|
public static bool operator ==(LadderFavoriteAlgosSettings a, LadderFavoriteAlgosSettings b) => a.Equals(b);
|
||||||
public static bool operator !=(LadderFavoriteAlgosSettings a, LadderFavoriteAlgosSettings b) => !a.Equals(b);
|
public static bool operator !=(LadderFavoriteAlgosSettings a, LadderFavoriteAlgosSettings b) => !a.Equals(b);
|
||||||
@@ -281,7 +349,7 @@ namespace mbts.spark {
|
|||||||
order_entry_panel_initial_width = _default_order_entry_panel_width;
|
order_entry_panel_initial_width = _default_order_entry_panel_width;
|
||||||
zoom_factor = _default_zoom_factor;
|
zoom_factor = _default_zoom_factor;
|
||||||
use_defaults = true;
|
use_defaults = true;
|
||||||
favorite_algos = new LadderFavoriteAlgosSettings(null, 2, null);
|
favorite_algos = new LadderFavoriteAlgosSettings(null, 2, null, null);
|
||||||
show_warn_on_cross = _default_show_warn_on_cross;
|
show_warn_on_cross = _default_show_warn_on_cross;
|
||||||
enforce_max_clip = _default_enforce_max_clip;
|
enforce_max_clip = _default_enforce_max_clip;
|
||||||
status_message_visible = true;
|
status_message_visible = true;
|
||||||
|
|||||||
@@ -70,7 +70,11 @@ namespace bts.shell {
|
|||||||
if (version < _version_where_stickied_algos_introduced) {
|
if (version < _version_where_stickied_algos_introduced) {
|
||||||
// We want to assign any existing favorite algos to stickied algos upon setting upgrade
|
// We want to assign any existing favorite algos to stickied algos upon setting upgrade
|
||||||
var favorite_algos_array = state.settings.favorite_algos.favorite_algos.ToArray();
|
var favorite_algos_array = state.settings.favorite_algos.favorite_algos.ToArray();
|
||||||
state.settings.favorite_algos = new LadderFavoriteAlgosSettings(favorite_algos_array, state.settings.favorite_algos.column_count, favorite_algos_array);
|
state.settings.favorite_algos = new LadderFavoriteAlgosSettings(
|
||||||
|
favorite_algos_array,
|
||||||
|
state.settings.favorite_algos.column_count,
|
||||||
|
favorite_algos_array,
|
||||||
|
state.settings.favorite_algos.auto_revert_algos.ToArray());
|
||||||
}
|
}
|
||||||
return load(state);
|
return load(state);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -268,14 +268,15 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// on Stop/Limit order updates
|
||||||
|
// When not triggered, allow for modification to StopPrice
|
||||||
|
// else treat modification as normal (Price)
|
||||||
public async void try_set_price(OrderRecordImmutable order, double new_price) {
|
public async void try_set_price(OrderRecordImmutable order, double new_price) {
|
||||||
// don't change stop or stop_limits => server crash
|
|
||||||
if (order.order_type() == bts.api.orderman.CustomOrderDefinition.CustomOneofCase.Stop || order.order_type() == bts.api.orderman.CustomOrderDefinition.CustomOneofCase.StopLimit) return;
|
|
||||||
if (order.working_quantity() <= 0) return;
|
if (order.working_quantity() <= 0) return;
|
||||||
_phantom_price = new_price;
|
_phantom_price = new_price;
|
||||||
RaisePropertyChanged(nameof(price));
|
RaisePropertyChanged(nameof(price));
|
||||||
++_n_active_price_change_ops;
|
++_n_active_price_change_ops;
|
||||||
if (await _owner.model.order_gateway.update_order(order, new_price, order.State.Quantity)) {
|
if (await _owner.model.order_gateway.update_order(order, new_price, order.State.Quantity, null)) {
|
||||||
// wait 3 secs, then give up if price change still hasn't taken effect
|
// wait 3 secs, then give up if price change still hasn't taken effect
|
||||||
await Task.Delay(3000);
|
await Task.Delay(3000);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ using mbts.ui.utility;
|
|||||||
using mbts.utils;
|
using mbts.utils;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.Immutable;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.Collections.Specialized;
|
using System.Collections.Specialized;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
@@ -746,15 +747,17 @@ namespace mbts.spark {
|
|||||||
readonly IObservableCollection<AlgoDefinitionVM> _algo_definitions;
|
readonly IObservableCollection<AlgoDefinitionVM> _algo_definitions;
|
||||||
readonly ObservableCollection<FavoriteAlgoItem> _raw_items = new ObservableCollection<FavoriteAlgoItem>();
|
readonly ObservableCollection<FavoriteAlgoItem> _raw_items = new ObservableCollection<FavoriteAlgoItem>();
|
||||||
int _column_count = 2;
|
int _column_count = 2;
|
||||||
HashSet<AlgoPersistedKey> _sticky_algo_keys;
|
ImmutableHashSet<AlgoPersistedKey>
|
||||||
IDisposable _sticky_algos_hook;
|
_sticky_algo_keys,
|
||||||
|
_auto_revert_algo_keys;
|
||||||
|
IDisposable _algo_data_hook;
|
||||||
|
|
||||||
public FavoriteAlgosVM(IObservableCollection<AlgoDefinitionVM> algo_definitions) {
|
public FavoriteAlgosVM(IObservableCollection<AlgoDefinitionVM> algo_definitions) {
|
||||||
_algo_definitions = algo_definitions;
|
_algo_definitions = algo_definitions;
|
||||||
items = new ObservableAggregateCollection<FavoriteAlgoItem>(_raw_items, new ObservableCollection<FavoriteAlgoItem> { FavoriteAlgoItem.AddButtonPlaceholderItem });
|
items = new ObservableAggregateCollection<FavoriteAlgoItem>(_raw_items, new ObservableCollection<FavoriteAlgoItem> { FavoriteAlgoItem.AddButtonPlaceholderItem });
|
||||||
add_item_cmd = new DelegateCommand(() => _raw_items.Add(_item_factory()));
|
add_item_cmd = new DelegateCommand(() => _raw_items.Add(_item_factory()));
|
||||||
remove_item_cmd = new DelegateCommand<FavoriteAlgoItem>(fai => _raw_items.Remove(fai));
|
remove_item_cmd = new DelegateCommand<FavoriteAlgoItem>(fai => _raw_items.Remove(fai));
|
||||||
_dispose = Disposable.Create(() => Disposable.dispose(ref _sticky_algos_hook));
|
_dispose = Disposable.Create(() => Disposable.dispose(ref _algo_data_hook));
|
||||||
}
|
}
|
||||||
|
|
||||||
public ObservableCollection<FavoriteAlgoItem> items { get; }
|
public ObservableCollection<FavoriteAlgoItem> items { get; }
|
||||||
@@ -771,32 +774,47 @@ namespace mbts.spark {
|
|||||||
fai.selector.try_select(k);
|
fai.selector.try_select(k);
|
||||||
return fai;
|
return fai;
|
||||||
}));
|
}));
|
||||||
_sticky_algo_keys = new HashSet<AlgoPersistedKey>(value.stickied_algos.Where(k => k.is_persisted).Select(x => new AlgoPersistedKey(x.persisted)));
|
_algo_data_hook?.Dispose();
|
||||||
Disposable.replace(ref _sticky_algos_hook,
|
_sticky_algo_keys = ImmutableHashSet.CreateRange(value.stickied_algos.Where(k => k.is_persisted).Select(x => new AlgoPersistedKey(x.persisted)));
|
||||||
ObservableAutoWrapper.connect_item_hooks(_raw_items, x =>
|
_auto_revert_algo_keys = ImmutableHashSet.CreateRange(value.auto_revert_algos.Where(k => k.is_persisted).Select(x => new AlgoPersistedKey(x.persisted)));
|
||||||
x.selector.subscribe_value().Subscribe(algo => {
|
var sticky_algos = _sticky_algo_keys;
|
||||||
if (algo != null &&
|
var auto_revert_algos = _auto_revert_algo_keys;
|
||||||
algo.key.is_persisted &&
|
_algo_data_hook = ObservableAutoWrapper.connect_item_hooks(_raw_items, x =>
|
||||||
(x.is_sticky = _sticky_algo_keys.Remove(new AlgoPersistedKey(algo.key.persisted))) &&
|
x.selector.subscribe_value().Subscribe(algo => {
|
||||||
_sticky_algo_keys.Count == 0)
|
if (algo != null && algo.key.is_persisted) {
|
||||||
//
|
var pk = new AlgoPersistedKey(algo.key.persisted);
|
||||||
Disposable.dispose(ref _sticky_algos_hook);
|
// sticky
|
||||||
})));
|
x.is_sticky = _sticky_algo_keys.Contains(pk);
|
||||||
|
sticky_algos = sticky_algos.Remove(pk);
|
||||||
|
// auto revert
|
||||||
|
x.auto_revert = _auto_revert_algo_keys.Contains(pk);
|
||||||
|
auto_revert_algos = auto_revert_algos.Remove(pk);
|
||||||
|
if (sticky_algos.Count == 0 && auto_revert_algos.Count == 0)
|
||||||
|
Disposable.dispose(ref _algo_data_hook);
|
||||||
|
}
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
public LadderFavoriteAlgosSettings create() =>
|
public LadderFavoriteAlgosSettings create() {
|
||||||
new LadderFavoriteAlgosSettings(_raw_items
|
return new LadderFavoriteAlgosSettings(_raw_items
|
||||||
.Select(fai => fai.algo_definition?.key ?? fai.selector.desired_key)
|
.Select(fai => fai.algo_definition?.key ?? fai.selector.desired_key)
|
||||||
.Where(k => k.HasValue && k.Value.is_persisted)
|
.Where(k => k.HasValue && k.Value.is_persisted)
|
||||||
.Select(k => k.Value)
|
.Select(k => k.Value)
|
||||||
.ToArray(),
|
.ToArray(),
|
||||||
column_count,
|
column_count,
|
||||||
|
// sticky
|
||||||
|
build_filtered_algo_array(fai => fai.is_sticky),
|
||||||
|
// auto revert
|
||||||
|
build_filtered_algo_array(fai => fai.auto_revert));
|
||||||
|
|
||||||
|
AlgoKey[] build_filtered_algo_array(Func<FavoriteAlgoItem, bool> filter) =>
|
||||||
_raw_items
|
_raw_items
|
||||||
.Where(fai => fai.is_sticky)
|
.Where(filter)
|
||||||
.Select(fai => fai.algo_definition?.key ?? fai.selector.desired_key)
|
.Select(fai => fai.algo_definition?.key ?? fai.selector.desired_key)
|
||||||
.Where(k => k.HasValue && k.Value.is_persisted)
|
.Where(k => k.HasValue && k.Value.is_persisted)
|
||||||
.Select(k => k.Value)
|
.Select(k => k.Value)
|
||||||
.ToArray());
|
.ToArray();
|
||||||
|
}
|
||||||
|
|
||||||
FavoriteAlgoItem _item_factory() =>
|
FavoriteAlgoItem _item_factory() =>
|
||||||
new FavoriteAlgoItem(_algo_definitions, new ListCollectionView<AlgoDefinitionVM>(_algo_definitions) {
|
new FavoriteAlgoItem(_algo_definitions, new ListCollectionView<AlgoDefinitionVM>(_algo_definitions) {
|
||||||
@@ -809,7 +827,9 @@ namespace mbts.spark {
|
|||||||
public static readonly FavoriteAlgoItem AddButtonPlaceholderItem = new _AddButtonPlaceholderItem();
|
public static readonly FavoriteAlgoItem AddButtonPlaceholderItem = new _AddButtonPlaceholderItem();
|
||||||
|
|
||||||
internal readonly KeyedItemSelector<AlgoDefinitionVM, AlgoKey> selector;
|
internal readonly KeyedItemSelector<AlgoDefinitionVM, AlgoKey> selector;
|
||||||
bool _is_sticky;
|
bool
|
||||||
|
_auto_revert,
|
||||||
|
_is_sticky;
|
||||||
|
|
||||||
protected FavoriteAlgoItem() { }
|
protected FavoriteAlgoItem() { }
|
||||||
|
|
||||||
@@ -820,6 +840,7 @@ namespace mbts.spark {
|
|||||||
|
|
||||||
public ICollectionView<AlgoDefinitionVM> algo_definitions_view { get; }
|
public ICollectionView<AlgoDefinitionVM> algo_definitions_view { get; }
|
||||||
public AlgoDefinitionVM algo_definition { get => selector.value; set => selector.value = value; }
|
public AlgoDefinitionVM algo_definition { get => selector.value; set => selector.value = value; }
|
||||||
|
public bool auto_revert { get => _auto_revert; set => Set(ref _auto_revert, value); }
|
||||||
public bool is_sticky { get => _is_sticky; set => Set(ref _is_sticky, value); }
|
public bool is_sticky { get => _is_sticky; set => Set(ref _is_sticky, value); }
|
||||||
|
|
||||||
class _AddButtonPlaceholderItem : FavoriteAlgoItem, ITemplateSelectorKey {
|
class _AddButtonPlaceholderItem : FavoriteAlgoItem, ITemplateSelectorKey {
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ using mbts.ui.shell;
|
|||||||
using mbts.utils;
|
using mbts.utils;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.Immutable;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.Collections.Specialized;
|
using System.Collections.Specialized;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@@ -34,7 +35,6 @@ namespace mbts.spark {
|
|||||||
_show_tif, _show_order_type, _show_size_preset, _show_auto_clear, _show_clear, _show_cancel_buys,
|
_show_tif, _show_order_type, _show_size_preset, _show_auto_clear, _show_clear, _show_cancel_buys,
|
||||||
_show_cancel_sells, _show_cancel_all, _show_zoom, _show_status_message;
|
_show_cancel_sells, _show_cancel_all, _show_zoom, _show_status_message;
|
||||||
readonly PropertyAutoWrapper<LadderSettings, Brush> _bid_background, _bid_foreground, _ask_background, _ask_foreground;
|
readonly PropertyAutoWrapper<LadderSettings, Brush> _bid_background, _bid_foreground, _ask_background, _ask_foreground;
|
||||||
readonly HashSet<AlgoKey> _sticky_algos = new HashSet<AlgoKey>();
|
|
||||||
double
|
double
|
||||||
_position,
|
_position,
|
||||||
_day_position,
|
_day_position,
|
||||||
@@ -49,6 +49,7 @@ namespace mbts.spark {
|
|||||||
IEqualityComparer<double> _equality;
|
IEqualityComparer<double> _equality;
|
||||||
Dictionary<double, LadderOrderVM> _slot_price_vs_orders;
|
Dictionary<double, LadderOrderVM> _slot_price_vs_orders;
|
||||||
IReadOnlyDictionary<uint, OrderSecurity> _cache = DictionaryHelper.empty<uint, OrderSecurity>();
|
IReadOnlyDictionary<uint, OrderSecurity> _cache = DictionaryHelper.empty<uint, OrderSecurity>();
|
||||||
|
ImmutableDictionary<AlgoKey, LadderFavoriteAlgoItem> _favorite_algo_map = ImmutableDictionary<AlgoKey, LadderFavoriteAlgoItem>.Empty;
|
||||||
|
|
||||||
public static LadderVM create(IBus bus, LadderModel model, LadderSettings init, IObservable<LadderSettings> settings) =>
|
public static LadderVM create(IBus bus, LadderModel model, LadderSettings init, IObservable<LadderSettings> settings) =>
|
||||||
new LadderVM(bus, model, init, settings, new OrderPropertiesEditorVM(model.order_gateway, Observable.Return(model.security_md), settings.Select(s => new InlineOrderProperties(model.order_gateway, s))));
|
new LadderVM(bus, model, init, settings, new OrderPropertiesEditorVM(model.order_gateway, Observable.Return(model.security_md), settings.Select(s => new InlineOrderProperties(model.order_gateway, s))));
|
||||||
@@ -168,17 +169,9 @@ namespace mbts.spark {
|
|||||||
|
|
||||||
foreach (var os in _cache.Values) {
|
foreach (var os in _cache.Values) {
|
||||||
var wo = os.order;
|
var wo = os.order;
|
||||||
var slot_price_target = wo.price();
|
var slot_price_target = wo.ui_price();
|
||||||
var order_type = wo.order_type();
|
var order_type = wo.order_type();
|
||||||
var filled = wo.filled();
|
var filled = wo.filled();
|
||||||
if (order_type == CustomOrderDefinition.CustomOneofCase.Stop) {
|
|
||||||
// if the stop order has been submitted but hasn't been triggered
|
|
||||||
// we draw the badge at the stop/trigger price, else the price price
|
|
||||||
if (filled == 0) { slot_price_target = wo.stop_price(); }
|
|
||||||
} else if (order_type == CustomOrderDefinition.CustomOneofCase.StopLimit) {
|
|
||||||
// consistent behavior as Stop order above.
|
|
||||||
if (filled == 0) { slot_price_target = wo.stop_limit_price(); }
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_slot_price_vs_orders.TryGetValue(slot_price_target, out LadderOrderVM slot_vm)) {
|
if (_slot_price_vs_orders.TryGetValue(slot_price_target, out LadderOrderVM slot_vm)) {
|
||||||
slot_vm.add_order((wo, os.piq, os.algo, os.meta));
|
slot_vm.add_order((wo, os.piq, os.algo, os.meta));
|
||||||
@@ -239,8 +232,8 @@ namespace mbts.spark {
|
|||||||
.Select(table => table.state.Values.FirstOrDefault(pos => pos.Item2.Account == a, tup => tup.Item2, (bts.api.position.PositionUnitImmutable?)null)));
|
.Select(table => table.state.Values.FirstOrDefault(pos => pos.Item2.Account == a, tup => tup.Item2, (bts.api.position.PositionUnitImmutable?)null)));
|
||||||
return Disposable.Create(
|
return Disposable.Create(
|
||||||
settings.OnDispatcher().Subscribe(s => {
|
settings.OnDispatcher().Subscribe(s => {
|
||||||
_sticky_algos.SetItems(s.favorite_algos.stickied_algos);
|
_favorite_algo_map = s.favorite_algos.build_map();
|
||||||
order_properties_vm.on_favorite_algos(s.favorite_algos);
|
order_properties_vm.on_favorite_algos(_favorite_algo_map, s.favorite_algos.column_count);
|
||||||
}),
|
}),
|
||||||
order_properties_vm,
|
order_properties_vm,
|
||||||
position_src.OnDispatcher().Subscribe(pos => {
|
position_src.OnDispatcher().Subscribe(pos => {
|
||||||
@@ -409,9 +402,9 @@ namespace mbts.spark {
|
|||||||
|
|
||||||
internal OrderRecordImmutable get_root_at_price((OrderRecordImmutable order, uint? _, AlgoData? __, AlgoDefinitionMetadata? meta) op) {
|
internal OrderRecordImmutable get_root_at_price((OrderRecordImmutable order, uint? _, AlgoData? __, AlgoDefinitionMetadata? meta) op) {
|
||||||
var order = op.order;
|
var order = op.order;
|
||||||
double p = order.price();
|
double p = order.ui_price();
|
||||||
foreach (var o in lineage(order.ParentKey)) {
|
foreach (var o in lineage(order.ParentKey)) {
|
||||||
if (_equality.Equals(p, o.price()))
|
if (_equality.Equals(p, o.ui_price()))
|
||||||
order = o;
|
order = o;
|
||||||
}
|
}
|
||||||
return order;
|
return order;
|
||||||
@@ -510,10 +503,16 @@ namespace mbts.spark {
|
|||||||
if (auto_clear)
|
if (auto_clear)
|
||||||
size_calculator.value = 0;
|
size_calculator.value = 0;
|
||||||
var fav_algo = order_properties_vm.selected_favorite_algo_definition;
|
var fav_algo = order_properties_vm.selected_favorite_algo_definition;
|
||||||
if (fav_algo != null && !_sticky_algos.Contains(fav_algo.key) && !order_properties_vm.try_pop_selected_algo_definition()) {
|
if (fav_algo != null) {
|
||||||
var key = new AlgoKey(OrderDataHelper.get_default_algo(OrderDataHelper.get_algo_format(security.ContractCase)));
|
if (_favorite_algo_map.TryGetValue(fav_algo.key, out var d)) {
|
||||||
if (order_properties_vm.try_get_algo_definition(key, out var r)) {
|
if (!d.flags.HasFlag(LadderFavoriteAlgoFlags.Sticky) && !order_properties_vm.try_pop_selected_algo_definition()) {
|
||||||
order_properties_vm.selected_algo_definition = r;
|
var key = new AlgoKey(OrderDataHelper.get_default_algo(OrderDataHelper.get_algo_format(security.ContractCase)));
|
||||||
|
if (order_properties_vm.try_get_algo_definition(key, out var r)) {
|
||||||
|
order_properties_vm.selected_algo_definition = r;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (d.flags.HasFlag(LadderFavoriteAlgoFlags.AutoRevert))
|
||||||
|
fav_algo.algo_root.revert_all_params();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,8 @@ using System.Windows.Media.Animation;
|
|||||||
|
|
||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
partial class LadderGridHost : Control {
|
partial class LadderGridHost : Control {
|
||||||
const int _min_row_count = 501, _max_row_count = 2001, _column_min_width = 8;
|
const int _min_row_count = 501, _max_row_count = 2001;
|
||||||
|
|
||||||
int _row_count = _min_row_count;
|
int _row_count = _min_row_count;
|
||||||
|
|
||||||
readonly VisualHost _visualHost = new VisualHost();
|
readonly VisualHost _visualHost = new VisualHost();
|
||||||
@@ -108,6 +109,8 @@ namespace mbts.spark {
|
|||||||
|
|
||||||
public event Action visible_columns_changed;
|
public event Action visible_columns_changed;
|
||||||
|
|
||||||
|
public static double ColumnMinWidth => 6;
|
||||||
|
|
||||||
public IEnumerable<ColumnType> visible_column_types =>
|
public IEnumerable<ColumnType> visible_column_types =>
|
||||||
columns.Where(c => c.settings.show)
|
columns.Where(c => c.settings.show)
|
||||||
.Select(c => c.column_type);
|
.Select(c => c.column_type);
|
||||||
@@ -531,14 +534,44 @@ namespace mbts.spark {
|
|||||||
_size_from_row(row, _price_list, _asks, _vm.security.ContractSpec);
|
_size_from_row(row, _price_list, _asks, _vm.security.ContractSpec);
|
||||||
|
|
||||||
uint _volume_from_row(int row) {
|
uint _volume_from_row(int row) {
|
||||||
if (_price_list != null) {
|
const int max_tries = 3;
|
||||||
var price = _price_list[row];
|
var errors = new List<string>(0);
|
||||||
var vapls = _volume_container.read_new_value();
|
int num_tries = 0;
|
||||||
if (vapls != null) {
|
for (; num_tries < max_tries; num_tries++) {
|
||||||
return vapls.SelectFirstOrDefault(v => MathUtils.epsilon_equals(v.Price, price), v => v.Volume);
|
try {
|
||||||
}
|
var rv = impl();
|
||||||
|
if (num_tries > 0) {
|
||||||
|
log_errors(true);
|
||||||
|
}
|
||||||
|
return rv;
|
||||||
|
} catch (Exception ex) {
|
||||||
|
errors.Add(ex.ToString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
log_errors(false);
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
void log_errors(bool succeeded) {
|
||||||
|
// Only log distinct errors to avoid useless noise.
|
||||||
|
// It's likely that the exception will always be the same (IndexOutOfRange),
|
||||||
|
// however, this bug is not fully understood, so assume nothing.
|
||||||
|
var error_msg = string.Join("; ", errors.Distinct());
|
||||||
|
if (succeeded) {
|
||||||
|
Log.Ui.error($"Ladder '{security}' got volume for row at index '{row}' after {num_tries + 1} attempts (price_list array length is {_price_list.Length}). The following exceptions were observed: {error_msg}");
|
||||||
|
} else {
|
||||||
|
Log.Ui.error($"Ladder '{security}' failed to get volume for row at index '{row}' after {max_tries} attempts (price_list array length is {_price_list.Length}): {error_msg}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint impl() {
|
||||||
|
if (_price_list.SafeTryGetAt(row, out var price)) {
|
||||||
|
var vapls = _volume_container.read_new_value();
|
||||||
|
if (vapls != null) {
|
||||||
|
return vapls.SelectFirstOrDefault(v => MathUtils.epsilon_equals(v.Price, price), v => v.Volume);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0u;
|
||||||
}
|
}
|
||||||
return 0u;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -572,7 +605,7 @@ namespace mbts.spark {
|
|||||||
case ColumnType.Price: new_col_width = (int)price_column_width; break;
|
case ColumnType.Price: new_col_width = (int)price_column_width; break;
|
||||||
case ColumnType.Ask: new_col_width = (int)ask_column_width; break;
|
case ColumnType.Ask: new_col_width = (int)ask_column_width; break;
|
||||||
case ColumnType.Volume: new_col_width = (int)VolumeColumnWidth; break;
|
case ColumnType.Volume: new_col_width = (int)VolumeColumnWidth; break;
|
||||||
default: new_col_width = (int)Math.Max((double)column.settings.width + adjustment, _column_min_width); break;
|
default: new_col_width = (int)Math.Max((double)column.settings.width + adjustment, ColumnMinWidth); break;
|
||||||
}
|
}
|
||||||
int true_adj = new_col_width - (int)column.settings.width;
|
int true_adj = new_col_width - (int)column.settings.width;
|
||||||
column.settings.width = (uint)new_col_width;
|
column.settings.width = (uint)new_col_width;
|
||||||
|
|||||||
@@ -828,6 +828,7 @@
|
|||||||
<ColumnDefinition Width="Auto" SharedSizeGroup="c0"/>
|
<ColumnDefinition Width="Auto" SharedSizeGroup="c0"/>
|
||||||
<ColumnDefinition Width="*"/>
|
<ColumnDefinition Width="*"/>
|
||||||
<ColumnDefinition Width="Auto" SharedSizeGroup="c1"/>
|
<ColumnDefinition Width="Auto" SharedSizeGroup="c1"/>
|
||||||
|
<ColumnDefinition Width="Auto" SharedSizeGroup="c2"/>
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Button Command="{Binding DataContext.remove_item_cmd, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding}" Style="{StaticResource RoundCloseButton}"/>
|
<Button Command="{Binding DataContext.remove_item_cmd, RelativeSource={RelativeSource AncestorType=ItemsControl}}" CommandParameter="{Binding}" Style="{StaticResource RoundCloseButton}"/>
|
||||||
<ComboBox Grid.Column="1" ItemsSource="{Binding algo_definitions_view}" SelectedItem="{Binding algo_definition}">
|
<ComboBox Grid.Column="1" ItemsSource="{Binding algo_definitions_view}" SelectedItem="{Binding algo_definition}">
|
||||||
@@ -837,7 +838,12 @@
|
|||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ComboBox.ItemTemplate>
|
</ComboBox.ItemTemplate>
|
||||||
</ComboBox>
|
</ComboBox>
|
||||||
<CheckBox Grid.Column="2" VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding is_sticky}"> Stay Enabled?</CheckBox>
|
<CheckBox Grid.Column="2" FontSize="10" VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding is_sticky}" ToolTip="Stay Enabled" Margin="4,0">
|
||||||
|
Stay Enabled
|
||||||
|
</CheckBox>
|
||||||
|
<CheckBox Grid.Column="3" FontSize="10" VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="{Binding auto_revert}" ToolTip="Auto Revert" Margin="0,0,4,0">
|
||||||
|
Auto Revert
|
||||||
|
</CheckBox>
|
||||||
</Grid>
|
</Grid>
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</u:KeyedTemplateSelector.Default>
|
</u:KeyedTemplateSelector.Default>
|
||||||
|
|||||||
@@ -48,7 +48,7 @@
|
|||||||
<Setter Property="BorderThickness" Value="0,0,1,0"/>
|
<Setter Property="BorderThickness" Value="0,0,1,0"/>
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Center" />
|
<Setter Property="HorizontalContentAlignment" Value="Center" />
|
||||||
<Setter Property="Height" Value="23" />
|
<Setter Property="Height" Value="23" />
|
||||||
<Setter Property="MinWidth" Value="30" />
|
<Setter Property="MinWidth" Value="{x:Static spark:LadderGridHost.ColumnMinWidth}"/>
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<ControlTemplate TargetType="{x:Type GridViewColumnHeader}">
|
<ControlTemplate TargetType="{x:Type GridViewColumnHeader}">
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ using bts.api;
|
|||||||
using bts.api.core;
|
using bts.api.core;
|
||||||
using bts.api.position;
|
using bts.api.position;
|
||||||
using bts.collections;
|
using bts.collections;
|
||||||
|
using bts.utils;
|
||||||
using mbts;
|
using mbts;
|
||||||
using mbts.spark;
|
using mbts.spark;
|
||||||
using mbts.ui;
|
using mbts.ui;
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ namespace mbts.spark {
|
|||||||
DataContext = vm;
|
DataContext = vm;
|
||||||
}
|
}
|
||||||
|
|
||||||
class MiniOrderBookRowView : DIYGrid.HighPerformanceRow<OrderBookRowVM, OrderBookGridView.ColumnKeys> {
|
class MiniOrderBookRowView : DIYGrid.HighPerformanceRow<OrderBookRowVM> {
|
||||||
public MiniOrderBookRowView() : base() {
|
public MiniOrderBookRowView() : base() {
|
||||||
FocusManager.SetIsFocusScope(this, true);
|
FocusManager.SetIsFocusScope(this, true);
|
||||||
KeyboardNavigation.SetTabNavigation(this, KeyboardNavigationMode.Cycle);
|
KeyboardNavigation.SetTabNavigation(this, KeyboardNavigationMode.Cycle);
|
||||||
|
|||||||
@@ -650,12 +650,13 @@ namespace mbts.spark {
|
|||||||
ListSortDirection? _cached_sort_direction;
|
ListSortDirection? _cached_sort_direction;
|
||||||
|
|
||||||
public OrderBookLastMessageColumn(IDataGridColumnPersistentFilter<OrderSecurityRootPair, string> filter)
|
public OrderBookLastMessageColumn(IDataGridColumnPersistentFilter<OrderSecurityRootPair, string> filter)
|
||||||
: base(Columns.LastMessage, new Binding(nameof(OrderBookRowVM.last_msg)), filter, DataGridFilterKnownTemplates.Regex) {
|
: base(Columns.LastMessage, filter, DataGridFilterKnownTemplates.Regex) {
|
||||||
id = key.ToString();
|
id = key.ToString();
|
||||||
this.filter = filter;
|
this.filter = filter;
|
||||||
Header = "Last Message";
|
Header = "Last Message";
|
||||||
Width = DefaultColumnWidths.LastMessage;
|
Width = DefaultColumnWidths.LastMessage;
|
||||||
tooltip_binding = new Binding(nameof(OrderBookRowVM.last_msg));
|
TextBinding = new Binding(nameof(OrderBookRowVM.last_msg));
|
||||||
|
ToolTipBinding = new Binding(nameof(OrderBookRowVM.last_msg));
|
||||||
}
|
}
|
||||||
|
|
||||||
public new IDataGridColumnPersistentFilter<OrderSecurityRootPair, string> filter { get; }
|
public new IDataGridColumnPersistentFilter<OrderSecurityRootPair, string> filter { get; }
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ namespace mbts.spark {
|
|||||||
public OrderBookRowVM(OrderBookVM owner, OrderSecurityRootPair order_tuple, bool is_expanded, Action<bool> on_selection_changed) {
|
public OrderBookRowVM(OrderBookVM owner, OrderSecurityRootPair order_tuple, bool is_expanded, Action<bool> on_selection_changed) {
|
||||||
_owner = owner;
|
_owner = owner;
|
||||||
this.order_tuple = order_tuple;
|
this.order_tuple = order_tuple;
|
||||||
is_visible = !is_child;
|
|
||||||
_is_expanded = is_expanded;
|
_is_expanded = is_expanded;
|
||||||
prospective_quantity = this.quantity;
|
prospective_quantity = this.quantity;
|
||||||
prospective_price = this.price;
|
prospective_price = this.price;
|
||||||
@@ -88,7 +87,7 @@ namespace mbts.spark {
|
|||||||
public DateTime last_change => order.last_change();
|
public DateTime last_change => order.last_change();
|
||||||
public string last_change_text => _fmt_date(last_change);
|
public string last_change_text => _fmt_date(last_change);
|
||||||
public OrderStatus status => order.status();
|
public OrderStatus status => order.status();
|
||||||
public double price => order.price();
|
public double price => order.ui_price();
|
||||||
public double last_price => order.last_price();
|
public double last_price => order.last_price();
|
||||||
public double avg_price => order.avg_price();
|
public double avg_price => order.avg_price();
|
||||||
public string price_text => _fmt_price(price);
|
public string price_text => _fmt_price(price);
|
||||||
@@ -113,7 +112,6 @@ namespace mbts.spark {
|
|||||||
// Tree
|
// Tree
|
||||||
public bool is_parent { get => _is_parent; set => Set(ref _is_parent, value); }
|
public bool is_parent { get => _is_parent; set => Set(ref _is_parent, value); }
|
||||||
public bool is_child => order.has_parent();
|
public bool is_child => order.has_parent();
|
||||||
public bool is_visible { get; set; }
|
|
||||||
public bool is_expanded {
|
public bool is_expanded {
|
||||||
get => _is_expanded;
|
get => _is_expanded;
|
||||||
set {
|
set {
|
||||||
@@ -269,13 +267,14 @@ namespace mbts.spark {
|
|||||||
if ((Columns.OrderType & dirty) != 0)
|
if ((Columns.OrderType & dirty) != 0)
|
||||||
RaisePropertyChanged(nameof(order_type), nameof(order_metadata));
|
RaisePropertyChanged(nameof(order_type), nameof(order_metadata));
|
||||||
// quantity
|
// quantity
|
||||||
if ((Columns.Size & dirty) != 0)
|
if ((Columns.Size & dirty) != 0) {
|
||||||
RaisePropertyChanged(nameof(quantity), nameof(is_qty_dirty));
|
RaisePropertyChanged(nameof(quantity), nameof(is_qty_dirty));
|
||||||
// we need to update the prospective_quantity here b/c an update could have come in while the row was in edit mode
|
// we need to update the prospective_quantity here b/c an update could have come in while the row was in edit mode
|
||||||
// via the Mini OB update column mechanism (vs the EditableQty column)
|
// via the Mini OB update column mechanism (vs the EditableQty column)
|
||||||
// prospecive price does not need to be updated in the same manner b/c if the price is changed, the whole
|
// prospecive price does not need to be updated in the same manner b/c if the price is changed, the whole
|
||||||
// row will no longer match the filter
|
// row will no longer match the filter
|
||||||
prospective_quantity = quantity;
|
prospective_quantity = quantity;
|
||||||
|
}
|
||||||
// price
|
// price
|
||||||
if ((Columns.Price & dirty) != 0) {
|
if ((Columns.Price & dirty) != 0) {
|
||||||
RaisePropertyChanged(nameof(price));
|
RaisePropertyChanged(nameof(price));
|
||||||
@@ -414,7 +413,7 @@ namespace mbts.spark {
|
|||||||
dirty |= Columns.LastPrice;
|
dirty |= Columns.LastPrice;
|
||||||
if (oldval.order.order.avg_price() != newval.order.order.avg_price())
|
if (oldval.order.order.avg_price() != newval.order.order.avg_price())
|
||||||
dirty |= Columns.AvgFilled;
|
dirty |= Columns.AvgFilled;
|
||||||
if (oldval.order.order.price() != newval.order.order.price())
|
if (oldval.order.order.ui_price() != newval.order.order.ui_price())
|
||||||
dirty |= Columns.Price;
|
dirty |= Columns.Price;
|
||||||
if (oldval.order.order.quantity() != newval.order.order.quantity())
|
if (oldval.order.order.quantity() != newval.order.order.quantity())
|
||||||
dirty |= Columns.Size;
|
dirty |= Columns.Size;
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ namespace mbts.spark {
|
|||||||
readonly OrderParamsAggregator _selected_params_mon;
|
readonly OrderParamsAggregator _selected_params_mon;
|
||||||
readonly CommonValueMonitor<SecurityImmutable?> _selected_security_mon = new CommonValueMonitor<SecurityImmutable?>();
|
readonly CommonValueMonitor<SecurityImmutable?> _selected_security_mon = new CommonValueMonitor<SecurityImmutable?>();
|
||||||
readonly RightPanelModel _right_panel = new RightPanelModel();
|
readonly RightPanelModel _right_panel = new RightPanelModel();
|
||||||
|
readonly CustomStateSynchronizer _custom_state_sync;
|
||||||
OrderBookFillsGridSettings _cached_fills_settings = OrderBookStartupData.DefaultFillsGrid;
|
OrderBookFillsGridSettings _cached_fills_settings = OrderBookStartupData.DefaultFillsGrid;
|
||||||
double
|
double
|
||||||
_raw_right_panel_width = OrderBookStartupData.Default.right_panel_width,
|
_raw_right_panel_width = OrderBookStartupData.Default.right_panel_width,
|
||||||
@@ -124,6 +125,8 @@ namespace mbts.spark {
|
|||||||
_row_collection.CollectionChanged += _row_collection_CollectionChanged;
|
_row_collection.CollectionChanged += _row_collection_CollectionChanged;
|
||||||
_current_row = backing<OrderBookRowVM>(nameof(current_row));
|
_current_row = backing<OrderBookRowVM>(nameof(current_row));
|
||||||
_columns.filter_changed += _on_filter_changed;
|
_columns.filter_changed += _on_filter_changed;
|
||||||
|
_custom_state_sync = new CustomStateSynchronizer(this);
|
||||||
|
// commands
|
||||||
collapse_all_rows_command = new DelegateCommand(_row_collection.collapse_all);
|
collapse_all_rows_command = new DelegateCommand(_row_collection.collapse_all);
|
||||||
expand_all_rows_command = new DelegateCommand(_row_collection.expand_all);
|
expand_all_rows_command = new DelegateCommand(_row_collection.expand_all);
|
||||||
var modify_selected_orders_async_cmd = new AsyncCommand(_modify_selected_orders_async, () => _selected_params_mon.all_active && order_mod_vm.is_dirty);
|
var modify_selected_orders_async_cmd = new AsyncCommand(_modify_selected_orders_async, () => _selected_params_mon.all_active && order_mod_vm.is_dirty);
|
||||||
@@ -188,6 +191,7 @@ namespace mbts.spark {
|
|||||||
security_plurality = p;
|
security_plurality = p;
|
||||||
RaisePropertyChanged(nameof(security_plurality));
|
RaisePropertyChanged(nameof(security_plurality));
|
||||||
}),
|
}),
|
||||||
|
_current_row.Subscribe(_ => _custom_state_sync.sync()),
|
||||||
orders_source.OnDispatcher().Subscribe(t => {
|
orders_source.OnDispatcher().Subscribe(t => {
|
||||||
if (_selected_rows.Count == 0) {
|
if (_selected_rows.Count == 0) {
|
||||||
_cached_orders = t.state;
|
_cached_orders = t.state;
|
||||||
@@ -207,6 +211,8 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
_custom_state_sync.sync(true);
|
||||||
|
orders_changed?.Invoke();
|
||||||
}),
|
}),
|
||||||
model.on_orders_can_attach.OnDispatcher().Subscribe(table => {
|
model.on_orders_can_attach.OnDispatcher().Subscribe(table => {
|
||||||
_cached_attachable = new MappedDictionary<uint, KeyValuePair<uint, bool>, bool>(table.state, kv => kv.Value);
|
_cached_attachable = new MappedDictionary<uint, KeyValuePair<uint, bool>, bool>(table.state, kv => kv.Value);
|
||||||
@@ -375,7 +381,7 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public event Action<OrderRecordImmutable?> selected_order_changed;
|
public event Action<OrderRecordImmutable?> selected_order_changed;
|
||||||
public event Action begin_attaching, end_attaching;
|
public event Action begin_attaching, end_attaching, orders_changed;
|
||||||
public event Action<(IEnumerable, bool)> request_selection;
|
public event Action<(IEnumerable, bool)> request_selection;
|
||||||
|
|
||||||
public ObservableAppendCollection<DIYGrid.ColumnBase> columns { get; }
|
public ObservableAppendCollection<DIYGrid.ColumnBase> columns { get; }
|
||||||
@@ -395,6 +401,7 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
public OrderRecordImmutable? current_order => current_row?.order;
|
public OrderRecordImmutable? current_order => current_row?.order;
|
||||||
|
public ObservableCollection<NamedValueVM> current_algo_custom_state { get; } = new ObservableCollection<NamedValueVM>();
|
||||||
public AlgoDefinitionVM algo_vm => order_mod_vm.algo_vm;
|
public AlgoDefinitionVM algo_vm => order_mod_vm.algo_vm;
|
||||||
public OrderParamsVM order_mod_vm { get; }
|
public OrderParamsVM order_mod_vm { get; }
|
||||||
public FillsVMContainer fills_vm { get; } = new FillsVMContainer();
|
public FillsVMContainer fills_vm { get; } = new FillsVMContainer();
|
||||||
@@ -474,6 +481,28 @@ namespace mbts.spark {
|
|||||||
public IObservable<bool> subscribe_show_fills() => _show_fills.observe_current(true);
|
public IObservable<bool> subscribe_show_fills() => _show_fills.observe_current(true);
|
||||||
public IObservable<bool> subscribe_show_ladder() => _show_ladder.observe_current(true);
|
public IObservable<bool> subscribe_show_ladder() => _show_ladder.observe_current(true);
|
||||||
public IObservable<bool> subscribe_show_order_params() => _show_order_params.observe_current(true);
|
public IObservable<bool> subscribe_show_order_params() => _show_order_params.observe_current(true);
|
||||||
|
public IObservable<OrderSecurityAlgo?> subscribe_single_selected_order() =>
|
||||||
|
Observable.Create<OrderSecurityAlgo?>(o => {
|
||||||
|
OrderSecurityAlgo? last_fired = null;
|
||||||
|
orders_changed += notify;
|
||||||
|
_current_row.Changed += on_current_row_changed;
|
||||||
|
notify();
|
||||||
|
return Disposable.Create(dispose);
|
||||||
|
// local methods
|
||||||
|
void notify() {
|
||||||
|
var next = current_row == null ? (OrderSecurityAlgo?)null : current_row.order_tuple.order;
|
||||||
|
if (next != last_fired)
|
||||||
|
o.OnNext(last_fired = next);
|
||||||
|
}
|
||||||
|
|
||||||
|
void on_current_row_changed(OrderBookRowVM oldval, OrderBookRowVM newval) =>
|
||||||
|
notify();
|
||||||
|
|
||||||
|
void dispose() {
|
||||||
|
orders_changed -= notify;
|
||||||
|
_current_row.Changed -= on_current_row_changed;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
public void row_selection_changed(SelectionChangedEventArgs e) {
|
public void row_selection_changed(SelectionChangedEventArgs e) {
|
||||||
try {
|
try {
|
||||||
@@ -503,6 +532,7 @@ namespace mbts.spark {
|
|||||||
_can_attach_selected_orders.refresh();
|
_can_attach_selected_orders.refresh();
|
||||||
_can_detach_selected_orders.refresh();
|
_can_detach_selected_orders.refresh();
|
||||||
selected_order_changed?.Invoke(current_order);
|
selected_order_changed?.Invoke(current_order);
|
||||||
|
_custom_state_sync.sync();
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
// [John]I observed a strange null-reference exception in this callback when the launcher was shutting down (see https://bluetradesys.atlassian.net/browse/SPARK-2089)
|
// [John]I observed a strange null-reference exception in this callback when the launcher was shutting down (see https://bluetradesys.atlassian.net/browse/SPARK-2089)
|
||||||
Log.Ui.error($"[{nameof(OrderBookVM)}] Error handling selection change: {ex}");
|
Log.Ui.error($"[{nameof(OrderBookVM)}] Error handling selection change: {ex}");
|
||||||
@@ -723,6 +753,45 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class CustomStateSynchronizer {
|
||||||
|
readonly OrderBookVM _vm;
|
||||||
|
OrderBookRowVM _synced_row;
|
||||||
|
|
||||||
|
public CustomStateSynchronizer(OrderBookVM vm) =>
|
||||||
|
_vm = vm;
|
||||||
|
|
||||||
|
public void sync(bool force_refresh = false) {
|
||||||
|
var row = _vm.current_row != null &&
|
||||||
|
_vm.selected_rows.Select(r => r.order_tuple.root.order.Key).Distinct().TryGetSingle(out uint droot) &&
|
||||||
|
_vm.current_row.order_tuple.root.order.Key == droot ?
|
||||||
|
_vm.current_row : null;
|
||||||
|
if (force_refresh || row != _synced_row) {
|
||||||
|
_synced_row = row;
|
||||||
|
_refresh();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _refresh() {
|
||||||
|
_vm.current_algo_custom_state.Clear();
|
||||||
|
if (_synced_row == null)
|
||||||
|
return;
|
||||||
|
var dcs = _synced_row.order.dynamic_custom_state();
|
||||||
|
// while dcs is not expected to be null, best to play it safe and double check.
|
||||||
|
if (dcs.is_null_or_empty()) {
|
||||||
|
var descendent_rows = _vm._row_collection.get_descendent_rows(_synced_row.order_key);
|
||||||
|
if (_vm._row_collection.filter != null)
|
||||||
|
descendent_rows = descendent_rows.Where(child => _vm._row_collection.filter(child.order_tuple));
|
||||||
|
foreach (var dr in descendent_rows) {
|
||||||
|
dcs = dr.order.dynamic_custom_state();
|
||||||
|
if (!dcs.is_null_or_empty())
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
foreach (var p in dcs.empty_if_null().OrderBy(kv => kv.Key))
|
||||||
|
_vm.current_algo_custom_state.Add(new NamedValueVM(p.Key, DynamicOrderHelper.fmt_param(p.Value)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public class OrderParamsVM : DisposableViewModelBase {
|
public class OrderParamsVM : DisposableViewModelBase {
|
||||||
readonly SelectorProperty<AccountTuple, AccountTuple?> _accounts;
|
readonly SelectorProperty<AccountTuple, AccountTuple?> _accounts;
|
||||||
readonly OrderBookVM _owner;
|
readonly OrderBookVM _owner;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using bts.api;
|
using bts;
|
||||||
|
using bts.api;
|
||||||
using bts.api.orderman;
|
using bts.api.orderman;
|
||||||
using bts.shell;
|
using bts.shell;
|
||||||
using bts.shell.fills;
|
using bts.shell.fills;
|
||||||
@@ -6,10 +7,11 @@ using bts.shell.orderbook;
|
|||||||
using bts.spark;
|
using bts.spark;
|
||||||
using bts.view;
|
using bts.view;
|
||||||
using mbts.persist;
|
using mbts.persist;
|
||||||
|
using mbts.spark.utilities;
|
||||||
using mbts.ui;
|
using mbts.ui;
|
||||||
using mbts.ui.extensions;
|
using mbts.ui.extensions;
|
||||||
using mbts.ui.shell;
|
|
||||||
using mbts.ui.spark;
|
using mbts.ui.spark;
|
||||||
|
using mbts.ui.utilities;
|
||||||
using mbts.ui.utility;
|
using mbts.ui.utility;
|
||||||
using mbts.utils;
|
using mbts.utils;
|
||||||
using System;
|
using System;
|
||||||
@@ -25,26 +27,38 @@ namespace mbts.spark {
|
|||||||
const string _window_type = "OrderBook", _default_title = "Order Book";
|
const string _window_type = "OrderBook", _default_title = "Order Book";
|
||||||
readonly INotificationService _notification_service;
|
readonly INotificationService _notification_service;
|
||||||
readonly IWindowSettingsManager<OrderBookGridSettings> _settings_manager;
|
readonly IWindowSettingsManager<OrderBookGridSettings> _settings_manager;
|
||||||
|
readonly bool _can_edit_specific_algo_params;
|
||||||
IDisposable _attachment_exit_sub;
|
IDisposable _attachment_exit_sub;
|
||||||
|
// initialized in thread_init
|
||||||
|
List<IDisposable> _thread_init_resources;
|
||||||
OrderBookStartupData _state;
|
OrderBookStartupData _state;
|
||||||
OrdersModel _model;
|
OrdersModel _model;
|
||||||
OrderBookVM _vm;
|
OrderBookVM _vm;
|
||||||
OrderBookView _view;
|
OrderBookView _view;
|
||||||
OrderBookWindowFactory _factory;
|
OrderBookWindowFactory _factory;
|
||||||
|
SparkMenuDisplayVM _menu_display_vm;
|
||||||
SparkCommand[] _commands;
|
SparkCommand[] _commands;
|
||||||
|
|
||||||
public OrderBookWindow(OrdersModel model, OrderBookWindowFactory factory, IBus bus, INotificationService notification_service,
|
public OrderBookWindow(OrdersModel model, OrderBookWindowFactory factory, IBus bus, INotificationService notification_service,
|
||||||
OrderBookStartupData state, ImageSource icon, IWindowSettingsManager<OrderBookGridSettings> settings_manager)
|
OrderBookStartupData state, ImageSource icon, IWindowSettingsManager<OrderBookGridSettings> settings_manager, bool can_edit_specific_algo_params)
|
||||||
: base(_default_title, bus, factory, SparkCommands.ShowOrders.icon) {
|
: base(_default_title, bus, factory, SparkCommands.ShowOrders.icon) {
|
||||||
_model = model;
|
_model = model;
|
||||||
_factory = factory;
|
_factory = factory;
|
||||||
_notification_service = notification_service;
|
_notification_service = notification_service;
|
||||||
_state = state;
|
_state = state;
|
||||||
_settings_manager = settings_manager;
|
_settings_manager = settings_manager;
|
||||||
|
_can_edit_specific_algo_params = can_edit_specific_algo_params;
|
||||||
thread_id = config.Configuration.get<bts.config.MultiThreadedWindows>().order_book ? "OrderBook" : null;
|
thread_id = config.Configuration.get<bts.config.MultiThreadedWindows>().order_book ? "OrderBook" : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override OrderBookStartupData SaveState => _state = _vm?.create();
|
public override OrderBookStartupData SaveState {
|
||||||
|
get {
|
||||||
|
_state = _vm?.create();
|
||||||
|
if (_state != null)
|
||||||
|
_state.menu_display = _menu_display_vm.safe_create();
|
||||||
|
return _state;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public override string window_type => _window_type;
|
public override string window_type => _window_type;
|
||||||
public override UIElement Content => _view;
|
public override UIElement Content => _view;
|
||||||
@@ -57,12 +71,17 @@ namespace mbts.spark {
|
|||||||
public string thread_id { get; }
|
public string thread_id { get; }
|
||||||
|
|
||||||
public override void Dispose() {
|
public override void Dispose() {
|
||||||
_commands.OfType<IDisposable>().DisposeAll();
|
Disposable.dispose(_thread_init_resources);
|
||||||
Disposable.dispose(ref _attachment_exit_sub);
|
Disposable.dispose(ref _attachment_exit_sub);
|
||||||
Disposable.dispose(ref _vm);
|
Disposable.dispose(ref _vm);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void thread_init() {
|
public void thread_init() {
|
||||||
|
Log.assert(_thread_init_resources == null, $"{nameof(_thread_init_resources)} must be initialized in thread_init.");
|
||||||
|
_thread_init_resources = new List<IDisposable>();
|
||||||
|
_menu_display_vm = new SparkMenuDisplayVM();
|
||||||
|
if (_state != null)
|
||||||
|
_menu_display_vm.load_from(_state.menu_display);
|
||||||
_vm = new OrderBookVM(_bus, _notification_service, _model, _settings_manager);
|
_vm = new OrderBookVM(_bus, _notification_service, _model, _settings_manager);
|
||||||
_vm.load_from(_state);
|
_vm.load_from(_state);
|
||||||
_view = new OrderBookView(_vm);
|
_view = new OrderBookView(_vm);
|
||||||
@@ -137,6 +156,15 @@ namespace mbts.spark {
|
|||||||
can_execute: () => _vm.selected_orders.Any(x => passes_recreate_search_criteria(x))
|
can_execute: () => _vm.selected_orders.Any(x => passes_recreate_search_criteria(x))
|
||||||
);
|
);
|
||||||
recreate_selected_orders_command.group = CommandGroups.Modify;
|
recreate_selected_orders_command.group = CommandGroups.Modify;
|
||||||
|
ICommand edit_algo_params_cmd;
|
||||||
|
if (_can_edit_specific_algo_params) {
|
||||||
|
_thread_init_resources.Add(CommandHelper.bind_param_source(
|
||||||
|
new DialogCommand<OrderSecurityAlgo?, Window>(mk_algo_params_dialog, has_algo_params),
|
||||||
|
_vm.subscribe_single_selected_order(),
|
||||||
|
out edit_algo_params_cmd, true));
|
||||||
|
} else {
|
||||||
|
edit_algo_params_cmd = DelegateCommand.empty;
|
||||||
|
}
|
||||||
|
|
||||||
var attach_selected_orders_command = new SparkCommandCommand(
|
var attach_selected_orders_command = new SparkCommandCommand(
|
||||||
"Attach To Selected",
|
"Attach To Selected",
|
||||||
@@ -184,24 +212,36 @@ namespace mbts.spark {
|
|||||||
show_grid_settings_command.group = CommandGroups.Auxiliary;
|
show_grid_settings_command.group = CommandGroups.Auxiliary;
|
||||||
|
|
||||||
_commands = new SparkCommand[] {
|
_commands = new SparkCommand[] {
|
||||||
|
// modify commands
|
||||||
toggle_show_right_panel_command,
|
toggle_show_right_panel_command,
|
||||||
attach_selected_orders_command,
|
attach_selected_orders_command,
|
||||||
detach_selected_orders_command,
|
detach_selected_orders_command,
|
||||||
recreate_selected_orders_command,
|
recreate_selected_orders_command,
|
||||||
|
new SparkCommandCommand("Algo Params...", Icons.Algo, edit_algo_params_cmd) {
|
||||||
|
group = CommandGroups.Modify,
|
||||||
|
show_in_toolbar = false,
|
||||||
|
show_in_context_menu = _can_edit_specific_algo_params
|
||||||
|
},
|
||||||
|
// cancel commands
|
||||||
cancel_selected_orders_command,
|
cancel_selected_orders_command,
|
||||||
cancel_buy_orders_command,
|
cancel_buy_orders_command,
|
||||||
cancel_sell_orders_command,
|
cancel_sell_orders_command,
|
||||||
cancel_all_orders_command,
|
cancel_all_orders_command,
|
||||||
|
|
||||||
toggle_collapse_all_command,
|
toggle_collapse_all_command,
|
||||||
toggle_expand_all_command,
|
toggle_expand_all_command,
|
||||||
show_grid_settings_command,
|
show_grid_settings_command,
|
||||||
// hidden cmds (i.e., keyboard shortcuts at window level)
|
// hidden cmds (i.e., keyboard shortcuts at window level)
|
||||||
hidden_cmd(new SparkCommandCommand(OrderBookView.CommandDescriptions.ModifyOrders, null, _vm.modify_selected_orders_cmd, OrderBookView.KeyboardShortcuts.ModifyOrders)),
|
hidden_cmd(new SparkCommandCommand(OrderBookView.CommandDescriptions.ModifyOrders, null, _vm.modify_selected_orders_cmd, OrderBookView.KeyboardShortcuts.ModifyOrders)),
|
||||||
hidden_cmd(new SparkCommandCommand(OrderBookView.CommandDescriptions.RevertOrders, null, _vm.revert_selected_orders_cmd, OrderBookView.KeyboardShortcuts.RevertOrders))
|
hidden_cmd(new SparkCommandCommand(OrderBookView.CommandDescriptions.RevertOrders, null, _vm.revert_selected_orders_cmd, OrderBookView.KeyboardShortcuts.RevertOrders)),
|
||||||
|
_menu_display_vm.spark_cmd
|
||||||
};
|
};
|
||||||
_vm.as_demuxer().subscribe<bool>(nameof(OrderBookVM.show_right_panel))
|
_thread_init_resources.AddRange(_commands.OfType<IDisposable>());
|
||||||
.Subscribe(_ => toggle_show_right_panel_command.title = get_toggle_show_right_panel_cmd_title());
|
_thread_init_resources.Add(_vm.as_demuxer()
|
||||||
|
.subscribe<bool>(nameof(OrderBookVM.show_right_panel))
|
||||||
|
.Subscribe(_ => toggle_show_right_panel_command.title = get_toggle_show_right_panel_cmd_title()));
|
||||||
_vm.selected_order_changed += vm_selected_order_changed;
|
_vm.selected_order_changed += vm_selected_order_changed;
|
||||||
|
_thread_init_resources.Add(Disposable.Create(() => _vm.selected_order_changed -= vm_selected_order_changed));
|
||||||
// local methods
|
// local methods
|
||||||
string get_toggle_show_right_panel_cmd_title() =>
|
string get_toggle_show_right_panel_cmd_title() =>
|
||||||
_vm.show_right_panel ? OrderBookView.CommandDescriptions.HideRightPanel : OrderBookView.CommandDescriptions.ShowRightPanel;
|
_vm.show_right_panel ? OrderBookView.CommandDescriptions.HideRightPanel : OrderBookView.CommandDescriptions.ShowRightPanel;
|
||||||
@@ -223,13 +263,45 @@ namespace mbts.spark {
|
|||||||
attach_selected_orders_command.raiseCanExecuteChanged();
|
attach_selected_orders_command.raiseCanExecuteChanged();
|
||||||
detach_selected_orders_command.raiseCanExecuteChanged();
|
detach_selected_orders_command.raiseCanExecuteChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool has_algo_params(OrderSecurityAlgo? order) =>
|
||||||
|
order.HasValue && !OrderDataHelper.get_metadata(order.Value.algo.value.CustomCase).NoProps;
|
||||||
|
|
||||||
|
Window mk_algo_params_dialog(OrderSecurityAlgo? order) {
|
||||||
|
if (!has_algo_params(order))
|
||||||
|
return null;
|
||||||
|
var algo_def = AlgoDefinitionVM.create(_model, order.Value.algo, editing_permissions: AlgoEditingPermissions.AllowEditValues);
|
||||||
|
var algo_params_vm = new OrderBookAlgoParamsVM(algo_def, order.Value.order.is_non_terminal());
|
||||||
|
var dialog = new OrderBookAlgoParamsDialog {
|
||||||
|
Content = algo_params_vm
|
||||||
|
};
|
||||||
|
ui.WindowStyle.SetTitleContent(dialog, algo_def);
|
||||||
|
dialog.Closed += (s, e) => {
|
||||||
|
Disposable.dispose(ref algo_params_vm);
|
||||||
|
dialog = null;
|
||||||
|
};
|
||||||
|
algo_params_vm.RequestCommit += commit;
|
||||||
|
algo_params_vm.RequestClose += (s, e) => close_dialog();
|
||||||
|
return dialog;
|
||||||
|
|
||||||
|
void close_dialog() {
|
||||||
|
dialog?.Close();
|
||||||
|
dialog = null;
|
||||||
|
}
|
||||||
|
void commit(CustomOrderDefinitionImmutable value) {
|
||||||
|
_model.update_order(order.Value.order, new_algo: value).ignore();
|
||||||
|
close_dialog();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override void OnParentViewCreated(SparkWindowView parent_view) =>
|
protected override void OnParentViewCreated(SparkWindowView parent_view) {
|
||||||
Disposable.replace(ref _attachment_exit_sub, parent_view.SubscribePreviewKeyDown((s, e) => {
|
Disposable.replace(ref _attachment_exit_sub, parent_view.SubscribePreviewKeyDown((s, e) => {
|
||||||
if (e.Key == Key.Escape || (e.Key == Key.Z && KeyboardExtensions.IsCtrlDown()))
|
if (e.Key == Key.Escape || (e.Key == Key.Z && KeyboardExtensions.IsCtrlDown()))
|
||||||
_vm.is_attaching_orders = false;
|
_vm.is_attaching_orders = false;
|
||||||
}));
|
}));
|
||||||
|
_menu_display_vm.safe_bind_to_view(parent_view);
|
||||||
|
}
|
||||||
|
|
||||||
static class CommandGroups {
|
static class CommandGroups {
|
||||||
public const string
|
public const string
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.shell.orderbook;
|
using bts.shell.orderbook;
|
||||||
using bts.spark;
|
using bts.spark;
|
||||||
|
using mbts.config;
|
||||||
using mbts.persist;
|
using mbts.persist;
|
||||||
using mbts.spark;
|
using mbts.spark;
|
||||||
using mbts.ui;
|
using mbts.ui;
|
||||||
@@ -15,8 +16,11 @@ namespace bts.shell {
|
|||||||
readonly INotificationServiceDataCache _notification_service_data_cache;
|
readonly INotificationServiceDataCache _notification_service_data_cache;
|
||||||
readonly OrdersModel _model;
|
readonly OrdersModel _model;
|
||||||
readonly UserSettingsHub _settings_hub;
|
readonly UserSettingsHub _settings_hub;
|
||||||
|
readonly OrderBookConfig _config;
|
||||||
|
|
||||||
public OrderBookWindowFactory(IShellModule owner, IBus bus, INotificationService notification_service, INotificationServiceDataCache notification_service_data_cache, OrdersModel model, UserSettingsHub settings_hub) : base(owner, "SparkOrderBookWindow") {
|
public OrderBookWindowFactory(IShellModule owner, IBus bus, INotificationService notification_service, INotificationServiceDataCache notification_service_data_cache, OrdersModel model, UserSettingsHub settings_hub) : base(owner, "SparkOrderBookWindow") {
|
||||||
|
var raw_config = Configuration.get<bts.config.OrderBookOptions>();
|
||||||
|
_config = new OrderBookConfig(raw_config.can_edit_specific_algo_params);
|
||||||
_bus = bus;
|
_bus = bus;
|
||||||
_notification_service = notification_service;
|
_notification_service = notification_service;
|
||||||
_notification_service_data_cache = notification_service_data_cache;
|
_notification_service_data_cache = notification_service_data_cache;
|
||||||
@@ -29,7 +33,8 @@ namespace bts.shell {
|
|||||||
var settings_manager = new WindowSettingsManager<OrderBookGridSettings>(_settings_hub, state.grid_settings_wrapper(),
|
var settings_manager = new WindowSettingsManager<OrderBookGridSettings>(_settings_hub, state.grid_settings_wrapper(),
|
||||||
us => us.order_book_grid ?? OrderBookStartupData.DefaultGrid,
|
us => us.order_book_grid ?? OrderBookStartupData.DefaultGrid,
|
||||||
(us, s) => us.with(order_book_grid: s));
|
(us, s) => us.with(order_book_grid: s));
|
||||||
var w = new OrderBookWindow(_model, this, _bus, _notification_service, state, SparkCommands.ShowOrders.icon, settings_manager.as_non_shared());
|
var w = new OrderBookWindow(_model, this, _bus, _notification_service, state,
|
||||||
|
SparkCommands.ShowOrders.icon, settings_manager.as_non_shared(), _config.can_edit_specific_algo_params);
|
||||||
return Task.FromResult<IShellWindow>(w);
|
return Task.FromResult<IShellWindow>(w);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,5 +42,12 @@ namespace bts.shell {
|
|||||||
var w = await load(startup_data);
|
var w = await load(startup_data);
|
||||||
_bus.post(SparkTags.ShowWindow, w);
|
_bus.post(SparkTags.ShowWindow, w);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
readonly struct OrderBookConfig {
|
||||||
|
public readonly bool can_edit_specific_algo_params;
|
||||||
|
|
||||||
|
public OrderBookConfig(bool can_edit_specific_algo_params) =>
|
||||||
|
this.can_edit_specific_algo_params = can_edit_specific_algo_params;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -144,7 +144,7 @@ namespace bts.shell.orderbook {
|
|||||||
pb.add_discrete_values(fs.symbols, o => o.order.security?.Symbol);
|
pb.add_discrete_values(fs.symbols, o => o.order.security?.Symbol);
|
||||||
// numeric
|
// numeric
|
||||||
pb.add_numeric(fs.qty, o => o.order.order.quantity());
|
pb.add_numeric(fs.qty, o => o.order.order.quantity());
|
||||||
pb.add_price(fs.price, o => o.order.order.price(), o => o.order.security);
|
pb.add_price(fs.price, o => o.order.order.ui_price(), o => o.order.security);
|
||||||
pb.add_numeric(fs.qty_filled, o => o.order.order.filled());
|
pb.add_numeric(fs.qty_filled, o => o.order.order.filled());
|
||||||
pb.add_numeric(fs.avg_price, o => o.order.order.avg_price());
|
pb.add_numeric(fs.avg_price, o => o.order.order.avg_price());
|
||||||
pb.add_numeric(fs.last_price, o => o.order.order.last_price());
|
pb.add_numeric(fs.last_price, o => o.order.order.last_price());
|
||||||
|
|||||||
@@ -65,6 +65,9 @@ namespace bts.shell.orderbook {
|
|||||||
// use defaults
|
// use defaults
|
||||||
[ProtoMember(25)]
|
[ProtoMember(25)]
|
||||||
public bool use_defaults;
|
public bool use_defaults;
|
||||||
|
// menu display
|
||||||
|
[ProtoMember(27)]
|
||||||
|
public SparkMenuDisplaySettings menu_display { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Please use <see cref="Default"/> to get a new instance (the only reason the default constructor still exists is for ProtoBuf deserialization).
|
/// Please use <see cref="Default"/> to get a new instance (the only reason the default constructor still exists is for ProtoBuf deserialization).
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
<Window
|
||||||
|
x:Class="bts.shell.orderbook.OrderBookAlgoParamsDialog"
|
||||||
|
x:ClassModifier="internal"
|
||||||
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:sp="clr-namespace:mbts.spark"
|
||||||
|
xmlns:ob="clr-namespace:bts.shell.orderbook"
|
||||||
|
xmlns:usp="clr-namespace:mbts.ui.spark"
|
||||||
|
xmlns:u="clr-namespace:mbts.ui"
|
||||||
|
xmlns:c="clr-namespace:mbts.ui.controls"
|
||||||
|
u:WindowStyle.SizeToContent="WidthAndHeight"
|
||||||
|
Margin="0"
|
||||||
|
Padding="0"
|
||||||
|
Style="{StaticResource BTSWindowTitleTemplate}"
|
||||||
|
>
|
||||||
|
<u:WindowStyle.TitleContentTemplate>
|
||||||
|
<DataTemplate DataType="{x:Type sp:AlgoDefinitionVM}">
|
||||||
|
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
|
||||||
|
<usp:OrderTypeItem Margin="4,0" DisplayName="{Binding name, StringFormat='{}{0} Params'}" BadgeFill="{Binding badge_fill}"/>
|
||||||
|
</StackPanel>
|
||||||
|
</DataTemplate>
|
||||||
|
</u:WindowStyle.TitleContentTemplate>
|
||||||
|
<Window.ContentTemplate>
|
||||||
|
<DataTemplate DataType="{x:Type ob:OrderBookAlgoParamsVM}">
|
||||||
|
<Grid>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="*"/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<usp:AlgoEditorGridView
|
||||||
|
Width="390"
|
||||||
|
Margin="5"
|
||||||
|
AlgoParamRows="{Binding param_rows}"
|
||||||
|
CanUserChangeAlgoRoot="False"
|
||||||
|
/>
|
||||||
|
<c:DialogSkirt Grid.Row="1" RightItems="{Binding dialog_skirt}"/>
|
||||||
|
</Grid>
|
||||||
|
</DataTemplate>
|
||||||
|
</Window.ContentTemplate>
|
||||||
|
</Window>
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
using bts.api.orderman;
|
||||||
|
using bts.collections;
|
||||||
|
using mbts.spark;
|
||||||
|
using mbts.ui;
|
||||||
|
using mbts.ui.controls;
|
||||||
|
using mbts.ui.shell;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Windows;
|
||||||
|
|
||||||
|
namespace bts.shell.orderbook {
|
||||||
|
/// <summary>
|
||||||
|
/// Interaction logic for OrderBookAlgoParamsDialog.xaml
|
||||||
|
/// </summary>
|
||||||
|
partial class OrderBookAlgoParamsDialog : Window {
|
||||||
|
public OrderBookAlgoParamsDialog() =>
|
||||||
|
InitializeComponent();
|
||||||
|
}
|
||||||
|
|
||||||
|
class OrderBookAlgoParamsVM : DisposableViewModelBase, IRequestViewClose {
|
||||||
|
readonly ObservableAggregateCollection<AlgoParamRowVM> _param_rows = new ObservableAggregateCollection<AlgoParamRowVM>();
|
||||||
|
readonly DialogSkirtItem _commit, _cancel;
|
||||||
|
|
||||||
|
public OrderBookAlgoParamsVM(AlgoDefinitionVM algo_definition, bool can_user_edit) {
|
||||||
|
this.algo_definition = algo_definition;
|
||||||
|
_dispose = AlgoParamRowsHelper.connect(algo_definition, _param_rows, false);
|
||||||
|
_commit = new DialogSkirtItem("OK", new DelegateCommand(commit, () => can_user_edit)) { is_default = true };
|
||||||
|
_cancel = new DialogSkirtItem("Cancel", new DelegateCommand(close)) { is_cancel = true };
|
||||||
|
// local methods
|
||||||
|
void commit() {
|
||||||
|
RequestCommit?.Invoke(new CustomOrderDefinitionImmutable(algo_definition.algo_root.created_assigned()));
|
||||||
|
close();
|
||||||
|
}
|
||||||
|
void close() => RequestClose?.Invoke(this, EventArgs.Empty);
|
||||||
|
}
|
||||||
|
|
||||||
|
public event EventHandler RequestClose;
|
||||||
|
public event Action<CustomOrderDefinitionImmutable> RequestCommit;
|
||||||
|
|
||||||
|
public AlgoDefinitionVM algo_definition { get; }
|
||||||
|
public IReadOnlyObservableCollection<AlgoParamRowVM> param_rows => _param_rows;
|
||||||
|
public IEnumerable<DialogSkirtItem> dialog_skirt {
|
||||||
|
get {
|
||||||
|
yield return _commit;
|
||||||
|
yield return _cancel;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -99,7 +99,7 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class OrderBookRowView : DIYGrid.HighPerformanceRow<OrderBookRowVM, OrderBookGridView.ColumnKeys> {
|
class OrderBookRowView : DIYGrid.HighPerformanceRow<OrderBookRowVM> {
|
||||||
public OrderBookRowView() : base() { }
|
public OrderBookRowView() : base() { }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -484,6 +484,7 @@
|
|||||||
<Border Padding="12,12,12,6">
|
<Border Padding="12,12,12,6">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="Auto"/>
|
<RowDefinition Height="Auto"/>
|
||||||
<RowDefinition Height="*"/>
|
<RowDefinition Height="*"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
@@ -495,7 +496,45 @@
|
|||||||
AlgoParamRows="{Binding param_rows}"
|
AlgoParamRows="{Binding param_rows}"
|
||||||
IsReadOnly="{Binding DataContext.can_user_modify_selected_orders, ElementName=Root, Converter={StaticResource NotConverter}}"
|
IsReadOnly="{Binding DataContext.can_user_modify_selected_orders, ElementName=Root, Converter={StaticResource NotConverter}}"
|
||||||
/>
|
/>
|
||||||
<StackPanel Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,8,0,0" Orientation="Horizontal">
|
<c:ExpanderToggleButton
|
||||||
|
x:Name="algo_state_toggle"
|
||||||
|
Grid.Row="1"
|
||||||
|
BorderThickness="0"
|
||||||
|
Content="Algo State"
|
||||||
|
HorizontalContentAlignment="Left"
|
||||||
|
Margin="0,4,0,0"
|
||||||
|
VerticalAlignment="Top"
|
||||||
|
Visibility="{Binding current_algo_custom_state.Count, Converter={StaticResource IntNotZeroVisibilityConverter}}"
|
||||||
|
/>
|
||||||
|
<c:DIYGrid Grid.Row="1" Rows="{Binding current_algo_custom_state}" Margin="0,28,0,4">
|
||||||
|
<c:DIYGrid.Visibility>
|
||||||
|
<MultiBinding>
|
||||||
|
<MultiBinding.Converter>
|
||||||
|
<cv:MultiValueConverterPipe>
|
||||||
|
<cv:BooleanAndConverter/>
|
||||||
|
<cv:BooleanToVisibilityConverter/>
|
||||||
|
</cv:MultiValueConverterPipe>
|
||||||
|
</MultiBinding.Converter>
|
||||||
|
<Binding Path="current_algo_custom_state.Count" Mode="OneWay" Converter="{StaticResource IntNotZeroConverter}"/>
|
||||||
|
<Binding Path="IsChecked" ElementName="algo_state_toggle"/>
|
||||||
|
</MultiBinding>
|
||||||
|
</c:DIYGrid.Visibility>
|
||||||
|
<c:DIYGrid.Columns>
|
||||||
|
<c:DIYGridColumnCollection>
|
||||||
|
<c:DIYGridColumn id="Name" Header="Param" Width="176"/>
|
||||||
|
<c:DIYGridColumn id="Value" Header="Value" Width="176"/>
|
||||||
|
</c:DIYGridColumnCollection>
|
||||||
|
</c:DIYGrid.Columns>
|
||||||
|
<c:DIYGrid.RowTemplate>
|
||||||
|
<DataTemplate>
|
||||||
|
<Grid c:DIYGrid.SyncWithColumnGeometry="True">
|
||||||
|
<c:TextCell c:DIYGrid.ColumnKey="Name" Text="{Binding name}"/>
|
||||||
|
<c:TextCell c:DIYGrid.ColumnKey="Value" Text="{Binding value}"/>
|
||||||
|
</Grid>
|
||||||
|
</DataTemplate>
|
||||||
|
</c:DIYGrid.RowTemplate>
|
||||||
|
</c:DIYGrid>
|
||||||
|
<StackPanel Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,8,0,0" Orientation="Horizontal">
|
||||||
<Button x:Name="modify_orders_button" Command="{Binding modify_selected_orders_cmd}">
|
<Button x:Name="modify_orders_button" Command="{Binding modify_selected_orders_cmd}">
|
||||||
<Button.Margin>
|
<Button.Margin>
|
||||||
<Thickness Right="{StaticResource DialogSkirtButtonPadding.Right}"/>
|
<Thickness Right="{StaticResource DialogSkirtButtonPadding.Right}"/>
|
||||||
|
|||||||
@@ -1,375 +1,388 @@
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.collections;
|
using bts.collections;
|
||||||
using bts.settings;
|
using bts.settings;
|
||||||
using bts.shell.pnl;
|
using bts.shell.pnl;
|
||||||
using bts.spark;
|
using bts.spark;
|
||||||
using bts.utils;
|
using bts.utils;
|
||||||
using mbts;
|
using bts.view;
|
||||||
using mbts.config;
|
using mbts;
|
||||||
using mbts.persist;
|
using mbts.config;
|
||||||
using mbts.spark;
|
using mbts.persist;
|
||||||
using mbts.ui;
|
using mbts.spark;
|
||||||
using mbts.ui.controls;
|
using mbts.ui;
|
||||||
using mbts.ui.settings;
|
using mbts.ui.controls;
|
||||||
using mbts.ui.spark;
|
using mbts.ui.settings;
|
||||||
using mbts.ui.utility;
|
using mbts.ui.spark;
|
||||||
using System;
|
using mbts.ui.utility;
|
||||||
using System.Collections.Generic;
|
using System;
|
||||||
using System.Collections.Immutable;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Specialized;
|
using System.Collections.Immutable;
|
||||||
using System.ComponentModel;
|
using System.Collections.Specialized;
|
||||||
using System.ComponentModel.Composition;
|
using System.ComponentModel;
|
||||||
using System.Linq;
|
using System.ComponentModel.Composition;
|
||||||
using System.Reactive.Linq;
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Reactive.Linq;
|
||||||
using System.Windows;
|
using System.Threading.Tasks;
|
||||||
using System.Windows.Media;
|
using System.Windows;
|
||||||
|
using System.Windows.Media;
|
||||||
namespace bts.shell {
|
|
||||||
class PNLWindowFactory : ShellWindowFactory<PNLSaveState> {
|
namespace bts.shell {
|
||||||
const string _window_type = "PNL", _window_title = "PNL";
|
class PNLWindowFactory : ShellWindowFactory<PNLSaveState> {
|
||||||
readonly IBus _bus;
|
const string _window_type = "PNL", _window_title = "PNL";
|
||||||
readonly OrdersModel _orders_model;
|
readonly IBus _bus;
|
||||||
readonly UserSettingsHub _settings_hub;
|
readonly OrdersModel _orders_model;
|
||||||
readonly PNLConfig _pnl_conf;
|
readonly UserSettingsHub _settings_hub;
|
||||||
readonly IShellWindowThreadIDProvider _thread_id_provider;
|
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;
|
public PNLWindowFactory(IShellModule owner, IBus bus, UserSettingsHub settings_hub, OrdersModel orders_model) : base(owner, _window_type) {
|
||||||
_orders_model = orders_model;
|
_bus = bus;
|
||||||
_settings_hub = settings_hub;
|
_orders_model = orders_model;
|
||||||
_pnl_conf = new PNLConfig(Configuration.get<bts.config.PNLOptions>());
|
_settings_hub = settings_hub;
|
||||||
_thread_id_provider = ShellWindowThreadIDFactory.create(_window_type, Configuration.get<bts.config.MultiThreadedWindows>().pnl);
|
_pnl_conf = new PNLConfig(Configuration.get<bts.config.PNLOptions>());
|
||||||
_dispose = bus.subscribe(SparkTags.ShowPNLTag).OnDispatcher().Subscribe(_show);
|
_thread_id_provider = ShellWindowThreadIDFactory.create(_window_type, Configuration.get<bts.config.MultiThreadedWindows>().pnl);
|
||||||
}
|
_dispose = bus.subscribe(SparkTags.ShowPNLTag).OnDispatcher().Subscribe(_show);
|
||||||
|
}
|
||||||
public override Task<IShellWindow> load(PNLSaveState state) =>
|
|
||||||
Task.FromResult(_create(state.settings));
|
public override Task<IShellWindow> load(PNLSaveState state) =>
|
||||||
|
Task.FromResult(_create(state.settings));
|
||||||
void _show(PNLSettings settings) =>
|
|
||||||
_bus.post(SparkTags.ShowWindow, _create(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);
|
IShellWindow _create(PNLSettings 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.
|
var settings_manager = _settings_hub.create_pnl_settings_manager(settings);
|
||||||
// If that happens, we would be unable to access _grid.Columns, and thus unable to get the current column 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.
|
||||||
// Use an ImmutableList to avoid any threading issues when responding to CollectionChanged events on the dispatcher thread.
|
// If that happens, we would be unable to access _grid.Columns, and thus unable to get the current column settings.
|
||||||
ImmutableList<DIYGrid.ColumnBase> cached_columns = ImmutableList<DIYGrid.ColumnBase>.Empty;
|
// Use an ImmutableList to avoid any threading issues when responding to CollectionChanged events on the dispatcher thread.
|
||||||
return SparkWindow<PNLSaveState>.create(_window_type, _window_title, _bus, this, Icons.Accounting, _thread_id_provider.next_id(), () => {
|
ImmutableList<DIYGrid.ColumnBase> cached_columns = ImmutableList<DIYGrid.ColumnBase>.Empty;
|
||||||
var vm = new PNLVM(_bus, _orders_model, settings ?? PNLSettings.Default);
|
Action<SparkWindowView> on_parent_view_created_impl = null;
|
||||||
var content = new PNLView {
|
return SparkWindow<PNLSaveState>.create(_window_type, _window_title, _bus, this, Icons.Accounting, _thread_id_provider.next_id(), () => {
|
||||||
DataContext = vm
|
var init_settings = settings ?? PNLSettings.Default;
|
||||||
};
|
var menu_display_vm = new SparkMenuDisplayVM();
|
||||||
vm.sorting_changed += sh => {
|
menu_display_vm.load_from(init_settings.menu_display);
|
||||||
try {
|
on_parent_view_created_impl = menu_display_vm.safe_bind_to_view;
|
||||||
DIYGridSortHelper.set_sort_directions(sh, content._grid.Columns);
|
var vm = new PNLVM(_bus, _orders_model, init_settings);
|
||||||
} catch { }
|
var content = new PNLView {
|
||||||
};
|
DataContext = vm
|
||||||
vm.SubscribeDisposed(
|
};
|
||||||
DIYGridSortHelper.observe_active_comparers<PNLView.Columns, PNLRowVM>(content._grid, PNLVM.get_column_comparer)
|
vm.sorting_changed += sh => {
|
||||||
.OnDispatcher()
|
try {
|
||||||
.Subscribe(sh => vm.sorting_hierarchy = sh.Select(s => (s.key, s.direction)).ToList()));
|
DIYGridSortHelper.set_sort_directions(sh, content._grid.Columns);
|
||||||
cached_columns = ImmutableList<DIYGrid.ColumnBase>.Empty.AddRange(content._grid.Columns);
|
} catch { }
|
||||||
|
};
|
||||||
Func<PNLSaveState> get_save_state = () => {
|
vm.SubscribeDisposed(
|
||||||
var cols = cached_columns.ToArray(c => c.create());
|
DIYGridSortHelper.observe_active_comparers<PNLView.Columns, PNLRowVM>(content._grid, PNLVM.get_column_comparer)
|
||||||
var filters = vm.get_filters_states();
|
.OnDispatcher()
|
||||||
var sorting_criterion = vm.sorting_hierarchy.Select(tup => new SortingCriteria(tup.key.ToString(), tup.direction == ListSortDirection.Ascending)).ToArray();
|
.Subscribe(sh => vm.sorting_hierarchy = sh.Select(s => (s.key, s.direction)).ToList()));
|
||||||
var calc_type = vm.calculation_type;
|
cached_columns = ImmutableList<DIYGrid.ColumnBase>.Empty.AddRange(content._grid.Columns);
|
||||||
var state = settings_manager.instance_settings;
|
|
||||||
if (state == null) {
|
Func<PNLSaveState> get_save_state = () => {
|
||||||
// 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 cols = cached_columns.ToArray(c => c.create());
|
||||||
var defaults = settings_manager.default_settings;
|
var filters = vm.get_filters_states();
|
||||||
if (calc_type == defaults.calculation_type &&
|
var sorting_criterion = vm.sorting_hierarchy.Select(tup => new SortingCriteria(tup.key.ToString(), tup.direction == ListSortDirection.Ascending)).ToArray();
|
||||||
defaults.sorting_criterion.SequenceEqual(sorting_criterion) &&
|
var calc_type = vm.calculation_type;
|
||||||
defaults.grid.columns.SequenceEqual(cols) && defaults.filters.safe_equals(filters)) {
|
var state = settings_manager.instance_settings;
|
||||||
// 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
|
if (state == null) {
|
||||||
return new PNLSaveState { use_defaults = true, settings = 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;
|
||||||
state = defaults;
|
if (calc_type == defaults.calculation_type &&
|
||||||
}
|
defaults.sorting_criterion.SequenceEqual(sorting_criterion) &&
|
||||||
// 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)
|
defaults.grid.columns.SequenceEqual(cols) && defaults.filters.safe_equals(filters)) {
|
||||||
state = state.with(
|
// 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
|
||||||
sorting_criterion,
|
return new PNLSaveState { use_defaults = true, settings = null };
|
||||||
vm.anchors,
|
}
|
||||||
filters,
|
state = defaults;
|
||||||
state.grid.with(columns: cols, background: vm.grid_background_color.rgb_color()),
|
}
|
||||||
calc_type,
|
// 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)
|
||||||
vm.header_row_display);
|
state = state.with(
|
||||||
return new PNLSaveState { use_defaults = false, settings = state };
|
sorting_criterion,
|
||||||
};
|
vm.anchors,
|
||||||
IEnumerable<SparkCommand> commands = new[] {
|
filters,
|
||||||
new SparkCommandCommand("Collapse All", Icons.RightArrow, new DelegateCommand(() => vm.set_all_expanded(false))),
|
state.grid.with(columns: cols, background: vm.grid_background_color.rgb_color()),
|
||||||
new SparkCommandCommand("Expand All", Icons.DownArrow, new DelegateCommand(() => vm.set_all_expanded(true))),
|
calc_type,
|
||||||
new SparkCommandCommand("Play", Icons.Play, new DelegateCommand(() => vm.is_paused = false)) {
|
vm.header_row_display,
|
||||||
show_in_context_menu = _pnl_conf.show_pause_resume,
|
menu_display: menu_display_vm.create());
|
||||||
show_in_toolbar = _pnl_conf.show_pause_resume
|
return new PNLSaveState { use_defaults = false, settings = state };
|
||||||
},
|
};
|
||||||
new SparkCommandCommand("Pause", Icons.Pause, new DelegateCommand(() => vm.is_paused = true)) {
|
IEnumerable<SparkCommand> commands = new[] {
|
||||||
show_in_context_menu = _pnl_conf.show_pause_resume,
|
new SparkCommandCommand("Collapse All", Icons.RightArrow, new DelegateCommand(() => vm.set_all_expanded(false))),
|
||||||
show_in_toolbar = _pnl_conf.show_pause_resume
|
new SparkCommandCommand("Expand All", Icons.DownArrow, new DelegateCommand(() => vm.set_all_expanded(true))),
|
||||||
},
|
new SparkCommandCommand("Play", Icons.Play, new DelegateCommand(() => vm.is_paused = false)) {
|
||||||
SparkCommands.window_settings_command(new DialogCommand(() => {
|
show_in_context_menu = _pnl_conf.show_pause_resume,
|
||||||
settings_manager.instance_settings = get_save_state().settings;
|
show_in_toolbar = _pnl_conf.show_pause_resume
|
||||||
var dialog_vm = new ShellSettingsDialogVM<PNLSettings, PNLSettingsVM>(
|
},
|
||||||
settings_manager,
|
new SparkCommandCommand("Pause", Icons.Pause, new DelegateCommand(() => vm.is_paused = true)) {
|
||||||
us => us.pnl,
|
show_in_context_menu = _pnl_conf.show_pause_resume,
|
||||||
UserSettings.FileExtensions.PNL,
|
show_in_toolbar = _pnl_conf.show_pause_resume
|
||||||
s => new PNLSettingsVM(s));
|
},
|
||||||
var dialog = new ShellSettingsDialog { DataContext = dialog_vm };
|
SparkCommands.window_settings_command(new DialogCommand(() => {
|
||||||
dialog_vm.RequestClose += on_request_close;
|
settings_manager.instance_settings = get_save_state().settings;
|
||||||
return dialog;
|
var dialog_vm = new ShellSettingsDialogVM<PNLSettings, PNLSettingsVM>(
|
||||||
void on_request_close(object sender, EventArgs e) =>
|
settings_manager,
|
||||||
WindowUtilities.force_close(dialog);
|
us => us.pnl,
|
||||||
}))
|
UserSettings.FileExtensions.PNL,
|
||||||
};
|
s => new PNLSettingsVM(s));
|
||||||
IDisposable dispose = Disposable.Create(
|
var dialog = new ShellSettingsDialog { DataContext = dialog_vm };
|
||||||
settings_manager.subscribe_current().OnDispatcher().Subscribe(s => {
|
dialog_vm.RequestClose += on_request_close;
|
||||||
vm.load_from(s);
|
return dialog;
|
||||||
var col_setting_map = s.grid.columns.ToDictionary(c => c.id);
|
void on_request_close(object sender, EventArgs e) =>
|
||||||
var fallback_family = new FontFamily(s.grid.font_family);
|
WindowUtilities.force_close(dialog);
|
||||||
// group
|
})),
|
||||||
var group_col_setting_map = s.group_columns.ToDictionary(c => c.id);
|
menu_display_vm.spark_cmd
|
||||||
var group_appearance = s.group_cell_appearance.to_appearance();
|
};
|
||||||
// header
|
IDisposable dispose = Disposable.Create(
|
||||||
var header_col_setting_map = s.header_columns.ToDictionary(c => c.id);
|
settings_manager.subscribe_current().OnDispatcher().Subscribe(s => {
|
||||||
var header_appearance = s.header_cell_appearance.to_appearance();
|
vm.load_from(s);
|
||||||
//
|
var col_setting_map = s.grid.columns.ToDictionary(c => c.id);
|
||||||
foreach (var c in content._grid.Columns.OfType<PNLColumn>()) {
|
var fallback_family = new FontFamily(s.grid.font_family);
|
||||||
if (col_setting_map.TryGetValue(c.id, out var cs)) {
|
// group
|
||||||
c.load_from(cs);
|
var group_col_setting_map = s.group_columns.ToDictionary(c => c.id);
|
||||||
}
|
var group_appearance = s.group_cell_appearance.to_appearance();
|
||||||
if (group_col_setting_map.TryGetValue(c.id, out var gcs)) {
|
// header
|
||||||
c.load_group_params(
|
var header_col_setting_map = s.header_columns.ToDictionary(c => c.id);
|
||||||
group_appearance.font_size,
|
var header_appearance = s.header_cell_appearance.to_appearance();
|
||||||
gcs.font_weight_override ?? group_appearance.font_weight,
|
//
|
||||||
gcs.font_color_override ?? group_appearance.foreground,
|
foreach (var c in content._grid.Columns.OfType<PNLColumn>()) {
|
||||||
group_appearance.font_family);
|
if (col_setting_map.TryGetValue(c.id, out var cs)) {
|
||||||
}
|
c.load_from(cs);
|
||||||
if (header_col_setting_map.TryGetValue(c.id, out var hcs)) {
|
}
|
||||||
c.load_header_params(
|
if (group_col_setting_map.TryGetValue(c.id, out var gcs)) {
|
||||||
header_appearance.font_size,
|
c.load_group_params(
|
||||||
hcs.font_weight_override ?? header_appearance.font_weight,
|
group_appearance.font_size,
|
||||||
hcs.font_color_override ?? header_appearance.foreground,
|
gcs.font_weight_override ?? group_appearance.font_weight,
|
||||||
header_appearance.font_family);
|
gcs.font_color_override ?? group_appearance.foreground,
|
||||||
}
|
group_appearance.font_family);
|
||||||
}
|
}
|
||||||
CollectionHelper.sync_with_never_duplicate(content._grid.Columns, s.grid.columns, cs => {
|
if (header_col_setting_map.TryGetValue(c.id, out var hcs)) {
|
||||||
throw new InvalidOperationException();
|
c.load_header_params(
|
||||||
}, c => c.id.ToLower(), cs => cs.id.ToLower());
|
header_appearance.font_size,
|
||||||
}),
|
hcs.font_weight_override ?? header_appearance.font_weight,
|
||||||
content._grid.Columns.Subscribe((s, e) => {
|
hcs.font_color_override ?? header_appearance.foreground,
|
||||||
switch (e.Action) {
|
header_appearance.font_family);
|
||||||
case NotifyCollectionChangedAction.Add: add_new(); break;
|
}
|
||||||
case NotifyCollectionChangedAction.Remove: remove_old(); break;
|
}
|
||||||
case NotifyCollectionChangedAction.Replace:
|
CollectionHelper.sync_with_never_duplicate(content._grid.Columns, s.grid.columns, cs => {
|
||||||
case NotifyCollectionChangedAction.Move:
|
throw new InvalidOperationException();
|
||||||
remove_old();
|
}, c => c.id.ToLower(), cs => cs.id.ToLower());
|
||||||
add_new();
|
}),
|
||||||
break;
|
content._grid.Columns.Subscribe((s, e) => {
|
||||||
case NotifyCollectionChangedAction.Reset:
|
switch (e.Action) {
|
||||||
cached_columns = ImmutableList<DIYGrid.ColumnBase>.Empty.AddRange(content._grid.Columns);
|
case NotifyCollectionChangedAction.Add: add_new(); break;
|
||||||
break;
|
case NotifyCollectionChangedAction.Remove: remove_old(); break;
|
||||||
}
|
case NotifyCollectionChangedAction.Replace:
|
||||||
void add_new() =>
|
case NotifyCollectionChangedAction.Move:
|
||||||
cached_columns = e.NewStartingIndex >= 0 ?
|
remove_old();
|
||||||
cached_columns.InsertRange(e.NewStartingIndex, e.NewItems.OfType<DIYGrid.ColumnBase>()) :
|
add_new();
|
||||||
cached_columns.AddRange(e.NewItems.OfType<DIYGrid.ColumnBase>());
|
break;
|
||||||
|
case NotifyCollectionChangedAction.Reset:
|
||||||
void remove_old() =>
|
cached_columns = ImmutableList<DIYGrid.ColumnBase>.Empty.AddRange(content._grid.Columns);
|
||||||
cached_columns = e.OldStartingIndex >= 0 ?
|
break;
|
||||||
cached_columns.RemoveRange(e.OldStartingIndex, e.OldItems.Count) :
|
}
|
||||||
cached_columns.RemoveRange(e.OldItems.OfType<DIYGrid.ColumnBase>());
|
void add_new() =>
|
||||||
}),
|
cached_columns = e.NewStartingIndex >= 0 ?
|
||||||
Disposable.wrap_collection(commands.OfType<IDisposable>()),
|
cached_columns.InsertRange(e.NewStartingIndex, e.NewItems.OfType<DIYGrid.ColumnBase>()) :
|
||||||
vm);
|
cached_columns.AddRange(e.NewItems.OfType<DIYGrid.ColumnBase>());
|
||||||
return (content, commands, get_save_state, dispose);
|
|
||||||
},
|
void remove_old() =>
|
||||||
min_width_offset: SystemParameters.HorizontalScrollBarButtonWidth + 8,
|
cached_columns = e.OldStartingIndex >= 0 ?
|
||||||
min_height_offset: 60);
|
cached_columns.RemoveRange(e.OldStartingIndex, e.OldItems.Count) :
|
||||||
}
|
cached_columns.RemoveRange(e.OldItems.OfType<DIYGrid.ColumnBase>());
|
||||||
|
}),
|
||||||
readonly struct PNLConfig {
|
Disposable.wrap_collection(commands.OfType<IDisposable>()),
|
||||||
public readonly bool
|
menu_display_vm,
|
||||||
enable_animations,
|
vm);
|
||||||
show_pause_resume;
|
return (content, commands, get_save_state, dispose);
|
||||||
|
},
|
||||||
public PNLConfig(bts.config.PNLOptions options) {
|
// the on_parent_view_created_impl delegate is initialized in the main create delegate,
|
||||||
enable_animations = options.enable_animations;
|
// so it can't be passed directly as an argument because it would just be null,
|
||||||
show_pause_resume = options.show_pause_resume;
|
// hence the proxy/wrapper delegate below.
|
||||||
}
|
on_parent_view_created: pview => on_parent_view_created_impl?.Invoke(pview),
|
||||||
}
|
min_width_offset: SystemParameters.HorizontalScrollBarButtonWidth + 8,
|
||||||
|
min_height_offset: 60);
|
||||||
[Export(typeof(IPNLSettingsMigrationRule))]
|
}
|
||||||
class AddMissingAnimationsMigrationRule : IPNLSettingsMigrationRule {
|
|
||||||
public bool apply(PNLSettings settings, out PNLSettings new_settings) {
|
readonly struct PNLConfig {
|
||||||
if (settings != null && (
|
public readonly bool
|
||||||
_apply(ref settings, settings.animations, PNLSettings.default_animations, (s, anims) => s.with(animations: anims)) |
|
enable_animations,
|
||||||
_apply(ref settings, settings.group_header_animations, PNLSettings.default_group_header_animations, (s, anims) => s.with(group_header_animations: anims)) |
|
show_pause_resume;
|
||||||
_apply(ref settings, settings.header_row_animations, PNLSettings.default_header_row_animations, (s, anims) => s.with(header_row_animations: anims)))) {
|
|
||||||
//
|
public PNLConfig(bts.config.PNLOptions options) {
|
||||||
new_settings = settings;
|
enable_animations = options.enable_animations;
|
||||||
return true;
|
show_pause_resume = options.show_pause_resume;
|
||||||
}
|
}
|
||||||
new_settings = null;
|
}
|
||||||
return false;
|
|
||||||
}
|
[Export(typeof(IPNLSettingsMigrationRule))]
|
||||||
|
class AddMissingAnimationsMigrationRule : IPNLSettingsMigrationRule {
|
||||||
static bool _apply(ref PNLSettings settings, IEnumerable<PNLAnimationTriggerData> actual_triggers, IEnumerable<PNLAnimationTriggerData> default_triggers, Func<PNLSettings, PNLAnimationTriggerData[], PNLSettings> set_triggers) {
|
public bool apply(PNLSettings settings, out PNLSettings new_settings) {
|
||||||
if (_apply(actual_triggers, default_triggers, out var result)) {
|
if (settings != null && (
|
||||||
settings = set_triggers(settings, actual_triggers.Concat(result).ToArray());
|
_apply(ref settings, settings.animations, PNLSettings.default_animations, (s, anims) => s.with(animations: anims)) |
|
||||||
return true;
|
_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)))) {
|
||||||
return false;
|
//
|
||||||
}
|
new_settings = settings;
|
||||||
|
return true;
|
||||||
static bool _apply(IEnumerable<PNLAnimationTriggerData> actual_triggers, IEnumerable<PNLAnimationTriggerData> default_triggers, out IEnumerable<PNLAnimationTriggerData> result) {
|
}
|
||||||
var default_trigger_map = default_triggers.ToDictionary(t => t.expression);
|
new_settings = null;
|
||||||
var actual_trigger_map = actual_triggers.ToImmutableDictionary(t => t.expression);
|
return false;
|
||||||
var snapshot = actual_trigger_map;
|
}
|
||||||
foreach (var kv in snapshot) {
|
|
||||||
if (default_trigger_map.TryGetValue(kv.Key, out var default_anims)) {
|
static bool _apply(ref PNLSettings settings, IEnumerable<PNLAnimationTriggerData> actual_triggers, IEnumerable<PNLAnimationTriggerData> default_triggers, Func<PNLSettings, PNLAnimationTriggerData[], PNLSettings> set_triggers) {
|
||||||
// assume 1 animation per column
|
if (_apply(actual_triggers, default_triggers, out var result)) {
|
||||||
var actual_col_anims = kv.Value.animations.ToDictionaryCrushed(a => a.column);
|
settings = set_triggers(settings, actual_triggers.Concat(result).ToArray());
|
||||||
var default_col_anims = default_anims.animations.ToDictionaryCrushed(a => a.column);
|
return true;
|
||||||
actual_col_anims.Difference(default_col_anims,
|
}
|
||||||
out var exclusive_actual,
|
return false;
|
||||||
out var exclusive_defaults,
|
}
|
||||||
out var diff);
|
|
||||||
var new_col_anims = exclusive_defaults.ToList();
|
static bool _apply(IEnumerable<PNLAnimationTriggerData> actual_triggers, IEnumerable<PNLAnimationTriggerData> default_triggers, out IEnumerable<PNLAnimationTriggerData> result) {
|
||||||
if (new_col_anims.Count > 0) {
|
var default_trigger_map = default_triggers.ToDictionary(t => t.expression);
|
||||||
// add the original col animations to the new ones (combine them)
|
var actual_trigger_map = actual_triggers.ToImmutableDictionary(t => t.expression);
|
||||||
new_col_anims.AddRange(actual_col_anims);
|
var snapshot = actual_trigger_map;
|
||||||
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 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);
|
||||||
foreach (var kv in default_trigger_map) {
|
var default_col_anims = default_anims.animations.ToDictionaryCrushed(a => a.column);
|
||||||
if (!actual_trigger_map.ContainsKey(kv.Key))
|
actual_col_anims.Difference(default_col_anims,
|
||||||
actual_trigger_map = actual_trigger_map.Add(kv.Key, kv.Value);
|
out var exclusive_actual,
|
||||||
}
|
out var exclusive_defaults,
|
||||||
if (actual_trigger_map != snapshot) {
|
out var diff);
|
||||||
result = actual_trigger_map.Values;
|
var new_col_anims = exclusive_defaults.ToList();
|
||||||
return true;
|
if (new_col_anims.Count > 0) {
|
||||||
}
|
// add the original col animations to the new ones (combine them)
|
||||||
result = null;
|
new_col_anims.AddRange(actual_col_anims);
|
||||||
return false;
|
actual_trigger_map = actual_trigger_map.SetItem(kv.Key, kv.Value.with(animations: new_col_anims.Select(col_anim => col_anim.Value).ToArray()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
[Export(typeof(IPNLSettingsMigrationRule))]
|
foreach (var kv in default_trigger_map) {
|
||||||
class AddMissingColumnsMigrationRule : IPNLSettingsMigrationRule {
|
if (!actual_trigger_map.ContainsKey(kv.Key))
|
||||||
public bool apply(PNLSettings settings, out PNLSettings new_settings) {
|
actual_trigger_map = actual_trigger_map.Add(kv.Key, kv.Value);
|
||||||
if (settings != null) {
|
}
|
||||||
var defaults = PNLSettings.Default;
|
if (actual_trigger_map != snapshot) {
|
||||||
if (_apply(ref settings, settings.grid.columns, defaults.grid.columns, (s, cols) => s.with(grid: s.grid.with(cols))) |
|
result = actual_trigger_map.Values;
|
||||||
_apply(ref settings, settings.group_columns, defaults.group_columns, (s, cols) => s.with(group_columns: cols)) |
|
return true;
|
||||||
_apply(ref settings, settings.header_columns, defaults.header_columns, (s, cols) => s.with(header_columns: cols))) {
|
}
|
||||||
new_settings = settings;
|
result = null;
|
||||||
return true;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
new_settings = null;
|
|
||||||
return false;
|
[Export(typeof(IPNLSettingsMigrationRule))]
|
||||||
}
|
class AddMissingColumnsMigrationRule : IPNLSettingsMigrationRule {
|
||||||
|
public bool apply(PNLSettings settings, out PNLSettings new_settings) {
|
||||||
static bool _apply(ref PNLSettings settings, IEnumerable<GridColumnSettings> actual_columns, IEnumerable<GridColumnSettings> default_columns, Func<PNLSettings, IEnumerable<GridColumnSettings>, PNLSettings> set_columns) {
|
if (settings != null) {
|
||||||
if (GridSettingsHelper.add_missing_columns(actual_columns, default_columns, out var new_cols)) {
|
var defaults = PNLSettings.Default;
|
||||||
settings = set_columns(settings, new_cols);
|
if (_apply(ref settings, settings.grid.columns, defaults.grid.columns, (s, cols) => s.with(grid: s.grid.with(cols))) |
|
||||||
return true;
|
_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))) {
|
||||||
return false;
|
new_settings = settings;
|
||||||
}
|
return true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
[Export(typeof(IPNLSettingsMigrationRule))]
|
new_settings = null;
|
||||||
class RemoveColumnsMigrationRule : IPNLSettingsMigrationRule {
|
return false;
|
||||||
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))) |
|
static bool _apply(ref PNLSettings settings, IEnumerable<GridColumnSettings> actual_columns, IEnumerable<GridColumnSettings> default_columns, Func<PNLSettings, IEnumerable<GridColumnSettings>, PNLSettings> set_columns) {
|
||||||
_apply(ref settings, settings.group_columns, (s, cols) => s.with(group_columns: cols)) |
|
if (GridSettingsHelper.add_missing_columns(actual_columns, default_columns, out var new_cols)) {
|
||||||
_apply(ref settings, settings.header_columns, (s, cols) => s.with(header_columns: cols))) {
|
settings = set_columns(settings, new_cols);
|
||||||
new_settings = settings;
|
return true;
|
||||||
return true;
|
}
|
||||||
}
|
return false;
|
||||||
}
|
}
|
||||||
new_settings = null;
|
}
|
||||||
return false;
|
|
||||||
}
|
[Export(typeof(IPNLSettingsMigrationRule))]
|
||||||
|
class RemoveColumnsMigrationRule : IPNLSettingsMigrationRule {
|
||||||
bool _apply(ref PNLSettings settings, IEnumerable<GridColumnSettings> columns, Func<PNLSettings, IEnumerable<GridColumnSettings>, PNLSettings> set_columns) {
|
public bool apply(PNLSettings settings, out PNLSettings new_settings) {
|
||||||
if (_apply(columns, out var new_cols)) {
|
if (settings != null) {
|
||||||
settings = set_columns(settings, new_cols);
|
if (_apply(ref settings, settings.grid.columns, (s, cols) => s.with(grid: s.grid.with(cols))) |
|
||||||
return true;
|
_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))) {
|
||||||
return false;
|
new_settings = settings;
|
||||||
}
|
return true;
|
||||||
|
}
|
||||||
bool _apply(IEnumerable<GridColumnSettings> columns, out IEnumerable<GridColumnSettings> result) {
|
}
|
||||||
var col_list = columns.ToList();
|
new_settings = null;
|
||||||
int orig_count = col_list.Count;
|
return false;
|
||||||
col_list.RemoveWhere(c => !Enum.TryParse<PNLView.Columns>(c.id, true, out var _));
|
}
|
||||||
if (col_list.Count < orig_count) {
|
|
||||||
result = col_list;
|
bool _apply(ref PNLSettings settings, IEnumerable<GridColumnSettings> columns, Func<PNLSettings, IEnumerable<GridColumnSettings>, PNLSettings> set_columns) {
|
||||||
return true;
|
if (_apply(columns, out var new_cols)) {
|
||||||
}
|
settings = set_columns(settings, new_cols);
|
||||||
result = null;
|
return true;
|
||||||
return false;
|
}
|
||||||
}
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
[Export(typeof(IPNLSettingsMigrationRule))]
|
bool _apply(IEnumerable<GridColumnSettings> columns, out IEnumerable<GridColumnSettings> result) {
|
||||||
class RemoveColumnAnimationsMigrationRule : IPNLSettingsMigrationRule {
|
var col_list = columns.ToList();
|
||||||
public bool apply(PNLSettings settings, out PNLSettings new_settings) {
|
int orig_count = col_list.Count;
|
||||||
if (settings != null) {
|
col_list.RemoveWhere(c => !Enum.TryParse<PNLView.Columns>(c.id, true, out var _));
|
||||||
if (_apply(ref settings, settings.animations, (s, t) => s.with(animations: t)) |
|
if (col_list.Count < orig_count) {
|
||||||
_apply(ref settings, settings.group_header_animations, (s, t) => s.with(group_header_animations: t)) |
|
result = col_list;
|
||||||
_apply(ref settings, settings.header_row_animations, (s, t) => s.with(header_row_animations: t))) {
|
return true;
|
||||||
new_settings = settings;
|
}
|
||||||
return true;
|
result = null;
|
||||||
}
|
return false;
|
||||||
}
|
}
|
||||||
new_settings = null;
|
}
|
||||||
return false;
|
|
||||||
}
|
[Export(typeof(IPNLSettingsMigrationRule))]
|
||||||
|
class RemoveColumnAnimationsMigrationRule : IPNLSettingsMigrationRule {
|
||||||
bool _apply(ref PNLSettings settings, IEnumerable<PNLAnimationTriggerData> triggers, Func<PNLSettings, IEnumerable<PNLAnimationTriggerData>, PNLSettings> set_triggers) {
|
public bool apply(PNLSettings settings, out PNLSettings new_settings) {
|
||||||
if (_apply(triggers, out var new_triggers)) {
|
if (settings != null) {
|
||||||
settings = set_triggers(settings, new_triggers);
|
if (_apply(ref settings, settings.animations, (s, t) => s.with(animations: t)) |
|
||||||
return true;
|
_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))) {
|
||||||
return false;
|
new_settings = settings;
|
||||||
}
|
return true;
|
||||||
|
}
|
||||||
bool _apply(IEnumerable<PNLAnimationTriggerData> triggers, out IEnumerable<PNLAnimationTriggerData> result) {
|
}
|
||||||
var trigger_map = triggers.ToImmutableDictionary(t => t.expression);
|
new_settings = null;
|
||||||
var snapshot = trigger_map;
|
return false;
|
||||||
foreach (var t in trigger_map.Values) {
|
}
|
||||||
var anims = t.animations.ToList();
|
|
||||||
int orig_count = anims.Count;
|
bool _apply(ref PNLSettings settings, IEnumerable<PNLAnimationTriggerData> triggers, Func<PNLSettings, IEnumerable<PNLAnimationTriggerData>, PNLSettings> set_triggers) {
|
||||||
anims.RemoveWhere(a => !Enum.IsDefined(typeof(PNLView.Columns), a.column));
|
if (_apply(triggers, out var new_triggers)) {
|
||||||
if (anims.Count < orig_count)
|
settings = set_triggers(settings, new_triggers);
|
||||||
trigger_map = trigger_map.SetItem(t.expression, t.with(animations: anims.ToArray()));
|
return true;
|
||||||
}
|
}
|
||||||
if (trigger_map != snapshot) {
|
return false;
|
||||||
result = trigger_map.Values;
|
}
|
||||||
return true;
|
|
||||||
}
|
bool _apply(IEnumerable<PNLAnimationTriggerData> triggers, out IEnumerable<PNLAnimationTriggerData> result) {
|
||||||
result = null;
|
var trigger_map = triggers.ToImmutableDictionary(t => t.expression);
|
||||||
return false;
|
var snapshot = trigger_map;
|
||||||
}
|
foreach (var t in trigger_map.Values) {
|
||||||
}
|
var anims = t.animations.ToList();
|
||||||
|
int orig_count = anims.Count;
|
||||||
[Export(typeof(IPNLSettingsMigrationRule))]
|
anims.RemoveWhere(a => !Enum.IsDefined(typeof(PNLView.Columns), a.column));
|
||||||
class EnableGridBackgroundColorMigrationRule : IPNLSettingsMigrationRule {
|
if (anims.Count < orig_count)
|
||||||
public bool apply(PNLSettings settings, out PNLSettings new_settings) {
|
trigger_map = trigger_map.SetItem(t.expression, t.with(animations: anims.ToArray()));
|
||||||
if (settings != null && !settings.grid.enable_background_color) {
|
}
|
||||||
new_settings = settings.with(grid: settings.grid.with(enable_background_color: true));
|
if (trigger_map != snapshot) {
|
||||||
return true;
|
result = trigger_map.Values;
|
||||||
}
|
return true;
|
||||||
new_settings = null;
|
}
|
||||||
return false;
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -224,6 +224,8 @@ namespace bts.shell.pnl {
|
|||||||
}
|
}
|
||||||
[ProtoMember(6)]
|
[ProtoMember(6)]
|
||||||
public PNLHeaderRowDisplay header_row_display { get; set; }
|
public PNLHeaderRowDisplay header_row_display { get; set; }
|
||||||
|
[ProtoMember(15)]
|
||||||
|
public SparkMenuDisplaySettings menu_display { get; set; }
|
||||||
|
|
||||||
public IReadOnlyList<Columns> anchors => _anchors ?? (_anchors = Array.Empty<Columns>());
|
public IReadOnlyList<Columns> anchors => _anchors ?? (_anchors = Array.Empty<Columns>());
|
||||||
public IReadOnlyList<PNLAnimationTriggerData> animations => _animations ?? (_animations = default_animations.ToArray());
|
public IReadOnlyList<PNLAnimationTriggerData> animations => _animations ?? (_animations = default_animations.ToArray());
|
||||||
@@ -275,7 +277,8 @@ namespace bts.shell.pnl {
|
|||||||
IEnumerable<PNLAnimationTriggerData> animations = null,
|
IEnumerable<PNLAnimationTriggerData> animations = null,
|
||||||
IEnumerable<PNLAnimationTriggerData> group_header_animations = null,
|
IEnumerable<PNLAnimationTriggerData> group_header_animations = null,
|
||||||
IEnumerable<PNLAnimationTriggerData> header_row_animations = null,
|
IEnumerable<PNLAnimationTriggerData> header_row_animations = null,
|
||||||
IEnumerable<GridColumnSettings> header_columns = null) =>
|
IEnumerable<GridColumnSettings> header_columns = null,
|
||||||
|
SparkMenuDisplaySettings? menu_display = null) =>
|
||||||
new PNLSettings {
|
new PNLSettings {
|
||||||
calculation_type = calculation_type ?? this.calculation_type,
|
calculation_type = calculation_type ?? this.calculation_type,
|
||||||
header_row_display = header_row_display ?? this.header_row_display,
|
header_row_display = header_row_display ?? this.header_row_display,
|
||||||
@@ -295,7 +298,8 @@ namespace bts.shell.pnl {
|
|||||||
_group_header_animations = group_header_animations?.ToArray() ?? _group_header_animations,
|
_group_header_animations = group_header_animations?.ToArray() ?? _group_header_animations,
|
||||||
_header_row_animations = header_row_animations?.ToArray() ?? _header_row_animations,
|
_header_row_animations = header_row_animations?.ToArray() ?? _header_row_animations,
|
||||||
// grid
|
// grid
|
||||||
grid = grid ?? this.grid
|
grid = grid ?? this.grid,
|
||||||
|
menu_display = menu_display ?? this.menu_display
|
||||||
};
|
};
|
||||||
|
|
||||||
public bool Equals(PNLSettings other) =>
|
public bool Equals(PNLSettings other) =>
|
||||||
@@ -486,4 +490,4 @@ namespace bts.shell.pnl {
|
|||||||
public static IReadOnlyList<IPNLAnimationTrigger<PNLNormalizedData>> group_triggers(this PNLSettings settings) => settings.group_header_animations.Select(a => a.to_trigger<PNLNormalizedData>()).ToList();
|
public static IReadOnlyList<IPNLAnimationTrigger<PNLNormalizedData>> group_triggers(this PNLSettings settings) => settings.group_header_animations.Select(a => a.to_trigger<PNLNormalizedData>()).ToList();
|
||||||
public static IReadOnlyList<IPNLAnimationTrigger<PNLNormalizedData>> header_triggers(this PNLSettings settings) => settings.header_row_animations.Select(a => a.to_trigger<PNLNormalizedData>()).ToList();
|
public static IReadOnlyList<IPNLAnimationTrigger<PNLNormalizedData>> header_triggers(this PNLSettings settings) => settings.header_row_animations.Select(a => a.to_trigger<PNLNormalizedData>()).ToList();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -29,6 +29,10 @@
|
|||||||
<Color x:Key="GroupRowForegroundColor">#FF000000</Color>
|
<Color x:Key="GroupRowForegroundColor">#FF000000</Color>
|
||||||
<!--Converters-->
|
<!--Converters-->
|
||||||
<cv:GridLengthConverter x:Key="GridLengthPixelConverter" UnitType="Pixel"/>
|
<cv:GridLengthConverter x:Key="GridLengthPixelConverter" UnitType="Pixel"/>
|
||||||
|
<cv:ValueConverterPipe x:Key="GroupRowHeightConverter">
|
||||||
|
<cv:RangeBlockConverter Minimum="{x:Static pnl:PNLView.MinGroupRowHeight}"/>
|
||||||
|
<cv:GridLengthConverter UnitType="Pixel"/>
|
||||||
|
</cv:ValueConverterPipe>
|
||||||
<cv:MultiValueConverterPipe x:Key="GroupRowBackgroundConverter">
|
<cv:MultiValueConverterPipe x:Key="GroupRowBackgroundConverter">
|
||||||
<cv:PartialConverter/>
|
<cv:PartialConverter/>
|
||||||
<cv:ColorToBrushConverter/>
|
<cv:ColorToBrushConverter/>
|
||||||
@@ -258,7 +262,7 @@
|
|||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="RowTextCell" TargetType="c:TextCell">
|
<Style x:Key="TextCellBase" TargetType="c:TextCell">
|
||||||
<Setter Property="Background">
|
<Setter Property="Background">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<SolidColorBrush Color="{Binding background}"/>
|
<SolidColorBrush Color="{Binding background}"/>
|
||||||
@@ -269,10 +273,14 @@
|
|||||||
<SolidColorBrush Color="{Binding foreground}"/>
|
<SolidColorBrush Color="{Binding foreground}"/>
|
||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
|
||||||
<Setter Property="FontWeight" Value="{Binding font_weight}"/>
|
<Setter Property="FontWeight" Value="{Binding font_weight}"/>
|
||||||
<Setter Property="FontSize" Value="{Binding font_size}"/>
|
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
||||||
<Setter Property="Text" Value="{Binding text}"/>
|
<Setter Property="Text" Value="{Binding text}"/>
|
||||||
|
<Setter Property="SnapsToDevicePixels" Value="True"/>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<Style x:Key="RowTextCell" TargetType="c:TextCell" BasedOn="{StaticResource TextCellBase}">
|
||||||
|
<Setter Property="FontSize" Value="{Binding font_size}"/>
|
||||||
<Setter Property="c:DIYGrid.ObservedCachedColumnParams">
|
<Setter Property="c:DIYGrid.ObservedCachedColumnParams">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<x:Array Type="{x:Type c:CachedColumnParam}">
|
<x:Array Type="{x:Type c:CachedColumnParam}">
|
||||||
@@ -284,20 +292,7 @@
|
|||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="GroupRowTextCell" TargetType="c:TextCell">
|
<Style x:Key="GroupRowTextCell" TargetType="c:TextCell" BasedOn="{StaticResource TextCellBase}">
|
||||||
<Setter Property="Background">
|
|
||||||
<Setter.Value>
|
|
||||||
<SolidColorBrush Color="{Binding background}"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="Foreground">
|
|
||||||
<Setter.Value>
|
|
||||||
<SolidColorBrush Color="{Binding foreground}"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
|
||||||
<Setter Property="FontWeight" Value="{Binding font_weight}"/>
|
|
||||||
<Setter Property="Text" Value="{Binding text}"/>
|
|
||||||
<Setter Property="c:DIYGrid.ObservedCachedColumnParams">
|
<Setter Property="c:DIYGrid.ObservedCachedColumnParams">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<x:Array Type="{x:Type c:CachedColumnParam}">
|
<x:Array Type="{x:Type c:CachedColumnParam}">
|
||||||
@@ -309,21 +304,8 @@
|
|||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="HeaderRowTextCell" TargetType="c:TextCell">
|
<Style x:Key="HeaderRowTextCell" TargetType="c:TextCell" BasedOn="{StaticResource TextCellBase}">
|
||||||
<Setter Property="Background">
|
|
||||||
<Setter.Value>
|
|
||||||
<SolidColorBrush Color="{Binding background}"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="Foreground">
|
|
||||||
<Setter.Value>
|
|
||||||
<SolidColorBrush Color="{Binding foreground}"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="Margin" Value="0,0,0,1"/>
|
<Setter Property="Margin" Value="0,0,0,1"/>
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
|
||||||
<Setter Property="FontWeight" Value="{Binding font_weight}"/>
|
|
||||||
<Setter Property="Text" Value="{Binding text}"/>
|
|
||||||
<Setter Property="c:DIYGrid.ObservedCachedColumnParams">
|
<Setter Property="c:DIYGrid.ObservedCachedColumnParams">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<x:Array Type="{x:Type c:CachedColumnParam}">
|
<x:Array Type="{x:Type c:CachedColumnParam}">
|
||||||
@@ -335,7 +317,22 @@
|
|||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="HyperlinkCell" TargetType="c:HyperlinkCell">
|
<Style x:Key="HyperlinkCellBase" TargetType="c:HyperlinkCell">
|
||||||
|
<Setter Property="Background">
|
||||||
|
<Setter.Value>
|
||||||
|
<SolidColorBrush Color="{Binding background}"/>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
<Setter Property="BorderBrush">
|
||||||
|
<Setter.Value>
|
||||||
|
<SolidColorBrush Color="{Binding border}"/>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
<Setter Property="Foreground">
|
||||||
|
<Setter.Value>
|
||||||
|
<SolidColorBrush Color="{Binding foreground}"/>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
||||||
<Setter Property="VerticalAlignment" Value="Stretch"/>
|
<Setter Property="VerticalAlignment" Value="Stretch"/>
|
||||||
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
|
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
|
||||||
@@ -349,41 +346,23 @@
|
|||||||
</MultiBinding>
|
</MultiBinding>
|
||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
<Setter Property="c:DIYGrid.ObservedCachedColumnParams">
|
<Setter Property="Cursor">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<x:Array Type="{x:Type c:CachedColumnParam}">
|
<Binding Path="IsMouseOverClickArea" RelativeSource="{RelativeSource Self}">
|
||||||
<c:CachedColumnParam SourcePropertyName="font_family" TargetProperty="c:HyperlinkCell.FontFamily"/>
|
<Binding.Converter>
|
||||||
<c:CachedColumnParam SourcePropertyName="font_size" TargetProperty="c:HyperlinkCell.FontSize"/>
|
<cv:BooleanToObjectConverter ValueForFalse="{x:Static Cursors.Arrow}" ValueForTrue="{x:Static Cursors.Hand}"/>
|
||||||
<c:CachedColumnParam SourcePropertyName="font_brush" TargetProperty="c:HyperlinkCell.Foreground"/>
|
</Binding.Converter>
|
||||||
<c:CachedColumnParam SourcePropertyName="horizontal_alignment" TargetProperty="c:HyperlinkCell.HorizontalContentAlignment"/>
|
</Binding>
|
||||||
</x:Array>
|
|
||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
|
||||||
|
|
||||||
<Style x:Key="RowHyperlinkCell" TargetType="c:HyperlinkCell">
|
|
||||||
<Setter Property="Background">
|
|
||||||
<Setter.Value>
|
|
||||||
<SolidColorBrush Color="{Binding background}"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="Foreground">
|
|
||||||
<Setter.Value>
|
|
||||||
<SolidColorBrush Color="{Binding foreground}"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="BorderBrush">
|
|
||||||
<Setter.Value>
|
|
||||||
<SolidColorBrush Color="{Binding border}"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="Padding" Value="{x:Static c:DIYGrid.AnimatableCellPadding}"/>
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
|
||||||
<Setter Property="FontWeight" Value="{Binding font_weight}"/>
|
<Setter Property="FontWeight" Value="{Binding font_weight}"/>
|
||||||
<Setter Property="FontSize" Value="{Binding font_size}"/>
|
<Setter Property="FontSize" Value="{Binding font_size}"/>
|
||||||
|
<Setter Property="SnapsToDevicePixels" Value="True"/>
|
||||||
<Setter Property="Text" Value="{Binding text}"/>
|
<Setter Property="Text" Value="{Binding text}"/>
|
||||||
<Setter Property="Command" Value="{x:Static pnl:PNLView.CellClickCommand}"/>
|
</Style>
|
||||||
<Setter Property="CommandTarget" Value="{Binding RelativeSource={RelativeSource AncestorType=pnl:PNLView}}"/>
|
|
||||||
|
<Style x:Key="RowHyperlinkCell" TargetType="c:HyperlinkCell" BasedOn="{StaticResource HyperlinkCellBase}">
|
||||||
|
<Setter Property="Padding" Value="{x:Static c:DIYGrid.AnimatableCellPadding}"/>
|
||||||
<Setter Property="CommandParameter">
|
<Setter Property="CommandParameter">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<MultiBinding Converter="{x:Static pnl:PNLView.CellParamsConverter}">
|
<MultiBinding Converter="{x:Static pnl:PNLView.CellParamsConverter}">
|
||||||
@@ -403,24 +382,9 @@
|
|||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="HeaderRowHyperlinkCellBase" TargetType="c:HyperlinkCell">
|
<Style x:Key="HeaderRowHyperlinkCellBase" TargetType="c:HyperlinkCell" BasedOn="{StaticResource HyperlinkCellBase}">
|
||||||
<Setter Property="Background">
|
|
||||||
<Setter.Value>
|
|
||||||
<SolidColorBrush Color="{Binding background}"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="Foreground">
|
|
||||||
<Setter.Value>
|
|
||||||
<SolidColorBrush Color="{Binding foreground}"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="Margin" Value="0,0,0,1"/>
|
<Setter Property="Margin" Value="0,0,0,1"/>
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
||||||
<Setter Property="FontWeight" Value="{Binding font_weight}"/>
|
|
||||||
<Setter Property="FontSize" Value="{Binding font_size}"/>
|
|
||||||
<Setter Property="Text" Value="{Binding text}"/>
|
|
||||||
<Setter Property="Command" Value="{x:Static pnl:PNLView.CellClickCommand}"/>
|
|
||||||
<Setter Property="CommandTarget" Value="{Binding RelativeSource={RelativeSource AncestorType=pnl:PNLView}}"/>
|
|
||||||
<Setter Property="c:DIYGrid.ObservedCachedColumnParams">
|
<Setter Property="c:DIYGrid.ObservedCachedColumnParams">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<x:Array Type="{x:Type c:CachedColumnParam}">
|
<x:Array Type="{x:Type c:CachedColumnParam}">
|
||||||
@@ -454,23 +418,7 @@
|
|||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
<Style x:Key="GroupRowHyperlinkCell" TargetType="c:HyperlinkCell">
|
<Style x:Key="GroupRowHyperlinkCell" TargetType="c:HyperlinkCell" BasedOn="{StaticResource HyperlinkCellBase}">
|
||||||
<Setter Property="Background">
|
|
||||||
<Setter.Value>
|
|
||||||
<SolidColorBrush Color="{Binding background}"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="Foreground">
|
|
||||||
<Setter.Value>
|
|
||||||
<SolidColorBrush Color="{Binding foreground}"/>
|
|
||||||
</Setter.Value>
|
|
||||||
</Setter>
|
|
||||||
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
|
||||||
<Setter Property="FontWeight" Value="{Binding font_weight}"/>
|
|
||||||
<Setter Property="FontSize" Value="{Binding font_size}"/>
|
|
||||||
<Setter Property="Text" Value="{Binding text}"/>
|
|
||||||
<Setter Property="Command" Value="{x:Static pnl:PNLView.CellClickCommand}"/>
|
|
||||||
<Setter Property="CommandTarget" Value="{Binding RelativeSource={RelativeSource AncestorType=pnl:PNLView}}"/>
|
|
||||||
<Setter Property="CommandParameter">
|
<Setter Property="CommandParameter">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<MultiBinding Converter="{x:Static pnl:PNLView.CellParamsConverter}">
|
<MultiBinding Converter="{x:Static pnl:PNLView.CellParamsConverter}">
|
||||||
@@ -506,7 +454,7 @@
|
|||||||
<Grid
|
<Grid
|
||||||
c:DIYGrid.SyncWithColumnGeometrySource="{Binding ElementName=_grid}"
|
c:DIYGrid.SyncWithColumnGeometrySource="{Binding ElementName=_grid}"
|
||||||
c:DIYGrid.SyncWithColumnGeometry="True"
|
c:DIYGrid.SyncWithColumnGeometry="True"
|
||||||
Height="{Binding RowHeight, ElementName=_grid}"
|
Height="{Binding RowHeight, ElementName=_grid, Converter={x:Static pnl:PNLView.HeaderRowHeightConverter}}"
|
||||||
>
|
>
|
||||||
<Grid.Visibility>
|
<Grid.Visibility>
|
||||||
<Binding Path="header_row_display">
|
<Binding Path="header_row_display">
|
||||||
@@ -609,7 +557,6 @@
|
|||||||
c:DIYGrid.CachedColumnParamsContainer="{Binding RelativeSource={RelativeSource AncestorType=pnl:PNLView}}"
|
c:DIYGrid.CachedColumnParamsContainer="{Binding RelativeSource={RelativeSource AncestorType=pnl:PNLView}}"
|
||||||
VirtualizingPanel.ScrollUnit="Pixel"
|
VirtualizingPanel.ScrollUnit="Pixel"
|
||||||
ScrollViewer.CanContentScroll="True"
|
ScrollViewer.CanContentScroll="True"
|
||||||
RowHeight="24"
|
|
||||||
Rows="{Binding rows_view}"
|
Rows="{Binding rows_view}"
|
||||||
SelectionHighlight="{Binding selection_highlight}"
|
SelectionHighlight="{Binding selection_highlight}"
|
||||||
SupportGroupItems="True"
|
SupportGroupItems="True"
|
||||||
@@ -1053,7 +1000,7 @@
|
|||||||
<!--Row Template-->
|
<!--Row Template-->
|
||||||
<c:DIYGrid.RowTemplate>
|
<c:DIYGrid.RowTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Grid c:DIYGrid.SyncWithColumnGeometry="True" usp:GridAnimation.RowAnimation="{Binding animations}">
|
<Grid c:DIYGrid.SyncWithColumnGeometry="True" usp:GridAnimation.RowAnimation="{Binding animations}" Height="{Binding RowHeight, RelativeSource={RelativeSource AncestorType=c:DIYGrid}}">
|
||||||
<Grid.Background>
|
<Grid.Background>
|
||||||
<SolidColorBrush Color="{Binding DataContext.grid_background_color, RelativeSource={RelativeSource AncestorType=pnl:PNLView}}"/>
|
<SolidColorBrush Color="{Binding DataContext.grid_background_color, RelativeSource={RelativeSource AncestorType=pnl:PNLView}}"/>
|
||||||
</Grid.Background>
|
</Grid.Background>
|
||||||
@@ -1147,7 +1094,7 @@
|
|||||||
</VisualStateGroup>
|
</VisualStateGroup>
|
||||||
</VisualStateManager.VisualStateGroups>
|
</VisualStateManager.VisualStateGroups>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="{Binding RowHeight, RelativeSource={RelativeSource AncestorType=c:DIYGrid}, Converter={StaticResource GridLengthPixelConverter}}"/>
|
<RowDefinition Height="{Binding RowHeight, RelativeSource={RelativeSource AncestorType=c:DIYGrid}, Converter={StaticResource GroupRowHeightConverter}}"/>
|
||||||
<RowDefinition Height="*"/>
|
<RowDefinition Height="*"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Rectangle Grid.ColumnSpan="99" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Stroke="Gray" StrokeThickness="1"/>
|
<Rectangle Grid.ColumnSpan="99" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Stroke="Gray" StrokeThickness="1"/>
|
||||||
@@ -1217,4 +1164,4 @@
|
|||||||
<Rectangle Grid.Row="2" HorizontalAlignment="Stretch" VerticalAlignment="Top" Height="1" Fill="Gray"/>
|
<Rectangle Grid.Row="2" HorizontalAlignment="Stretch" VerticalAlignment="Top" Height="1" Fill="Gray"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</AdornerDecorator>
|
</AdornerDecorator>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@@ -6,6 +6,7 @@ using mbts.ui;
|
|||||||
using mbts.ui.controls;
|
using mbts.ui.controls;
|
||||||
using mbts.ui.controls.adorners;
|
using mbts.ui.controls.adorners;
|
||||||
using mbts.ui.converters;
|
using mbts.ui.converters;
|
||||||
|
using mbts.ui.dpi;
|
||||||
using mbts.ui.extensions;
|
using mbts.ui.extensions;
|
||||||
using mbts.ui.spark;
|
using mbts.ui.spark;
|
||||||
using mbts.ui.utility;
|
using mbts.ui.utility;
|
||||||
@@ -31,6 +32,10 @@ namespace bts.shell.pnl {
|
|||||||
}
|
}
|
||||||
|
|
||||||
partial class PNLView : UserControl {
|
partial class PNLView : UserControl {
|
||||||
|
public static readonly double
|
||||||
|
MinGroupRowHeight = 24.0.RoundLayoutValue(),
|
||||||
|
MinHeaderRowHeight = 24.0.RoundLayoutValue();
|
||||||
|
|
||||||
public enum Columns {
|
public enum Columns {
|
||||||
Account = 1,
|
Account = 1,
|
||||||
// Security
|
// Security
|
||||||
@@ -85,6 +90,7 @@ namespace bts.shell.pnl {
|
|||||||
public static readonly IValueConverter
|
public static readonly IValueConverter
|
||||||
IncrementalGroupLevelConverter = ValueConverter.create<int, int>(level => level + 1),
|
IncrementalGroupLevelConverter = ValueConverter.create<int, int>(level => level + 1),
|
||||||
GroupLevelMarginConverter = ValueConverter.create<int, Thickness>(level => new Thickness(24 * level, 0, 0, 0)),
|
GroupLevelMarginConverter = ValueConverter.create<int, Thickness>(level => new Thickness(24 * level, 0, 0, 0)),
|
||||||
|
HeaderRowHeightConverter = new RangeBlockConverter<double> { Minimum = MinHeaderRowHeight },
|
||||||
ExpandedVisualStateConverter = ValueConverter.create<bool, string>(is_expanded => is_expanded ? "Expanded" : "Collapsed");
|
ExpandedVisualStateConverter = ValueConverter.create<bool, string>(is_expanded => is_expanded ? "Expanded" : "Collapsed");
|
||||||
|
|
||||||
public static readonly IMultiValueConverter
|
public static readonly IMultiValueConverter
|
||||||
@@ -163,17 +169,22 @@ namespace bts.shell.pnl {
|
|||||||
void _grid_loaded(object sender, RoutedEventArgs e) {
|
void _grid_loaded(object sender, RoutedEventArgs e) {
|
||||||
// this is a hack to make room for the 'totals row' between the column headers and the regular rows.
|
// this is a hack to make room for the 'totals row' between the column headers and the regular rows.
|
||||||
if (_grid.try_find_descendent_of_type(out DIYGridRowsPresenter rp)) {
|
if (_grid.try_find_descendent_of_type(out DIYGridRowsPresenter rp)) {
|
||||||
rp.SetBinding(MarginProperty, new Binding(nameof(PNLVM.header_row_display)) {
|
rp.SetBinding(MarginProperty,
|
||||||
Converter = ValueConverter.create<PNLHeaderRowDisplay, Thickness>(hrd => {
|
BindingHelper.create_multi(
|
||||||
double top = 0;
|
ValueConverter.create<PNLHeaderRowDisplay, double, Thickness>((hrd, row_height) => {
|
||||||
if ((hrd & PNLHeaderRowDisplay.Total) != 0)
|
double top = 0;
|
||||||
top += 24;
|
if ((hrd & PNLHeaderRowDisplay.Total) != 0)
|
||||||
if ((hrd & PNLHeaderRowDisplay.SelectedTotal) != 0)
|
top += row_height;
|
||||||
top += 24;
|
if ((hrd & PNLHeaderRowDisplay.SelectedTotal) != 0)
|
||||||
return new Thickness(0, top, 0, 0);
|
top += row_height;
|
||||||
}),
|
return new Thickness(0, top, 0, 0);
|
||||||
Source = DataContext
|
}),
|
||||||
});
|
new Binding(nameof(PNLVM.header_row_display)),
|
||||||
|
new Binding {
|
||||||
|
Path = new PropertyPath(DIYGrid.RowHeightProperty),
|
||||||
|
Converter = HeaderRowHeightConverter,
|
||||||
|
Source = _grid
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.shell;
|
using bts.shell;
|
||||||
using bts.spark;
|
using bts.spark;
|
||||||
|
using bts.utils;
|
||||||
using mbts.config;
|
using mbts.config;
|
||||||
using mbts.persist;
|
using mbts.persist;
|
||||||
using mbts.spark;
|
using mbts.spark;
|
||||||
@@ -114,6 +115,7 @@ namespace mbts.ui {
|
|||||||
void dispose_core() {
|
void dispose_core() {
|
||||||
Disposable.dispose(ref _settings_sub);
|
Disposable.dispose(ref _settings_sub);
|
||||||
Disposable.dispose(ref _toast_controller);
|
Disposable.dispose(ref _toast_controller);
|
||||||
|
Disposable.dispose(ref _sound_player);
|
||||||
if (_dispatcher != null && !_dispatcher.HasShutdownStarted) {
|
if (_dispatcher != null && !_dispatcher.HasShutdownStarted) {
|
||||||
_dispatcher.BeginInvokeShutdown(DispatcherPriority.Background);
|
_dispatcher.BeginInvokeShutdown(DispatcherPriority.Background);
|
||||||
}
|
}
|
||||||
@@ -158,15 +160,25 @@ namespace mbts.ui {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class SoundNotificationPlayer {
|
class SoundNotificationPlayer : IDisposable {
|
||||||
readonly IReadOnlyDictionary<SoundNotification.SystemSound, NAudioPlayer> _players;
|
IReadOnlyDictionary<SoundNotification.SystemSound, NAudioPlayer> _players;
|
||||||
|
|
||||||
public static SoundNotificationPlayer create() => new SoundNotificationPlayer(_all_players());
|
|
||||||
|
|
||||||
SoundNotificationPlayer(IReadOnlyDictionary<SoundNotification.SystemSound, NAudioPlayer> players) =>
|
SoundNotificationPlayer(IReadOnlyDictionary<SoundNotification.SystemSound, NAudioPlayer> players) =>
|
||||||
_players = players;
|
_players = players;
|
||||||
|
|
||||||
|
public static SoundNotificationPlayer create() =>
|
||||||
|
new SoundNotificationPlayer(_all_players());
|
||||||
|
|
||||||
|
public void Dispose() {
|
||||||
|
if (_players != null) {
|
||||||
|
_players.Values.DisposeAll();
|
||||||
|
_players = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void play_sounds(IEnumerable<SoundNotification> sounds) {
|
public void play_sounds(IEnumerable<SoundNotification> sounds) {
|
||||||
|
if (_players == null)
|
||||||
|
return;
|
||||||
foreach (var s in sounds) {
|
foreach (var s in sounds) {
|
||||||
switch (s.sound_type_case) {
|
switch (s.sound_type_case) {
|
||||||
case SoundNotification.SoundTypeOneofCase.System: _players.GetValueOrDefault(s.system_sound.Value)?.play(); break;
|
case SoundNotification.SoundTypeOneofCase.System: _players.GetValueOrDefault(s.system_sound.Value)?.play(); break;
|
||||||
@@ -177,7 +189,8 @@ namespace mbts.ui {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static IReadOnlyDictionary<SoundNotification.SystemSound, NAudioPlayer> _all_players() =>
|
static IReadOnlyDictionary<SoundNotification.SystemSound, NAudioPlayer> _all_players() =>
|
||||||
EnumHelper.get_values<SoundNotification.SystemSound>().ToReadOnlyDictionary(s => s, NAudioPlayer.create);
|
EnumHelper.get_values<SoundNotification.SystemSound>()
|
||||||
|
.ToReadOnlyDictionaryWhere<SoundNotification.SystemSound, NAudioPlayer>(NAudioPlayer.try_create);
|
||||||
}
|
}
|
||||||
|
|
||||||
// This class adopts to role of view-controller in the mvc paradigm, rather than view-model in mvvm.
|
// This class adopts to role of view-controller in the mvc paradigm, rather than view-model in mvvm.
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using bts.shell;
|
using bts;
|
||||||
|
using bts.shell;
|
||||||
using mbts.ui.utility;
|
using mbts.ui.utility;
|
||||||
using NAudio.Wave;
|
using NAudio.Wave;
|
||||||
using System;
|
using System;
|
||||||
@@ -6,29 +7,71 @@ using System.IO;
|
|||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
namespace mbts.ui {
|
namespace mbts.ui {
|
||||||
class NAudioPlayer {
|
class NAudioPlayer : IDisposable {
|
||||||
// number of milliseconds to delay playing sound,
|
// number of milliseconds to delay playing sound,
|
||||||
// during which time all subsequent requests to play the same sound will be ignored.
|
// during which time all subsequent requests to play the same sound will be ignored.
|
||||||
const int _delay_ms = 75;
|
const int _delay_ms = 75;
|
||||||
readonly int _start_position;
|
readonly int _start_position;
|
||||||
|
IDisposable _stream_in;
|
||||||
WaveOutEvent _wave_out = new WaveOutEvent();
|
WaveOutEvent _wave_out = new WaveOutEvent();
|
||||||
WaveFileReader _wave_reader;
|
WaveFileReader _wave_reader;
|
||||||
bool _is_playing, _is_play_requested;
|
bool _is_playing, _is_play_requested;
|
||||||
|
|
||||||
public NAudioPlayer(Stream uwave_stream, int start_position = 0) {
|
/// <paramref name="stream_in"/> should not be disposed by the caller,
|
||||||
var ms = new MemoryStream();
|
/// as NAudioPlayer handles that in its own Dispose method;
|
||||||
uwave_stream.CopyTo(ms);
|
/// this constructor is private is to prevent such misuse.
|
||||||
ms.Position = 0;
|
NAudioPlayer(Stream stream_in, int start_position = 0) {
|
||||||
_wave_reader = new WaveFileReader(ms);
|
_stream_in = stream_in;
|
||||||
|
_wave_reader = new WaveFileReader(stream_in);
|
||||||
_wave_reader.Position = _start_position = (start_position < _wave_reader.Length ? start_position : 0);
|
_wave_reader.Position = _start_position = (start_position < _wave_reader.Length ? start_position : 0);
|
||||||
_wave_out.Init(_wave_reader);
|
_wave_out.Init(_wave_reader);
|
||||||
_wave_out.PlaybackStopped += _on_playback_stopped;
|
_wave_out.PlaybackStopped += _on_playback_stopped;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static NAudioPlayer create(SoundNotification.SystemSound system_sound) {
|
/// <see cref="_playback_stopped"/> is a proxy/buffer for the _wave_out.PlaybackStopped event.
|
||||||
var stream = _get_stream(system_sound);
|
/// It serves a couple purposes:
|
||||||
var sb = EnumHelper.get_attribute<SoundNotification.SystemSound, SilenceBufferAttribute>(system_sound);
|
/// 1) The main callback (<see cref="_on_playback_stopped(object, StoppedEventArgs)"/>)
|
||||||
return sb != null ? new NAudioPlayer(stream, sb.start_position) : new NAudioPlayer(stream);
|
/// is guarenteed to be executed first (though it would be anyways, since that
|
||||||
|
/// callback is hooked up in the constructor, the proxy event makes it obvious).
|
||||||
|
/// 2) <see cref="_playback_stopped"/> is only raised after playback is truly complete,
|
||||||
|
/// meaning there are no pending requests to repeat the sound.
|
||||||
|
event Action _playback_stopped;
|
||||||
|
|
||||||
|
public static bool try_create(SoundNotification.SystemSound system_sound, out NAudioPlayer result) {
|
||||||
|
if (_try_get_stream(system_sound, out var stream)) {
|
||||||
|
var sb = EnumHelper.get_attribute<SoundNotification.SystemSound, SilenceBufferAttribute>(system_sound);
|
||||||
|
result = sb != null ? new NAudioPlayer(stream, sb.start_position) : new NAudioPlayer(stream);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
result = null;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void play(SoundNotification.SystemSound system_sound) {
|
||||||
|
if (try_create(system_sound, out var player)) {
|
||||||
|
try {
|
||||||
|
var temp = player;
|
||||||
|
temp._playback_stopped += temp.Dispose;
|
||||||
|
player.play();
|
||||||
|
player = null;
|
||||||
|
} catch (Exception ex) {
|
||||||
|
Log.Ui.warn($"Encountered exception playing the system sound '{system_sound}': {ex}.");
|
||||||
|
} finally {
|
||||||
|
player?.Dispose();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
Log.Ui.warn($"Unable to play the system sound '{system_sound}': unexpected sound type (did not find an audio stream that corresponds to this enum value).");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose() {
|
||||||
|
if (_wave_out != null) {
|
||||||
|
_wave_out.PlaybackStopped -= _on_playback_stopped;
|
||||||
|
_wave_out.Dispose();
|
||||||
|
_wave_out = null;
|
||||||
|
}
|
||||||
|
Disposable.dispose(ref _wave_reader);
|
||||||
|
Disposable.dispose(ref _stream_in);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void play() {
|
public void play() {
|
||||||
@@ -46,6 +89,8 @@ namespace mbts.ui {
|
|||||||
if (_is_play_requested) {
|
if (_is_play_requested) {
|
||||||
_is_play_requested = false;
|
_is_play_requested = false;
|
||||||
_play_core();
|
_play_core();
|
||||||
|
} else {
|
||||||
|
_playback_stopped?.Invoke();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,18 +101,26 @@ namespace mbts.ui {
|
|||||||
_is_playing = false;
|
_is_playing = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static Stream _get_stream(SoundNotification.SystemSound system_sound) {
|
static bool _try_get_stream(SoundNotification.SystemSound system_sound, out Stream stream) {
|
||||||
|
UnmanagedMemoryStream um_stream;
|
||||||
switch (system_sound) {
|
switch (system_sound) {
|
||||||
case SoundNotification.SystemSound.GameCorrect: return bts.Properties.Resources.game_sound_correct;
|
case SoundNotification.SystemSound.GameCorrect: um_stream = bts.Properties.Resources.game_sound_correct; break;
|
||||||
case SoundNotification.SystemSound.GameIncorrect: return bts.Properties.Resources.game_sound_wrong;
|
case SoundNotification.SystemSound.GameIncorrect: um_stream = bts.Properties.Resources.game_sound_wrong; break;
|
||||||
case SoundNotification.SystemSound.GameOverArcade: return bts.Properties.Resources.game_over_arcade;
|
case SoundNotification.SystemSound.GameOverArcade: um_stream = bts.Properties.Resources.game_over_arcade; break;
|
||||||
case SoundNotification.SystemSound.Whistle: return bts.Properties.Resources.whistle;
|
case SoundNotification.SystemSound.Whistle: um_stream = bts.Properties.Resources.whistle; break;
|
||||||
case SoundNotification.SystemSound.BellCounter: return bts.Properties.Resources.bell_counter;
|
case SoundNotification.SystemSound.BellCounter: um_stream = bts.Properties.Resources.bell_counter; break;
|
||||||
case SoundNotification.SystemSound.Powerup: return bts.Properties.Resources.powerup;
|
case SoundNotification.SystemSound.Powerup: um_stream = bts.Properties.Resources.powerup; break;
|
||||||
case SoundNotification.SystemSound.CashRegister: return bts.Properties.Resources.cash_register_purchase;
|
case SoundNotification.SystemSound.CashRegister: um_stream = bts.Properties.Resources.cash_register_purchase; break;
|
||||||
case SoundNotification.SystemSound.Reload: return bts.Properties.Resources.reload_1911;
|
case SoundNotification.SystemSound.Reload: um_stream = bts.Properties.Resources.reload_1911; break;
|
||||||
default: throw new NotImplementedException($"Unknown {nameof(SoundNotification.SystemSound)}: {system_sound}.");
|
default:
|
||||||
|
stream = null;
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
stream = new MemoryStream();
|
||||||
|
um_stream.CopyTo(stream);
|
||||||
|
um_stream.Dispose();
|
||||||
|
stream.Position = 0;
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -54,7 +54,8 @@ namespace mbts.spark {
|
|||||||
bool price_valid = _validate_price(), size_valid = size_calculator.validate();
|
bool price_valid = _validate_price(), size_valid = size_calculator.validate();
|
||||||
if (price_valid && size_valid && !HasErrors && !properties_vm.HasErrors) {
|
if (price_valid && size_valid && !HasErrors && !properties_vm.HasErrors) {
|
||||||
model.send_order(security, properties_vm.create(side), price, size_calculator.value.Value).ignore();
|
model.send_order(security, properties_vm.create(side), price, size_calculator.value.Value).ignore();
|
||||||
RequestClose?.Invoke(this, new EventArgs());
|
if (close_on_send)
|
||||||
|
RequestClose?.Invoke(this, new EventArgs());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
set_price_command = new DelegateCommand<double>(set_price);
|
set_price_command = new DelegateCommand<double>(set_price);
|
||||||
@@ -84,6 +85,7 @@ namespace mbts.spark {
|
|||||||
public CalculatorLogic size_calculator { get; }
|
public CalculatorLogic size_calculator { get; }
|
||||||
public OrderPropertiesEditorVM properties_vm { get; }
|
public OrderPropertiesEditorVM properties_vm { get; }
|
||||||
public BBOVM bbo { get; }
|
public BBOVM bbo { get; }
|
||||||
|
public bool close_on_send { get; set; }
|
||||||
public ICommand send_order { get; }
|
public ICommand send_order { get; }
|
||||||
public ICommand set_price_command { get; }
|
public ICommand set_price_command { get; }
|
||||||
|
|
||||||
|
|||||||
@@ -1,90 +1,113 @@
|
|||||||
using bts;
|
using bts;
|
||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.api.orderman;
|
using bts.api.orderman;
|
||||||
using bts.utils;
|
using bts.utils;
|
||||||
using mbts.spark.utilities;
|
using mbts.spark.utilities;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Collections.Immutable;
|
||||||
using System.Reactive.Linq;
|
using System.Linq;
|
||||||
|
using System.Reactive.Linq;
|
||||||
namespace mbts.spark {
|
|
||||||
/// <summary>
|
namespace mbts.spark {
|
||||||
/// Monitors selected rows, and determines whether or not they are all active-orders, with common parameters.
|
/// <summary>
|
||||||
/// </summary>
|
/// Monitors selected rows, and determines whether or not they are all active-orders, with common parameters.
|
||||||
class OrderParamsAggregator {
|
/// </summary>
|
||||||
readonly TimeSpan _throttle;
|
class OrderParamsAggregator {
|
||||||
readonly CommonValueGroupMonitor<CustomOrderDefinitionImmutable, CustomOrderDefinitionImmutable> _algo_def_mon =
|
readonly TimeSpan _throttle;
|
||||||
new CommonValueGroupMonitor<CustomOrderDefinitionImmutable, CustomOrderDefinitionImmutable>(
|
readonly CommonValueGroupMonitor<CustomOrderDefinitionImmutable, CustomOrderDefinitionImmutable> _algo_def_mon =
|
||||||
ask => ask,
|
new CommonValueGroupMonitor<CustomOrderDefinitionImmutable, CustomOrderDefinitionImmutable>(
|
||||||
OrderDataHelper.EqualsHelpers.custom_order_defi_structure_comparer,
|
ask => ask,
|
||||||
OrderDataHelper.EqualsHelpers.custom_order_defi_comparer);
|
OrderDataHelper.EqualsHelpers.custom_order_defi_structure_comparer,
|
||||||
readonly CommonValueMonitor<SecurityImmutable?> _spreader_security_mon = new CommonValueMonitor<SecurityImmutable?>();
|
OrderDataHelper.EqualsHelpers.custom_order_defi_comparer);
|
||||||
readonly CommonValueMonitor<SecurityImmutable?> _security_mon = new CommonValueMonitor<SecurityImmutable?>();
|
readonly CommonValueMonitor<SecurityImmutable?> _spreader_security_mon = new CommonValueMonitor<SecurityImmutable?>();
|
||||||
readonly CommonValueMonitor<double> _price_mon = new CommonValueMonitor<double>(double.NaN);
|
readonly CommonValueMonitor<SecurityImmutable?> _security_mon = new CommonValueMonitor<SecurityImmutable?>();
|
||||||
readonly CommonValueMonitor<uint> _size_mon = new CommonValueMonitor<uint>();
|
readonly CommonValueMonitor<double> _price_mon = new CommonValueMonitor<double>(double.NaN);
|
||||||
readonly CommonValueMonitor<AccountTuple> _account_mon = new CommonValueMonitor<AccountTuple>();
|
readonly CommonValueMonitor<uint> _size_mon = new CommonValueMonitor<uint>();
|
||||||
readonly CommonValueMonitor<bool> _all_active_mon = new CommonValueMonitor<bool>();
|
readonly CommonValueMonitor<AccountTuple> _account_mon = new CommonValueMonitor<AccountTuple>();
|
||||||
readonly CommonValueMonitorMultiplexor<OrderSecurityAlgo> _group_mon = new CommonValueMonitorMultiplexor<OrderSecurityAlgo>();
|
readonly CommonValueMonitor<bool> _all_active_mon = new CommonValueMonitor<bool>();
|
||||||
readonly DynamicOrderHelper _dyn_helper;
|
readonly CommonValueMonitorMultiplexor<OrderSecurityAlgo> _group_mon = new CommonValueMonitorMultiplexor<OrderSecurityAlgo>();
|
||||||
readonly Func<uint, OrderSecurityAlgo?> _lookup_order;
|
readonly DynamicOrderHelper _dyn_helper;
|
||||||
|
readonly Func<uint, OrderSecurityAlgo?> _lookup_order;
|
||||||
public OrderParamsAggregator(DynamicOrderHelper dyn_helper, TimeSpan throttle, Func<uint, OrderSecurityAlgo?> lookup_order) {
|
|
||||||
_dyn_helper = dyn_helper;
|
public OrderParamsAggregator(DynamicOrderHelper dyn_helper, TimeSpan throttle, Func<uint, OrderSecurityAlgo?> lookup_order) {
|
||||||
_throttle = throttle;
|
_dyn_helper = dyn_helper;
|
||||||
_lookup_order = lookup_order;
|
_throttle = throttle;
|
||||||
_group_mon.add_member_mon(_algo_def_mon, _build_algo_tree);
|
_lookup_order = lookup_order;
|
||||||
_group_mon.add_member_mon(_spreader_security_mon, _get_spreader_sec, s => s.HasValue);
|
_group_mon.add_member_mon(_algo_def_mon, _build_algo_tree);
|
||||||
_group_mon.add_member_mon(_security_mon, osam => osam.security, s => s.HasValue);
|
_group_mon.add_member_mon(_spreader_security_mon, _get_spreader_sec, s => s.HasValue);
|
||||||
_group_mon.add_member_mon(_price_mon, osam => osam.order.price());
|
_group_mon.add_member_mon(_security_mon, osam => osam.security, s => s.HasValue);
|
||||||
_group_mon.add_member_mon(_size_mon, osam => osam.order.quantity());
|
_group_mon.add_member_mon(_price_mon, osam => osam.order.price());
|
||||||
_group_mon.add_member_mon(_account_mon, osam => new AccountTuple(osam.order.account_id(), osam.order.account()));
|
_group_mon.add_member_mon(_size_mon, osam => osam.order.quantity());
|
||||||
_group_mon.add_member_mon(_all_active_mon, osam => osam.order.is_active());
|
_group_mon.add_member_mon(_account_mon, osam => new AccountTuple(osam.order.account_id(), osam.order.account()));
|
||||||
}
|
_group_mon.add_member_mon(_all_active_mon, osam => osam.order.is_active());
|
||||||
|
}
|
||||||
public SecurityImmutable? security => _security_mon.common_value;
|
|
||||||
public SecurityImmutable? spreader_security => _spreader_security_mon.common_value;
|
public SecurityImmutable? security => _security_mon.common_value;
|
||||||
public double price => _price_mon.try_get_common_value(out double p) ? p : double.NaN;
|
public SecurityImmutable? spreader_security => _spreader_security_mon.common_value;
|
||||||
public uint? size => _size_mon.common_value_nullable();
|
public double price => _price_mon.try_get_common_value(out double p) ? p : double.NaN;
|
||||||
public AccountTuple? account => _account_mon.common_value_nullable();
|
public uint? size => _size_mon.common_value_nullable();
|
||||||
public bool all_active => _all_active_mon.common_value;
|
public AccountTuple? account => _account_mon.common_value_nullable();
|
||||||
|
public bool all_active => _all_active_mon.common_value;
|
||||||
public IObservable<IEnumerable<CustomOrderDefinitionImmutable>> subscribe_algos() => _algo_def_mon.SubscribeThrottled(_throttle, (ask, vals) => vals, Enumerable.Empty<CustomOrderDefinitionImmutable>());
|
|
||||||
public IObservable<SecurityImmutable?> subscribe_spreader_security() => _spreader_security_mon.SubscribeThrottled(_throttle);
|
/// <summary>
|
||||||
public IObservable<SecurityImmutable?> subscribe_security() => _security_mon.SubscribeThrottled(_throttle);
|
/// Notifies observers when the set of <see cref="CustomOrderDefinitionImmutable"/>s changes.
|
||||||
public IObservable<double> subscribe_price() => _price_mon.SubscribeThrottled(_throttle);
|
/// The algos in the set are the distinct group of algos for the selected <see cref="OrderSecurityAlgo"/>s.
|
||||||
public IObservable<uint?> subscribe_size() => _size_mon.SubscribeThrottledNullable(_throttle);
|
/// </summary>
|
||||||
public IObservable<AccountTuple?> subscribe_account() => _account_mon.SubscribeThrottledNullable(_throttle);
|
// Note: this might be better optimized by adding a 'begin_reset' method to CommonValueMonitor that records the current state,
|
||||||
public IObservable<bool> subscribe_all_active() => _all_active_mon.SubscribeThrottled(_throttle);
|
// and accumulates subsequent changes into a batch change. If the 'begin_reset' method returned an IDisposable,
|
||||||
public IObservable<Plurality> subscribe_security_plurality() => _security_mon.SubscribePluralityThrottled(_throttle);
|
// the batch change object could be examined when Dispose is called,
|
||||||
|
// to avoid firing the common_values_changed event if the accumulated changes cancel each other out.
|
||||||
public IDisposable defer_updates() =>
|
|
||||||
_group_mon.defer_updates();
|
// However, such a change would be non-trivial, so this method will suffice for now.
|
||||||
|
// It should perform fine in practice, even with a large number of selected orders,
|
||||||
public void Add(OrderSecurityAlgo order_tuple) =>
|
// because the input is throttled.
|
||||||
_group_mon.add(order_tuple);
|
public IObservable<IEnumerable<CustomOrderDefinitionImmutable>> subscribe_algos() =>
|
||||||
|
Observable.Create<ImmutableHashSet<CustomOrderDefinitionImmutable>>(o => {
|
||||||
public void Remove(OrderSecurityAlgo order_tuple) =>
|
var last_algos = ImmutableHashSet.Create(OrderDataHelper.EqualsHelpers.custom_order_defi_comparer);
|
||||||
_group_mon.remove(order_tuple);
|
return _algo_def_mon
|
||||||
|
.SubscribeThrottled(_throttle, (ask, vals) => vals, Array.Empty<CustomOrderDefinitionImmutable>())
|
||||||
public void Clear() =>
|
.Subscribe(algos => {
|
||||||
_group_mon.clear();
|
// only notify the observer if the algo set has actually changed.
|
||||||
|
if (algos.Count != last_algos.Count || !algos.All(last_algos.Contains))
|
||||||
static SecurityImmutable? _get_spreader_sec(OrderSecurityAlgo osam) =>
|
o.OnNext(last_algos = ImmutableHashSet.CreateRange(OrderDataHelper.EqualsHelpers.custom_order_defi_comparer, algos));
|
||||||
OrderDataHelper.enumerate_algo_hierarchy(osam.order.Def.CustomDef.CloneToMutable())
|
});
|
||||||
.Any(algo => algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Spreader) ?
|
});
|
||||||
osam.security : null;
|
public IObservable<SecurityImmutable?> subscribe_spreader_security() => _spreader_security_mon.SubscribeThrottled(_throttle);
|
||||||
|
public IObservable<SecurityImmutable?> subscribe_security() => _security_mon.SubscribeThrottled(_throttle);
|
||||||
CustomOrderDefinitionImmutable _build_algo_tree(OrderSecurityAlgo root) =>
|
public IObservable<double> subscribe_price() => _price_mon.SubscribeThrottled(_throttle);
|
||||||
root.order.Def.AttachTargetOrderKey == 0 ?
|
public IObservable<uint?> subscribe_size() => _size_mon.SubscribeThrottledNullable(_throttle);
|
||||||
root.order.Def.CustomDef :
|
public IObservable<AccountTuple?> subscribe_account() => _account_mon.SubscribeThrottledNullable(_throttle);
|
||||||
new CustomOrderDefinitionImmutable(_add_attached_targets(root.order.Def.CustomDef.CloneToMutable(), root.order.Key, root.order.Def.AttachTargetOrderKey));
|
public IObservable<bool> subscribe_all_active() => _all_active_mon.SubscribeThrottled(_throttle);
|
||||||
|
public IObservable<Plurality> subscribe_security_plurality() => _security_mon.SubscribePluralityThrottled(_throttle);
|
||||||
CustomOrderDefinition _add_attached_targets(CustomOrderDefinition mroot, uint root_id, uint attached_target) {
|
|
||||||
var lin = _lineage(root_id, attached_target);
|
public IDisposable defer_updates() =>
|
||||||
if (lin != null && lin.Count > 0) {
|
_group_mon.defer_updates();
|
||||||
var mparent = mroot;
|
|
||||||
var pcad = OrderDataHelper.get_primary_child_algo_data(mparent);
|
public void Add(OrderSecurityAlgo order_tuple) =>
|
||||||
|
_group_mon.add(order_tuple);
|
||||||
|
|
||||||
|
public void Remove(OrderSecurityAlgo order_tuple) =>
|
||||||
|
_group_mon.remove(order_tuple);
|
||||||
|
|
||||||
|
public void Clear() =>
|
||||||
|
_group_mon.clear();
|
||||||
|
|
||||||
|
static SecurityImmutable? _get_spreader_sec(OrderSecurityAlgo osam) =>
|
||||||
|
OrderDataHelper.enumerate_algo_hierarchy(osam.order.Def.CustomDef.CloneToMutable())
|
||||||
|
.Any(algo => algo.CustomCase == CustomOrderDefinition.CustomOneofCase.Spreader) ?
|
||||||
|
osam.security : null;
|
||||||
|
|
||||||
|
CustomOrderDefinitionImmutable _build_algo_tree(OrderSecurityAlgo root) =>
|
||||||
|
root.order.Def.AttachTargetOrderKey == 0 ?
|
||||||
|
root.order.Def.CustomDef :
|
||||||
|
new CustomOrderDefinitionImmutable(_add_attached_targets(root.order.Def.CustomDef.CloneToMutable(), root.order.Key, root.order.Def.AttachTargetOrderKey));
|
||||||
|
|
||||||
|
CustomOrderDefinition _add_attached_targets(CustomOrderDefinition mroot, uint root_id, uint attached_target) {
|
||||||
|
var lin = _lineage(root_id, attached_target);
|
||||||
|
if (lin != null && lin.Count > 0) {
|
||||||
|
var mparent = mroot;
|
||||||
|
var pcad = OrderDataHelper.get_primary_child_algo_data(mparent);
|
||||||
if (pcad.HasValue) {
|
if (pcad.HasValue) {
|
||||||
do {
|
do {
|
||||||
var mchild = lin.Pop().order.Def.CustomDef.CloneToMutable();
|
var mchild = lin.Pop().order.Def.CustomDef.CloneToMutable();
|
||||||
@@ -92,44 +115,44 @@ namespace mbts.spark {
|
|||||||
mparent = mchild;
|
mparent = mchild;
|
||||||
pcad = OrderDataHelper.get_primary_child_algo_data(mparent);
|
pcad = OrderDataHelper.get_primary_child_algo_data(mparent);
|
||||||
} while (lin.Count > 0 && pcad.HasValue);
|
} while (lin.Count > 0 && pcad.HasValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return mroot;
|
return mroot;
|
||||||
}
|
}
|
||||||
|
|
||||||
Stack<OrderSecurityAlgo> _lineage(uint root, uint target) {
|
Stack<OrderSecurityAlgo> _lineage(uint root, uint target) {
|
||||||
// check args/preconditions
|
// check args/preconditions
|
||||||
if (root == 0) throw new ArgumentException("Cannot be zero.", nameof(root));
|
if (root == 0) throw new ArgumentException("Cannot be zero.", nameof(root));
|
||||||
if (target == 0) throw new ArgumentException("Cannot be zero.", nameof(target));
|
if (target == 0) throw new ArgumentException("Cannot be zero.", nameof(target));
|
||||||
if (target == root) return null;
|
if (target == root) return null;
|
||||||
var inner = _lookup_order(target);
|
var inner = _lookup_order(target);
|
||||||
if (!inner.HasValue)
|
if (!inner.HasValue)
|
||||||
return null;
|
return null;
|
||||||
// if 'target' has an attach target iteself (nested), push the nested lineage onto the stack first,
|
// if 'target' has an attach target iteself (nested), push the nested lineage onto the stack first,
|
||||||
// then push the original target onto the stack, and try to hop up each algo-generation
|
// then push the original target onto the stack, and try to hop up each algo-generation
|
||||||
// via parent-key lookups until we reach the root.
|
// via parent-key lookups until we reach the root.
|
||||||
// **If the lineage is disjointed, and we never reach the root, return null**
|
// **If the lineage is disjointed, and we never reach the root, return null**
|
||||||
var ival = inner.Value;
|
var ival = inner.Value;
|
||||||
var lin_stack = ival.order.attached_target_order_key() != 0 ?
|
var lin_stack = ival.order.attached_target_order_key() != 0 ?
|
||||||
_lineage(ival.order.Key, ival.order.attached_target_order_key()) ?? new Stack<OrderSecurityAlgo>() :
|
_lineage(ival.order.Key, ival.order.attached_target_order_key()) ?? new Stack<OrderSecurityAlgo>() :
|
||||||
new Stack<OrderSecurityAlgo>();
|
new Stack<OrderSecurityAlgo>();
|
||||||
lin_stack.Push(ival);
|
lin_stack.Push(ival);
|
||||||
target = ival.order.ParentKey;
|
target = ival.order.ParentKey;
|
||||||
while (target != root) {
|
while (target != root) {
|
||||||
if (target == 0) {
|
if (target == 0) {
|
||||||
// **disjointed lineage**
|
// **disjointed lineage**
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
inner = _lookup_order(target);
|
inner = _lookup_order(target);
|
||||||
if (!inner.HasValue) {
|
if (!inner.HasValue) {
|
||||||
// **disjointed lineage**
|
// **disjointed lineage**
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
ival = inner.Value;
|
ival = inner.Value;
|
||||||
lin_stack.Push(ival);
|
lin_stack.Push(ival);
|
||||||
target = ival.order.ParentKey;
|
target = ival.order.ParentKey;
|
||||||
}
|
}
|
||||||
return lin_stack;
|
return lin_stack;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,6 @@ using bts.api;
|
|||||||
using bts.api.core;
|
using bts.api.core;
|
||||||
using bts.api.orderman;
|
using bts.api.orderman;
|
||||||
using bts.collections;
|
using bts.collections;
|
||||||
using bts.spark;
|
|
||||||
using bts.utils;
|
using bts.utils;
|
||||||
using mbts.collections;
|
using mbts.collections;
|
||||||
using mbts.spark.utilities;
|
using mbts.spark.utilities;
|
||||||
@@ -14,6 +13,7 @@ using mbts.ui.utility;
|
|||||||
using mbts.utils;
|
using mbts.utils;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.Immutable;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.Collections.Specialized;
|
using System.Collections.Specialized;
|
||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
@@ -62,7 +62,7 @@ namespace mbts.spark {
|
|||||||
readonly ObservableAggregateCollection<AlgoParamRowVM> _algo_param_rows = new ObservableAggregateCollection<AlgoParamRowVM>();
|
readonly ObservableAggregateCollection<AlgoParamRowVM> _algo_param_rows = new ObservableAggregateCollection<AlgoParamRowVM>();
|
||||||
readonly AlgoDefinitionVM the_anchor_algo_def_vm;
|
readonly AlgoDefinitionVM the_anchor_algo_def_vm;
|
||||||
IReadOnlyDictionary<AlgoKey, AlgoDefinitionMetadata> _algo_metadata = DictionaryHelper.empty<AlgoKey, AlgoDefinitionMetadata>();
|
IReadOnlyDictionary<AlgoKey, AlgoDefinitionMetadata> _algo_metadata = DictionaryHelper.empty<AlgoKey, AlgoDefinitionMetadata>();
|
||||||
IReadOnlyDictionary<AlgoKey, int> _favorite_algos_index = DictionaryHelper.empty<AlgoKey, int>();
|
ImmutableDictionary<AlgoKey, LadderFavoriteAlgoItem> _favorite_algo_map = ImmutableDictionary<AlgoKey, LadderFavoriteAlgoItem>.Empty;
|
||||||
IDisposable _algo_param_rows_hook;
|
IDisposable _algo_param_rows_hook;
|
||||||
int _favorite_algos_column_count;
|
int _favorite_algos_column_count;
|
||||||
bool _open_algo_popup_on_select, _use_algo_param_grid;
|
bool _open_algo_popup_on_select, _use_algo_param_grid;
|
||||||
@@ -239,12 +239,15 @@ namespace mbts.spark {
|
|||||||
|
|
||||||
void _selected_algo_definition_Changed(AlgoDefinitionVM old_value, AlgoDefinitionVM new_value, SelectionReason reason) {
|
void _selected_algo_definition_Changed(AlgoDefinitionVM old_value, AlgoDefinitionVM new_value, SelectionReason reason) {
|
||||||
Disposable.dispose(ref _algo_param_rows_hook);
|
Disposable.dispose(ref _algo_param_rows_hook);
|
||||||
if (old_value != null)
|
if (old_value != null) {
|
||||||
// Taha feels that we should always revert to a Limit order either when the user explicity unchecks a sticky button
|
// Taha feels that we should always revert to a Limit order either when the user explicity unchecks a sticky button
|
||||||
// or when a non-sticky button is pressed. Rather than completely remove the stack at this time (b/c it may be come
|
// or when a non-sticky button is pressed. Rather than completely remove the stack at this time (b/c it may be come
|
||||||
// back in the future), let's just always push a specfic def_vm.key onto it [Limit] ;)
|
// back in the future), let's just always push a specfic def_vm.key onto it [Limit] ;)
|
||||||
//_selected_algo_stack.Push(old_value.key);
|
//_selected_algo_stack.Push(old_value.key);
|
||||||
_selected_algo_stack.Push(the_anchor_algo_def_vm.key);
|
_selected_algo_stack.Push(the_anchor_algo_def_vm.key);
|
||||||
|
if (_favorite_algo_map.TryGetValue(old_value.key, out var tup) && tup.flags.HasFlag(LadderFavoriteAlgoFlags.AutoRevert))
|
||||||
|
old_value.algo_root.revert_all_params();
|
||||||
|
}
|
||||||
if (new_value != null) {
|
if (new_value != null) {
|
||||||
if (use_algo_param_grid)
|
if (use_algo_param_grid)
|
||||||
_algo_param_rows_hook = _connect_algo_param_rows(new_value, _algo_param_rows);
|
_algo_param_rows_hook = _connect_algo_param_rows(new_value, _algo_param_rows);
|
||||||
@@ -340,6 +343,9 @@ namespace mbts.spark {
|
|||||||
public IObservable<IAlgoVM> observe_order_type(bool start_immediately = false) =>
|
public IObservable<IAlgoVM> observe_order_type(bool start_immediately = false) =>
|
||||||
_selected_algo_definition.observe_selected_item(start_immediately).Select(d => d?.algo_root);
|
_selected_algo_definition.observe_selected_item(start_immediately).Select(d => d?.algo_root);
|
||||||
|
|
||||||
|
public IObservable<AlgoDefinitionVM> observe_algo_definition_vm(bool start_immediately = false) =>
|
||||||
|
_selected_algo_definition.observe_selected_item(start_immediately);
|
||||||
|
|
||||||
public OrderDefinition create(Side side) {
|
public OrderDefinition create(Side side) {
|
||||||
if (HasErrors)
|
if (HasErrors)
|
||||||
throw new InvalidOperationException("Cannot create order when errors are present.");
|
throw new InvalidOperationException("Cannot create order when errors are present.");
|
||||||
@@ -365,12 +371,12 @@ namespace mbts.spark {
|
|||||||
return order;
|
return order;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void on_favorite_algos(LadderFavoriteAlgosSettings value) {
|
public void on_favorite_algos(ImmutableDictionary<AlgoKey, LadderFavoriteAlgoItem> favorite_algo_map, int favorite_algos_column_count) {
|
||||||
_favorite_algos_index = value.favorite_algos.Select((v, i) => (v, i)).ToDictionaryCrushed(t => t.v, t => t.i);
|
_favorite_algo_map = favorite_algo_map;
|
||||||
foreach (var d in algo_definitions) {
|
foreach (var d in algo_definitions) {
|
||||||
d.favorite_index = _get_favorite_algo_index(d.key);
|
d.favorite_index = _get_favorite_algo_index(d.key);
|
||||||
}
|
}
|
||||||
favorite_algos_column_count = value.column_count;
|
this.favorite_algos_column_count = favorite_algos_column_count;
|
||||||
RaisePropertyChanged(nameof(selected_favorite_algo_definition));
|
RaisePropertyChanged(nameof(selected_favorite_algo_definition));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -383,7 +389,7 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int? _get_favorite_algo_index(AlgoKey key) =>
|
int? _get_favorite_algo_index(AlgoKey key) =>
|
||||||
key.mode == AlgoKey.Mode.Persisted && _favorite_algos_index.TryGetValue(key, out int i) ? i : (int?)null;
|
key.mode == AlgoKey.Mode.Persisted && _favorite_algo_map.TryGetValue(key, out var tup) ? tup.sort_index : (int?)null;
|
||||||
|
|
||||||
void _on_template_metadata(IReadOnlyDictionary<AlgoKey, AlgoDefinitionMetadata> meta) {
|
void _on_template_metadata(IReadOnlyDictionary<AlgoKey, AlgoDefinitionMetadata> meta) {
|
||||||
_algo_metadata = meta;
|
_algo_metadata = meta;
|
||||||
|
|||||||
@@ -23,6 +23,32 @@ namespace mbts.spark {
|
|||||||
|
|
||||||
public IEnumerable<string> dynamic_types => _dynamic_types.DynamicOrderDesc.Select(d => d.DynamicOrderType);
|
public IEnumerable<string> dynamic_types => _dynamic_types.DynamicOrderDesc.Select(d => d.DynamicOrderType);
|
||||||
|
|
||||||
|
public static string fmt_param(DynamicOrderParam dyn_param) {
|
||||||
|
if (dyn_param == null)
|
||||||
|
return null;
|
||||||
|
switch (dyn_param.ValueCase) {
|
||||||
|
case DynamicOrderParam.ValueOneofCase.AsArray:
|
||||||
|
return string.Join(", ", dyn_param.AsArray.Element.Select(fmt_param));
|
||||||
|
case DynamicOrderParam.ValueOneofCase.AsBool:
|
||||||
|
return dyn_param.AsBool.ToString();
|
||||||
|
case DynamicOrderParam.ValueOneofCase.AsDouble:
|
||||||
|
return dyn_param.AsDouble.ToString();
|
||||||
|
case DynamicOrderParam.ValueOneofCase.AsEnumerated:
|
||||||
|
return dyn_param.AsEnumerated.EnumValue;
|
||||||
|
case DynamicOrderParam.ValueOneofCase.AsInt32:
|
||||||
|
return dyn_param.AsInt32.ToString();
|
||||||
|
case DynamicOrderParam.ValueOneofCase.AsQuantity:
|
||||||
|
return dyn_param.AsQuantity.ToString();
|
||||||
|
case DynamicOrderParam.ValueOneofCase.AsString:
|
||||||
|
return dyn_param.AsString;
|
||||||
|
default:
|
||||||
|
// implement additional cases as needed
|
||||||
|
// (as of 4/17/20, this method is only used to format
|
||||||
|
// dynamic orders' CustomState params in the orderbook)
|
||||||
|
return $"({dyn_param.ValueCase})";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public void add_dynamic_order_defs(List<CustomOrderDefinitionImmutable> defs, Func<CustomOrderDefinition.CustomOneofCase, CustomOrderDefinition> factory) {
|
public void add_dynamic_order_defs(List<CustomOrderDefinitionImmutable> defs, Func<CustomOrderDefinition.CustomOneofCase, CustomOrderDefinition> factory) {
|
||||||
foreach (var d in _dynamic_types.DynamicOrderDesc) {
|
foreach (var d in _dynamic_types.DynamicOrderDesc) {
|
||||||
var dorder = factory(CustomOrderDefinition.CustomOneofCase.Dynamic);
|
var dorder = factory(CustomOrderDefinition.CustomOneofCase.Dynamic);
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ namespace mbts.spark
|
|||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
var ev = fd.EnumType.Values.First(x => x.Name == value)?.Number;
|
var ev = fd.EnumType.Values.FirstOrDefault(x => x.Name == value)?.Number;
|
||||||
if(ev.HasValue)
|
if(ev.HasValue)
|
||||||
fd.Accessor.SetValue(message, ev.Value);
|
fd.Accessor.SetValue(message, ev.Value);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
using bts.api.orderman;
|
using bts.api.orderman;
|
||||||
using bts.collections;
|
using bts.collections;
|
||||||
using bts.spark;
|
|
||||||
using Google.Protobuf;
|
using Google.Protobuf;
|
||||||
using Google.Protobuf.Reflection;
|
using Google.Protobuf.Reflection;
|
||||||
using mbts.collections;
|
using mbts.collections;
|
||||||
@@ -15,21 +14,19 @@ using System.Collections.ObjectModel;
|
|||||||
using System.ComponentModel;
|
using System.ComponentModel;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
|
using System.Reflection;
|
||||||
using AlgoType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase;
|
using AlgoType = bts.api.orderman.CustomOrderDefinition.CustomOneofCase;
|
||||||
|
|
||||||
namespace mbts.spark {
|
namespace mbts.spark {
|
||||||
static partial class OrderTypeVMFactory
|
static partial class OrderTypeVMFactory {
|
||||||
{
|
internal class GenericOrderFactory {
|
||||||
internal class GenericOrderFactory
|
static public IAlgoVM create_vm(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions) {
|
||||||
{
|
|
||||||
static public IAlgoVM create_vm(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions)
|
|
||||||
{
|
|
||||||
var prop = typeof(CustomOrderDefinition).GetProperty(algo_type.ToString(),
|
var prop = typeof(CustomOrderDefinition).GetProperty(algo_type.ToString(),
|
||||||
System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public);
|
BindingFlags.Instance | BindingFlags.Public);
|
||||||
var rt = prop.PropertyType;
|
var rt = prop.PropertyType;
|
||||||
|
|
||||||
var propi = typeof(CustomOrderDefinitionImmutable).GetProperty(algo_type.ToString(),
|
var propi = typeof(CustomOrderDefinitionImmutable).GetProperty(algo_type.ToString(),
|
||||||
System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public);
|
BindingFlags.Instance | BindingFlags.Public);
|
||||||
var rti = propi.PropertyType;
|
var rti = propi.PropertyType;
|
||||||
|
|
||||||
var vmt = typeof(GenericOrderVM<,>);
|
var vmt = typeof(GenericOrderVM<,>);
|
||||||
@@ -38,38 +35,33 @@ namespace mbts.spark {
|
|||||||
object vm = Activator.CreateInstance(makevm, key, algo_type, display_name, editing_permissions);
|
object vm = Activator.CreateInstance(makevm, key, algo_type, display_name, editing_permissions);
|
||||||
return (IAlgoVM)vm;
|
return (IAlgoVM)vm;
|
||||||
}
|
}
|
||||||
static public void setup_generic_custom_order(CustomOrderDefinition custom, CustomOrderDefinition.CustomOneofCase type)
|
static public void setup_generic_custom_order(CustomOrderDefinition custom, CustomOrderDefinition.CustomOneofCase type) {
|
||||||
{
|
|
||||||
var prop = typeof(CustomOrderDefinition).GetProperty(type.ToString(),
|
var prop = typeof(CustomOrderDefinition).GetProperty(type.ToString(),
|
||||||
System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.Public);
|
BindingFlags.Instance | BindingFlags.Public);
|
||||||
var rt = prop.PropertyType;
|
var rt = prop.PropertyType;
|
||||||
var rtt = Activator.CreateInstance(rt);
|
var rtt = Activator.CreateInstance(rt);
|
||||||
|
|
||||||
var ci = rt.GetProperties().Where(x => x.PropertyType == typeof(CustomOrderDefinition));
|
var ci = rt.GetProperties().Where(x => x.PropertyType == typeof(CustomOrderDefinition));
|
||||||
foreach(var cid in ci)
|
foreach (var cid in ci)
|
||||||
cid.SetValue(rtt, new CustomOrderDefinition { Limit = new LimitOrderDefinition() });
|
cid.SetValue(rtt, new CustomOrderDefinition { Limit = new LimitOrderDefinition() });
|
||||||
prop.SetValue(custom, rtt);
|
prop.SetValue(custom, rtt);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class GenericOrderVM<TMutable, TImmutable> : OrderTypeVMBase<TMutable, TImmutable>
|
class GenericOrderVM<TMutable, TImmutable> : OrderTypeVMBase<TMutable, TImmutable>
|
||||||
where TMutable : class, IMessage, new() where TImmutable : struct, IImmutableMessage
|
where TMutable : class, IMessage, new() where TImmutable : struct, IImmutableMessage {
|
||||||
{
|
|
||||||
readonly ObservableKeyedCollection<GenericOrderParamVM<TMutable>, string> _parameters =
|
readonly ObservableKeyedCollection<GenericOrderParamVM<TMutable>, string> _parameters =
|
||||||
new ObservableKeyedCollection<GenericOrderParamVM<TMutable>, string>(vm => vm.descriptor.Name);
|
new ObservableKeyedCollection<GenericOrderParamVM<TMutable>, string>(vm => vm.descriptor.Name);
|
||||||
readonly AlgoType _algo_type;
|
readonly AlgoType _algo_type;
|
||||||
|
|
||||||
public GenericOrderVM(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions)
|
public GenericOrderVM(AlgoKey key, AlgoType algo_type, string display_name, AlgoEditingPermissions editing_permissions)
|
||||||
: base(key, display_name, editing_permissions)
|
: base(key, display_name, editing_permissions) {
|
||||||
{
|
|
||||||
_algo_type = algo_type;
|
_algo_type = algo_type;
|
||||||
_parameters = new ObservableKeyedCollection<GenericOrderParamVM<TMutable>, string>(vm => vm.descriptor.Name);
|
_parameters = new ObservableKeyedCollection<GenericOrderParamVM<TMutable>, string>(vm => vm.descriptor.Name);
|
||||||
_resources.AddRange(
|
_resources.AddRange(
|
||||||
ObservableAutoWrapper.connect_item_hooks(_parameters, p =>
|
ObservableAutoWrapper.connect_item_hooks(_parameters, p => {
|
||||||
{
|
|
||||||
p.PropertyChanged += on_param_prop_changed;
|
p.PropertyChanged += on_param_prop_changed;
|
||||||
return Disposable.Create(() =>
|
return Disposable.Create(() => {
|
||||||
{
|
|
||||||
p.PropertyChanged -= on_param_prop_changed;
|
p.PropertyChanged -= on_param_prop_changed;
|
||||||
remove_property(p.descriptor.Name);
|
remove_property(p.descriptor.Name);
|
||||||
p.Dispose();
|
p.Dispose();
|
||||||
@@ -80,84 +72,74 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public string algo_type => _algo_type.ToString();
|
public string algo_type => _algo_type.ToString();
|
||||||
public override string abbreviation =>
|
public override string abbreviation =>
|
||||||
model == null ? display_name : model.factory.abbreviate_algo(new OneOf<CustomOrderDefinition.CustomOneofCase, string>(_algo_type));
|
model == null ? display_name : model.factory.abbreviate_algo(new OneOf<CustomOrderDefinition.CustomOneofCase, string>(_algo_type));
|
||||||
public override AlgoDisplayGroup group => AlgoDisplayGroup.API;
|
public override AlgoDisplayGroup group => AlgoDisplayGroup.API;
|
||||||
public ObservableCollection<GenericOrderParamVM<TMutable>> parameters => _parameters;
|
public ObservableCollection<GenericOrderParamVM<TMutable>> parameters => _parameters;
|
||||||
|
|
||||||
protected override void on_model_internal()
|
protected override void on_model_internal() =>
|
||||||
{
|
|
||||||
_sync_generic_params();
|
_sync_generic_params();
|
||||||
}
|
|
||||||
|
|
||||||
void _sync_generic_params()
|
void _sync_generic_params() {
|
||||||
{
|
if (model != null) {
|
||||||
if (model != null)
|
MessageDescriptor desc = new TMutable().Descriptor;
|
||||||
{
|
|
||||||
Google.Protobuf.Reflection.MessageDescriptor desc = new TMutable().Descriptor;
|
|
||||||
_parameters.SyncWithDictionary(
|
_parameters.SyncWithDictionary(
|
||||||
desc.Fields.InDeclarationOrder().Where(_is_value_param_desc).ToDictionary(p => p.Name), _mk_param_vm);
|
desc.Fields.InDeclarationOrder().Where(_is_value_param_desc).ToDictionary(p => p.Name), _mk_param_vm);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
static bool _is_value_param_desc(FieldDescriptor desc)
|
|
||||||
{
|
static bool _is_value_param_desc(FieldDescriptor desc) =>
|
||||||
return (desc.FieldType != Google.Protobuf.Reflection.FieldType.Message ||
|
(desc.FieldType != FieldType.Message ||
|
||||||
_is_quantity_measure_desc(desc));
|
_is_quantity_measure_desc(desc));
|
||||||
}
|
|
||||||
|
|
||||||
static bool _is_quantity_measure_desc(FieldDescriptor desc)
|
static bool _is_quantity_measure_desc(FieldDescriptor desc) =>
|
||||||
{
|
desc.FieldType == FieldType.Message &&
|
||||||
return desc.FieldType == Google.Protobuf.Reflection.FieldType.Message &&
|
|
||||||
desc.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName;
|
desc.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName;
|
||||||
}
|
|
||||||
|
|
||||||
protected override IEnumerable<ChildAlgoData> get_selector_data()
|
protected override IEnumerable<ChildAlgoData> get_selector_data() =>
|
||||||
{
|
OrderDataHelper.get_child_algo_data(_algo_type);
|
||||||
var v = OrderDataHelper.get_child_algo_data(_algo_type);
|
|
||||||
return v;
|
|
||||||
}
|
|
||||||
|
|
||||||
GenericOrderParamVM<TMutable> _mk_param_vm(FieldDescriptor descriptor)
|
GenericOrderParamVM<TMutable> _mk_param_vm(FieldDescriptor descriptor) {
|
||||||
{
|
|
||||||
ExceptionAssert.Argument.NotNull(descriptor, nameof(descriptor));
|
ExceptionAssert.Argument.NotNull(descriptor, nameof(descriptor));
|
||||||
|
if (descriptor.FieldType == FieldType.Message &&
|
||||||
if (descriptor.FieldType == FieldType.Message &&
|
descriptor.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName) {
|
||||||
descriptor.MessageType.FullName == typeof(bts.spark.QuantityMeasure).FullName)
|
|
||||||
{
|
|
||||||
var qm = new GenericOrderQuantityVM<TMutable>(descriptor);
|
var qm = new GenericOrderQuantityVM<TMutable>(descriptor);
|
||||||
return attached(qm, GenericOrderHelper.get_quantity_value, GenericOrderHelper.set_quantity_value);
|
return attached(qm, GenericOrderHelper.get_quantity_value, GenericOrderHelper.set_quantity_value);
|
||||||
}
|
} else if (descriptor.FieldType == FieldType.Enum) {
|
||||||
else if(descriptor.FieldType == FieldType.Enum)
|
return EnumParamFactory.create(this, descriptor);
|
||||||
{
|
} else if (descriptor.FieldType == FieldType.Bool) {
|
||||||
var pvm = new GenericOrderEnumeratedVM<TMutable>(descriptor);
|
|
||||||
attached(pvm, GenericOrderHelper.get_enumerated_value, GenericOrderHelper.set_enumerated_value);
|
|
||||||
return pvm;
|
|
||||||
}
|
|
||||||
else if (descriptor.FieldType == FieldType.Bool)
|
|
||||||
return mk<bool?, bool>(descriptor, v => v, v => v.GetValueOrDefault());
|
return mk<bool?, bool>(descriptor, v => v, v => v.GetValueOrDefault());
|
||||||
else if (descriptor.FieldType == FieldType.Double || descriptor.FieldType == FieldType.Float)
|
} else if (descriptor.FieldType == FieldType.Double || descriptor.FieldType == FieldType.Float) {
|
||||||
return mk<double, double>(descriptor, v => v, v => v, double.NaN);
|
return mk<double, double>(descriptor, v => v, v => v, double.NaN);
|
||||||
else if (descriptor.FieldType == FieldType.Int32)
|
} else if (descriptor.FieldType == FieldType.Int32) {
|
||||||
return mk<int?, int>(descriptor, v => v, v => v.GetValueOrDefault());
|
return mk<int?, int>(descriptor, v => v, v => v.GetValueOrDefault());
|
||||||
else if (descriptor.FieldType == FieldType.UInt32)
|
} else if (descriptor.FieldType == FieldType.UInt32) {
|
||||||
return mk<uint?, uint>(descriptor, v => v, v => v.GetValueOrDefault());
|
return mk<uint?, uint>(descriptor, v => v, v => v.GetValueOrDefault());
|
||||||
else if (descriptor.FieldType == FieldType.String)
|
} else if (descriptor.FieldType == FieldType.String) {
|
||||||
return mk<string, string>(descriptor, v => v, v => v);
|
return mk<string, string>(descriptor, v => v, v => v);
|
||||||
else
|
} else return null;
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
GenericOrderParamVM<TMutable, TView, TModel> mk<TView, TModel>(FieldDescriptor fdesc, Func<TModel, TView> convert, Func<TView, TModel> convert_back, TView default_value = default)
|
|
||||||
{
|
|
||||||
var pvm = new GenericOrderParamVM<TMutable, TView, TModel>(fdesc, convert, convert_back);
|
|
||||||
return attached<TView, GenericOrderParamVM<TMutable, TView, TModel>>(pvm, get_from_param, assign_to_param, default_value);
|
|
||||||
|
|
||||||
|
GenericOrderParamVM<TMutable, TView, TModel> mk<TView, TModel>(
|
||||||
|
FieldDescriptor fdesc,
|
||||||
|
Func<TModel, TView> convert,
|
||||||
|
Func<TView, TModel> convert_back,
|
||||||
|
TView default_value = default) {
|
||||||
|
//
|
||||||
|
var pvm = new GenericOrderParamVM<TMutable, TView, TModel>(fdesc, convert, convert_back);
|
||||||
|
return attached(pvm, get_from_param, assign_to_param, default_value);
|
||||||
TView get_from_param(IMessage param, FieldDescriptor fd) => convert(ConvertUtils.try_convert<TModel>(fdesc.Accessor.GetValue(param)));
|
TView get_from_param(IMessage param, FieldDescriptor fd) => convert(ConvertUtils.try_convert<TModel>(fdesc.Accessor.GetValue(param)));
|
||||||
void assign_to_param(IMessage param, FieldDescriptor fd, TView value) => fdesc.Accessor.SetValue(param, convert_back(value));
|
void assign_to_param(IMessage param, FieldDescriptor fd, TView value) => fdesc.Accessor.SetValue(param, convert_back(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
TParam attached<T, TParam>(TParam pvm, Func<IMessage, FieldDescriptor, T> selector, Action<IMessage, FieldDescriptor, T> assign_to_param, T default_value = default) where TParam : GenericOrderParamVM<TMutable>, IGenericOrderParamVM<T>
|
TParam attached<T, TParam>(
|
||||||
{
|
TParam pvm,
|
||||||
add_property<T>(
|
Func<IMessage, FieldDescriptor, T>
|
||||||
|
selector, Action<IMessage, FieldDescriptor, T> assign_to_param,
|
||||||
|
T default_value = default)
|
||||||
|
where TParam : GenericOrderParamVM<TMutable>, IGenericOrderParamVM<T> {
|
||||||
|
//
|
||||||
|
add_property(
|
||||||
pvm.descriptor.Name,
|
pvm.descriptor.Name,
|
||||||
mdef => mdef != null ? selector(mdef, pvm.descriptor) : default_value,
|
mdef => mdef != null ? selector(mdef, pvm.descriptor) : default_value,
|
||||||
(mdef, v) => assign_to_param(mdef, pvm.descriptor, v),
|
(mdef, v) => assign_to_param(mdef, pvm.descriptor, v),
|
||||||
@@ -166,7 +148,37 @@ namespace mbts.spark {
|
|||||||
pvm.subscribe_value(),
|
pvm.subscribe_value(),
|
||||||
default_value);
|
default_value);
|
||||||
return pvm;
|
return pvm;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static class EnumParamFactory {
|
||||||
|
[ThreadStatic]
|
||||||
|
static Dictionary<Type, IFactory> _factories_backing;
|
||||||
|
static Dictionary<Type, IFactory> _factories =>
|
||||||
|
_factories_backing ?? (_factories_backing = new Dictionary<Type, IFactory>());
|
||||||
|
|
||||||
|
public static GenericOrderParamVM<TMutable> create(GenericOrderVM<TMutable, TImmutable> owner, FieldDescriptor descriptor) {
|
||||||
|
if (descriptor.FieldType != FieldType.Enum)
|
||||||
|
throw ExceptionBuilder.Argument.unexpected_case(descriptor.FieldType, $"{nameof(descriptor)}.{nameof(FieldDescriptor.FieldType)}");
|
||||||
|
if (!_factories.TryGetValue(descriptor.EnumType.ClrType, out var f)) {
|
||||||
|
// Impl<T> is a nested type, so parent class's generic type args must be included.
|
||||||
|
_factories[descriptor.EnumType.ClrType] = f = (IFactory)Activator.CreateInstance(typeof(Impl<>)
|
||||||
|
.MakeGenericType(typeof(TMutable), typeof(TImmutable), descriptor.EnumType.ClrType));
|
||||||
|
}
|
||||||
|
return f.create(owner, descriptor);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface IFactory {
|
||||||
|
GenericOrderParamVM<TMutable> create(GenericOrderVM<TMutable, TImmutable> owner, FieldDescriptor descriptor);
|
||||||
|
}
|
||||||
|
|
||||||
|
class Impl<T> : IFactory where T : struct {
|
||||||
|
static readonly Func<T, T?> _convert = v => v;
|
||||||
|
static readonly Func<T?, T> _convert_back = v => v ?? default;
|
||||||
|
|
||||||
|
public GenericOrderParamVM<TMutable> create(GenericOrderVM<TMutable, TImmutable> owner, FieldDescriptor descriptor) =>
|
||||||
|
owner.mk(descriptor, _convert, _convert_back, default);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -129,6 +129,13 @@ namespace mbts.spark {
|
|||||||
public static IEnumerable<IAlgoParamVM> enumerate_all_params(this IAlgoVM vm) =>
|
public static IEnumerable<IAlgoParamVM> enumerate_all_params(this IAlgoVM vm) =>
|
||||||
vm == null ? Enumerable.Empty<IAlgoParamVM>() : vm.algo_params.Concat(vm.child_algo_selectors.SelectMany(s => enumerate_all_params(s.selected_algo)));
|
vm == null ? Enumerable.Empty<IAlgoParamVM>() : vm.algo_params.Concat(vm.child_algo_selectors.SelectMany(s => enumerate_all_params(s.selected_algo)));
|
||||||
|
|
||||||
|
public static void revert_all_params(this IAlgoVM vm) {
|
||||||
|
foreach (var p in vm.enumerate_all_params()) {
|
||||||
|
if (p.is_dirty)
|
||||||
|
p.revert();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static IObservable<bool> subscribe_is_dirty(this IAlgoParamVM param_vm) =>
|
public static IObservable<bool> subscribe_is_dirty(this IAlgoParamVM param_vm) =>
|
||||||
Observable.Create<bool>(o => {
|
Observable.Create<bool>(o => {
|
||||||
o.OnNext(param_vm.is_dirty);
|
o.OnNext(param_vm.is_dirty);
|
||||||
|
|||||||
@@ -35,11 +35,24 @@ namespace mbts.spark {
|
|||||||
public static double price(this OrderRecordImmutable order) =>
|
public static double price(this OrderRecordImmutable order) =>
|
||||||
order.HasState ? order.State.Price : double.NaN;
|
order.HasState ? order.State.Price : double.NaN;
|
||||||
|
|
||||||
|
public static double ui_price(this OrderRecordImmutable order) {
|
||||||
|
if (order.HasState) {
|
||||||
|
if (order.order_type() == CustomOrderDefinition.CustomOneofCase.Stop && !order.stop_or_stop_limit_has_been_triggered()) {
|
||||||
|
return order.stop_price();
|
||||||
|
}
|
||||||
|
if (order.order_type() == CustomOrderDefinition.CustomOneofCase.StopLimit && !order.stop_or_stop_limit_has_been_triggered()) {
|
||||||
|
return order.stop_limit_price();
|
||||||
|
}
|
||||||
|
return order.State.Price;
|
||||||
|
}
|
||||||
|
return double.NaN;
|
||||||
|
}
|
||||||
|
|
||||||
public static double stop_price(this OrderRecordImmutable order) =>
|
public static double stop_price(this OrderRecordImmutable order) =>
|
||||||
order.HasDef && order.Def.HasCustomDef && order.Def.CustomDef.HasStop ? order.Def.CustomDef.Stop.StopPrice : double.NaN;
|
order.HasState && order.State.HasStop && order.State.Stop.HasNativeState ? order.State.Stop.NativeState.StopPx : double.NaN;
|
||||||
|
|
||||||
public static double stop_limit_price(this OrderRecordImmutable order) =>
|
public static double stop_limit_price(this OrderRecordImmutable order) =>
|
||||||
order.HasDef && order.Def.HasCustomDef && order.Def.CustomDef.HasStopLimit ? order.Def.CustomDef.StopLimit.StopPrice : double.NaN;
|
order.HasState && order.State.HasStopLimit && order.State.StopLimit.HasNativeState ? order.State.StopLimit.NativeState.StopPx : double.NaN;
|
||||||
|
|
||||||
public static double avg_price(this OrderRecordImmutable order) =>
|
public static double avg_price(this OrderRecordImmutable order) =>
|
||||||
order.HasState ? order.State.AvgPrice : double.NaN;
|
order.HasState ? order.State.AvgPrice : double.NaN;
|
||||||
@@ -50,6 +63,11 @@ namespace mbts.spark {
|
|||||||
public static string last_msg(this OrderRecordImmutable order) =>
|
public static string last_msg(this OrderRecordImmutable order) =>
|
||||||
order.HasState ? order.State.LastMsg : string.Empty;
|
order.HasState ? order.State.LastMsg : string.Empty;
|
||||||
|
|
||||||
|
public static IReadOnlyDictionary<string, DynamicOrderParam> dynamic_custom_state(this OrderRecordImmutable order) =>
|
||||||
|
order.HasState && order.State.HasDynamic ?
|
||||||
|
(order.State.Dynamic.CustomState ?? DictionaryHelper.empty<string, DynamicOrderParam>()) :
|
||||||
|
DictionaryHelper.empty<string, DynamicOrderParam>();
|
||||||
|
|
||||||
public static DateTime created(this OrderRecordImmutable order) =>
|
public static DateTime created(this OrderRecordImmutable order) =>
|
||||||
order.HasState && order.State.HasCreated ? order.State.Created.ToDateTime().ToLocalTime() : DateTime.MinValue;
|
order.HasState && order.State.HasCreated ? order.State.Created.ToDateTime().ToLocalTime() : DateTime.MinValue;
|
||||||
|
|
||||||
@@ -248,6 +266,20 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static bool stop_or_stop_limit_has_been_triggered(this OrderRecordImmutable order) {
|
||||||
|
if (order.HasState && (order.order_type() == CustomOrderDefinition.CustomOneofCase.Stop || order.order_type() == CustomOrderDefinition.CustomOneofCase.StopLimit)) {
|
||||||
|
var native_state = order.State.native_order_state();
|
||||||
|
if (native_state.HasValue) {
|
||||||
|
if (order.State.HasStop || order.State.HasStopLimit) {
|
||||||
|
return native_state.Value.NativeType == NativeOrderType.Limit;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
public static string type_id(this CustomOrderDefinition.CustomOneofCase order_type) =>
|
public static string type_id(this CustomOrderDefinition.CustomOneofCase order_type) =>
|
||||||
order_type.ToString().ToUpper();
|
order_type.ToString().ToUpper();
|
||||||
|
|
||||||
|
|||||||
@@ -154,7 +154,9 @@ namespace mbts.spark {
|
|||||||
.GroupTable(OrderSecurityHelper.key_fn, tup => tup.order.Def.SecurityKey)
|
.GroupTable(OrderSecurityHelper.key_fn, tup => tup.order.Def.SecurityKey)
|
||||||
.Cache();
|
.Cache();
|
||||||
// working account orders
|
// working account orders
|
||||||
var working_account_order_groups = working_orders.GroupTable(t => t.order.Key, t => new PNLKey(t.order.account_id(), t.order.security_key()));
|
var working_account_order_groups = working_orders
|
||||||
|
.Filter(o => o.order.is_exchange_order())
|
||||||
|
.GroupTable(t => t.order.Key, t => new PNLKey(t.order.account_id(), t.order.security_key()));
|
||||||
// security account pnl
|
// security account pnl
|
||||||
security_account_pnl = on_pnl
|
security_account_pnl = on_pnl
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
@@ -213,8 +215,11 @@ namespace mbts.spark {
|
|||||||
FillTuple.key_fn);
|
FillTuple.key_fn);
|
||||||
on_fill_tuples_with_root = fill_order_tuples_with_root_join.Cache();
|
on_fill_tuples_with_root = fill_order_tuples_with_root_join.Cache();
|
||||||
// manual fills
|
// manual fills
|
||||||
on_manual_fills_securities = _position_service.subscribei_manual_fills()
|
on_manual_fills_securities = admin_model
|
||||||
.Naggle(interval, scheduler)
|
.permission_filter(
|
||||||
|
_position_service.subscribei_manual_fills()
|
||||||
|
.Naggle(interval, scheduler),
|
||||||
|
f => f.AccountId)
|
||||||
.Filter(f => f.FillType == ManualFill.Types.FillType.Local)
|
.Filter(f => f.FillType == ManualFill.Types.FillType.Local)
|
||||||
.join(sstore, mf => mf.SecurityKey)
|
.join(sstore, mf => mf.SecurityKey)
|
||||||
.Table().Cache();
|
.Table().Cache();
|
||||||
@@ -349,6 +354,21 @@ namespace mbts.spark {
|
|||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private CustomOrderDefinitionImmutable? _create_custom_def_for_stop_and_stop_limit(OrderRecordImmutable order, ref double stop_price) {
|
||||||
|
CustomOrderDefinition modified_custom_def = null;
|
||||||
|
var ord_type = order.order_type();
|
||||||
|
if (ord_type == CustomOrderDefinition.CustomOneofCase.Stop) {
|
||||||
|
modified_custom_def = order.Def.CustomDef.CloneToMutable();
|
||||||
|
modified_custom_def.Stop.StopPrice = stop_price;
|
||||||
|
} else if (ord_type == CustomOrderDefinition.CustomOneofCase.StopLimit) {
|
||||||
|
modified_custom_def = order.Def.CustomDef.CloneToMutable();
|
||||||
|
double temp_price = order.price();
|
||||||
|
modified_custom_def.StopLimit.StopPrice = stop_price;
|
||||||
|
stop_price = temp_price;
|
||||||
|
}
|
||||||
|
return modified_custom_def;
|
||||||
|
}
|
||||||
|
|
||||||
public async Task<bool> update_order(OrderRecordImmutable order, double? new_price = null, uint? new_size = null, CustomOrderDefinitionImmutable? new_algo = null) {
|
public async Task<bool> update_order(OrderRecordImmutable order, double? new_price = null, uint? new_size = null, CustomOrderDefinitionImmutable? new_algo = null) {
|
||||||
if (order.working_quantity() <= 0) {
|
if (order.working_quantity() <= 0) {
|
||||||
// order already filled to completion
|
// order already filled to completion
|
||||||
@@ -356,10 +376,16 @@ namespace mbts.spark {
|
|||||||
}
|
}
|
||||||
var size = new_size ?? order.quantity();
|
var size = new_size ?? order.quantity();
|
||||||
var price = new_price ?? order.price();
|
var price = new_price ?? order.price();
|
||||||
if (size == order.quantity() && price == order.price() && !new_algo.HasValue) {
|
if (!(order.order_type() == CustomOrderDefinition.CustomOneofCase.Stop || order.order_type() == CustomOrderDefinition.CustomOneofCase.StopLimit)
|
||||||
|
&& size == order.quantity() && price == order.price() && !new_algo.HasValue) {
|
||||||
// no parameters would be changed by this update
|
// no parameters would be changed by this update
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if ((order.order_type() == CustomOrderDefinition.CustomOneofCase.Stop || order.order_type() == CustomOrderDefinition.CustomOneofCase.StopLimit) &&
|
||||||
|
!order.stop_or_stop_limit_has_been_triggered() && !new_algo.HasValue) {
|
||||||
|
// note the ref price parameter, if this is a stop limit then we swap the fields
|
||||||
|
new_algo = _create_custom_def_for_stop_and_stop_limit(order, ref price);
|
||||||
|
}
|
||||||
_activity.update_order(order, price, size, new_algo.HasValue);
|
_activity.update_order(order, price, size, new_algo.HasValue);
|
||||||
var result = await _service.update_order_async(new Update() {
|
var result = await _service.update_order_async(new Update() {
|
||||||
OrderKey = order.Key,
|
OrderKey = order.Key,
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
<RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
|
<RuntimeIdentifiers>win7-x64</RuntimeIdentifiers>
|
||||||
<PlatformTarget>AnyCPU</PlatformTarget>
|
<PlatformTarget>AnyCPU</PlatformTarget>
|
||||||
<LanguageTargets>$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets>
|
<LanguageTargets>$(MSBuildExtensionsPath)\$(VisualStudioVersion)\Bin\Microsoft.CSharp.targets</LanguageTargets>
|
||||||
|
<LanguageTargets Condition="'$(VisualStudioVersion)'=='16.0'">$(MSBuildToolsPath)\Microsoft.CSharp.targets</LanguageTargets>
|
||||||
<ApplicationIcon>logo.ico</ApplicationIcon>
|
<ApplicationIcon>logo.ico</ApplicationIcon>
|
||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<StartupObject>mbts.ui.shell.App</StartupObject>
|
<StartupObject>mbts.ui.shell.App</StartupObject>
|
||||||
|
|||||||
@@ -525,8 +525,11 @@
|
|||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<control:SparkMenuItem
|
<control:SparkMenuItem
|
||||||
Command="{Binding command}" Style="{StaticResource SparkMenuButton}" Icon="{Binding icon}"
|
Command="{Binding command}"
|
||||||
|
Style="{StaticResource SparkMenuButton}"
|
||||||
|
Icon="{Binding icon}"
|
||||||
Collapsed="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type control:SparkMenu}}, Path=ShowText, Converter={StaticResource NotConverter}}"
|
Collapsed="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type control:SparkMenu}}, Path=ShowText, Converter={StaticResource NotConverter}}"
|
||||||
|
ContentFlowDirection="{Binding Orientation, RelativeSource={RelativeSource AncestorType=control:SparkMenu}, Converter={x:Static control:SparkMenu.ItemContentFlowDirectionConverter}}"
|
||||||
>
|
>
|
||||||
<control:SparkMenuItem.Content>
|
<control:SparkMenuItem.Content>
|
||||||
<MultiBinding Converter="{x:Static ut:CommandHelper.DescriptionConverter}">
|
<MultiBinding Converter="{x:Static ut:CommandHelper.DescriptionConverter}">
|
||||||
@@ -546,7 +549,11 @@
|
|||||||
BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"
|
BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"
|
||||||
Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true"
|
Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true"
|
||||||
>
|
>
|
||||||
<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
|
<StackPanel
|
||||||
|
IsItemsHost="True"
|
||||||
|
Orientation="{Binding Orientation, RelativeSource={RelativeSource TemplatedParent}}"
|
||||||
|
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
|
||||||
|
/>
|
||||||
</Border>
|
</Border>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</ControlTemplate>
|
</ControlTemplate>
|
||||||
@@ -559,4 +566,4 @@
|
|||||||
<Setter Property="Command" Value="{Binding command}"/>
|
<Setter Property="Command" Value="{Binding command}"/>
|
||||||
<Setter Property="Icon" Value="{Binding icon, Converter={StaticResource IconConverter}}"/>
|
<Setter Property="Icon" Value="{Binding icon, Converter={StaticResource IconConverter}}"/>
|
||||||
</Style>
|
</Style>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -1,10 +1,15 @@
|
|||||||
using bts.api;
|
using bts.api;
|
||||||
using mbts;
|
using mbts;
|
||||||
using mbts.ui;
|
using mbts.ui;
|
||||||
|
using mbts.ui.utility;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
|
using System.Collections.Specialized;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reactive.Linq;
|
using System.Reactive.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using System.Windows.Data;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using static mbts.spark.SparkTags;
|
using static mbts.spark.SparkTags;
|
||||||
@@ -60,6 +65,7 @@ namespace bts.spark {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public ObservableCollection<SparkCommand> child_items { get; } = new ObservableCollection<SparkCommand>();
|
||||||
|
|
||||||
public abstract void execute(IBus bus);
|
public abstract void execute(IBus bus);
|
||||||
public virtual bool canExecute() => true;
|
public virtual bool canExecute() => true;
|
||||||
@@ -328,6 +334,8 @@ namespace bts.spark {
|
|||||||
public class SparkCommandVM : mbts.ui.shell.ViewModelBase, ICommand {
|
public class SparkCommandVM : mbts.ui.shell.ViewModelBase, ICommand {
|
||||||
readonly SparkCommand _cmd;
|
readonly SparkCommand _cmd;
|
||||||
readonly IBus _bus;
|
readonly IBus _bus;
|
||||||
|
readonly ISelectable _selectable_cmd;
|
||||||
|
object _first_child_group;
|
||||||
|
|
||||||
public SparkCommandVM(SparkCommand cmd, IBus bus) {
|
public SparkCommandVM(SparkCommand cmd, IBus bus) {
|
||||||
_cmd = cmd;
|
_cmd = cmd;
|
||||||
@@ -336,6 +344,20 @@ namespace bts.spark {
|
|||||||
cmd.group_changed += () => RaisePropertyChanged(nameof(group));
|
cmd.group_changed += () => RaisePropertyChanged(nameof(group));
|
||||||
cmd.show_in_toolbar_changed += () => RaisePropertyChanged(nameof(show_in_toolbar));
|
cmd.show_in_toolbar_changed += () => RaisePropertyChanged(nameof(show_in_toolbar));
|
||||||
cmd.show_in_context_menu_changed += () => RaisePropertyChanged(nameof(show_in_context_menu));
|
cmd.show_in_context_menu_changed += () => RaisePropertyChanged(nameof(show_in_context_menu));
|
||||||
|
if (cmd.child_items != null) {
|
||||||
|
ObservableAutoWrapper.connect(cmd.child_items, child_items, item => new SparkCommandVM(item, bus));
|
||||||
|
child_items_view = new ListCollectionView(child_items);
|
||||||
|
child_items_view.GroupDescriptions.Add(new PropertyGroupDescription(nameof(group)));
|
||||||
|
if (child_items_view.Groups is INotifyCollectionChanged child_groups_ncc) {
|
||||||
|
child_groups_ncc.Subscribe((s, e) => refresh_first_child_group());
|
||||||
|
refresh_first_child_group();
|
||||||
|
void refresh_first_child_group() =>
|
||||||
|
first_child_group = (child_items_view.Groups.FirstOrDefault() as CollectionViewGroup)?.Name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_selectable_cmd = cmd as ISelectable;
|
||||||
|
if (_selectable_cmd != null)
|
||||||
|
_selectable_cmd.is_selected_changed += _ => RaisePropertyChanged(nameof(is_selected));
|
||||||
}
|
}
|
||||||
|
|
||||||
public string title => _cmd.title;
|
public string title => _cmd.title;
|
||||||
@@ -344,7 +366,22 @@ namespace bts.spark {
|
|||||||
public ImageSource icon => _cmd.icon;
|
public ImageSource icon => _cmd.icon;
|
||||||
public bool show_in_toolbar => _cmd.show_in_toolbar;
|
public bool show_in_toolbar => _cmd.show_in_toolbar;
|
||||||
public bool show_in_context_menu => _cmd.show_in_context_menu;
|
public bool show_in_context_menu => _cmd.show_in_context_menu;
|
||||||
|
public bool is_selectable => _selectable_cmd != null;
|
||||||
|
public bool is_selected {
|
||||||
|
get => _selectable_cmd?.is_selected ?? false;
|
||||||
|
set {
|
||||||
|
if (_selectable_cmd != null)
|
||||||
|
_selectable_cmd.is_selected = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
public ICommand command => this;
|
public ICommand command => this;
|
||||||
|
public ObservableCollection<SparkCommandVM> child_items { get; } = new ObservableCollection<SparkCommandVM>();
|
||||||
|
public ListCollectionView child_items_view { get; }
|
||||||
|
public object first_child_group {
|
||||||
|
get => _first_child_group;
|
||||||
|
set => Set(ref _first_child_group, value);
|
||||||
|
}
|
||||||
|
|
||||||
event EventHandler ICommand.CanExecuteChanged { add { _cmd.CanExecuteChanged += value; } remove { _cmd.CanExecuteChanged -= value; } }
|
event EventHandler ICommand.CanExecuteChanged { add { _cmd.CanExecuteChanged += value; } remove { _cmd.CanExecuteChanged -= value; } }
|
||||||
|
|
||||||
bool ICommand.CanExecute(object parameter) => _cmd.canExecute();
|
bool ICommand.CanExecute(object parameter) => _cmd.canExecute();
|
||||||
|
|||||||
@@ -57,6 +57,9 @@ namespace bts.spark {
|
|||||||
SparkCommand.create("Ladder", Icons.Ladder, SparkTags.ShowPickOne, ShowLadder());
|
SparkCommand.create("Ladder", Icons.Ladder, SparkTags.ShowPickOne, ShowLadder());
|
||||||
|
|
||||||
// Order Ticket
|
// Order Ticket
|
||||||
|
public static PartialCommand<IImmutableSet<uint>> ShowOrderTicketAutoLookup(KeyGesture key_gesture = null) =>
|
||||||
|
SparkCommand.create("Order Ticket", Icons.AddOrders, SparkTags.ShowOrderTicketAutoLookupTag, key_gesture);
|
||||||
|
|
||||||
public static PartialCommand<(OrderDefinitionImmutable def, double price, uint size)> ShowOrderTicket(KeyGesture key_gesture = null) =>
|
public static PartialCommand<(OrderDefinitionImmutable def, double price, uint size)> ShowOrderTicket(KeyGesture key_gesture = null) =>
|
||||||
SparkCommand.create("Order Ticket", Icons.AddOrders, SparkTags.ShowOrderTicketTag, key_gesture);
|
SparkCommand.create("Order Ticket", Icons.AddOrders, SparkTags.ShowOrderTicketTag, key_gesture);
|
||||||
|
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ namespace mbts.spark {
|
|||||||
public static ITag<(uint key, double price, uint size)> UpdateOrder { get; } = new SparkTag<(uint, double, uint)>();
|
public static ITag<(uint key, double price, uint size)> UpdateOrder { get; } = new SparkTag<(uint, double, uint)>();
|
||||||
|
|
||||||
public static ITag<uint> ShowModifyOrderTag { get; } = new SparkTag<uint>(nameof(ShowModifyOrderTag));
|
public static ITag<uint> ShowModifyOrderTag { get; } = new SparkTag<uint>(nameof(ShowModifyOrderTag));
|
||||||
|
public static ITag<IImmutableSet<uint>> ShowOrderTicketAutoLookupTag { get; } = new SparkTag<IImmutableSet<uint>>(nameof(ShowOrderTicketAutoLookupTag));
|
||||||
public static ITag<SecurityMD> ShowOrderTicketFromSecurityTag = new SparkTag<SecurityMD>(nameof(ShowOrderTicketFromSecurityTag));
|
public static ITag<SecurityMD> ShowOrderTicketFromSecurityTag = new SparkTag<SecurityMD>(nameof(ShowOrderTicketFromSecurityTag));
|
||||||
public static ITag<(OrderDefinitionImmutable def, double price, uint size)> ShowOrderTicketTag = new SparkTag<(OrderDefinitionImmutable def, double price, uint size)>(nameof(ShowOrderTicketTag));
|
public static ITag<(OrderDefinitionImmutable def, double price, uint size)> ShowOrderTicketTag = new SparkTag<(OrderDefinitionImmutable def, double price, uint size)>(nameof(ShowOrderTicketTag));
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -37,6 +37,8 @@ namespace mbts.ui
|
|||||||
}
|
}
|
||||||
|
|
||||||
public class DelegateCommand : DelegateCommand<object> {
|
public class DelegateCommand : DelegateCommand<object> {
|
||||||
|
public static DelegateCommand empty => new DelegateCommand(() => { });
|
||||||
|
|
||||||
public DelegateCommand(Action execute) : this(_ => execute()) { }
|
public DelegateCommand(Action execute) : this(_ => execute()) { }
|
||||||
public DelegateCommand(Action execute, Func<bool> can_execute) : this(_ => execute(), _ => can_execute()) { }
|
public DelegateCommand(Action execute, Func<bool> can_execute) : this(_ => execute(), _ => can_execute()) { }
|
||||||
public DelegateCommand(Action<object> execute) : base(execute) { }
|
public DelegateCommand(Action<object> execute) : base(execute) { }
|
||||||
|
|||||||
@@ -65,8 +65,10 @@ namespace mbts.ui {
|
|||||||
var cmd = new AsyncCommand(() => execute(param), () => can_execute, allow_concurrent_executions);
|
var cmd = new AsyncCommand(() => execute(param), () => can_execute, allow_concurrent_executions);
|
||||||
observer = new AnonymousObserver<T>(p => {
|
observer = new AnonymousObserver<T>(p => {
|
||||||
param = p;
|
param = p;
|
||||||
if (can_execute != get_can_execute(param))
|
if (can_execute != get_can_execute(param)) {
|
||||||
|
can_execute = !can_execute;
|
||||||
cmd.RaiseCanExecuteChanged();
|
cmd.RaiseCanExecuteChanged();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
return cmd;
|
return cmd;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
using System;
|
||||||
|
using System.Diagnostics;
|
||||||
|
|
||||||
|
namespace bts.utils.diagnostics {
|
||||||
|
class OpTimer : IDisposable {
|
||||||
|
readonly Stopwatch _stopwatch = new Stopwatch();
|
||||||
|
|
||||||
|
public TimeSpan elapsed => _stopwatch.Elapsed;
|
||||||
|
|
||||||
|
public static OpTimer Hot() {
|
||||||
|
var ot = new OpTimer();
|
||||||
|
ot.Start();
|
||||||
|
return ot;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Start() =>
|
||||||
|
_stopwatch.Start();
|
||||||
|
|
||||||
|
public void Dispose() =>
|
||||||
|
_stopwatch.Stop();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
using bts.api.core;
|
||||||
|
using bts.api.orderman;
|
||||||
|
using mbts;
|
||||||
|
using mbts.spark;
|
||||||
|
using System;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Reactive.Linq;
|
||||||
|
|
||||||
|
namespace bts.utils.diagnostics {
|
||||||
|
static class TestDataFactory {
|
||||||
|
#if DEBUG
|
||||||
|
public static IObservable<TableUpdate<OrderSecurity, uint>> OrdersWithRandomPIQ(IObservable<TableUpdate<OrderSecurity, uint>> orders, TimeSpan throttle) =>
|
||||||
|
Observable.Create<TableUpdate<OrderSecurity, uint>>(o => {
|
||||||
|
TableUpdate<OrderSecurity, uint> last_orders = null;
|
||||||
|
var output = TableUpdate<OrderSecurity, uint>.mk_empty(p => p.order.Key);
|
||||||
|
var piq_offsets = Enumerable.Range(1, 10).Select(i => (uint)i).ToArray();
|
||||||
|
var rand = new Random();
|
||||||
|
return Disposable.Create(
|
||||||
|
orders.Subscribe(new_orders => {
|
||||||
|
last_orders = new_orders;
|
||||||
|
notify();
|
||||||
|
}),
|
||||||
|
Observable.Interval(throttle).Subscribe(_ => notify()));
|
||||||
|
void notify() {
|
||||||
|
var bd = last_orders.to_builder();
|
||||||
|
foreach (var os in last_orders.state.Values) {
|
||||||
|
if (os.order.is_active()) {
|
||||||
|
var rpiq = os.piq ?? 0;
|
||||||
|
rpiq += piq_offsets[rand.Next(piq_offsets.Length)];
|
||||||
|
bd.add_or_update(os.order.Key, new OrderSecurity(os.security, os.order, rpiq, os.algo, os.meta));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
last_orders = bd.to_table();
|
||||||
|
if (last_orders.has_changes())
|
||||||
|
o.OnNext(last_orders);
|
||||||
|
|
||||||
|
}
|
||||||
|
}).Cache();
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -63,5 +63,20 @@ namespace mbts {
|
|||||||
|
|
||||||
public static double? nan_nullable(double value) =>
|
public static double? nan_nullable(double value) =>
|
||||||
double.IsNaN(value) ? (double?)null : value;
|
double.IsNaN(value) ? (double?)null : value;
|
||||||
|
|
||||||
|
public static int? to_optional_int32(double value) {
|
||||||
|
if (double.IsNaN(value) || double.IsInfinity(value))
|
||||||
|
return null;
|
||||||
|
if (value > 0) {
|
||||||
|
value = Math.Floor(value);
|
||||||
|
if (value <= int.MaxValue)
|
||||||
|
return (int)value;
|
||||||
|
} else if (value < 0) {
|
||||||
|
value = Math.Ceiling(value);
|
||||||
|
if (value >= int.MinValue)
|
||||||
|
return (int)value;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -22,7 +22,7 @@ namespace mbts.spark {
|
|||||||
_notification = NotificationSettings.Default,
|
_notification = NotificationSettings.Default,
|
||||||
_market_view_grid = bts.shell.MarketViewWindowFactory.StartupData.DefaultGridSettings,
|
_market_view_grid = bts.shell.MarketViewWindowFactory.StartupData.DefaultGridSettings,
|
||||||
_fills_grid = bts.shell.fills.FillsSettings.DefaultGridSettings,
|
_fills_grid = bts.shell.fills.FillsSettings.DefaultGridSettings,
|
||||||
_time_and_sales_grid = bts.shell.TimeAndSalesWindowFactory.StartupData.DefaultGridSettings,
|
_time_and_sales_grid = bts.shell.time_and_sales.TimeAndSalesSettings.DefaultGridSettings,
|
||||||
_synthetic_management_grid = bts.shell.SyntheticManagementWindowFactory.StartupData.DefaultGridSettings,
|
_synthetic_management_grid = bts.shell.SyntheticManagementWindowFactory.StartupData.DefaultGridSettings,
|
||||||
_order_book_grid = bts.shell.orderbook.OrderBookStartupData.DefaultGrid
|
_order_book_grid = bts.shell.orderbook.OrderBookStartupData.DefaultGrid
|
||||||
};
|
};
|
||||||
@@ -72,7 +72,7 @@ namespace mbts.spark {
|
|||||||
public uint next_ladder_profile_id => _last_ladder_profile_id + 1;
|
public uint next_ladder_profile_id => _last_ladder_profile_id + 1;
|
||||||
public NotificationSettings notification => _notification ?? (_notification = NotificationSettings.Default);
|
public NotificationSettings notification => _notification ?? (_notification = NotificationSettings.Default);
|
||||||
public GridSettings market_view_grid => _market_view_grid ?? (_market_view_grid = bts.shell.MarketViewWindowFactory.StartupData.DefaultGridSettings);
|
public GridSettings market_view_grid => _market_view_grid ?? (_market_view_grid = bts.shell.MarketViewWindowFactory.StartupData.DefaultGridSettings);
|
||||||
public GridSettings time_and_sales_grid => _time_and_sales_grid ?? (_time_and_sales_grid = GridSettings.Default.with(bts.shell.TimeAndSalesWindowFactory.StartupData.DefaultColumns.all));
|
public GridSettings time_and_sales_grid => _time_and_sales_grid ?? (_time_and_sales_grid = GridSettings.Default.with(bts.shell.time_and_sales.TimeAndSalesSettings.DefaultColumns.all));
|
||||||
public GridSettings fills_grid => _fills_grid ?? (_fills_grid = bts.shell.fills.FillsSettings.DefaultGridSettings);
|
public GridSettings fills_grid => _fills_grid ?? (_fills_grid = bts.shell.fills.FillsSettings.DefaultGridSettings);
|
||||||
public GridSettings synthetic_management_grid => _synthetic_management_grid ?? (_synthetic_management_grid = bts.shell.SyntheticManagementWindowFactory.StartupData.DefaultGridSettings);
|
public GridSettings synthetic_management_grid => _synthetic_management_grid ?? (_synthetic_management_grid = bts.shell.SyntheticManagementWindowFactory.StartupData.DefaultGridSettings);
|
||||||
public GridSettings pnl_grid => _pnl_grid ?? (_pnl_grid = bts.shell.PAndLWindowFactory.PAndLStartupData.DefaultGridSettings);
|
public GridSettings pnl_grid => _pnl_grid ?? (_pnl_grid = bts.shell.PAndLWindowFactory.PAndLStartupData.DefaultGridSettings);
|
||||||
|
|||||||
@@ -123,15 +123,15 @@ namespace bts.utils {
|
|||||||
_deferred_adds = new RefCountMap<T>(value_comparer);
|
_deferred_adds = new RefCountMap<T>(value_comparer);
|
||||||
_deferred_removes = new RefCountMap<T>(value_comparer);
|
_deferred_removes = new RefCountMap<T>(value_comparer);
|
||||||
_value_groups = new Dictionary<TKey, RefCountMap<T>>(key_comparer);
|
_value_groups = new Dictionary<TKey, RefCountMap<T>>(key_comparer);
|
||||||
distinct_value_groups = new MappedDictionary<TKey, RefCountMap<T>, IEnumerable<T>>(_value_groups, rcm => rcm.Keys);
|
distinct_value_groups = new MappedDictionary<TKey, RefCountMap<T>, IReadOnlyCollection<T>>(_value_groups, rcm => rcm.Keys);
|
||||||
}
|
}
|
||||||
|
|
||||||
public event Action<KeyValuePair<TKey, IEnumerable<T>>?> common_value_group_changed;
|
public event Action<KeyValuePair<TKey, IReadOnlyCollection<T>>?> common_value_group_changed;
|
||||||
public event Action<(IEnumerable<T> removed, IEnumerable<T> added)> common_values_changed;
|
public event Action<(IReadOnlyCollection<T> removed, IReadOnlyCollection<T> added)> common_values_changed;
|
||||||
|
|
||||||
public IReadOnlyDictionary<TKey, IEnumerable<T>> distinct_value_groups { get; }
|
public IReadOnlyDictionary<TKey, IReadOnlyCollection<T>> distinct_value_groups { get; }
|
||||||
public KeyValuePair<TKey, IEnumerable<T>>? common_value_group =>
|
public KeyValuePair<TKey, IReadOnlyCollection<T>>? common_value_group =>
|
||||||
distinct_value_groups.TryGetSingle(out KeyValuePair<TKey, IEnumerable<T>> kv) ? kv : (KeyValuePair<TKey, IEnumerable<T>>?)null;
|
distinct_value_groups.TryGetSingle(out KeyValuePair<TKey, IReadOnlyCollection<T>> kv) ? kv : (KeyValuePair<TKey, IReadOnlyCollection<T>>?)null;
|
||||||
|
|
||||||
public void add(T value) {
|
public void add(T value) {
|
||||||
if (_is_deferred) {
|
if (_is_deferred) {
|
||||||
@@ -141,7 +141,7 @@ namespace bts.utils {
|
|||||||
var k = _key(value);
|
var k = _key(value);
|
||||||
if (_value_groups.TryGetValue(k, out RefCountMap<T> rcm)) {
|
if (_value_groups.TryGetValue(k, out RefCountMap<T> rcm)) {
|
||||||
if (rcm.increment_adds_key(value) && _value_groups.Count == 1) {
|
if (rcm.increment_adds_key(value) && _value_groups.Count == 1) {
|
||||||
common_values_changed?.Invoke((Enumerable.Empty<T>(), new[] { value }));
|
common_values_changed?.Invoke((Array.Empty<T>(), new[] { value }));
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
_value_groups.Add(k, rcm = new RefCountMap<T>(_value_comparer));
|
_value_groups.Add(k, rcm = new RefCountMap<T>(_value_comparer));
|
||||||
@@ -172,7 +172,7 @@ namespace bts.utils {
|
|||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (_value_groups.Count == 1)
|
if (_value_groups.Count == 1)
|
||||||
common_values_changed?.Invoke((new[] { value }, Enumerable.Empty<T>()));
|
common_values_changed?.Invoke((new[] { value }, Array.Empty<T>()));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -190,7 +190,7 @@ namespace bts.utils {
|
|||||||
switch (_value_groups.Count) {
|
switch (_value_groups.Count) {
|
||||||
case 1:
|
case 1:
|
||||||
_value_groups.Clear();
|
_value_groups.Clear();
|
||||||
common_values_changed?.Invoke((Enumerable.Empty<T>(), Enumerable.Empty<T>()));
|
common_values_changed?.Invoke((Array.Empty<T>(), Array.Empty<T>()));
|
||||||
common_value_group_changed?.Invoke(null);
|
common_value_group_changed?.Invoke(null);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@@ -230,8 +230,8 @@ namespace bts.utils {
|
|||||||
common_value_group_changed?.Invoke(common_value_group);
|
common_value_group_changed?.Invoke(common_value_group);
|
||||||
} else if (last_fired_common_key is TKey k) {
|
} else if (last_fired_common_key is TKey k) {
|
||||||
common_values_changed?.Invoke((
|
common_values_changed?.Invoke((
|
||||||
_deferred_removes.Select(krc => krc.Key).Where(v => _key_comparer.Equals(_key(v), k)),
|
CollectionHelper.wrap_mutable_as_read_only(_deferred_removes, kv => kv.Key),
|
||||||
_deferred_adds.Select(krc => krc.Key).Where(v => _key_comparer.Equals(_key(v), k))));
|
CollectionHelper.wrap_mutable_as_read_only(_deferred_adds, kv => kv.Key)));
|
||||||
}
|
}
|
||||||
_deferred_adds = new RefCountMap<T>(_value_comparer);
|
_deferred_adds = new RefCountMap<T>(_value_comparer);
|
||||||
_deferred_removes = new RefCountMap<T>(_value_comparer);
|
_deferred_removes = new RefCountMap<T>(_value_comparer);
|
||||||
@@ -435,7 +435,13 @@ namespace bts.utils {
|
|||||||
o.OnNext(monitor.try_get_common_value(out T result) ? selector(result) : default_value);
|
o.OnNext(monitor.try_get_common_value(out T result) ? selector(result) : default_value);
|
||||||
});
|
});
|
||||||
|
|
||||||
public static IObservable<TResult> SubscribeThrottled<T, TKey, TResult>(this CommonValueGroupMonitor<T, TKey> monitor, TimeSpan throttle, Func<TKey, IEnumerable<T>, TResult> selector, TResult default_value) where TKey : struct =>
|
public static IObservable<TResult> SubscribeThrottled<T, TKey, TResult>(
|
||||||
|
this CommonValueGroupMonitor<T, TKey> monitor,
|
||||||
|
TimeSpan throttle,
|
||||||
|
Func<TKey, IReadOnlyCollection<T>, TResult> selector,
|
||||||
|
TResult default_value)
|
||||||
|
where TKey : struct =>
|
||||||
|
//
|
||||||
Observable.Create<TResult>(o => {
|
Observable.Create<TResult>(o => {
|
||||||
bool busy = false, dirty = false;
|
bool busy = false, dirty = false;
|
||||||
notify();
|
notify();
|
||||||
@@ -445,8 +451,8 @@ namespace bts.utils {
|
|||||||
monitor.common_values_changed -= on_values_changed;
|
monitor.common_values_changed -= on_values_changed;
|
||||||
monitor.common_value_group_changed -= on_value_group_changed;
|
monitor.common_value_group_changed -= on_value_group_changed;
|
||||||
});
|
});
|
||||||
void on_values_changed((IEnumerable<T>, IEnumerable<T>) _) => on_changed();
|
void on_values_changed((IReadOnlyCollection<T>, IReadOnlyCollection<T>) _) => on_changed();
|
||||||
void on_value_group_changed(KeyValuePair<TKey, IEnumerable<T>>? _) => on_changed();
|
void on_value_group_changed(KeyValuePair<TKey, IReadOnlyCollection<T>>? _) => on_changed();
|
||||||
async void on_changed() {
|
async void on_changed() {
|
||||||
if (busy) {
|
if (busy) {
|
||||||
dirty = true;
|
dirty = true;
|
||||||
@@ -461,7 +467,7 @@ namespace bts.utils {
|
|||||||
busy = false;
|
busy = false;
|
||||||
}
|
}
|
||||||
void notify() =>
|
void notify() =>
|
||||||
o.OnNext(monitor.common_value_group is KeyValuePair<TKey, IEnumerable<T>> kv ? selector(kv.Key, kv.Value) : default_value);
|
o.OnNext(monitor.common_value_group is KeyValuePair<TKey, IReadOnlyCollection<T>> kv ? selector(kv.Key, kv.Value) : default_value);
|
||||||
});
|
});
|
||||||
|
|
||||||
public static IObservable<T?> SubscribeThrottledNullable<T>(this CommonValueMonitor<T> monitor, TimeSpan throttle) where T : struct =>
|
public static IObservable<T?> SubscribeThrottledNullable<T>(this CommonValueMonitor<T> monitor, TimeSpan throttle) where T : struct =>
|
||||||
|
|||||||
@@ -258,7 +258,7 @@ namespace bts.utils {
|
|||||||
_property_monitors[pm_pos++] = (pad.prop_info.Name, initialize, refresh);
|
_property_monitors[pm_pos++] = (pad.prop_info.Name, initialize, refresh);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ArrayHelper.trim(ref _property_monitors, _property_monitors.Length - pm_pos);
|
ArrayHelper.trim(ref _property_monitors, pm_pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
public IDisposable detect_changes(T target) {
|
public IDisposable detect_changes(T target) {
|
||||||
|
|||||||
@@ -61,8 +61,8 @@
|
|||||||
<SolidColorBrush x:Key="CheckBox.Pressed.BorderBrush" Color="{StaticResource CheckBox.Pressed.BorderColor}"/>
|
<SolidColorBrush x:Key="CheckBox.Pressed.BorderBrush" Color="{StaticResource CheckBox.Pressed.BorderColor}"/>
|
||||||
|
|
||||||
<!--ComboBox-->
|
<!--ComboBox-->
|
||||||
<Color x:Key="ComboBoxBackgroundLightColor">#FFE5E5E5</Color>
|
<Color x:Key="ComboBoxBackgroundLightColor">#FFF0F0F0</Color>
|
||||||
<Color x:Key="ComboBoxBackgroundMediumColor">#FFF0F0F0</Color>
|
<Color x:Key="ComboBoxBackgroundMediumColor">#FFE5E5E5</Color>
|
||||||
|
|
||||||
<Color x:Key="ComboBoxBorderLightColor">#FFACACAC</Color>
|
<Color x:Key="ComboBoxBorderLightColor">#FFACACAC</Color>
|
||||||
<Color x:Key="ComboBoxBorderMediumColor">#FF7EB4EA</Color>
|
<Color x:Key="ComboBoxBorderMediumColor">#FF7EB4EA</Color>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ using System.Windows.Input;
|
|||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
|
|
||||||
namespace mbts.ui.controls.adorners {
|
namespace mbts.ui.controls.adorners {
|
||||||
public class DragRectAdorner : Adorner, IDisposable {
|
public class DragRectAdorner : Adorner, IDisposable, DIYGrid.ISelectionHighlightListener {
|
||||||
Brush _fill = DIYGrid.DefaultSelectionHighlight;
|
Brush _fill = DIYGrid.DefaultSelectionHighlight;
|
||||||
Pen _stroke = DIYGrid.DefaultSelectionStroke;
|
Pen _stroke = DIYGrid.DefaultSelectionStroke;
|
||||||
readonly ScrollViewerTuple _scroll_viewer_tup;
|
readonly ScrollViewerTuple _scroll_viewer_tup;
|
||||||
@@ -110,6 +110,12 @@ namespace mbts.ui.controls.adorners {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void on_selection_fill(SolidColorBrush selection_fill) {
|
||||||
|
Fill = selection_fill;
|
||||||
|
Stroke = new Pen(selection_fill.Color.to_solid_brush(), 1);
|
||||||
|
InvalidateVisual();
|
||||||
|
}
|
||||||
|
|
||||||
class ScrollViewerTuple {
|
class ScrollViewerTuple {
|
||||||
public readonly ScrollViewer scroll_viewer;
|
public readonly ScrollViewer scroll_viewer;
|
||||||
ScrollContentPresenter _presenter;
|
ScrollContentPresenter _presenter;
|
||||||
@@ -120,4 +126,4 @@ namespace mbts.ui.controls.adorners {
|
|||||||
public ScrollContentPresenter presenter => _presenter ?? (_presenter = scroll_viewer.descendants_of_type<ScrollContentPresenter>().FirstOrDefault());
|
public ScrollContentPresenter presenter => _presenter ?? (_presenter = scroll_viewer.descendants_of_type<ScrollContentPresenter>().FirstOrDefault());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,13 +1,12 @@
|
|||||||
using System;
|
using mbts.ui.extensions;
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
|
using System.Windows.Controls.Primitives;
|
||||||
using System.Windows.Documents;
|
using System.Windows.Documents;
|
||||||
using System.Windows.Input;
|
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using bts.utils;
|
|
||||||
using mbts.ui.extensions;
|
|
||||||
|
|
||||||
namespace mbts.ui.controls.adorners {
|
namespace mbts.ui.controls.adorners {
|
||||||
public class RowSelectionAdorner : Adorner, DIYGrid.ISelectionHighlightListener, IDisposable {
|
public class RowSelectionAdorner : Adorner, DIYGrid.ISelectionHighlightListener, IDisposable {
|
||||||
@@ -55,16 +54,24 @@ namespace mbts.ui.controls.adorners {
|
|||||||
_diy_scp = _diy_rp.descendants_of_type<ScrollContentPresenter>().empty_if_null().FirstOrDefault();
|
_diy_scp = _diy_rp.descendants_of_type<ScrollContentPresenter>().empty_if_null().FirstOrDefault();
|
||||||
|
|
||||||
// We actually don't need mouse up/down or key up/down when we can just respond to selection changes
|
// We actually don't need mouse up/down or key up/down when we can just respond to selection changes
|
||||||
_disposables.Add(((System.Windows.Controls.Primitives.Selector)_diy_rp).SubscribeSelectionChanged((s, e) => InvalidateVisual()));
|
_disposables.Add(_diy_rp.SubscribeSelectionChanged((s, e) => InvalidateVisual()));
|
||||||
// so that we update the highlight as the grid scrolls
|
// so that we update the highlight as the grid scrolls
|
||||||
_disposables.Add(_diy_scroll.SubscribeScrollChanged((s, e) => InvalidateVisual()));
|
_disposables.Add(_diy_scroll.SubscribeScrollChanged((s, e) => InvalidateVisual()));
|
||||||
|
// listen to ItemContainerGenerator changes
|
||||||
|
_diy_rp.ItemContainerGenerator.ItemsChanged += on_items_changed;
|
||||||
|
_diy_rp.ItemContainerGenerator.StatusChanged += on_status_changed;
|
||||||
|
_disposables.Add(Disposable.Create(() => {
|
||||||
|
_diy_rp.ItemContainerGenerator.ItemsChanged -= on_items_changed;
|
||||||
|
_diy_rp.ItemContainerGenerator.StatusChanged -= on_status_changed;
|
||||||
|
}));
|
||||||
|
void on_items_changed(object sender, ItemsChangedEventArgs e) => InvalidateVisual();
|
||||||
|
void on_status_changed(object sender, EventArgs e) => InvalidateVisual();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
protected override void OnRender(DrawingContext drawingContext) {
|
protected override void OnRender(DrawingContext drawingContext) {
|
||||||
base.OnRender(drawingContext);
|
base.OnRender(drawingContext);
|
||||||
if (AdornedElement is ListBox lb && lb.SelectedItems != null && lb.SelectedItems.Count > 0) {
|
if (AdornedElement is ListBox lb && lb.SelectedItems != null && lb.SelectedItems.Count > 0) {
|
||||||
foreach(var lbi in lb.SelectedItems) {
|
foreach (var lbi in lb.SelectedItems) {
|
||||||
if (_diy_rp.ItemContainerGenerator.ContainerFromItem(lbi) is FrameworkElement row && row.IsVisible) {
|
if (_diy_rp.ItemContainerGenerator.ContainerFromItem(lbi) is FrameworkElement row && row.IsVisible) {
|
||||||
var top_left = lb.GetChildTopLeft(row);
|
var top_left = lb.GetChildTopLeft(row);
|
||||||
var top_is_within_bounds = top_left.Y >= 0;
|
var top_is_within_bounds = top_left.Y >= 0;
|
||||||
@@ -72,7 +79,7 @@ namespace mbts.ui.controls.adorners {
|
|||||||
// Note that the top of the row can still technically be visible but we wont show
|
// Note that the top of the row can still technically be visible but we wont show
|
||||||
// the adorner rectangle b/c the bottom of the row will be obscured by the scrollbar
|
// the adorner rectangle b/c the bottom of the row will be obscured by the scrollbar
|
||||||
var bottom_is_within_bounds = lb.GetChildBounds(row).BottomRight.Y <= _diy_scroll.ActualHeight;
|
var bottom_is_within_bounds = lb.GetChildBounds(row).BottomRight.Y <= _diy_scroll.ActualHeight;
|
||||||
if (top_is_within_bounds && bottom_is_within_bounds) {
|
if (top_is_within_bounds && bottom_is_within_bounds) {
|
||||||
// we use the scroll content presenter in the X point calculation instead of the row
|
// we use the scroll content presenter in the X point calculation instead of the row
|
||||||
// because of the OB which has a right side panel that takes up some space over
|
// because of the OB which has a right side panel that takes up some space over
|
||||||
// row width
|
// row width
|
||||||
|
|||||||
@@ -0,0 +1,83 @@
|
|||||||
|
using bts.utils;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Documents;
|
||||||
|
using System.Windows.Media;
|
||||||
|
|
||||||
|
namespace mbts.ui.controls.adorners {
|
||||||
|
class SimpleOverlayAdorner : Adorner {
|
||||||
|
static readonly IComparer<(int, UIElement, Visual)> _id_comparer =
|
||||||
|
Comparer<int>.Default.wrap<int, (int, UIElement, Visual)>(tup => tup.Item1);
|
||||||
|
|
||||||
|
readonly List<(int id, UIElement target, Visual content)> _cache =
|
||||||
|
new List<(int id, UIElement target, Visual content)>();
|
||||||
|
int _child_id_counter;
|
||||||
|
|
||||||
|
public SimpleOverlayAdorner(UIElement adorned_element)
|
||||||
|
: base(adorned_element) { }
|
||||||
|
|
||||||
|
protected override int VisualChildrenCount => _cache.Count;
|
||||||
|
|
||||||
|
public IDisposable OverlayVisual(UIElement target, Visual visual) {
|
||||||
|
int id = _child_id_counter++;
|
||||||
|
_cache.Add((id, target, visual));
|
||||||
|
AddVisualChild(visual);
|
||||||
|
if (_cache.Count == 1)
|
||||||
|
this.attach();
|
||||||
|
// don't the caller prevent children from being garbage collected (returned idisposable's lifetime may exceed that of this adorner).
|
||||||
|
var weak_cache_ref = new WeakReference<List<(int, UIElement, Visual)>>(_cache);
|
||||||
|
return Disposable.Create(() => {
|
||||||
|
if (weak_cache_ref.TryGetTarget(out var loc_cache)) {
|
||||||
|
int pos = loc_cache.BinarySearch((id, null, null), _id_comparer);
|
||||||
|
if (pos >= 0) {
|
||||||
|
RemoveVisualChild(loc_cache[pos].Item3);
|
||||||
|
loc_cache.RemoveAt(pos);
|
||||||
|
}
|
||||||
|
if (loc_cache.Count == 0)
|
||||||
|
this.detach();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override Size ArrangeOverride(Size final_size) {
|
||||||
|
double xmin = final_size.Width, xmax = 0, ymin = final_size.Height, ymax = 0;
|
||||||
|
var final_rect = new Rect(new Point(0, 0), final_size);
|
||||||
|
foreach (var (id, target, content) in _cache) {
|
||||||
|
if (content is UIElement el) {
|
||||||
|
var tl = target.TranslatePoint(new Point(0, 0), AdornedElement);
|
||||||
|
var br = new Point(tl.X + target.RenderSize.Width, tl.Y + target.RenderSize.Height);
|
||||||
|
var rect = new Rect(tl, br);
|
||||||
|
rect.Intersect(final_rect);
|
||||||
|
if (!rect.Size.IsEmpty) {
|
||||||
|
el.Arrange(rect);
|
||||||
|
if (rect.Right > xmax)
|
||||||
|
xmax = rect.Right;
|
||||||
|
if (rect.Bottom > ymax)
|
||||||
|
ymax = rect.Bottom;
|
||||||
|
if (rect.Left < xmin)
|
||||||
|
xmin = rect.Left;
|
||||||
|
if (rect.Top < ymin)
|
||||||
|
ymin = rect.Top;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (xmin < xmax && ymin < ymax)
|
||||||
|
return new Size(xmax - xmin, ymax - ymin);
|
||||||
|
return new Size(0, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override Visual GetVisualChild(int index) =>
|
||||||
|
index >= 0 && index < _cache.Count ? _cache[index].content : null;
|
||||||
|
|
||||||
|
protected override Size MeasureOverride(Size constraint) {
|
||||||
|
foreach (var (id, target, content) in _cache) {
|
||||||
|
if (content is UIElement el)
|
||||||
|
el.Measure(target.DesiredSize);
|
||||||
|
}
|
||||||
|
return new Size(
|
||||||
|
Math.Min(constraint.Width, AdornedElement.DesiredSize.Width),
|
||||||
|
Math.Min(constraint.Height, AdornedElement.DesiredSize.Height));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using mbts.ui.converters;
|
using mbts.ui.converters;
|
||||||
|
using mbts.ui.dpi;
|
||||||
using mbts.ui.shell;
|
using mbts.ui.shell;
|
||||||
using mbts.ui.utility.text;
|
using mbts.ui.utility.text;
|
||||||
using System;
|
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
@@ -83,79 +83,39 @@ namespace mbts.ui.controls {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Rect? get_clip(Size content_size, double row_height, double left, double unclipped_left, double width) =>
|
|
||||||
content_size == null ? get_clip(0, 0, row_height, left, unclipped_left, width) :
|
|
||||||
get_clip(content_size.Width, content_size.Height, row_height, left, unclipped_left, width);
|
|
||||||
|
|
||||||
public static Rect? get_clip(double content_width, double content_height, double row_height, double left, double unclipped_left, double width) {
|
|
||||||
if (content_width > width || unclipped_left < left)
|
|
||||||
return new Rect(left, 0, width - left + unclipped_left, row_height);
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static IDisposable draw_with_clip(DrawingContext dc, double raw_content_width, double raw_content_height, Thickness padding, double row_height, ColumnGeometry position) =>
|
|
||||||
draw_with_clip(dc,
|
|
||||||
raw_content_width + padding.Left + padding.Right,
|
|
||||||
raw_content_height + padding.Top + padding.Bottom,
|
|
||||||
row_height, position.left, position.unclipped_left, position.width);
|
|
||||||
|
|
||||||
public static IDisposable draw_with_clip(DrawingContext dc, double content_width, double content_height, double row_height, double left, double unclipped_left, double width) {
|
|
||||||
var clip = get_clip(content_width, content_height, row_height, left, unclipped_left, width);
|
|
||||||
if (clip.HasValue) {
|
|
||||||
dc.PushClip(new RectangleGeometry(clip.Value));
|
|
||||||
return Disposable.Create(dc.Pop);
|
|
||||||
} else return Disposable.Create(() => { });
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void draw_text(
|
public static void draw_text(
|
||||||
DrawingContext dc, GlyphContext glyph_context, double font_size, string text, ColumnGeometry position, double row_height,
|
DrawingContext dc,
|
||||||
Brush foreground, Brush background, HorizontalAlignment x_align, VerticalAlignment y_align, Thickness padding) {
|
GlyphContext glyph_context,
|
||||||
|
double font_size,
|
||||||
|
string text,
|
||||||
|
ColumnGeometry position,
|
||||||
|
double row_height,
|
||||||
|
Brush foreground,
|
||||||
|
Brush background,
|
||||||
|
HorizontalAlignment x_align,
|
||||||
|
VerticalAlignment y_align,
|
||||||
|
Thickness padding,
|
||||||
|
bool round_to_layout = true) {
|
||||||
//
|
//
|
||||||
if (!string.IsNullOrEmpty(text)) {
|
var gr = glyph_context.get_glyph_run(text, font_size, position.unclipped_left, 0, position.right, row_height, x_align, y_align, padding, round_to_layout);
|
||||||
var gr = glyph_context.get_glyph_run(text, font_size, position.unclipped_left, 0, position.right, row_height, x_align, y_align, padding);
|
var gwidth = gr == null ? 0 : gr.ComputeAlignmentBox().Width;
|
||||||
draw_text(dc, gr, gr.AdvanceWidths.Sum(), font_size, position, padding, row_height, foreground, background);
|
draw_text(dc, gr, gwidth, font_size, position, padding, row_height, foreground, background);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void draw_text(DrawingContext dc, GlyphRun glyph_run, double glyph_width, double font_size, ColumnGeometry position, Thickness padding, double row_height, Brush foreground, Brush background) {
|
public static void draw_text(DrawingContext dc, GlyphRun glyph_run, double glyph_width, double font_size, ColumnGeometry position, Thickness padding, double row_height, Brush foreground, Brush background) {
|
||||||
using (draw_with_clip(dc, glyph_width, font_size, padding, row_height, position)) {
|
if (glyph_run == null && background == null)
|
||||||
if (background != null)
|
return;
|
||||||
dc.DrawRectangle(background, null, new Rect(position.left, 0, position.width, row_height));
|
var rect = position.to_rect(row_height);
|
||||||
dc.DrawGlyphRun(foreground, glyph_run);
|
if (background != null) {
|
||||||
|
var guidelines = rect.AntiAliasGuidelines(0);
|
||||||
|
dc.PushGuidelineSet(guidelines);
|
||||||
|
dc.DrawRectangle(background, null, rect);
|
||||||
|
dc.Pop();
|
||||||
}
|
}
|
||||||
}
|
if (glyph_run != null) {
|
||||||
|
dc.PushClip(new RectangleGeometry(rect));
|
||||||
public static void draw_text(
|
dc.DrawGlyphRun(foreground, glyph_run);
|
||||||
DrawingContext dc, GlyphContext glyph_context, double font_size, string text, ColumnGeometry position, double row_height,
|
dc.Pop();
|
||||||
Brush foreground, Brush background, HorizontalAlignment x_align, VerticalAlignment y_align, Thickness padding, IEnumerable<CellAnimation> trigger_actions) {
|
|
||||||
//
|
|
||||||
using (position.clip_draw(dc, row_height)) {
|
|
||||||
double adjusted_left = position.unclipped_left;
|
|
||||||
double available_width = position.width;
|
|
||||||
if (background != null)
|
|
||||||
dc.DrawRectangle(background, null, new Rect(position.left, 0, position.width, row_height));
|
|
||||||
// store any trigger-glyphs in a list, to be drawn after iterating through all triggers (must draw background first, so glyphs will not be covered up).
|
|
||||||
List<(Brush brush, GlyphRun glyph)> glyphs = new List<(Brush brush, GlyphRun glyph)>(1);
|
|
||||||
if (trigger_actions != null) {
|
|
||||||
foreach (CellAnimation ta in trigger_actions) {
|
|
||||||
switch (ta.animation_type_case) {
|
|
||||||
case CellAnimation.AnimationTypeOneofCase.BackgroundAnimation:
|
|
||||||
dc.DrawRectangle(ta.background_animation.brush, ta.background_animation.pen, new Rect(position.left, 0, position.width, row_height));
|
|
||||||
break;
|
|
||||||
case CellAnimation.AnimationTypeOneofCase.SymbolAnimation:
|
|
||||||
var (symbol_text, is_sideways) = _get_symbol_animation_args(ta.symbol_animation);
|
|
||||||
GlyphRun symbol_glyph = glyph_context.get_glyph_run(symbol_text, font_size, position.width, row_height, HorizontalAlignment.Left, adjusted_left, y_align, 0, is_sideways: is_sideways);
|
|
||||||
glyphs.Add((ta.symbol_animation.brush, symbol_glyph));
|
|
||||||
adjusted_left += symbol_glyph.AdvanceWidths.Sum();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
foreach (var (brush, glyph) in glyphs) {
|
|
||||||
dc.DrawGlyphRun(brush, glyph);
|
|
||||||
}
|
|
||||||
GlyphRun main_content = glyph_context.get_glyph_run(text, font_size, adjusted_left, 0, position.right, row_height, x_align, y_align, padding);
|
|
||||||
draw_text(dc, main_content, main_content.AdvanceWidths.Sum(), font_size, position, padding, row_height, foreground, background);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -165,14 +125,6 @@ namespace mbts.ui.controls {
|
|||||||
public static void change_position(FrameworkElement cell_view, double row_height, ColumnGeometry? position) {
|
public static void change_position(FrameworkElement cell_view, double row_height, ColumnGeometry? position) {
|
||||||
if (position.HasValue) {
|
if (position.HasValue) {
|
||||||
WPFHelper.set_if_changed(cell_view, VisibilityProperty, Visibility.Visible);
|
WPFHelper.set_if_changed(cell_view, VisibilityProperty, Visibility.Visible);
|
||||||
var clip = get_clip(cell_view.DesiredSize, row_height, 0, position.Value.unclipped_left - position.Value.left, position.Value.width);
|
|
||||||
var el_clip = cell_view.Clip as RectangleGeometry;
|
|
||||||
if (clip.HasValue) {
|
|
||||||
if (el_clip == null || !el_clip.Rect.Equals(clip.Value))
|
|
||||||
cell_view.Clip = new RectangleGeometry(clip.Value);
|
|
||||||
} else if (cell_view.Clip != null) {
|
|
||||||
cell_view.Clip = null;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
WPFHelper.set_if_changed(cell_view, VisibilityProperty, Visibility.Collapsed);
|
WPFHelper.set_if_changed(cell_view, VisibilityProperty, Visibility.Collapsed);
|
||||||
}
|
}
|
||||||
@@ -188,4 +140,4 @@ namespace mbts.ui.controls {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loaded 100 of 287 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user