Compare commits

...
Author SHA1 Message Date
Taha Afzal 11de1c552e For SIM exchanges, securities with expired expirations are not filtered out 2022-08-16 18:43:48 -04:00
Taha Afzal 977fe53b94 SIM orders are fixed - this needed using thecorrent ExchangeGateway and changing DateTime.cpp to handle leading spaces in milliseconds 2022-08-16 18:21:03 -04:00
Taha Afzal 0080bce7ec Merge branch 'spark_crypto.prod' into spark_crypto.md_cleanup 2022-08-15 10:19:35 -04:00
Taha Afzal 87379bba82 ExecutionGatewayFactory returns the correct Gateway based on the connections platform 2022-08-12 00:18:25 -04:00
Taha Afzal 8f6d8c0eea Seperating out SIM connection from Deribit's 2022-08-11 23:34:51 -04:00
John Colvin 6ca2753951 fix (vs): Use precison in terms of actual data for eq comp
Bugs (fixed):
  * The tick up/down buttons have no effect for vol input cells

  Cause: The cell vm ignores some value updates because the equality
  comparer incorrectly considers the new value equal to the current one
  (because it doesn't use enough decimal places in the comparison)
2022-08-11 01:33:43 -04:00
Taha Afzal 470ca0093e Adding more logging helpers to VolSurfaceTroubleshootingFunctions 2022-08-10 20:54:10 -04:00
John Colvin 7e1715964f fix (vs): Pass the vm's 'current_grid' to the model
Bugs (fixed):
  * Cannot edit volsurface cell values (they are immediately reverted)

  Cause: The vm was passing the model's grid back to itself before, effectively
  undoing manual edits in cells
2022-08-10 18:27:41 -04:00
John Colvin 39e929a614 fix: Actually use eq-comp member in Property vm 2022-08-10 18:17:58 -04:00
John Colvin a9aa06f275 fix (vs): Actually use coulmn comparer in cell vm 2022-08-10 18:11:27 -04:00
John Colvin 54510c9e59 refactor (vs grid): Supress recalc reqs while processing update 2022-08-10 14:26:28 -04:00
John Colvin cb56429f04 refactor: Rename 'execute' -> 'Invoke'
To be consistent and interchangeable w/ System.Action
2022-08-10 14:26:28 -04:00
John Colvin ac8147cc0f refactor: Add 'implicit operator T(Optional<T>)' for convenience 2022-08-10 14:26:28 -04:00
John Colvin 82ac189ac9 refactor: Strip 'Wrapper' from 'DeferrableActionWrapper' name 2022-08-10 14:26:27 -04:00
John Colvin 5721ff78b6 fix (vs): Only request recalc when input changes (not output)
Bugs (fixed):
  * The volsurface grid can get into an endless loop of recalc requests
2022-08-09 15:56:05 -04:00
John Colvin 7afd2947f1 refactor: Clean up vs grid vms a bit
* Split vs-cell-vm classes up into own files
* Rename classes by changing 'VolGrid' prefix to 'VolSurface'
* Remove unused struct VolSurfaceCellState
* Enable nullable
* Run formatter
2022-08-09 15:55:40 -04:00
John Colvin c3e3862c5f refactor: Update vs cell 'is_dirty' synchronously when vals change 2022-08-09 02:57:35 -04:00
John Colvin bf2dc9ecca fix (vs grid): Account for nan & rounding error
Bugs (fixed):
  * The volsurface grid starts flasing is_dirty borders all over the place. The
    repro is inexact, but it seems to happen after inputs are changed a few
    times (perhaps from loading a previous volsurface).

  * The volsurface grid flashes is_dirty borders just from clicking on an input
    cell (even if no change is entered).
2022-08-09 02:57:35 -04:00
John Colvin e0e188a02c refactor: Enable NaN identity equality in tick_equals 2022-08-09 02:57:35 -04:00
John Colvin 79ba1654d3 fix: Fix typo in tick_equals fn 2022-08-09 02:57:35 -04:00
Taha Afzal 2aab0d18a5 Formatting slide exp, to look like PNL's 2022-08-08 23:45:02 -04:00
John Colvin 312c8ded11 fix (ui pnl): Add greek props to group row vm
Bugs (fixed):
  * Greek sums still aren't visible in group rows (though they are visible in
    Selected/Total header rows)
2022-08-08 16:11:25 -04:00
John Colvin 3f86779da6 ui (launcher): Move PNL menu items to Analytics module 2022-08-08 16:11:25 -04:00
John Colvin 716d3b8482 ui (day fills): Make title & icon consistent w/ PNL win 2022-08-08 16:11:25 -04:00
John Colvin 24f6dbc4f0 ui (day fills): Convert fill_time utc to local 2022-08-08 16:11:25 -04:00
John Colvin 3e943fa35e refactor (pnl): Add 'PNL' prop to Icons class
To make it clear which icon belongs to which window
2022-08-08 16:11:25 -04:00
John Colvin 457f878b41 ui (pnl): Change win title to 'P&L' to match launcher menu item 2022-08-08 16:11:25 -04:00
John Colvin ac2b2d042a refactor: Split WorkspaceProtos up into 1 class/file 2022-08-08 16:11:25 -04:00
John Colvin 829d2cdbf6 refactor: Provide ICloneable impl in IProtobuf<T> 2022-08-08 16:11:25 -04:00
John Colvin 3cd9693b36 diag (vs): Log cell vm 'is_dirty' changes 2022-08-08 16:11:25 -04:00
John Colvin 2b52ecf2ef perf (vs): Supress repeated 'is_dirty' updates
Before the updates reach the dispatcher thread
2022-08-08 16:11:25 -04:00
John Colvin faab60cbc1 ui (vs): Convert NaN to 0 when users clicks tick up/down 2022-08-08 16:11:25 -04:00
John Colvin b6be0d649d fix (vs): Don't throw ex if parse_double input is null
Bugs (fixed):
  * Previous vol surfaces may have missing data, which can lead to an assert
    crash in the parse_double fn
2022-08-08 16:11:25 -04:00
Taha Afzal 2a65c45d21 Theos/Greeks are still produced if AW2 window is not loaded 2022-08-08 16:00:48 -04:00
Taha Afzal dc6ae2ac29 Removing P from the names of greek columns in Day PNL 2022-08-08 11:53:56 -04:00
Taha Afzal df4250c33a Hooking AW2 populate empty exps 2022-08-07 22:03:50 -04:00
John Colvin 53504ef6f0 ui (pnl): Improve default settings 2022-08-07 15:18:16 -04:00
John Colvin 10afb1af06 ui (pnl): Show greek sums in group/header rows 2022-08-07 14:59:00 -04:00
John Colvin a9149dfa87 refactor: Clean up PNLNormalizedData
* Use new lang feats: nullable, and 'init' prop setters
* Group 'sod', 'day', and 'working' members in respective groups
* Run formatter
2022-08-07 14:39:44 -04:00
John Colvin 5afa6695e7 fix (pnl view): Enforce min height for 'Selected' header row 2022-08-07 13:51:55 -04:00
John Colvin d2a6d54090 refactor (pnl): Replace dyn resources w/ Bindings in xaml
Traditional Bindings are more performant than DynamicResources, and make for
cleaner code
2022-08-07 13:51:55 -04:00
John Colvin 794ac25c01 log: Change 'Begin/End' tags to 'BEG/END' in log_op ext
Improves readability of log_op logs

* Gives the 'BEG/END' tags a uniform width, so their msg bodies will align
* All caps makes the tags stand out

Improves readability by providing uniform width to the BEG/END tags
2022-08-07 13:51:55 -04:00
John Colvin 37214e9480 refactor: Make msg body param optional in 'fn' logger exts 2022-08-07 13:51:55 -04:00
John Colvin 90ab551778 ui (day fills): Format dates in exp col filter 2022-08-07 13:51:54 -04:00
John Colvin 9a4ec46440 fix: Don't begin shutdown til after workspace saved (async)
Bugs (fixed):
   * Seems like only one window's settings are restored w/ workspace
2022-08-07 13:51:54 -04:00
John Colvin c86d283755 fix: Supress empty TableUpdates in 'distinct_on'
Bugs (fixed):
  * Discrete values column filters (i.e., multi-selector views) that are driven
  by 'distinct_on' IObservable<TableUpdate> deselect items when the main
  grid data changes

  Cause: When processing updates from the input IObseravble, the 'distinct_on'
  ext doesn't check if the new/old results are equal. This in turn causes the
  selector-view to remove, then re-add items that didn't actually change.
  Exhibiting reasonable behavior, the view deselects items when they are removed
  from the ItemsSource.
2022-08-07 13:51:54 -04:00
John Colvin 941956c1b5 fix: Actually supress false changes in 'to_table_checked' ext 2022-08-07 13:51:54 -04:00
John Colvin 67e3d22104 style: Fix typo in param name '_selector' -> 'selector' 2022-08-07 13:51:54 -04:00
John Colvin 7e41c93f9a refactor: Rename PNLFilterStates -> PNLFilterSettings 2022-08-07 13:51:54 -04:00
John Colvin 086ccbb3fa refactor: Weaken T constraint for is_within_range ext
There is no reason T has to implement IFloatingPoint<T>
2022-08-07 13:51:54 -04:00
John Colvin 329ddc576d ui (day fills): Add (groupable) exp column 2022-08-07 13:51:54 -04:00
John Colvin 1faef425ab refactor: Consolidate format_expiration fns into single fn 2022-08-07 13:51:54 -04:00
John Colvin bb068cf6b2 fix (preemptive): Add 'Option' case to exp switch expr 2022-08-07 13:51:54 -04:00
John Colvin f7cade41c6 ui (day fills): Fmt qty cols w/ sec-meta display settings 2022-08-07 13:51:54 -04:00
John Colvin 47afd3a911 ui (day fills): Hide bid/ask cols by default 2022-08-07 13:51:54 -04:00
John Colvin ef80d2a41d ui: Shorten a few default column widths
Namely: Account, Exchange, and Symbol
2022-08-07 13:51:53 -04:00
John Colvin 44ef080e9f ui (day fills): Format theo and driver w/ 4 dec places
With the caveat that future fills' drivers are formatted according to their own
tick factors (i.e., same as the "price" column). This should be good/reasonable
behavior because in rare cases where futures don't drive themselves, they are
most likely driven by a neighboring expiration with the same price display.
2022-08-07 13:51:53 -04:00
John Colvin fef8d2c413 ui (day fills): Format price w/ sec's tick factors 2022-08-07 13:51:53 -04:00
John Colvin 201746e561 fix (day fills): Init column models w/ settings
Bugs (fixed):
  * Day fills column settings are not restored with workspace

  Cause: This is a kind-of re-entrancy bug.  When the SimpleGridSettingsManager
  attempts to load the initial column settings, it assigns props in the column
  views. When the width prop is set, the column view forwards the new width to
  the model, which causes the model to fire a settings_changed event, which
  pipes the model's settings (which have not been fully initialized) back to
  the view.
2022-08-07 13:51:53 -04:00
John Colvin 8e375a0b7f ui (day fills): Use qty fg to indicate fill side
Rather than using the row bg, this gives the win a subtler, more modern look
2022-08-07 13:51:53 -04:00
John Colvin 045f3dc060 chore: Move ValueConverter into own file 2022-08-07 13:51:53 -04:00
John Colvin 6b6012236d ui (day fills): Add pnl, delta foreground triggers 2022-08-07 13:51:53 -04:00
John Colvin 9cee798939 chore: Set ModalStateDefinition ContentProperty
For convenience in xaml (so ModalStateDefinition.Source can be defined without
explicit tag)
2022-08-07 13:51:53 -04:00
John Colvin c79bdb12e0 refactor: Make ActivityLogCategories readonly props 2022-08-07 13:51:53 -04:00
John Colvin bce77d65de fix: Add null check in OptionsView
Bugs (fixed):
  * If an Options View window is launched w/ "incomplete" security criteria
    (i.e., not a tuple of Exch, Type, Sym), a null ref crash happens when the
    window is restored with the workspace.
2022-08-07 13:51:53 -04:00
John Colvin 0db814ef2d fix (rec rept): Use tick-factors to avoid rounding errors
Bugs (fixed):
  * Reconcile Report can show false positive price mismatch

  Cause: The epsilon const (1E-12) used in the price comparison too small.
  Evidently, the Deribit-position prices provided to the Reconcile Report are
  only accurate up to 9 decimal places.
2022-08-07 13:51:53 -04:00
John Colvin 31b5ec4bd3 fix (fills view): Change side col base class row type to the vm
Bugs (fixed):
  * In the Fills window, side column cells are empty
2022-08-07 13:51:52 -04:00
John Colvin e15cdfd76e refactor: Add get bg/fg delegates to RenderColumnBase
These colors are frequently functions of the rows; now such cases don't require
implementation in classes that derive from RenderColumnBase
2022-08-07 13:51:52 -04:00
John Colvin eb150ba82c chore (ui): Hook up background setting in OrderTypeColumn 2022-08-07 13:51:52 -04:00
John Colvin d763275179 fix (ui preemptive): Bind horiz align setting to horiz content align
Bugs (fixed)
  * (preemptive) The OrderTypeColumn root border doesn't span the width of the
    column.  This would happen if the column's background was a
    non-transparent brush, and horizontal alignment wasn't stretched.
2022-08-07 13:51:52 -04:00
John Colvin 2b96a8a5c4 ui: Enable grid background setting in all windows
And remove bool props that were used to toggle this behavior
2022-08-07 13:51:52 -04:00
John Colvin 31866c76b7 chore (vs graph): Add tick_line_color setting 2022-08-07 13:51:52 -04:00
John Colvin a2da946e03 fix (vs graph): Actually use axis_line_color setting in vm
Bugs (fixed):
  * The vs graph axis line color setting is ignored
2022-08-07 13:51:52 -04:00
John Colvin 528bab34e7 chore: Show color name in ColorNotFoundException msg 2022-08-07 13:51:52 -04:00
John Colvin 776b9e4f94 chore: Remove '_color' and '_brush' props from BTSColors
The BTSColor props are implicitly convertible to both System.Windows.Media.Color
and Brush
2022-08-07 13:51:52 -04:00
John Colvin 168d328e97 chore: Clean BTSColorExtension 2022-08-06 23:54:15 -04:00
John Colvin f871dbd230 chore: Add 'Pure' attr to is_null_or_empty ext 2022-08-06 23:54:15 -04:00
John Colvin 1662b56ea0 refactor: Clean up ReflectionHelper a bit
* Rename '(static_)property_delegates_of_type' -> '(static_)property_getters',
  and include name w/ prop getters
* Rename 'FindApplicableConstructor' -> 'get_constructor'
* Remove unused fns
2022-08-06 23:54:15 -04:00
John Colvin f3302dbac0 fix (ui): Validate width/height before updating DragRectAdorner 2022-08-06 23:54:15 -04:00
John Colvin 181072f3e7 chore: Clean up ui settings classes
* Move most settings files into new dir 'Model/Settings'
* Conform code style to our current practices
2022-08-06 23:54:15 -04:00
John Colvin f654312123 chore (refactor): Move synth mgmt settings classes into sep files 2022-08-05 13:41:37 -04:00
John Colvin c46d97646a fix: Gather individual win settings on dispatcher thread
In practice, window-states live on their respective dispatcher threads.
Window settings factories shouldn't be expected to be thread-safe.
2022-08-05 13:41:37 -04:00
John Colvin 41742359e9 fix (vs ui): Don't clip vs time sched ui 2022-08-05 13:41:37 -04:00
John Colvin 024723925e ui (vs grid settings): Constrain window height 2022-08-05 13:41:37 -04:00
John Colvin 76b834768e style: Clean up spark.csproj 2022-08-05 13:41:37 -04:00
John Colvin 89284bea87 build: Upgrade csharp nuget pkgs 2022-08-05 13:41:37 -04:00
John Colvin 532154640b refactor: Replace PNLCellAppearance ctr w/ 'init' props 2022-08-05 13:41:36 -04:00
Taha Afzal ab8468d498 Added function in VolSurfaceDisplayModel to populate empty exps 2022-08-04 18:42:15 -04:00
Taha Afzal 84b0332778 Better logs for the case when Deribit's open orders's security can not be resolved 2022-08-03 23:53:57 -04:00
Taha Afzal 20b601f290 Fixed the crash related to querying Deribit for open orders 2022-08-03 16:57:10 -04:00
Taha Afzal 47002cae4c This PNL fix change was accidentally merged out 2022-08-03 08:47:50 -04:00
John Colvin eaaffe369a Fix typo typeof(HyperlinkCell) -> typeof(TextCell) 2022-08-03 00:07:39 -04:00
John Colvin 7292a31c00 fix (rec rep): Save grid settings w/ workspace 2022-08-03 00:07:39 -04:00
John Colvin 389d762a93 ui (launcher): Drop "2" in "P&L 2" menu item
It was leftover from the transition to the "new" pnl window (which hasn't been
new since 2019)
2022-08-03 00:07:39 -04:00
John Colvin 9704ebf096 style: Move ReconcileReportModel into rec rep dir 2022-08-03 00:07:39 -04:00
John Colvin de320338ca ui (launcher): Group 'Fill' menu items together 2022-08-03 00:07:39 -04:00
John Colvin 668dfd9130 feat (ui): Add Day Fills win 2022-08-03 00:07:39 -04:00
John Colvin a2960b23a8 refactor (ITradeLogRow): Rename trader -> user, add user_id
Use consistent nomenclature throught the sys
2022-08-03 00:01:02 -04:00
John Colvin 55744edc25 refactor: Move SecurityDataHelper.Defaults into Security class 2022-08-02 13:24:48 -04:00
John Colvin 7ece5d18cb refactor: Move sec 'key_fn' into Security class 2022-08-02 12:37:46 -04:00
John Colvin 8005ac8635 refactor: Name top_of_book tuple items bid/ask 2022-08-01 21:56:07 -04:00
John Colvin c00a71fdfa chore: Add fill_kind to ITradeLogRow 2022-08-01 11:14:29 -04:00
John Colvin 197c915968 Remove erroneous font_size binding in xaml
Each cell's font size comes from its associated column object (not the cell vm)
2022-08-01 11:14:29 -04:00
John Colvin 6d77a07bbe fix: Load grid-level settings in pnl window
Font family/size/weight, foreground, background
2022-08-01 11:14:29 -04:00
John Colvin adfb560dd1 chore: Post users-map on the bus 2022-08-01 11:14:29 -04:00
John Colvin 508d20e4e0 refactor: Rename ITradeLogRow.trade_key -> order_key
This is what it actually is; the trade_key misnomer was ported from edge
2022-08-01 11:14:29 -04:00
John Colvin 72457619f7 chore: Move IPositionModel to Spark.Trading ns 2022-08-01 11:14:29 -04:00
John Colvin 18d5b83a95 chore: Replace anon pnl win w/ proper PNLWindow class
The PNL window is too complex/terse to be nested anonymously in the
PNLWindowFactory class.  This makes the code cleaner/easier to read.
2022-08-01 11:14:29 -04:00
John Colvin 653362b947 chore: Make 'Safe' IEnumerable exts accept nullable ref types 2022-08-01 11:14:29 -04:00
John Colvin b7477b8f93 fix (fills ui): Add back 'Fill Status' col
Not sure when/why it went missing
2022-08-01 11:14:29 -04:00
John Colvin 105f1fceaf ui (pnl): Increase sec column default width 2022-08-01 11:14:29 -04:00
John Colvin cb65489ab7 fix (combo vm): Fix typo when assigning swipe_sum net/calls/puts
Bugs (fixed):
  * The swipe sum net/puts are swapped in combo status bar
2022-08-01 11:14:29 -04:00
John Colvin 96772727df fix (exp params): Ensure auto-picked driver has right sym 2022-08-01 11:14:29 -04:00
John Colvin 960a618fe1 fix: Bind pnl account col to AccountTuple
Bugs (fixed):
  * The group-row pnl cell hyperlinks don't open anything when clicked

  Cause: An InvalidCastException is thrown when the code that creates the fills
  vm (for the popup) casts 'PNLRowCollectionViewGroup.Name' to an AccountTuple,
  as said 'Name' member is bound to the 'account_name' (of type string).
2022-08-01 11:14:29 -04:00
John Colvin 505cd37225 chore: Assert that PositionPriceSize.GetHashCode isn't invoked
Impl doesn't guarentee equal objects produce the same hash
2022-08-01 11:14:28 -04:00
John Colvin a5f66b8ac6 feat: Add greeks cols to pnl view (for options) 2022-08-01 11:14:28 -04:00
John Colvin 2021f29f62 feat: Support options in pnl view 2022-08-01 11:14:28 -04:00
John Colvin 9ccf3e0f87 chore: Remove UTF-8 BOM from pnl files 2022-08-01 11:14:28 -04:00
John Colvin 7cfc53eba8 refactor: Make sum_real ext generic (IFloatingPoint<T>)
Also add bool param 'nan_if_none' (to return NaN instead of 0 when values
contains no real numbers)
2022-08-01 11:14:28 -04:00
John Colvin f9d269c750 chore: Add account_id to ITradeLogRow, IPNLUnit 2022-08-01 11:14:28 -04:00
John Colvin 67d5161fd1 chore: Dispose _pnl_calc in ReportDaemon.Dispose
This wasn't causing any problems in practice (this class is instantiated once
on startup and never gets disposed).  However, since it implements IDisposable,
might as well do it correctly.
2022-08-01 11:14:28 -04:00
Taha Afzal d6e9bbce71 Something funky, not sure why it is showing as touched 2022-08-01 11:14:28 -04:00
John Colvin 76ec2c0fa2 fix: Pass key_fn to TableUpdate Operate ext
Bugs (fixed):
  * PNL window crashes immediately when opened

    Cause: The 'Operate' ext fn aggregates an IObservable of TableUpdates w/
    another IObservable of any T.  If the latter fires before the former, an
    'empty' TableUpdate is passed to the aggregate fn.  When this happens, a
    null ref ex is thrown in the 'empty' TableUpdate's ctr because the key
    param is null.
2022-08-01 11:14:28 -04:00
Taha Afzal e82a2c9402 Added Day PNL trades to PNLData 2022-08-01 11:14:28 -04:00
Taha Afzal 60ce106e24 Fixing a PNL crash which was caused by options for a symbol being temporarily null 2022-08-01 11:14:28 -04:00
Taha Afzal 1eb4952422 Added Control Keys to sheets, Ctrl + right click always brings up the context menu, Ctrl + market always brings up the ladder 2022-08-01 11:14:28 -04:00
Taha Afzal 3043582889 Improved some log messages 2022-08-01 11:14:28 -04:00
Taha Afzal f604db6517 Reorganized PNL calculator and associated types 2022-08-01 11:14:28 -04:00
Taha Afzal f95b0c19d7 Added PNL Calculation code 2022-08-01 11:14:28 -04:00
Taha Afzal 627b44d53b Cleaning up market data initialization 2022-07-29 18:42:50 -04:00
taha afzal 655bf87e92 Fixing open orders callback (was firing intermittent callbacks) 2022-07-22 16:36:52 -04:00
taha afzal 6d06a1920d OrderServiceServer now publishes open orders 2022-07-22 15:16:03 -04:00
taha afzal 70af51e163 ExchangeOpenOrders are now routed all the way to OrderServiceServer 2022-07-21 20:36:17 -04:00
taha afzal 2c17fe334e Added Exchange Open Orders function to IExecutionGateway 2022-07-21 00:38:15 -04:00
taha afzal 5eca2cd3ac Exchange Open orders are routed all the way to EMExecutionGateway 2022-07-20 20:13:56 -04:00
taha afzal 4b5ff8cad4 Adding AsyncRequestHelper to EmMDListener, that allows code to be shared bw positions and open_orders request 2022-07-20 15:29:25 -04:00
taha afzal 89d5b25cc7 For EmMDListener, added a limit of 5 pending calls for positions, after which the counter is reset is positions are re-requested 2022-07-12 17:03:19 -04:00
Taha Afzal 3e10d403b4 Combo Report now listens to the sectups in the report configuration 2022-07-12 09:35:42 -04:00
Taha Afzal 1ebf06d49a Slide report filters the securities based on the security tuples passed in the report 2022-07-12 09:35:42 -04:00
Taha Afzal 2be857a851 Forcing qty's to be rounded to 2 2022-07-12 09:35:42 -04:00
John Colvin 1de22a82e8 fix (combo settings ui): Refresh 'result' when sec criteria changes
Bugs (fixed):
   * In Combo settings dialog, security criteria changes aren't committed to
     server if they are the last prop changed before OK click
2022-07-12 01:00:51 -04:00
John Colvin f275308cc8 build (client cpp): Remove ZERO_CHECK.vcxproj from spark_client.sln
The new cmake generates ZERO_CHECK.proj instead, which doesn't need to be
included in the sln. I think this change was introduced in v 3.22.

Devs: This won't break the build for older versions of cmake, although you may
need to manually touch "CMakeLists.txt" when you add/remove build src files
2022-07-12 01:00:44 -04:00
taha afzal 79de0dd4d8 Removed exchange from sub acocunt config 2022-07-11 21:13:05 -04:00
taha afzal 5cedf74406 Merge branch 'spark_crypto.multiple_accounts' into spark_crypto.dev 2022-07-11 17:44:02 -04:00
taha afzal e5de6b4ad7 Changed the relationship of internal account to sub account to simple 1:1 2022-07-11 17:28:53 -04:00
John Colvin e467195de1 chore (combo vm): Let end observer call OnDispatcher
This behavior could arguably be coupled with a Subscribe call, since its whole
purpose is to ensure subscription callbacks occur on the dispatcher thread.
2022-07-11 17:22:44 -04:00
John Colvin 913a5b4a7e ui (combo settings): Show contract picker 2022-07-11 17:22:44 -04:00
John Colvin feb8bd9b79 ui (slide settings): Show contract picker 2022-07-11 16:55:23 -04:00
taha afzal 846ecfa776 Fixed the reconcile issue where if the security existed in multiple accounts it was getting surpressed in one 2022-07-11 13:27:10 -04:00
taha afzal d98fb399a8 Exchange Positions can now be obtained for multiple sub accounts 2022-07-09 01:40:28 -04:00
taha afzal 4a1c1d023a Changes to accomodate the EM API change for mulitple accounts 2022-07-06 16:42:04 -04:00
387 changed files with 9590 additions and 5941 deletions

No files matched your search

-10
View File
@@ -12,8 +12,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "sparkcmd", "src\client\spar
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZERO_CHECK", "build\ZERO_CHECK.vcxproj", "{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_sdk", "src\client\spark_sdk\spark_sdk.csproj", "{6963C314-83C4-4667-B0D0-C2F7AE208C29}"
ProjectSection(ProjectDependencies) = postProject
{9FA60215-26AF-3EB7-AB89-D4F4B126EF40} = {9FA60215-26AF-3EB7-AB89-D4F4B126EF40}
@@ -69,14 +67,6 @@ Global
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.Debug|x64.ActiveCfg = Debug|x64
{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.Debug|x64.Build.0 = Debug|x64
{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64
{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.MinSizeRel|x64.Build.0 = MinSizeRel|x64
{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.Release|x64.ActiveCfg = Release|x64
{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.Release|x64.Build.0 = Release|x64
{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64
{A1B7276B-8F81-3D58-A22E-870AF28DF9B9}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.ActiveCfg = Debug|x64
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.Build.0 = Debug|x64
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.ActiveCfg = Release|x64
@@ -15,6 +15,7 @@ namespace mbts.spark {
using mbts.ui.utility;
using mbts.utils;
using Spark.Core;
using Spark.Core.Collections;
using Spark.ViewModel.Commands;
@@ -33,13 +34,13 @@ namespace mbts.spark {
class AnalyticsExpirationParametersVM : DisposableViewModelBase, IHandleRowSelection {
readonly IBus _bus;
readonly ObservableCollection<AnalyticsExpirationParameters> _parameters = new();
readonly DeferrableActionWrapper _sync_visible_rows;
readonly DeferrableAction _sync_visible_rows;
readonly Property<AnalyticsExpirationParametersRowVM?> _copy_row_source;
readonly Property<bool> _auto_copy_rolls_is_checked;
readonly Property<bool> _auto_copy_rates_is_checked;
readonly DelegateProperty<bool> _is_dirty;
readonly ObservableHashSet<AnalyticsExpirationParametersRowVM> _selected_rows = new();
readonly DeferrableActionWrapper _raise_selected_rows_changed;
readonly DeferrableAction _raise_selected_rows_changed;
readonly IRaiseCanExecuteChangedCommand _set_driver_to_nearest_exp_cmd;
AnalyticsExpirationParametersMap? _parameter_map;
@@ -81,24 +82,24 @@ namespace mbts.spark {
selected_rows_changed += _ => _set_driver_to_nearest_exp_cmd.RaiseCanExecuteChanged();
_dispose = Disposable.Create(
_selected_rows.Subscribe((s, e) => _raise_selected_rows_changed.execute()),
_selected_rows.Subscribe((s, e) => _raise_selected_rows_changed.Invoke()),
ObservableAutoWrapper.connect(_parameters, rows, p => new(this, p), r => r.Dispose()),
ObservableAutoWrapper.connect(
non_options,
explicit_drivers,
sec => new ExpirationDriverImmutable(new() { Security = sec.to_api_sec_exp() })),
rows.Subscribe((s, e) => _sync_visible_rows.execute()),
rows.Subscribe((s, e) => _sync_visible_rows.Invoke()),
_bus.subscribe(SparkTags.ExpirationParametersInputTag).OnDispatcher().Subscribe(
CompositeObserver.create(
Observer.Create<AnalyticsExpirationParametersMap>(_on_parameter_map),
can_commit_observer.wrap<bool, AnalyticsExpirationParametersMap>(m => m is not null))),
ObservableAutoWrapper.connect_item_hooks(selected_symbols, sym => {
if (selected_symbol_ref_count.increment_adds_key(sym)) {
_sync_visible_rows.execute();
_sync_visible_rows.Invoke();
}
return Disposable.Create(() => {
if (selected_symbol_ref_count.decrement_removes_key(sym)) {
_sync_visible_rows.execute();
_sync_visible_rows.Invoke();
}
});
}),
@@ -196,9 +197,11 @@ namespace mbts.spark {
void _set_driver_to_nearest_exp(IEnumerable<AnalyticsExpirationParametersRowVM> rows) {
foreach (var r in rows) {
if (drivers.Where(d => d.HasSecurity).TryGetMinElement(
d => (r.security.expiration - d.Security.Expiration.date_time()).Ticks.abs(),
out var nearest_exp)) {
if (drivers
.Where(d => d.HasSecurity && d.Security.Symbol == r.security.symbol)
.TryGetMinElement(
d => (r.security.expiration - d.Security.Expiration.date_time()).Ticks.abs(),
out var nearest_exp)) {
r.driver = nearest_exp;
}
}
@@ -285,7 +288,7 @@ namespace mbts.spark {
}
symbols.sync_with(_parameters.Select(p => p.security.symbol).Distinct().Ordered());
using var _ = _sync_visible_rows.defer_execution();
using var _ = _sync_visible_rows.defer();
if (is_first_update) {
// select all symbols on first update
selected_symbols.sync_with(symbols);
@@ -32,7 +32,7 @@ namespace mbts.spark {
public SingleVolSurfaceRequestCalculator(int vs_id, IEnumerable<string> symbols,
ThreadedBlackboard threaded_bb) {
bts.Log.Gen.info($"SingleVolSurfaceRequestCalculator cons vs_id:{vs_id}");
bts.Log.Gen.info($"SingleVolSurfaceRequestCalculator cons vs_id: {vs_id}");
_vs_id = vs_id;
_symbols = new HashSet<string>(symbols);
_bb = threaded_bb;
@@ -89,8 +89,8 @@ namespace mbts.spark {
effective_req.cascade_up,
effective_req.cascade_down);
_timer.stop();
bts.Log.Gen.info($"SingleVolSurfaceRequestCalculator._recompute_and_publish time:" +
$"{_timer.lastIntervalTime} vs_output:{_last_output.log_string()}");
bts.Log.Gen.info($"SingleVolSurfaceRequestCalculator._recompute_and_publish time: " +
$"{_timer.lastIntervalTime}");
_bb.post(SparkTags.VolSurfaceCalculationResponseTag(_vs_id),
new VolSurfaceCalculationResponse(_last_output, effective_req.request_id));
}
@@ -11,18 +11,22 @@ namespace mbts.analytics {
// tags, into IReadOnlyDictionary of symbol vs data publsihed under one tag
public class SymbolAggregationPublisher<TData> : IDisposable {
private readonly ThreadedBlackboard _bb;
private readonly ITag<SystemContractData> _sc_data_tag;
private readonly SecurityType _sec_type;
Func<string, ITag<TData>> _get_tag;
// the tag on which the output will be published
ITag<IReadOnlyDictionary<string, TData>> _out_tag;
private readonly ITag<SystemContractData> _sc_data_tag;
private Dictionary<string, ITag<TData>> _tag_map =
new Dictionary<string, ITag<TData>>();
private HashSet<object> _obj_tags = new HashSet<object>();
private bool _dirty = true;
public SymbolAggregationPublisher(
ThreadedBlackboard bb,
SecurityType sec_type,
Func<string, ITag<TData>> get_tag,
ITag<IReadOnlyDictionary<string, TData>> out_tag) {
_bb = bb;
_sec_type = sec_type;
_get_tag = get_tag;
_out_tag = out_tag;
_sc_data_tag = SparkTags.SystemContractsTag;
@@ -48,15 +52,20 @@ namespace mbts.analytics {
return;
}
foreach (var st in sc_data.sectup_map) {
if (st.security_type != _sec_type) {
continue;
}
// this is not correct since it is assuming symbol/name is
// unique across securty_tuples
string symbol = st.security_name;
if (!_tag_map.ContainsKey(symbol)) {
var symbol_tag = _get_tag(symbol);
_tag_map.Add(symbol, symbol_tag);
_obj_tags.Add(symbol_tag);
_bb.subscribe(symbol_tag);
_dirty = true;
var tag = _get_tag(symbol);
if (tag != null) {
_tag_map.Add(symbol, tag);
_obj_tags.Add(tag);
_bb.subscribe(tag);
_dirty = true;
}
}
}
}
@@ -16,6 +16,7 @@ using System.Collections;
using mbts.spark;
using System.DirectoryServices.ActiveDirectory;
using Spark.Core.Protobuf;
using mbts.ui;
// using mbts.bb;
namespace mbts.spark {
@@ -101,11 +102,14 @@ namespace mbts.spark {
_subs.Add(new AnalyticsParametersManager(bus, _analytics_service));
_subs.Add(new ResourceAllocator(bus, _bb));
_subs.Add(new SymbolAggregationPublisher<OptionDriverPriceMap>(
_bb, (sym) => SparkTags.OptionDriverBBOTag(sym),
_bb, SecurityType.Option, sym => SparkTags.OptionDriverBBOTag(sym),
SparkTags.AllOptionDriverBBOTag));
_subs.Add(new SymbolAggregationPublisher<OptionTheoInterpolationData>(
_bb, (sym) => SparkTags.SymbolInterpGreeksTag(sym),
_bb, SecurityType.Option, sym => SparkTags.SymbolInterpGreeksTag(sym),
SparkTags.AllInterpGreeks));
_subs.Add(new SymbolAggregationPublisher<ExpStrikeKeyedData<TheoPoint>>(
_bb, SecurityType.Option, sym => SparkTags.TC2Tags.LiveTheosTag(sym),
SparkTags.TC2Tags.AllLiveTheosTag));
_subs.Add(new LiveTheoPublisher(_bb));
_subs.Add(new VolSurfaceInterpGreeksMultiplexer(_bb));
// usage
@@ -138,6 +142,7 @@ namespace mbts.spark {
var list_imm = new VolSurfaceUsageListImmutable(ulist);
Log.Ui.info(list_imm.log_string());
_bb.post(SparkTags.VolSurfaceUsageTag, list_imm);
_spin_vss(list_imm);
});
_disps.Add(list_sub);
}
@@ -146,6 +151,13 @@ namespace mbts.spark {
return _bb;
}
void _spin_vss(VolSurfaceUsageListImmutable ulist) {
foreach (var u in ulist.UsageList) {
var vs_id = u.VsId;
_bb.post(SparkTags.VolSurfaceActiveUITag(vs_id), true);
}
}
void _on_vs_usage_update(Update<VolSurfaceUsageListImmutable, int> update) {
// TODO
return;
@@ -6,6 +6,7 @@
using mbts.user.settings;
using System;
using System.Collections.Generic;
public class VolSurfaceDisplayGridColumn : IEquatable<VolSurfaceDisplayGridColumn> {
public readonly Func<object, string> format;
@@ -18,16 +19,19 @@
VolSurfaceColumnSettings settings,
Func<object, string> format = null,
Func<string, object> parse = null,
Func<object, bool, object> tick_move = null) {
Func<object, bool, object> tick_move = null,
IEqualityComparer<object> comparer = null) {
this.settings = settings;
this.format = format ?? (v => v?.ToString() ?? string.Empty);
this.parse = parse ?? (v => v);
this.tick_move = tick_move ?? ((v, is_up) => v);
this.comparer = comparer ?? EqualityComparer<object>.Default;
}
public string unique_col_name => settings.id;
public string display_name => settings.display_name;
public string group => settings.group;
public IEqualityComparer<object> comparer { get; }
internal VolSurfaceColumnType type => settings.type;
@@ -7,6 +7,7 @@
using mbts.user.settings;
using System;
using System.Collections.Generic;
class VolSurfaceDisplayUtilities {
public static TickDisplaySettings default_tick_display =>
@@ -18,6 +19,10 @@
default_tick_display.with(display_multiplier: 100);
public static double parse_double(object obj) {
if (obj is null) {
Log.Gen.warn("parse_double received null input (will return nan and continue)");
return double.NaN;
}
Log.assert(obj is double);
obj = obj ?? Double.NaN;
double rv = obj is Double ? (double)obj : (Double.TryParse(obj.ToString(), out rv) ? rv : Double.NaN);
@@ -49,9 +54,31 @@
}
public static Func<object, bool, object> get_double_tickmove(TickFactors tick_factors, int tick_move) =>
(data, is_up) => data is double d_data ?
tick_factors.tick(d_data, is_up ? tick_move : -tick_move) :
data;
(data, is_up) => {
if (data is not double dbl) {
return data;
}
if (dbl.is_nan()) {
return 0D;
}
return tick_factors.tick(dbl, is_up ? tick_move : -tick_move);
};
public static IEqualityComparer<double> get_double_comparer(
TickFactors tick_factors = null, double display_mult = double.NaN) {
if (tick_factors is null) {
return new TickFactors(10^7, 1).tick_equality_comparer();
}
// This equality comparer is used to compare actual values (not multiplied by
// 'display_mult'), while the TickFactors are used to format the display value (multiplied
// by 'display_mult'). Multiply the tick base by 'display_mult' so the equality comparison
// is done with the correct number of decimal places.
if (display_mult > 0 && Math.Log10(display_mult).is_int()) {
tick_factors = tick_factors.with(
tick_base: tick_factors.tick_base * display_mult);
}
return tick_factors.tick_equality_comparer();
}
public static VolSurfaceDisplayGridColumn get_double_output_col(
string group,
@@ -113,7 +140,10 @@
col_config,
format: get_double_tostring(col_config.tick_factors, col_config.tick_display),
parse: get_parse_double(col_config.tick_factors, col_config.tick_display),
tick_move: get_double_tickmove(col_config.tick_factors, col_config.tick_move));
tick_move: get_double_tickmove(col_config.tick_factors, col_config.tick_move),
comparer: get_double_comparer(
col_config.tick_factors, col_config.tick_display.display_multiplier)
.cast<double, object>());
}
}
}
@@ -63,6 +63,27 @@ namespace mbts.spark {
return rv;
}
public static string log_string(this VolSurfaceCalculationRequest vs_req) {
if (vs_req == null) {
return "Null";
}
string action_str = String.Empty;
foreach (var kv in vs_req.action_map) {
action_str += $"exp: {kv.Key.ToString()} action: {kv.Value.ToString()}, ";
}
action_str = action_str.TrimEnd(',', ' ');
return $"vs_inp: {vs_req.volsurface_input.log_string()}\nreq_id: {vs_req.request_id}\n" +
$"action_map: {action_str}\nup: {vs_req.cascade_up} down: {vs_req.cascade_down}";
}
public static string log_string(this VolSurfaceCalculationResponse resp) {
if (resp == null) {
return "Null";
}
return $"req_id: {resp.request_id} vs_output: " +
$"{resp.volsurface_calculation_output.volsurface_input.log_string()}";
}
private static string _trim_leading_char(string s, char c) {
if (!s.is_null_or_empty() && s.EndsWith(c)) {
return s.Remove(s.Length - 1, 1);
@@ -71,11 +92,12 @@ namespace mbts.spark {
}
internal static string log_string(this VolSurfaceDisplayModel.DisplayModelData dm_data) {
string rv = String.Empty;
string global_grid_str = dm_data.global_grid == null ? "Null" : dm_data.global_grid.log_string();
rv += $"global_grid: {global_grid_str} \n";
string exp_grid_str = dm_data.exp_grid == null ? "Null" : dm_data.exp_grid.log_string();
rv += $"exp_grid: {exp_grid_str} \n";
var vs_output = dm_data.vs_output;
var exp_grid = dm_data.exp_grid;
var vs_output_str = vs_output == null ? "NULL" : vs_output.volsurface_input.log_string();
var exp_grid_str = exp_grid == null ? "NULL" : exp_grid.log_string();
var rv = $"DisplayModelData\nvs_output:\n{vs_output_str}\n" +
$"exp_grid\n{exp_grid_str}\n";
return rv;
}
@@ -91,19 +113,19 @@ namespace mbts.spark {
}
internal static string log_string(this VolSurfaceDisplayGrid dgrid) {
Func<IDictionary<string, object>, string> log_exp = (map) => {
Func<IDictionary<string, object>, string> log_exp = (col_val_map) => {
string rv = String.Empty;
foreach (var kv in map) {
foreach (var kv in col_val_map) {
string val_string = kv.Value == null ? "Null" : kv.Value.ToString();
rv += $"{kv.Key}:{val_string},";
rv += $"{kv.Key}: {val_string}, ";
}
return _trim_leading_char(rv, ',');
};
string rv = String.Empty;
foreach (var kv in dgrid.data_map) {
rv += $"Exp:{kv.Key.expiration.ToShortDateString()} Data:{log_exp(kv.Value)},";
rv += $"Exp: {kv.Key.expiration.ToShortDateString()} Data: {log_exp(kv.Value)}\n";
}
return _trim_leading_char(rv, ',');
return rv;
}
internal static string log_string(this OptionDriverPriceMap map) {
@@ -238,6 +260,15 @@ namespace mbts.spark {
return rv;
}
internal static string log_string(this IPNLUnit p) {
string rv = "IPNLUnit:";
rv += $" account: {p.account} sec: {p.security.security_desc()} driver: {p.driver} theo: {p.theo} settle: {p.settle_price}" +
$" start_pos: {p.start_long_pos - p.start_short_pos} day_pos: {p.day_long_pos - p.day_short_pos}" +
$" start_pnl: {p.start_pnl} start_delta: {p.start_delta} start_vega: {p.start_vega}" +
$" day_pnl: {p.day_pnl} day_delta: {p.day_delta} day_vega: {p.day_vega}";
return rv;
}
internal static int tid() {
return System.Threading.Thread.CurrentThread.ManagedThreadId;
}
@@ -47,6 +47,7 @@ namespace mbts.spark {
var x_axis = BTSOxyGraphAxisDouble.Default;
x_axis.name = "Strike";
x_axis.major_grid_line_color = BTSColors.Graph.grid_line;
x_axis.tick_line_color = BTSColors.Graph.tick_line;
x_axis.position = AxisPosition.BottomLeftToRight;
x_axis.minimum = 0;
x_axis.maximum = 2000;
@@ -59,6 +60,7 @@ namespace mbts.spark {
var y_axis = BTSOxyGraphAxisDouble.Default;
y_axis.name = "Volatility";
y_axis.major_grid_line_color = BTSColors.Graph.grid_line;
y_axis.tick_line_color = BTSColors.Graph.tick_line;
y_axis.position = AxisPosition.LeftBottomToTop;
y_axis.minimum = 0;
y_axis.maximum = 1;
@@ -1,84 +0,0 @@
namespace mbts.spark {
using mbts.ui;
using mbts.ui.shell;
using System;
using System.Reactive.Linq;
using System.Windows.Input;
class VolGridCellVM : DisposableViewModelBase {
readonly Property<object> _candidate_value;
readonly Property<object> _committed_value;
readonly Property<bool> _is_dirty;
public VolGridCellVM(string column_id) {
this.column_id = column_id ?? throw new ArgumentNullException(nameof(column_id));
_committed_value = backing<object>(nameof(committed_value));
_candidate_value = backing<object>(nameof(candidate_value));
_is_dirty = backing(nameof(is_dirty),
_committed_value.observe_current(true)
.CombineLatest(_candidate_value.observe_current(true))
.Select(tup => !Equals(tup.First, tup.Second))
.OnDispatcher());
}
public string column_id { get; }
public object committed_value {
get => _committed_value.Value;
set => _committed_value.set(value);
}
public object candidate_value {
get => _candidate_value.Value;
set => _candidate_value.set(value);
}
public bool is_dirty => _is_dirty.Value;
public IObservable<object> observe_candidate(bool start_immediately = false) =>
_candidate_value.observe_current(start_immediately);
public void revert() =>
candidate_value = committed_value;
public override string ToString() =>
$"column_id: {column_id}, committed: {committed_value}, candidate: {candidate_value}";
}
class VolGridCellVM<T> : VolGridCellVM {
public VolGridCellVM(string column_id) : base(column_id) { }
public VolGridCellVM(string column_id, T committed_value, T candidate_value) : base(column_id) {
this.committed_value = committed_value;
this.candidate_value = candidate_value;
}
public new T committed_value {
get => base.committed_value is T v ? v : default;
set => base.committed_value = value;
}
public new T candidate_value {
get => base.candidate_value is T v ? v : default;
set => base.candidate_value = value;
}
}
class VolGridTickCellVM : VolGridCellVM {
ICommand _tick_up_cmd;
ICommand _tick_down_cmd;
public VolGridTickCellVM(string column_id) : base(column_id) { }
public event Action<bool> request_tick;
public ICommand tick_up_cmd =>
_tick_up_cmd ??= new DelegateCommand(() =>
request_tick?.Invoke(true));
public ICommand tick_down_cmd =>
_tick_down_cmd ??= new DelegateCommand(() =>
request_tick?.Invoke(false));
}
}
@@ -0,0 +1,11 @@
#nullable enable
namespace mbts.spark.VolSurface {
using System.Windows.Media;
readonly struct VolSurfaceCellState {
public bool is_dirty => committed_text is not null;
public FormattedText? text { get; init; }
public FormattedText? committed_text { get; init; }
}
}
@@ -0,0 +1,79 @@
#nullable enable
namespace mbts.spark {
using bts;
using mbts.ui.controls;
using mbts.ui.shell;
using Spark.Core;
using System;
class VolSurfaceCellVM : DisposableViewModelBase {
readonly Property<object?> _candidate_value;
readonly Property<object?> _committed_value;
readonly DelegateProperty<bool> _is_dirty;
readonly DeferrableAction _refresh;
public VolSurfaceCellVM(
VolSurfaceDisplayGridExpiration expiration, VolSurfaceDisplayGridColumn column) {
this.column = column ?? throw new ArgumentNullException(nameof(column));
this.expiration = expiration ?? throw new ArgumentNullException(nameof(expiration));
_committed_value = backing<object?>(nameof(committed_value), column.comparer);
_candidate_value = backing<object?>(nameof(candidate_value), column.comparer);
_is_dirty = backing(
nameof(is_dirty), () => !column.comparer.Equals(candidate_value, committed_value));
_refresh = new(_is_dirty.refresh);
_committed_value.Changed += on_committed_changed;
_candidate_value.Changed += on_candidate_changed;
_is_dirty.Changed += (o, n) => {
Log.assert(o != n);
Log.Ui.info(
$"VolSurface '{expiration}.{column}' is_dirty changed to {n}. " +
$"commited: {committed_value}; candidate: {candidate_value}");
};
void on_committed_changed(object? oldval, object? newval) =>
_is_dirty.refresh();
void on_candidate_changed(object? oldval, object? newval) =>
_is_dirty.refresh();
}
public event PropertyChange<object?>? candidate_value_changed {
add => _candidate_value.Changed += value;
remove => _candidate_value.Changed -= value;
}
public VolSurfaceDisplayGridColumn column { get; }
public string column_id => column.unique_col_name;
public VolSurfaceDisplayGridExpiration expiration { get; }
public object? committed_value {
get => _committed_value.Value;
set => _committed_value.set(value);
}
public object? candidate_value {
get => _candidate_value.Value;
set => _candidate_value.set(value);
}
public bool is_dirty => _is_dirty.Value;
public IObservable<object?> observe_candidate(bool start_immediately = false) =>
_candidate_value.observe_current(start_immediately);
public void reset(object? committed_value, object? candidate_value) {
using var _ = _refresh.defer();
this.committed_value = committed_value;
this.candidate_value = candidate_value;
}
public void revert() =>
candidate_value = committed_value;
public override string ToString() =>
$"column: {column}, committed: {committed_value}, candidate: {candidate_value}";
}
}
@@ -78,7 +78,7 @@ namespace mbts.spark.VolSurface {
view.SetBinding(FrameworkElement.DataContextProperty, new Binding() {
Converter = _data_context_converter
});
view.SetBinding(TextBlock.TextProperty, new Binding(nameof(VolGridCellVM.candidate_value)) {
view.SetBinding(TextBlock.TextProperty, new Binding(nameof(VolSurfaceCellVM.candidate_value)) {
Converter = ValueConverter.create(obj => model.format(obj))
});
return view;
@@ -101,16 +101,16 @@ namespace mbts.spark.VolSurface {
view.SetBinding(FrameworkElement.DataContextProperty, new Binding() {
Converter = _data_context_converter
});
view.SetBinding(VolSurfaceCellView.CommittedValueProperty, new Binding(nameof(VolGridCellVM.committed_value)) {
view.SetBinding(VolSurfaceCellView.CommittedValueProperty, new Binding(nameof(VolSurfaceCellVM.committed_value)) {
Mode = BindingMode.OneWay,
Converter = ValueConverter.create(obj => model.format(obj))
});
view.SetBinding(VolSurfaceCellView.CandidateValueProperty, new Binding(nameof(VolGridCellVM.candidate_value)) {
view.SetBinding(VolSurfaceCellView.CandidateValueProperty, new Binding(nameof(VolSurfaceCellVM.candidate_value)) {
Mode = BindingMode.TwoWay,
Converter = ValueConverter.create<object, string>(obj => model.format(obj), obj => model.parse(obj))
});
view.SetBinding(VolSurfaceCellView.TickDownCommandProperty, new Binding(nameof(VolGridTickCellVM.tick_down_cmd)));
view.SetBinding(VolSurfaceCellView.TickUpCommandProperty, new Binding(nameof(VolGridTickCellVM.tick_up_cmd)));
view.SetBinding(VolSurfaceCellView.TickDownCommandProperty, new Binding(nameof(VolSurfaceTickCellVM.tick_down_cmd)));
view.SetBinding(VolSurfaceCellView.TickUpCommandProperty, new Binding(nameof(VolSurfaceTickCellVM.tick_up_cmd)));
var bd = new Border {
HorizontalAlignment = HorizontalAlignment.Stretch,
VerticalAlignment = VerticalAlignment.Stretch,
@@ -1,3 +1,4 @@
#nullable enable
namespace mbts.spark.VolSurface {
using bts;
using bts.collections;
@@ -11,6 +12,8 @@ namespace mbts.spark.VolSurface {
using mbts.ui.shell;
using mbts.ui.utility;
using Spark.Core;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -25,17 +28,20 @@ namespace mbts.spark.VolSurface {
class VolSurfaceGridVM : DisposableViewModelBase {
readonly VolSurfaceVM _parent;
readonly ObservableCollection<VolSurfaceDisplayGridExpiration> _expirations = new();
readonly DeferrableActionWrapper _invalidate_rows;
readonly DeferrableAction _invalidate_rows;
readonly ColumnsModel _columns_model;
ISet<string> _hidden_columns;
ISet<VolSurfaceExpiration> _hidden_expirations;
IDisposable _shift_editor;
ISet<VolSurfaceExpiration>? _hidden_expirations;
IDisposable? _shift_editor;
public VolSurfaceGridVM(VolSurfaceVM vm, VolSurfaceDisplayModel model,
ISet<string> hidden_columns, ISet<VolSurfaceExpiration> hidden_expirations) {
Log.assert(hidden_columns != null);
Log.assert(hidden_expirations != null);
public VolSurfaceGridVM(
VolSurfaceVM vm,
VolSurfaceDisplayModel model,
ISet<string> hidden_columns,
ISet<VolSurfaceExpiration> hidden_expirations) {
Log.notnull(hidden_columns);
Log.notnull(hidden_expirations);
_parent = vm;
this.model = model;
_columns_model = new(create_exp_column_view());
@@ -63,7 +69,8 @@ namespace mbts.spark.VolSurface {
};
_dispose = Disposable.Create(
ObservableAutoWrapper.connect(_expirations, rows, exp => new VolSurfaceRowVM(this, exp), row => row.Dispose()),
ObservableAutoWrapper.connect(_expirations, rows, row_factory),
ObservableAutoWrapper.connect_item_hooks(rows, connect_row),
sorted_visible_rows.bind(visible_rows),
Disposable.Create(() => {
this.model.on_candidate_grid_change -= _on_grid_updated;
@@ -73,6 +80,20 @@ namespace mbts.spark.VolSurface {
}),
_columns_model);
VolSurfaceRowVM row_factory(VolSurfaceDisplayGridExpiration exp) =>
new(this, exp);
IDisposable connect_row(VolSurfaceRowVM row) {
row.request_calculate += request_recalc;
return Disposable.Create(() => {
row.request_calculate -= request_recalc;
row.Dispose();
});
void request_recalc() =>
model.set_candidate_grid(current_grid);
}
VolSurfaceColumn create_exp_column_view() {
var filter = new ComboCheckBox();
filter.SetResourceReference(FrameworkElement.StyleProperty, "ExpirationFilterDropDown");
@@ -92,7 +113,7 @@ namespace mbts.spark.VolSurface {
}
}
public event Action<IEnumerable<VolSurfaceDisplayGridExpiration>> on_selection_changed;
public event Action<IEnumerable<VolSurfaceDisplayGridExpiration>>? on_selection_changed;
public VolSurfaceDisplayGrid current_grid { get; private set; }
public VolSurfaceDisplayGrid committed_grid { get; private set; }
@@ -118,6 +139,7 @@ namespace mbts.spark.VolSurface {
.Select(group => new DIYGridSuperHeaderVM(group.Key, group.Count(), collapsed_content: _short_header(group.Key)))
.ToList();
public ICommand populate_empty_exps_cmd => _parent.populate_empty_exps_cmd;
public ICommand main_settings_cmd => _parent.main_settings_cmd;
public ICommand advanced_settings_cmd => _parent.advanced_settings_cmd;
public ICommand graph_settings_cmd => _parent.vol_curve_vm.settings_command;
@@ -141,13 +163,14 @@ namespace mbts.spark.VolSurface {
rows.select_exp().Except(visible_rows.select_exp());
public void invalidate_rows() =>
_invalidate_rows.execute();
_invalidate_rows.Invoke();
public IDisposable defer_invalidate_rows() =>
_invalidate_rows.defer_execution();
_invalidate_rows.defer();
public VolSurfaceColumn get_column(string id) =>
columns.FirstOrDefault(c => c.id == id) as VolSurfaceColumn;
columns.FirstOrDefault(c => c.id == id) as VolSurfaceColumn ??
throw new InvalidOperationException($"Failed to find column '{id}'");
internal void signal_selection_changed() {
var e = on_selection_changed;
@@ -218,7 +241,7 @@ namespace mbts.spark.VolSurface {
!_hidden_columns.Contains(column.unique_col_name);
void _on_grid_updated() {
using var _ = _invalidate_rows.defer_execution();
using var _ = _invalidate_rows.defer();
var grid_new = model.get_active_grid();
// add/remove columns
var cols_new = grid_new.get_ordered_columns()
@@ -243,7 +266,7 @@ namespace mbts.spark.VolSurface {
}
current_grid = grid_new;
committed_grid = is_dirty ? model.get_committed_grid() : current_grid;
_invalidate_rows.execute();
_invalidate_rows.Invoke();
}
void _launch_shift_editor(VolSurfaceDisplayGridColumn column, Action<double> commit_shift) {
@@ -79,6 +79,7 @@ namespace mbts.spark {
public bool is_input_cell => column?.type == VolSurfaceColumnType.ReadWriteTick;
public ICommand populate_empty_exps_cmd => _parent.populate_empty_exps_cmd;
public ICommand main_settings_cmd => _parent.main_settings_cmd;
public ICommand advanced_settings_cmd => _parent.advanced_settings_cmd;
public ICommand grid_settings_cmd => _parent.grid_settings_cmd;
@@ -4,22 +4,18 @@ namespace mbts.spark.VolSurface {
using mbts.ui.controls;
using mbts.ui.shell;
using Spark.Core;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reactive.Linq;
using System.Windows.Media;
public struct VolSurfaceCellState {
public bool is_dirty => committed_text is not null;
public FormattedText? text;
public FormattedText? committed_text;
}
class VolSurfaceRowVM : DisposableViewModelBase, ISelectable, IFormatCellsToClipboard, DIYGrid.IRowVM {
readonly VolSurfaceGridVM _parent;
readonly VolSurfaceDisplayGridExpiration _exp;
readonly Dictionary<string, CellData> _cells = new();
readonly DeferrableAction _request_calculate;
VolSurfaceRowContextMenuVM? _context_menu;
bool _is_selected;
@@ -27,6 +23,7 @@ namespace mbts.spark.VolSurface {
public VolSurfaceRowVM(VolSurfaceGridVM parent, VolSurfaceDisplayGridExpiration exp) {
_parent = parent;
_exp = exp;
_request_calculate = new(() => request_calculate?.Invoke());
_dispose = Disposable.Create(() => {
_cells.Values.DisposeAll();
_cells.Clear();
@@ -36,6 +33,7 @@ namespace mbts.spark.VolSurface {
public event Action<bool>? is_selected_changed;
public event Action? invalidated;
public event Action? request_calculate;
public VolSurfaceDisplayGridExpiration expiration => _exp;
@@ -52,12 +50,14 @@ namespace mbts.spark.VolSurface {
public VolSurfaceRowContextMenuVM context_menu =>
_context_menu ??= new(_parent, this);
public VolGridCellVM get_cell(VolSurfaceDisplayGridColumn column) =>
public VolSurfaceCellVM get_cell(VolSurfaceDisplayGridColumn column) =>
_cells.GetOrAdd(column.unique_col_name, _ => _create_cell(column)).vm;
public void invalidate() {
foreach (var cell in _cells.Values) {
_sync_cell(cell.vm);
using (_request_calculate.supress()) {
foreach (var cell in _cells.Values) {
_sync_cell(cell.vm);
}
}
invalidated?.Invoke();
}
@@ -79,29 +79,15 @@ namespace mbts.spark.VolSurface {
CellData _create_cell(VolSurfaceDisplayGridColumn column) {
var cell = column.type switch {
VolSurfaceColumnType.ReadWriteTick => create_tick_cell(),
_ => new VolGridCellVM(column.unique_col_name),
_ => new VolSurfaceCellVM(_exp, column)
};
_sync_cell(cell);
var dispose = cell.observe_candidate().DistinctUntilChanged().OnDispatcher()
.Subscribe(value => {
var curr = _parent.current_grid.read(expiration, column);
if (Equals(value, curr)) {
return;
}
var grid = _parent.current_grid;
grid.write(expiration, column, value);
_parent.model.set_candidate_grid(grid);
});
return new(cell, dispose);
return new(cell, _connect_cell(cell));
VolGridTickCellVM create_tick_cell() {
var cell = new VolGridTickCellVM(column.unique_col_name);
VolSurfaceCellVM create_tick_cell() {
var cell = new VolSurfaceTickCellVM(_exp, column);
cell.request_tick += is_up => {
var col = _parent.get_column(column.unique_col_name);
if (col is null) {
throw new InvalidOperationException(
$"Failed to find column with id {column.unique_col_name}");
}
if (col.model?.tick_move is var tm) {
cell.candidate_value = tm?.Invoke(cell.candidate_value, is_up);
return;
@@ -112,23 +98,48 @@ namespace mbts.spark.VolSurface {
}
}
void _sync_cell(VolGridCellVM cell) {
void _sync_cell(VolSurfaceCellVM cell) {
if (cell is null) {
return;
}
cell.committed_value = _parent.committed_grid.read(_exp, cell.column_id);
cell.candidate_value = _parent.current_grid.read(_exp, cell.column_id);
using var _ = _request_calculate.supress();
cell.reset(
committed_value: _parent.committed_grid.read(_exp, cell.column_id),
candidate_value: _parent.current_grid.read(_exp, cell.column_id));
}
IDisposable? _connect_cell(VolSurfaceCellVM cell) {
return cell.column.type switch {
VolSurfaceColumnType.ReadWriteTick => connect_input(),
_ => null
};
IDisposable connect_input() {
cell.candidate_value_changed += on_candidate_value_changed;
return Disposable.Create(() =>
cell.candidate_value_changed -= on_candidate_value_changed);
void on_candidate_value_changed(object? oldval, object? newval) {
var curr = _parent.current_grid.read(expiration, cell.column);
if (cell.column.comparer.Equals(newval, curr)) {
return;
}
var grid = _parent.current_grid;
grid.write(expiration, cell.column, newval);
_request_calculate.Invoke();
}
}
}
class CellData : IDisposable {
IDisposable _dispose;
IDisposable? _dispose;
public CellData(VolGridCellVM vm, IDisposable dispose) {
public CellData(VolSurfaceCellVM vm, IDisposable? dispose) {
this.vm = vm;
_dispose = Disposable.Create(vm, dispose);
}
public VolGridCellVM vm { get; }
public VolSurfaceCellVM vm { get; }
public void Dispose() =>
Disposable.dispose(ref _dispose);
@@ -0,0 +1,27 @@
#nullable enable
namespace mbts.spark {
using mbts.ui;
using mbts.ui.controls;
using System;
using System.Windows.Input;
class VolSurfaceTickCellVM : VolSurfaceCellVM {
ICommand? _tick_up_cmd;
ICommand? _tick_down_cmd;
public VolSurfaceTickCellVM(
VolSurfaceDisplayGridExpiration expiration, VolSurfaceDisplayGridColumn column)
: base(expiration, column) { }
public event Action<bool>? request_tick;
public ICommand tick_up_cmd =>
_tick_up_cmd ??= new DelegateCommand(() =>
request_tick?.Invoke(true));
public ICommand tick_down_cmd =>
_tick_down_cmd ??= new DelegateCommand(() =>
request_tick?.Invoke(false));
}
}
@@ -77,8 +77,8 @@
public IRaiseCanExecuteChangedCommand vol_shift { get; }
IEnumerable<IRaiseCanExecuteChangedCommand> _commands =>
ReflectionHelper.property_delegates_of_type<VolSurfaceMacroActionsVM, IRaiseCanExecuteChangedCommand>()
.Select(g => g(this));
ReflectionHelper.property_getters<VolSurfaceMacroActionsVM, IRaiseCanExecuteChangedCommand>()
.Select(pg => pg.get(this));
public void selection_changed(IEnumerable<VolSurfaceDisplayGridExpiration> selected) {
_selected_exps = selected.ToList();
@@ -60,6 +60,7 @@ namespace mbts.spark {
vol_terms_vm = new VolTermsGraphVM(_model, demux);
// command
populate_empty_exps_cmd = new Command(() => { _model.populate_empty_expirations(); });
_revert_cmd = new Command(o => _model.revert(), o => _model.is_dirty);
_commit_cmd = new Command(o => _model.commit(), o => _model.is_dirty);
load_previous_cmd = new Command(
@@ -185,6 +186,7 @@ namespace mbts.spark {
public ICommand revert_cmd => _revert_cmd;
public ICommand commit_cmd => _commit_cmd;
public ICommand populate_empty_exps_cmd { get; }
public ICommand main_settings_cmd => _main_settings_cmd;
public ICommand advanced_settings_cmd => _advanced_settings_cmd;
public ICommand grid_settings_cmd => _grid_settings_cmd;
+18 -6
View File
@@ -126,6 +126,20 @@
_log_bad_transition(_state, "set candidate grid");
}
public void populate_empty_expirations() {
bts.Log.Ui.info(String.Format("VolSurfaceDisplayModel.populate_expirations called with state: {0}",
_state.ToString()));
if (_state == DisplayModelState.Idle || _state == DisplayModelState.ResponseReady) {
DisplayModelData curr_data = _get_current_data();
VolSurfaceInput vs_inp =
VolSurfaceDataFunctions.populate_empty_expirations(curr_data.vs_output.volsurface_input);
_change_state(DisplayModelState.WaitingForCalcResponse);
_bus.post(SparkTags.VolSurfaceCalculationRequestTag(_vs_id),
new VolSurfaceCalculationRequest(vs_inp, _request_version_no++));
} else
_log_bad_transition(_state, "populate_expirations");
}
#endregion
#region Globals
@@ -145,6 +159,7 @@
return (_committed_data != null && _committed_data.vs_output != null) ? _committed_data.vs_output.volsurface_input.surface_parameters.vol_time : DateTime.MinValue;
}
public void set_candidate_vol_time(DateTime vol_time) {
bts.Log.Ui.info($"VolSurfaceDisplayModel.set_candidate_vol_time vs_id: {_vs_id} state: {_state.ToString()} vol_time: {vol_time}");
if (_state == DisplayModelState.Idle || _state == DisplayModelState.ResponseReady) {
DisplayModelData curr_data = _get_current_data();
if (curr_data != null) {
@@ -568,9 +583,7 @@
private void _change_state(DisplayModelState new_state) {
bool dirty_before = _translate_to_dirty(_state),
dirty_after = _translate_to_dirty(new_state);
// mbts.Logger.log(bts.log.Level.Info, bts.log.Subsystem.ui,
// String.Format("State change {0}->{1}", _state.ToString(), new_state.ToString()));
bts.Log.Ui.info(String.Format("State change {0}->{1}", _state.ToString(), new_state.ToString()));
bts.Log.Ui.info($"VolSurfaceDisplayModel._change_state vs_id: {_vs_id} {_state.ToString()}->{new_state.ToString()}");
_state = new_state;
if (dirty_before != dirty_after && on_dirty_change != null) {
_bus.post(SparkTags.VolSurfaceDirtyStateTag(_vs_id), dirty_after);
@@ -613,9 +626,8 @@
}
}
private static void _log_bad_transition(DisplayModelState state, string action) {
//mbts.Logger.log(bts.log.Level.Error, bts.log.Subsystem.ui, String.Format("{0}:{1}", state, action));
bts.Log.Ui.error(String.Format("{0}:{1}", state, action));
private void _log_bad_transition(DisplayModelState state, string action) {
bts.Log.Ui.error($"VoLSurfaceDisplayModel bad_transaction vs_id: {_vs_id} {state}:{action}");
}
private static bool _translate_to_dirty(DisplayModelState state) {
+7 -5
View File
@@ -50,11 +50,13 @@ namespace mbts.spark {
.Table(UserTuple.key_fn)
.Cache() :
Observable.Return(TableUpdate<UserTuple, uint>.mk_empty(UserTuple.key_fn).with_added(new[] { user }));
_dispose = on_accounts.Subscribe(map => {
_account_map = map;
var account_tuple_map = MappedDictionary.create(map, (id, name) => new AccountTuple(id, name));
bus.post(SparkTags.AccountsTag, account_tuple_map);
});
_dispose = Disposable.Create(
all_user_tuples.Subscribe(t => bus.post(SparkTags.Users, t.state)),
on_accounts.Subscribe(map => {
_account_map = map;
var account_tuple_map = MappedDictionary.create(map, (id, name) => new AccountTuple(id, name));
bus.post(SparkTags.AccountsTag, account_tuple_map);
}));
}
public IObservable<IReadOnlyDictionary<uint, string>> on_users { get; }
@@ -189,6 +189,6 @@ namespace mbts {
exchange ?? sec_exp.exchange, security_type ?? sec_exp.security_type,
symbol ?? sec_exp.symbol,
expiration ?? sec_exp.expiration,
id.has_value ? id.value : sec_exp.id);
id.has_value ? id : sec_exp.id);
}
}
@@ -65,7 +65,7 @@ namespace mbts.analytics {
}
public override string ToString() {
return String.Format("{0} {1} {2}",
return String.Format("{0} {1} {2}",
security_type.ToString().ToUpper().First(), symbol, expiration.ToShortDateString());
}
@@ -74,6 +74,11 @@ namespace mbts.analytics {
int rv = expiration.CompareTo(other.expiration);
return rv != 0 ? rv : symbol.CompareTo(other.symbol);
}
public double diff_days(VolSurfaceExpiration exp_other) {
TimeSpan ts = expiration - exp_other.expiration;
return ts.TotalDays;
}
}
public static class VolSurfaceExpirationExtensions {
@@ -680,5 +680,60 @@ namespace mbts.analytics
}
#endregion
#region Data copying
public static bool exp_has_input(VolSurfaceSettings vs_settings, VolCurveParameters exp_params) {
if (exp_params == null || vs_settings == null)
return false;
double atm_vol = get_atm_vol(vs_settings, exp_params);
double ref_fwd = exp_params.core_parameters.ref_forward;
return !Double.IsNaN(atm_vol) && !Double.IsNaN(ref_fwd);
}
public static VolSurfaceExpiration find_nearest_populated_exp(
VolSurfaceInput vs_input, VolSurfaceExpiration vs_exp) {
VolCurveParameters exp_params = get_curve_parameters(vs_input, vs_exp);
if (exp_has_input(vs_input.surface_settings, exp_params))
return vs_exp;
VolSurfaceExpiration rv = null;
double rv_diff_days = Double.MaxValue;
foreach (var kv in vs_input.surface_parameters.curve_parameters_map) {
var this_exp = kv.Item1;
var this_exp_params = kv.Item2;
if (exp_has_input(vs_input.surface_settings, this_exp_params)) {
double this_exp_diff_days = Math.Abs(vs_exp.diff_days(this_exp));
if (this_exp_diff_days < rv_diff_days) {
rv = this_exp;
rv_diff_days = this_exp_diff_days;
}
}
}
return rv;
}
// Copies the empty exps from closest neighbor
public static VolSurfaceInput populate_empty_expirations(VolSurfaceInput vs_input) {
VolSurfaceInput rv = Spark.Core.Protobuf.ProtobufSerializationHelper.clone(vs_input);
rv.surface_parameters.curve_parameters_map.Clear();
foreach (var kv in vs_input.surface_parameters.curve_parameters_map) {
var vs_exp = kv.Item1;
var exp_params = kv.Item2;
if (!exp_has_input(vs_input.surface_settings, exp_params)) {
VolSurfaceExpiration np_exp = find_nearest_populated_exp(vs_input, vs_exp);
if (np_exp != null) {
var np_exp_params = get_curve_parameters(vs_input, np_exp);
if (np_exp_params != null) {
exp_params = Spark.Core.Protobuf.ProtobufSerializationHelper.clone(np_exp_params);
}
}
}
rv.surface_parameters.curve_parameters_map.Add(
new Tuple<VolSurfaceExpiration, VolCurveParameters>(vs_exp, exp_params));
}
return rv;
}
#endregion
}
}
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -68,6 +68,7 @@ namespace bts.daemons {
double price,
int size = 1,
string account = "ACC A",
uint account_id = 1,
double? strike = null,
PutOrCall? cp = null,
double? theo = null
@@ -81,9 +82,11 @@ namespace bts.daemons {
price,
theo ?? price + 10 * new Random().NextDouble(),
account,
account_id,
true,
DateTime.Now,
"FakeTrader");
"FakeTrader",
1);
return t1;
}
}
+13 -10
View File
@@ -65,18 +65,21 @@ namespace bts {
_merge_and_post();
}
private void _merge_and_post() {
Func<SecurityMD, bool> is_active = (sec_md) => {
if (sec_md.security.HasFuture || sec_md.security.HasOption) {
var exp = sec_md.security.security_expiration();
if (exp.HasValue) {
return exp.Value.Date >= DateTime.Now.Date.AddDays(-1);
}
return true;
private static bool _is_active(SecurityMD sec_md) {
if (sec_md.security.Exchange == Venue.Sim)
return true;
if (sec_md.security.HasFuture || sec_md.security.HasOption) {
var exp = sec_md.security.security_expiration();
if (exp.HasValue) {
return exp.Value.Date >= DateTime.Now.Date.AddDays(-1);
}
return true;
};
var to_pub = _server_sec_map.Where(kv => is_active(kv.Value)).ToDictionary(kv => kv.Key, kv => kv.Value);
}
return true;
}
private void _merge_and_post() {
var to_pub = _server_sec_map.Where(kv => _is_active(kv.Value)).ToDictionary(kv => kv.Key, kv => kv.Value);
foreach (var kv in _fake_sec_map) {
to_pub[kv.Key] = kv.Value;
}
+6 -3
View File
@@ -29,6 +29,7 @@ namespace bts.daemons {
readonly OrderService _order_service;
readonly ErrorReporter _error_reporter;
readonly IBus _bus;
readonly mbts.analytics.PNLReportCalculator _pnl_calc;
IReadOnlyDictionary<int, ReportImmutable> _report_parameters_map =
new Dictionary<int, ReportImmutable>();
@@ -48,6 +49,7 @@ namespace bts.daemons {
_error_reporter = error_reporter;
_order_service = order_service;
_report_calculators = new(mk_report_calculator);
_pnl_calc = new PNLReportCalculator(bus);
_dispose = Disposable.Create(
bus.subscribe(SparkTags.ReportBlackboardTags.Create).Subscribe(rp => _create_report(rp).ignore()),
@@ -59,7 +61,8 @@ namespace bts.daemons {
_bus.subscribe(SparkTags.SystemContractsTag).CombineLatest(
_order_service.subscribe_fills(), _position_service.subscribe_manual_fills())
.Subscribe(tup => _on_all_trade_data(tup.First, tup.Second, tup.Third)),
_report_calculators);
_report_calculators,
_pnl_calc);
IDisposable mk_report_calculator(int id) {
if (!_report_parameters_map.TryGetValue(id, out var r)) {
@@ -156,8 +159,8 @@ namespace bts.daemons {
var fills_tl = fills_filtered.Select(
f => new TradeLogRow(f, sc_data.sec_md_map[f.SecurityKey].security));
var m_fills_tl = man_fills_filtered.Select(
m => new TradeLogRow(m, sc_data.sec_md_map[m.SecurityKey].security));
var m_fills_tl = man_fills_filtered.Select(m => new TradeLogRow(
m, sc_data.sec_md_map[m.SecurityKey].security, Fill.Types.FillKind.Standard));
var merged_fills = fills_tl.Concat(m_fills_tl).ToList();
Log.Ui.info($"ReportDaemon posting {merged_fills.Count} trades");
_bus.post(SparkTags.TradeLogTag, merged_fills);
+2
View File
@@ -203,6 +203,7 @@ namespace mbts.ui {
public static ImageSource CopyBoxes => create_icon(CopyBoxesGeometryKey, null, _copy_boxes_pen);
public static ImageSource CurrencyExchange => create_icon(CurrencyExchangeGeometryKey);
public static ImageSource DataEdit => create_icon(DataEditGeometryKey);
public static ImageSource DayFills => PNL;
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 Disk => create_icon(DiskGeometryKey);
@@ -235,6 +236,7 @@ namespace mbts.ui {
public static ImageSource Payment => create_icon(PaymentGeometryKey);
public static ImageSource Pencil => create_icon(PencilGeometryKey);
public static ImageSource Play => create_icon(PlayGeometryKey);
public static ImageSource PNL => Accounting;
public static ImageSource Prohibited => create_icon(ProhibitedGeometryKey);
public static ImageSource RecurringSchedule => create_icon(RecurringScheduleGeometryKey);
public static ImageSource RecurringScheduleGray => create_icon(RecurringScheduleGeometryKey, Brushes.Gray);
@@ -1,31 +1,31 @@
using bts.utils;
using ProtoBuf;
using System;
using System.Collections.Generic;
using System.Linq;
namespace mbts.spark {
[ProtoContract]
class GlobalAlertSettings : IEquatable<GlobalAlertSettings> {
[ProtoMember(1)]
TradeAlert[] _trade_alerts;
public GlobalAlertSettings() { }
public GlobalAlertSettings(IEnumerable<TradeAlert> trade_alerts) =>
_trade_alerts = trade_alerts.ToArray();
public IReadOnlyList<TradeAlert> trade_alerts => _trade_alerts ?? Array.Empty<TradeAlert>();
public bool Equals(GlobalAlertSettings other) =>
other != null &&
trade_alerts.SequenceEqual(other.trade_alerts);
public override bool Equals(object obj) =>
Equals(obj as GlobalAlertSettings);
public override int GetHashCode() =>
EqualityComparer.auto_phase(trade_alerts);
}
}
using bts.utils;
using ProtoBuf;
using System;
using System.Collections.Generic;
using System.Linq;
namespace mbts.spark {
[ProtoContract]
class GlobalAlertSettings : IEquatable<GlobalAlertSettings> {
[ProtoMember(1)]
TradeAlert[] _trade_alerts;
public GlobalAlertSettings() { }
public GlobalAlertSettings(IEnumerable<TradeAlert> trade_alerts) =>
_trade_alerts = trade_alerts.ToArray();
public IReadOnlyList<TradeAlert> trade_alerts => _trade_alerts ?? Array.Empty<TradeAlert>();
public bool Equals(GlobalAlertSettings other) =>
other != null &&
trade_alerts.SequenceEqual(other.trade_alerts);
public override bool Equals(object obj) =>
Equals(obj as GlobalAlertSettings);
public override int GetHashCode() =>
EqualityComparer.auto_phase(trade_alerts);
}
}
@@ -1,88 +1,88 @@
using bts;
using mbts.ui.shell;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Composition;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace mbts.ui.settings {
public interface ISavedWindowFactory {
Task<IShellWindow> restore(WindowState window);
}
[Export(typeof(ISavedWindowFactory))]
public class WindowFactory : ISavedWindowFactory {
IShellWindowMigrationRule[] _compat;
[ImportingConstructor]
public WindowFactory([ImportMany] IShellWindowMigrationRule[] migration) {
_compat = migration;
}
[Import]
public ObservableCollection<IShellModule> modules { get; set; }
public Task<IShellWindow> restore(WindowState window) {
Log.Ui.info("Loading window '{0}'".fmt(window.title));
bool changed;
int count = 0;
do {
count++;
changed = apply_compatability_migrations(ref window);
} while (count < 100 && changed);
if (count == 100) {
Log.Persist.error("Error: Window state migration still changing after 100 iterations. Please check IShellWindowMigrationRule logic.");
}
return restore(window.owner, window.app_data, window.position);
}
/// When we apply the migration changes to a window we stop as soon as one "matches" and updates the state
/// Since it's possible that we have multiple levels of migration we run this function until the data stops changing (or 100 iterations)
/// ex: If change the data format twice from A to B to C then we would write 2 IShellWindowMigration instances.
/// Starting in state A one of the _compat tests changes to state B. Now we need to re-run
/// the migrations because state B will match a different rule and be converted to state C.
private bool apply_compatability_migrations(ref WindowState window) {
foreach (var test in _compat) {
try {
if (test.apply(ref window)) {
return true;
}
} catch (Exception e) {
Log.Persist.error("Exception running compat rule {0}.\n{1}".fmt(test.GetType().Name, e.ToString()));
}
}
return false;
}
private async Task<IShellWindow> restore(string owner_name, byte[] state, WindowPosition windowPosition) {
IShellModule owner = modules.empty_if_null().SingleOrDefault(m => m.key() == owner_name);
if (owner == null) {
Log.Ui.warn("Could not locate module '{0}'".fmt(owner_name));
return null;
}
try {
Task<IShellWindow> task = owner.create(new MemoryStream(state));
if (task != null) {
IShellWindow window = await task;
if (window != null) {
window.set_start_position(windowPosition);
Log.Ui.info($"Restoring window {owner_name} - {window.diagnostic_name()}.");
}
return window;
}
} catch (Exception e) {
Log.Ui.error("Failure to re-create window for module {0}. Error: {1}".fmt(owner_name, e.Message));
}
return null;
}
}
}
using bts;
using mbts.ui.shell;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Composition;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace mbts.ui.settings {
public interface ISavedWindowFactory {
Task<IShellWindow> restore(WindowSettings window);
}
[Export(typeof(ISavedWindowFactory))]
public class WindowFactory : ISavedWindowFactory {
IShellWindowMigrationRule[] _compat;
[ImportingConstructor]
public WindowFactory([ImportMany] IShellWindowMigrationRule[] migration) {
_compat = migration;
}
[Import]
public ObservableCollection<IShellModule> modules { get; set; }
public Task<IShellWindow> restore(WindowSettings window) {
Log.Ui.info("Loading window '{0}'".fmt(window.title));
bool changed;
int count = 0;
do {
count++;
changed = apply_compatability_migrations(ref window);
} while (count < 100 && changed);
if (count == 100) {
Log.Persist.error("Error: Window state migration still changing after 100 iterations. Please check IShellWindowMigrationRule logic.");
}
return restore(window.owner, window.app_data, window.position);
}
/// When we apply the migration changes to a window we stop as soon as one "matches" and updates the state
/// Since it's possible that we have multiple levels of migration we run this function until the data stops changing (or 100 iterations)
/// ex: If change the data format twice from A to B to C then we would write 2 IShellWindowMigration instances.
/// Starting in state A one of the _compat tests changes to state B. Now we need to re-run
/// the migrations because state B will match a different rule and be converted to state C.
private bool apply_compatability_migrations(ref WindowSettings window) {
foreach (var test in _compat) {
try {
if (test.apply(ref window)) {
return true;
}
} catch (Exception e) {
Log.Persist.error("Exception running compat rule {0}.\n{1}".fmt(test.GetType().Name, e.ToString()));
}
}
return false;
}
private async Task<IShellWindow> restore(string owner_name, byte[] state, WindowPosition windowPosition) {
IShellModule owner = modules.empty_if_null().SingleOrDefault(m => m.key() == owner_name);
if (owner == null) {
Log.Ui.warn("Could not locate module '{0}'".fmt(owner_name));
return null;
}
try {
Task<IShellWindow> task = owner.create(new MemoryStream(state));
if (task != null) {
IShellWindow window = await task;
if (window != null) {
window.set_start_position(windowPosition);
Log.Ui.info($"Restoring window {owner_name} - {window.diagnostic_name()}.");
}
return window;
}
} catch (Exception e) {
Log.Ui.error("Failure to re-create window for module {0}. Error: {1}".fmt(owner_name, e.Message));
}
return null;
}
}
}
@@ -1,86 +1,113 @@
using bts;
using mbts.ui.shell;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Composition;
using System.IO;
using System.Linq;
namespace mbts.ui.settings {
public interface ISettingsCollector {
// Get the save state for every open window
IEnumerable<WindowState> get_window_state();
WindowState get_window_state(IShellWindow window);
IEnumerable<ModuleState> get_module_state();
WindowPosition get_launcher_state();
}
[Export(typeof(ISettingsCollector))]
class SettingsCollector : ISettingsCollector {
WindowManager _wm;
ILauncher _launcher;
[ImportingConstructor]
public SettingsCollector(WindowManager wm, ILauncher launcher) {
_wm = wm;
_launcher = launcher;
}
[Import]
public ObservableCollection<IShellModule> modules { get; set; }
IWindowsInterop _interop => _wm;
public IEnumerable<WindowState> get_window_state() {
foreach (var window in _wm.list_windows()) {
// Check that the window is still open since we might be iterating asyncronously
if (_wm.contains(window)) {
var state = get_window_state(window);
if (state != null) {
yield return state;
}
}
}
}
public IEnumerable<ModuleState> get_module_state() {
//Note: I'm assuming that the list of modules is stable and I don't have to protect against it changing here
foreach (var module in modules.OfTypeSafe<IPersistShellModule>()) {
MemoryStream out_stream = new MemoryStream();
module.get_state(out_stream);
yield return new ModuleState() {
name = module.key(),
app_data = out_stream.ToArray(),
};
}
}
public WindowPosition get_launcher_state() {
return _launcher.get_position();
}
public WindowState get_window_state(IShellWindow window) {
try {
if (window == null || window.Owner == null) return null;
MemoryStream out_stream = new MemoryStream();
window.GetState(out_stream);
var pos = _interop.GetPosition(window);
var state = new WindowState() {
owner = window.Owner.key(),
app_data = out_stream.ToArray(),
position = pos,
title = string.IsNullOrEmpty(pos.custom_title) ? window.Title : pos.custom_title
};
return state;
} catch (Exception e) {
Log.Ui.error("Error saving window state for type {0}.\n {1}".fmt(window.GetType(), e.Message));
}
return null;
}
}
}
using bts;
using mbts.ui.shell;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Composition;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Threading;
namespace mbts.ui.settings {
public interface ISettingsCollector {
// Get the save state for every open window
Task<List<WindowSettings>> get_window_state();
Task<WindowSettings> get_window_state(IShellWindow window);
IEnumerable<ModuleSettings> get_module_state();
WindowPosition get_launcher_state();
}
[Export(typeof(ISettingsCollector))]
class SettingsCollector : ISettingsCollector {
WindowManager _wm;
ILauncher _launcher;
[ImportingConstructor]
public SettingsCollector(WindowManager wm, ILauncher launcher) {
_wm = wm;
_launcher = launcher;
}
[Import]
public ObservableCollection<IShellModule> modules { get; set; }
[Import]
public IShellThreadFactory thread_factory { get; set; }
IWindowsInterop _interop => _wm;
public async Task<List<WindowSettings>> get_window_state() {
var windows = _wm.list_windows();
var rv = new List<WindowSettings>(windows.Count);
foreach (var window in windows) {
// Check that the window is still open since we might be iterating asyncronously
if (_wm.contains(window)) {
var state = await get_window_state(window);
if (state != null) {
rv.Add(state);
}
}
}
return rv;
}
public IEnumerable<ModuleSettings> get_module_state() {
//Note: I'm assuming that the list of modules is stable and I don't have to protect against it changing here
foreach (var module in modules.OfTypeSafe<IPersistShellModule>()) {
MemoryStream out_stream = new MemoryStream();
module.get_state(out_stream);
yield return new ModuleSettings() {
name = module.key(),
app_data = out_stream.ToArray(),
};
}
}
public WindowPosition get_launcher_state() {
return _launcher.get_position();
}
public async Task<WindowSettings> get_window_state(IShellWindow window) {
try {
if (window == null || window.Owner == null) return null;
Dispatcher dispatcher = null;
if (window is ISlowWindow) {
var tf = thread_factory;
if (tf is not null) {
var thread_id = (window as ISharedWindow)?.thread_id;
dispatcher = tf.get_dispatcher(thread_id);
if (dispatcher is null) {
Log.Gen.error(
$"Unable to get window state for '{window.Title}.' " +
$"Didn't find dispatcher for thread {thread_id}.");
return null;
}
}
}
var pos = _interop.GetPosition(window);
var state = new WindowSettings() {
owner = window.Owner.key(),
app_data = dispatcher is null ?
serialize() : (await dispatcher.InvokeAsync(serialize)),
position = pos,
title = string.IsNullOrEmpty(pos.custom_title) ? window.Title : pos.custom_title
};
return state;
byte[] serialize() {
using var ms = new MemoryStream();
window.GetState(ms);
return ms.ToArray();
}
} catch (Exception e) {
Log.Ui.error("Error saving window state for type {0}.\n {1}".fmt(window.GetType(), e.Message));
}
return null;
}
}
}
@@ -1,95 +1,96 @@
using bts.shell.pnl;
using bts.utils;
using mbts.ui.settings;
using System;
using System.Collections.Generic;
namespace bts.settings {
interface ISettingsMigrationRule<T> {
bool apply(T settings, out T new_settings);
}
// Migration rules of type ISettingsMigrationRule<T>, where 'T' is a common type, such as GridSettings,
// should be exposed through explicitly named interfaces that inherit ISettingsMigrationRule<T>.
// This avoids magic const names in the MEF import/export contracts, which would otherwise be needed to
// determine the various windows to which such rules apply.
interface IFillsGridSettingsMigrationRule : ISettingsMigrationRule<GridSettings> { }
interface IMarketViewGridSettingsMigrationRule : ISettingsMigrationRule<GridSettings> { }
interface IPAndLGridSettingsMigrationRule : ISettingsMigrationRule<GridSettings> { }
interface IPNLSettingsMigrationRule : ISettingsMigrationRule<PNLSettings> { }
interface ISyntheticManagementMigrationRule : ISettingsMigrationRule<GridSettings> { }
interface IReconcileReportMigrationRule : ISettingsMigrationRule<GridSettings> { }
static class SettingsMigrationHelper {
public static bool apply<T>(T settings, IEnumerable<ISettingsMigrationRule<T>> migration_rules, out T new_settings) {
bool applied = false;
foreach (var r in migration_rules) {
if (r.apply(settings, out var migrated)) {
settings = migrated;
applied = true;
}
}
new_settings = applied ? settings : default;
return applied;
}
public static void apply_quiet<T>(ref T settings, IEnumerable<ISettingsMigrationRule<T>> migration_rules) {
if (apply(settings, migration_rules, out var new_settings))
settings = new_settings;
}
public static ISettingsMigrationRule<T> merge<T>(this IEnumerable<ISettingsMigrationRule<T>> rules) =>
new MergeWrapper<T>(rules);
public static ISettingsMigrationRule<TOuter> wrap<TInner, TOuter>(this ISettingsMigrationRule<TInner> rule, IImmutableProperty<TOuter, TInner> propi) =>
new SelectorWrapper<TInner, TOuter>(rule, propi.get, propi.set);
public static ISettingsMigrationRule<TOuter> wrap<TInner, TOuter>(this ISettingsMigrationRule<TInner> rule, Func<TOuter, TInner> get, Func<TOuter, TInner, TOuter> set) =>
new SelectorWrapper<TInner, TOuter>(rule, get, set);
class MergeWrapper<T> : ISettingsMigrationRule<T> {
readonly IEnumerable<ISettingsMigrationRule<T>> _rules;
public MergeWrapper(IEnumerable<ISettingsMigrationRule<T>> rules) =>
_rules = rules;
public bool apply(T settings, out T new_settings) {
bool applied = false;
foreach (var r in _rules) {
if (r.apply(settings, out var migrated)) {
settings = migrated;
applied = true;
}
}
new_settings = applied ? settings : default;
return applied;
}
}
class SelectorWrapper<TInner, TOuter> : ISettingsMigrationRule<TOuter> {
readonly ISettingsMigrationRule<TInner> _rule;
readonly Func<TOuter, TInner> _get;
readonly Func<TOuter, TInner, TOuter> _set;
public SelectorWrapper(ISettingsMigrationRule<TInner> rule, Func<TOuter, TInner> get, Func<TOuter, TInner, TOuter> set) {
_rule = rule;
_get = get;
_set = set;
}
public bool apply(TOuter settings, out TOuter new_settings) {
if (settings != null) {
var ival = _get(settings);
if (_rule.apply(ival, out var new_ival)) {
new_settings = _set(settings, new_ival);
return true;
}
}
new_settings = default;
return false;
}
}
}
}
using bts.shell.pnl;
using bts.utils;
using mbts.ui.settings;
using System;
using System.Collections.Generic;
namespace bts.settings {
interface ISettingsMigrationRule<T> {
bool apply(T settings, out T new_settings);
}
// Migration rules of type ISettingsMigrationRule<T>, where 'T' is a common type, such as GridSettings,
// should be exposed through explicitly named interfaces that inherit ISettingsMigrationRule<T>.
// This avoids magic const names in the MEF import/export contracts, which would otherwise be needed to
// determine the various windows to which such rules apply.
interface IFillsGridSettingsMigrationRule : ISettingsMigrationRule<GridSettings> { }
interface IMarketViewGridSettingsMigrationRule : ISettingsMigrationRule<GridSettings> { }
interface IPAndLGridSettingsMigrationRule : ISettingsMigrationRule<GridSettings> { }
interface IPNLSettingsMigrationRule : ISettingsMigrationRule<PNLSettings> { }
interface ISyntheticManagementMigrationRule : ISettingsMigrationRule<GridSettings> { }
interface IReconcileReportMigrationRule : ISettingsMigrationRule<GridSettings> { }
interface IDayFillsGridSettingsMigrationRule : ISettingsMigrationRule<GridSettings> { }
static class SettingsMigrationHelper {
public static bool apply<T>(T settings, IEnumerable<ISettingsMigrationRule<T>> migration_rules, out T new_settings) {
bool applied = false;
foreach (var r in migration_rules) {
if (r.apply(settings, out var migrated)) {
settings = migrated;
applied = true;
}
}
new_settings = applied ? settings : default;
return applied;
}
public static void apply_quiet<T>(ref T settings, IEnumerable<ISettingsMigrationRule<T>> migration_rules) {
if (apply(settings, migration_rules, out var new_settings))
settings = new_settings;
}
public static ISettingsMigrationRule<T> merge<T>(this IEnumerable<ISettingsMigrationRule<T>> rules) =>
new MergeWrapper<T>(rules);
public static ISettingsMigrationRule<TOuter> wrap<TInner, TOuter>(this ISettingsMigrationRule<TInner> rule, IImmutableProperty<TOuter, TInner> propi) =>
new SelectorWrapper<TInner, TOuter>(rule, propi.get, propi.set);
public static ISettingsMigrationRule<TOuter> wrap<TInner, TOuter>(this ISettingsMigrationRule<TInner> rule, Func<TOuter, TInner> get, Func<TOuter, TInner, TOuter> set) =>
new SelectorWrapper<TInner, TOuter>(rule, get, set);
class MergeWrapper<T> : ISettingsMigrationRule<T> {
readonly IEnumerable<ISettingsMigrationRule<T>> _rules;
public MergeWrapper(IEnumerable<ISettingsMigrationRule<T>> rules) =>
_rules = rules;
public bool apply(T settings, out T new_settings) {
bool applied = false;
foreach (var r in _rules) {
if (r.apply(settings, out var migrated)) {
settings = migrated;
applied = true;
}
}
new_settings = applied ? settings : default;
return applied;
}
}
class SelectorWrapper<TInner, TOuter> : ISettingsMigrationRule<TOuter> {
readonly ISettingsMigrationRule<TInner> _rule;
readonly Func<TOuter, TInner> _get;
readonly Func<TOuter, TInner, TOuter> _set;
public SelectorWrapper(ISettingsMigrationRule<TInner> rule, Func<TOuter, TInner> get, Func<TOuter, TInner, TOuter> set) {
_rule = rule;
_get = get;
_set = set;
}
public bool apply(TOuter settings, out TOuter new_settings) {
if (settings != null) {
var ival = _get(settings);
if (_rule.apply(ival, out var new_ival)) {
new_settings = _set(settings, new_ival);
return true;
}
}
new_settings = default;
return false;
}
}
}
}
@@ -1,171 +1,152 @@
using mbts.spark;
using mbts.utils;
using System;
using System.Linq;
using System.Reactive.Linq;
using System.Reactive.Subjects;
using System.Threading.Tasks;
namespace mbts.persist {
interface IWindowSettingsManager<T> where T : class {
T instance_settings { get; set; }
T default_settings { get; }
event Action<T> instance_settings_changed;
IObservable<T> subscribe_default();
Task save_default_settings(T value);
IWindowSettingsManagerNonShared<T> as_non_shared();
}
/// <summary>
/// An implementation of IWindowSettingsManager that uses a clone of the actual default settings;
/// provides a convenient way to avoid problems that arise from sharing a single default settings object among multiple window instances.
/// </summary>
interface IWindowSettingsManagerNonShared<T> : IWindowSettingsManager<T>, IDisposable where T : class { }
class WindowSettingsManager<T> : IWindowSettingsManager<T> where T : class {
readonly UserSettingsHub _hub;
readonly Func<UserSettings, T> _get;
readonly Func<UserSettings, T, UserSettings> _set;
T _instance_settings;
public WindowSettingsManager(UserSettingsHub hub, T instance_settings, Func<UserSettings, T> get, Func<UserSettings, T, UserSettings> set) {
_hub = hub;
_instance_settings = instance_settings;
_get = get;
_set = set;
}
public T instance_settings {
get => _instance_settings;
set {
_instance_settings = value;
instance_settings_changed?.Invoke(value);
}
}
public T default_settings => _get(_hub.current);
public event Action<T> instance_settings_changed;
public async Task save_default_settings(T value) =>
await _hub.save_default(_set(_hub.current, value));
public IObservable<T> subscribe_default() =>
_hub.subscribe_default_settings().Select(_get).DistinctUntilChanged();
public IWindowSettingsManagerNonShared<T> as_non_shared() =>
new NonSharedWrapper(this);
class NonSharedWrapper : IWindowSettingsManagerNonShared<T> {
readonly IWindowSettingsManager<T> _wsm;
readonly BehaviorSubject<T> _default_subject;
IDisposable _dispose;
public NonSharedWrapper(IWindowSettingsManager<T> wsm) {
_wsm = wsm;
_default_subject = new BehaviorSubject<T>(_wsm.default_settings);
_dispose = wsm.subscribe_default().Subscribe(s =>
_default_subject.OnNext(default_settings = MiscUtils.clone_proto(s)));
}
public T instance_settings {
get => _wsm.instance_settings;
set => _wsm.instance_settings = value;
}
public T default_settings { get; private set; }
public event Action<T> instance_settings_changed {
add => _wsm.instance_settings_changed += value;
remove => _wsm.instance_settings_changed -= value;
}
public async Task save_default_settings(T value) =>
await _wsm.save_default_settings(value);
public IObservable<T> subscribe_default() =>
_default_subject.AsObservable();
public IWindowSettingsManagerNonShared<T> as_non_shared() =>
new NonSharedWrapper(_wsm);
public void Dispose() => Disposable.dispose(ref _dispose);
}
public class DisconnectedImpl : IWindowSettingsManager<T> {
readonly BehaviorSubject<T> _default_settings_subject;
T _instance_settings, _default_settings;
public DisconnectedImpl(T settings) : this(settings, settings) { }
public DisconnectedImpl(T instance_settings, T default_settings) {
_instance_settings = instance_settings;
_default_settings = default_settings;
_default_settings_subject = new BehaviorSubject<T>(default_settings);
}
public T instance_settings {
get => _instance_settings;
set {
if (!Equals(_instance_settings, value)) {
_instance_settings = value;
instance_settings_changed?.Invoke(value);
}
}
}
public T default_settings {
get => _default_settings;
set {
if (!Equals(_default_settings, _default_settings)) {
_default_settings = value;
_default_settings_subject.OnNext(value);
}
}
}
public event Action<T> instance_settings_changed;
public IWindowSettingsManagerNonShared<T> as_non_shared() => new NonSharedWrapper(this);
public Task save_default_settings(T value) {
default_settings = value;
return Task.CompletedTask;
}
public IObservable<T> subscribe_default() => _default_settings_subject;
}
}
static class WindowSettingsManagerExtensions {
/// <summary>
/// Returns an observable sequence of the settings object used by a particular window.
/// <para/>Note: 'Instance' settings take priority over 'default' settings. While the former is present, any changes to the latter will be ignored.
/// </summary>
public static IObservable<T> subscribe_current<T>(this IWindowSettingsManager<T> wsm) where T : class =>
Observable.CombineLatest(
Observable.FromEvent<Action<T>, T>(cb => wsm.instance_settings_changed += cb, cb => wsm.instance_settings_changed -= cb)
.StartWith(wsm.instance_settings),
wsm.subscribe_default(),
(i, d) => i ?? d
).Where(v => v != null)
.DistinctUntilChanged();
public static IObservable<T> subscribe_current<T>(this IWindowSettingsManager<T> wsm, Func<(T defaults, T instance), T> merge_settings) where T : class, IDefaultableSettings {
return Observable.Create<T>(o => {
IDisposable defaults_sub = wsm.subscribe_default().Subscribe(_ => o.OnNext(get_current()));
wsm.instance_settings_changed += on_instance_settings_changed;
return Disposable.Create(() => {
defaults_sub.Dispose();
wsm.instance_settings_changed -= on_instance_settings_changed;
});
void on_instance_settings_changed(T _) =>
o.OnNext(get_current());
});
T get_current() {
var inst = wsm.instance_settings;
if (inst == null) return wsm.default_settings;
if (inst.use_defaults) return merge_settings((wsm.default_settings, inst));
return inst;
}
}
public static T current_settings<T>(this IWindowSettingsManager<T> wsm) where T : class =>
wsm.instance_settings ?? wsm.default_settings;
}
}
using mbts.spark;
using mbts.utils;
using System;
using System.Linq;
using System.Reactive.Linq;
using System.Reactive.Subjects;
using System.Threading.Tasks;
namespace mbts.persist {
interface IWindowSettingsManager<T> where T : class {
T instance_settings { get; set; }
T default_settings { get; }
event Action<T> instance_settings_changed;
IObservable<T> subscribe_default();
Task save_default_settings(T value);
IWindowSettingsManagerNonShared<T> as_non_shared();
}
/// <summary>
/// An implementation of IWindowSettingsManager that uses a clone of the actual default settings;
/// provides a convenient way to avoid problems that arise from sharing a single default settings object among multiple window instances.
/// </summary>
interface IWindowSettingsManagerNonShared<T> : IWindowSettingsManager<T>, IDisposable where T : class { }
class WindowSettingsManager<T> : IWindowSettingsManager<T> where T : class {
readonly UserSettingsHub _hub;
readonly Func<UserSettings, T> _get;
readonly Func<UserSettings, T, UserSettings> _set;
T _instance_settings;
public WindowSettingsManager(UserSettingsHub hub, T instance_settings, Func<UserSettings, T> get, Func<UserSettings, T, UserSettings> set) {
_hub = hub;
_instance_settings = instance_settings;
_get = get;
_set = set;
}
public T instance_settings {
get => _instance_settings;
set {
_instance_settings = value;
instance_settings_changed?.Invoke(value);
}
}
public T default_settings => _get(_hub.current);
public event Action<T> instance_settings_changed;
public async Task save_default_settings(T value) =>
await _hub.save_default(_set(_hub.current, value));
public IObservable<T> subscribe_default() =>
_hub.subscribe_default_settings().Select(_get).DistinctUntilChanged();
public IWindowSettingsManagerNonShared<T> as_non_shared() =>
new NonSharedWrapper(this);
class NonSharedWrapper : IWindowSettingsManagerNonShared<T> {
readonly IWindowSettingsManager<T> _wsm;
readonly BehaviorSubject<T> _default_subject;
IDisposable _dispose;
public NonSharedWrapper(IWindowSettingsManager<T> wsm) {
_wsm = wsm;
_default_subject = new BehaviorSubject<T>(_wsm.default_settings);
_dispose = wsm.subscribe_default().Subscribe(s =>
_default_subject.OnNext(default_settings = MiscUtils.clone_proto(s)));
}
public T instance_settings {
get => _wsm.instance_settings;
set => _wsm.instance_settings = value;
}
public T default_settings { get; private set; }
public event Action<T> instance_settings_changed {
add => _wsm.instance_settings_changed += value;
remove => _wsm.instance_settings_changed -= value;
}
public async Task save_default_settings(T value) =>
await _wsm.save_default_settings(value);
public IObservable<T> subscribe_default() =>
_default_subject.AsObservable();
public IWindowSettingsManagerNonShared<T> as_non_shared() =>
new NonSharedWrapper(_wsm);
public void Dispose() => Disposable.dispose(ref _dispose);
}
public class DisconnectedImpl : IWindowSettingsManager<T> {
readonly BehaviorSubject<T> _default_settings_subject;
T _instance_settings, _default_settings;
public DisconnectedImpl(T settings) : this(settings, settings) { }
public DisconnectedImpl(T instance_settings, T default_settings) {
_instance_settings = instance_settings;
_default_settings = default_settings;
_default_settings_subject = new BehaviorSubject<T>(default_settings);
}
public T instance_settings {
get => _instance_settings;
set {
if (!Equals(_instance_settings, value)) {
_instance_settings = value;
instance_settings_changed?.Invoke(value);
}
}
}
public T default_settings {
get => _default_settings;
set {
if (!Equals(_default_settings, _default_settings)) {
_default_settings = value;
_default_settings_subject.OnNext(value);
}
}
}
public event Action<T> instance_settings_changed;
public IWindowSettingsManagerNonShared<T> as_non_shared() => new NonSharedWrapper(this);
public Task save_default_settings(T value) {
default_settings = value;
return Task.CompletedTask;
}
public IObservable<T> subscribe_default() => _default_settings_subject;
}
}
static class WindowSettingsManagerExtensions {
/// <summary>
/// Returns an observable sequence of the settings object used by a particular window.
/// <para/>Note: 'Instance' settings take priority over 'default' settings. While the former is present, any changes to the latter will be ignored.
/// </summary>
public static IObservable<T> subscribe_current<T>(this IWindowSettingsManager<T> wsm) where T : class =>
Observable.CombineLatest(
Observable.FromEvent<Action<T>, T>(cb => wsm.instance_settings_changed += cb, cb => wsm.instance_settings_changed -= cb)
.StartWith(wsm.instance_settings),
wsm.subscribe_default(),
(i, d) => i ?? d
).Where(v => v != null)
.DistinctUntilChanged();
public static T current_settings<T>(this IWindowSettingsManager<T> wsm) where T : class =>
wsm.instance_settings ?? wsm.default_settings;
}
}
@@ -0,0 +1,31 @@
#nullable enable
namespace mbts.ui.shell {
using ProtoBuf;
using Spark.Core.Protobuf;
using System.Collections.Generic;
[ProtoContract]
public class ModuleSettings : IProtobuf<ModuleSettings> {
[ProtoMember(1)]
public string? name { get; set; }
[ProtoMember(2)]
public byte[]? app_data { get; set; }
public bool Equals(ModuleSettings? other) =>
other is not null &&
name == other.name &&
app_data.safe_sequence_equals(other.app_data);
public override bool Equals(object? obj) =>
Equals(obj as ModuleSettings);
public override int GetHashCode() =>
GetType().GetHashCode();
public ModuleSettings Clone() =>
ProtobufSerializationHelper.clone(this);
}
}
@@ -0,0 +1,172 @@
#nullable enable
namespace mbts.persist {
using bts;
using bts.api.core;
using bts.api.persistence;
using bts.spark;
using Spark.Core.Protobuf;
using System;
using System.Collections.Generic;
using System.Composition;
using System.Linq;
using System.Reactive.Linq;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
public class SettingsPersistenceModel : IPersist, IUserPersist {
readonly PersistenceService _persist;
readonly ErrorReporter _errors;
readonly string _user;
public SettingsPersistenceModel(
string user, PersistenceService persist, ErrorReporter errors) {
_user = user;
_persist = persist;
_errors = errors;
}
public Task set<T>(string ns, string key, T value) {
return _persist.store_async(new StoreRequest() {
Ns = _user_ns(ns),
Record = {
new Record() {
Key = key,
Value = ProtobufSerializationHelper.serialize_to_byte_string(value)
}
}
});
}
public Task clear(string ns, string key) {
return _persist.remove_async(new RemoveRequest() {
Ns = _user_ns(ns),
Key = { key }
});
}
public async Task<T?> get<T>(string ns, string key) {
var ret = await _persist.retrieve_async(new RetrieveRequest() {
Ns = _user_ns(ns),
Key = { key }
});
_check_error(ret, ns, key, out var empty);
if (empty) {
return default;
}
return ProtobufSerializationHelper.deserialize<T>(ret.value.Record.Single().Value);
}
public async Task<T[]> get_many<T>(string ns, string key) {
var ret = await _persist.retrieve_async(new RetrieveRequest() {
Ns = _user_ns(ns),
Key = { key }
});
_check_error(ret, ns, key, out bool empty);
if (empty) {
return Array.Empty<T>();
}
return ProtobufSerializationHelper.deserialize_many<T>(
ret.value.Record.Single().Value.ToByteArray());
}
public async Task<IEnumerable<PersistResult<T>>> query<T>(string ns, string pattern) {
var regex = new Regex(pattern);
var results = await _persist.retrieve_all_async(
new RetrieveAllRequest() {
Ns = _user_ns(ns)
});
_check_error(results, ns, string.Empty, out bool empty);
if (empty) {
return Enumerable.Empty<PersistResult<T>>();
}
return results.value.Record
.Where(r => regex.IsMatch(r.Key))
.Select(r => new PersistResult<T>() {
user = _user,
ns = ns,
key = r.Key,
value = ProtobufSerializationHelper.deserialize<T>(r.Value)
}).ToList();
}
public IDisposable subscribe<T>(
string ns, string pattern, Action<IEnumerable<PersistResult<T>>> callback) =>
subscribe<T>(ns, pattern).Subscribe(callback);
public IObservable<IEnumerable<PersistResult<T>>> subscribe<T>(string ns, string pattern) {
var ctx = SynchronizationContext.Current ??
throw new InvalidOperationException("Current SynchronizationContext is null");
var re = new Regex(pattern);
return _persist
.subscribe_ns(_user_ns(ns))
.Select(update =>
update.added
.Where(item => re.IsMatch(item.Key))
.Select(item => new PersistResult<T>() {
user = _user,
ns = ns,
key = item.Key,
value = ProtobufSerializationHelper.deserialize<T>(item.Value)
}))
.SubscribeOn(ctx);
}
public void Dispose() =>
GC.SuppressFinalize(this);
string _user_ns(string ns) =>
$"{_user}#{ns}";
void _check_error(Result<RetrieveResponse> result, string ns, string key, out bool empty) {
if (result.success) {
switch (result.value.Result) {
case RetrieveResponse.Types.Result.EmptyNs:
case RetrieveResponse.Types.Result.NoSuchNs:
case RetrieveResponse.Types.Result.NoSuchKey:
empty = true;
return;
case RetrieveResponse.Types.Result.EmptyKey:
case RetrieveResponse.Types.Result.DuplicateKey:
_errors?.report_error(
$"Invalid Key {result} '{key}'",
"Requested Invalid Settings Key",
MessageBoxImage.Information);
empty = true;
return;
default:
case RetrieveResponse.Types.Result.Ok:
empty = false;
return;
}
} else {
_errors?.report_error(
$"There was an error communicating with the settings server: {result.error_message}",
"Failed to retrieve settings from the server");
empty = true;
}
}
}
[Export(typeof(IPersist))]
public class UISettings : SettingsPersistenceModel {
[ImportingConstructor]
public UISettings([Import("settings")] PersistenceService persist, ErrorReporter err)
: base("all_users", persist, err) { }
}
[Export(typeof(IUserPersist))]
public class UserUISettings : SettingsPersistenceModel {
public UserUISettings(
uint user_id, [Import("settings")] PersistenceService persist, ErrorReporter err)
: base($"User {user_id}", persist, err) { }
[ImportingConstructor]
public UserUISettings(
Lazy<UserTuple> user, [Import("settings")] PersistenceService persist, ErrorReporter err)
: this(user.Value.id, persist, err) { }
}
}
@@ -0,0 +1,44 @@
#nullable enable
namespace mbts.spark {
using bts.utils;
using System;
interface ISettingsProfile<T> {
uint id { get; }
string? name { get; }
T? value { get; }
SecurityCriteria? security_criteria { get; }
}
readonly struct SettingsProfile<T> : IEquatable<SettingsProfile<T>> where T : class, IEquatable<T> {
public static readonly Func<SettingsProfile<T>, uint> key_fn = ns => ns.id;
public readonly uint id;
public readonly string? name;
public readonly T? value;
public readonly SecurityCriteria? security_criteria;
public SettingsProfile(uint id, string? name, T? value, SecurityCriteria? security_criteria = null) {
this.id = id;
this.name = name;
this.value = value;
this.security_criteria = security_criteria;
}
public SettingsProfile<T> with(uint? id = null, string? name = null, T? value = null, SecurityCriteria? security_criteria = null) =>
new(id ?? this.id, name ?? this.name, value ?? this.value, security_criteria ?? this.security_criteria);
public bool Equals(SettingsProfile<T> other) =>
id == other.id &&
name == other.name &&
value.safe_equals(other.value) &&
security_criteria.safe_equals(other.security_criteria);
public override bool Equals(object? obj) =>
obj is SettingsProfile<T> other && Equals(other);
public override int GetHashCode() =>
id.GetHashCode();
}
}
@@ -1,73 +1,73 @@
using mbts.persist;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace mbts.ui.tests {
// Stub persistance store for shell unit tests
public class TestPersist : IPersist, IUserPersist {
public Dictionary<string, Dictionary<string, object>> Values = new Dictionary<string, Dictionary<string, object>>();
public Task set<T>(string ns, string key, T value) {
TaskCompletionSource<object> source = new TaskCompletionSource<object>();
try {
Values[ns][key] = value;
source.TrySetResult(null);
} catch (Exception e) {
source.TrySetException(e);
}
return source.Task;
}
public Task clear(string ns, string key) {
TaskCompletionSource<object> source = new TaskCompletionSource<object>();
try {
Values[ns].Remove(key);
source.TrySetResult(null);
} catch (Exception e) {
source.TrySetException(e);
}
return source.Task;
}
public Task<T> get<T>(string ns, string key) {
TaskCompletionSource<T> source = new TaskCompletionSource<T>();
try {
T result = (T)Values[ns][key];
source.TrySetResult(result);
} catch (Exception e) {
source.TrySetException(e);
}
return source.Task;
}
public Task<T[]> get_many<T>(string ns, string key) {
var source = new TaskCompletionSource<T[]>();
try {
source.TrySetResult((T[])Values[ns][key]);
} catch (Exception e) {
source.TrySetException(e);
}
return source.Task;
}
public async Task<IEnumerable<Tuple<T, DateTime>>> get_history<T>(string ns, string key) {
var res = await get<T>(ns, key);
return new Tuple<T, DateTime>[] { Tuple.Create(res, DateTime.Today) };
}
public Task<IEnumerable<PersistResult<T>>> query<T>(string ns, string pattern) {
throw new NotImplementedException();
}
public IDisposable subscribe<T>(string ns, string pattern, Action<IEnumerable<PersistResult<T>>> callback) {
throw new NotImplementedException();
}
public void Dispose() { }
}
}
using mbts.persist;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace mbts.ui.tests {
// Stub persistance store for shell unit tests
public class TestPersist : IPersist, IUserPersist {
public Dictionary<string, Dictionary<string, object>> Values = new Dictionary<string, Dictionary<string, object>>();
public Task set<T>(string ns, string key, T value) {
TaskCompletionSource<object> source = new TaskCompletionSource<object>();
try {
Values[ns][key] = value;
source.TrySetResult(null);
} catch (Exception e) {
source.TrySetException(e);
}
return source.Task;
}
public Task clear(string ns, string key) {
TaskCompletionSource<object> source = new TaskCompletionSource<object>();
try {
Values[ns].Remove(key);
source.TrySetResult(null);
} catch (Exception e) {
source.TrySetException(e);
}
return source.Task;
}
public Task<T> get<T>(string ns, string key) {
TaskCompletionSource<T> source = new TaskCompletionSource<T>();
try {
T result = (T)Values[ns][key];
source.TrySetResult(result);
} catch (Exception e) {
source.TrySetException(e);
}
return source.Task;
}
public Task<T[]> get_many<T>(string ns, string key) {
var source = new TaskCompletionSource<T[]>();
try {
source.TrySetResult((T[])Values[ns][key]);
} catch (Exception e) {
source.TrySetException(e);
}
return source.Task;
}
public async Task<IEnumerable<Tuple<T, DateTime>>> get_history<T>(string ns, string key) {
var res = await get<T>(ns, key);
return new Tuple<T, DateTime>[] { Tuple.Create(res, DateTime.Today) };
}
public Task<IEnumerable<PersistResult<T>>> query<T>(string ns, string pattern) {
throw new NotImplementedException();
}
public IDisposable subscribe<T>(string ns, string pattern, Action<IEnumerable<PersistResult<T>>> callback) {
throw new NotImplementedException();
}
public void Dispose() { }
}
}
@@ -1,16 +1,24 @@
using bts.shell.pnl;
using Google.Protobuf.WellKnownTypes;
using mbts.ui.settings;
using ProtoBuf;
using System;
using System.Collections.Generic;
using System.Linq;
#nullable enable
namespace mbts.spark {
using bts.shell;
using bts.shell.fills;
using bts.shell.market_view;
using bts.shell.orderbook;
using bts.shell.pnl;
using bts.shell.time_and_sales;
using Google.Protobuf.WellKnownTypes;
using mbts.ui.settings;
using ProtoBuf;
using Spark.Trading;
using System;
using System.Collections.Generic;
using System.Linq;
interface IDefaultableSettings {
bool use_defaults { get; set; }
}
@@ -21,21 +29,21 @@ namespace mbts.spark {
[ProtoContract]
class UserSettings {
public static UserSettings factory_defaults =>
new UserSettings {
new() {
_ladder = LadderSettings.Default,
_notification = NotificationSettings.Default,
_market_view_grid = bts.shell.market_view.MarketViewSettings.DefaultGridSettings,
_fills_grid = bts.shell.fills.FillsSettings.DefaultGridSettings,
_time_and_sales_grid = bts.shell.time_and_sales.TimeAndSalesSettings.DefaultGridSettings,
_synthetic_management_grid = bts.shell.SyntheticManagementWindowFactory.StartupData.DefaultGridSettings,
_reconcile_report_grid = Spark.Trading.ReconcileReportSettings.Default().grid,
_order_book_grid = bts.shell.orderbook.OrderBookStartupData.DefaultGrid
_market_view_grid = MarketViewSettings.DefaultGridSettings,
_fills_grid = FillsSettings.DefaultGridSettings,
_time_and_sales_grid = TimeAndSalesSettings.DefaultGridSettings,
_synthetic_management = SyntheticManagementSettings.default_grid_settings,
_reconcile_report = ReconcileReportSettings.Default().grid,
_order_book = OrderBookStartupData.DefaultGrid
};
[ProtoMember(1)]
LadderSettings _ladder;
LadderSettings? _ladder;
[ProtoMember(11)]
readonly LadderSettingsProfile[] _ladder_profiles;
LadderSettingsProfile[]? _ladder_profiles;
/// When Profiles Are Deleted, ladders that were using that profile shall copy the profile's settings to a local profile.
/// Therefor:
/// Deleted profile ids must never be reused.
@@ -48,65 +56,96 @@ namespace mbts.spark {
uint _last_ladder_profile_id;
// removing NotificationSettings these from proto-serialization, since they are disabled by default for now.
// This way, when they are enabled, there won't be any backwards compatability issues to worry about, as no clients will have persisted them yet.
NotificationSettings _notification;
NotificationSettings? _notification;
[ProtoMember(5)]
GridSettings _market_view_grid;
GridSettings? _market_view_grid;
[ProtoMember(6)]
GridSettings _time_and_sales_grid;
GridSettings? _time_and_sales_grid;
[ProtoMember(7)]
GridSettings _fills_grid;
GridSettings? _fills_grid;
[ProtoMember(15)]
GridSettings? _day_fills_grid;
[ProtoMember(8)]
GridSettings _synthetic_management_grid;
GridSettings? _synthetic_management;
[ProtoMember(14)]
GridSettings _reconcile_report_grid;
GridSettings? _reconcile_report;
[ProtoMember(9)]
bts.shell.orderbook.OrderBookGridSettings _order_book_grid;
OrderBookGridSettings? _order_book;
[ProtoMember(10)]
PNLSettings _pnl;
PNLSettings? _pnl;
[ProtoMember(13)]
GlobalAlertSettings _alerts;
GlobalAlertSettings? _alerts;
public UserSettings() { }
public UserSettings(LadderSettingsProfile[] ladder_profiles) =>
_ladder_profiles = ladder_profiles;
public LadderSettings ladder =>
_ladder ??= LadderSettings.Default;
public LadderSettings ladder => _ladder ?? (_ladder = LadderSettings.Default);
public IReadOnlyList<LadderSettingsProfile> ladder_profiles => _ladder_profiles ?? Array.Empty<LadderSettingsProfile>();
public uint next_ladder_profile_id => _last_ladder_profile_id + 1;
public NotificationSettings notification => _notification ?? (_notification = NotificationSettings.Default);
public GridSettings market_view_grid => _market_view_grid ?? (_market_view_grid = bts.shell.market_view.MarketViewSettings.DefaultGridSettings);
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 synthetic_management_grid => _synthetic_management_grid ?? (_synthetic_management_grid = bts.shell.SyntheticManagementWindowFactory.StartupData.DefaultGridSettings);
public GridSettings reconcile_report_grid => _reconcile_report_grid ??= Spark.Trading.ReconcileReportSettings.Default().grid;
public PNLSettings pnl => _pnl ?? (_pnl = PNLSettings.Default);
public bts.shell.orderbook.OrderBookGridSettings order_book_grid => _order_book_grid ?? (_order_book_grid = bts.shell.orderbook.OrderBookStartupData.Default.grid_settings_wrapper());
public IReadOnlyList<LadderSettingsProfile> ladder_profiles =>
_ladder_profiles ?? Array.Empty<LadderSettingsProfile>();
public GlobalAlertSettings alerts => _alerts ?? (_alerts = new GlobalAlertSettings());
public uint next_ladder_profile_id =>
_last_ladder_profile_id + 1;
public UserSettings with(LadderSettings ladder = null,
LadderSettingsProfile[] ladder_profiles = null,
NotificationSettings notification = null,
GridSettings provided_market_view_gridsettings = null,
GridSettings time_and_sales = null,
GridSettings provided_fills_gridsettings = null,
GridSettings provided_synthetic_management_gridsettings = null,
GridSettings reconcile_report_grid = null,
PNLSettings pnl = null,
bts.shell.orderbook.OrderBookGridSettings order_book_grid = null,
GlobalAlertSettings alerts = null) {
var us = new UserSettings(ladder_profiles ?? _ladder_profiles) {
public NotificationSettings notification =>
_notification ??= NotificationSettings.Default;
public GridSettings market_view_grid =>
_market_view_grid ??= MarketViewSettings.DefaultGridSettings;
public GridSettings time_and_sales_grid =>
_time_and_sales_grid ??= GridSettings.Default.with(
TimeAndSalesSettings.DefaultColumns.all);
public GridSettings fills_grid =>
_fills_grid ??= FillsSettings.DefaultGridSettings;
public GridSettings day_fills_grid =>
_day_fills_grid ??= DayFillsSettings.default_grid();
public GridSettings synthetic_management_grid =>
_synthetic_management ??=
SyntheticManagementSettings.default_grid_settings;
public GridSettings reconcile_report_grid =>
_reconcile_report ??= ReconcileReportSettings.Default().grid ??
throw new InvalidOperationException();
public PNLSettings pnl =>
_pnl ??= PNLSettings.Default;
public OrderBookGridSettings order_book_grid =>
_order_book ??= OrderBookStartupData.Default.grid_settings_wrapper();
public GlobalAlertSettings alerts =>
_alerts ??= new GlobalAlertSettings();
public UserSettings with(
LadderSettings? ladder = null,
LadderSettingsProfile[]? ladder_profiles = null,
NotificationSettings? notification = null,
GridSettings? market_view = null,
GridSettings? time_and_sales = null,
GridSettings? fills = null,
GridSettings? day_fills = null,
GridSettings? synthetic_management = null,
GridSettings? reconcile_report = null,
PNLSettings? pnl = null,
OrderBookGridSettings? order_book_grid = null,
GlobalAlertSettings? alerts = null) {
var us = new UserSettings() {
_ladder_profiles = ladder_profiles ?? _ladder_profiles,
_ladder = ladder ?? _ladder,
_notification = notification ?? _notification,
_market_view_grid = provided_market_view_gridsettings ?? _market_view_grid,
_market_view_grid = market_view ?? _market_view_grid,
_time_and_sales_grid = time_and_sales ?? _time_and_sales_grid,
_fills_grid = provided_fills_gridsettings ?? _fills_grid,
_synthetic_management_grid = provided_synthetic_management_gridsettings ?? _synthetic_management_grid,
_reconcile_report_grid = reconcile_report_grid ?? _reconcile_report_grid,
_fills_grid = fills ?? _fills_grid,
_day_fills_grid = day_fills ?? _day_fills_grid,
_synthetic_management = synthetic_management ?? _synthetic_management,
_reconcile_report = reconcile_report ?? _reconcile_report,
_pnl = pnl ?? _pnl,
_order_book_grid = order_book_grid ?? _order_book_grid,
_order_book = order_book_grid ?? _order_book,
_alerts = alerts ?? _alerts
};
us._last_ladder_profile_id = Math.Max(_last_ladder_profile_id, us.ladder_profiles.Select(p => p.id).MaxOrDefault());
@@ -130,9 +169,9 @@ namespace mbts.spark {
[ProtoContract]
class NotificationSettings {
[ProtoMember(1)]
readonly SoundNotificationSettings _sound_notification;
readonly SoundNotificationSettings? _sound_notification;
[ProtoMember(2)]
readonly ToastNotificationSettings _toast_notification;
readonly ToastNotificationSettings? _toast_notification;
public NotificationSettings() { }
public NotificationSettings(SoundNotificationSettings sound_notification, ToastNotificationSettings toast_notification) {
@@ -142,8 +181,8 @@ namespace mbts.spark {
public static NotificationSettings Default => new NotificationSettings(SoundNotificationSettings.Default, ToastNotificationSettings.Default);
public SoundNotificationSettings sound_notification => _sound_notification;
public ToastNotificationSettings toast_notification => _toast_notification;
public SoundNotificationSettings? sound_notification => _sound_notification;
public ToastNotificationSettings? toast_notification => _toast_notification;
}
[ProtoContract]
@@ -155,7 +194,7 @@ namespace mbts.spark {
public SoundNotificationSettings(bool enabled) =>
_enabled = enabled;
public static SoundNotificationSettings Default => new SoundNotificationSettings(true);
public static SoundNotificationSettings Default => new(true);
public bool enabled => _enabled;
}
@@ -172,16 +211,17 @@ namespace mbts.spark {
}
public static ToastNotificationSettings Default =>
new ToastNotificationSettings(Mode.Flash, new Duration { Seconds = 5 }, 320);
new(Mode.Flash, new Duration { Seconds = 5 }, 320);
[ProtoMember(1)]
readonly Mode _mode;
[ProtoMember(2)]
readonly Duration _duration;
readonly Duration? _duration;
[ProtoMember(3)]
readonly double _max_height;
public ToastNotificationSettings() { }
public ToastNotificationSettings(Mode mode, Duration duration, double max_height) {
_mode = mode;
_duration = duration;
@@ -189,7 +229,11 @@ namespace mbts.spark {
}
public Mode mode => _mode;
public TimeSpan? duration => _mode == Mode.Flash ? _duration?.ToTimeSpan() ?? TimeSpan.FromSeconds(5) : new TimeSpan?();
public TimeSpan duration =>
_mode switch {
Mode.Flash => _duration?.ToTimeSpan() ?? TimeSpan.FromSeconds(5),
_ => new()
};
public double max_height => _max_height;
}
}
@@ -1,4 +1,4 @@
using bts;
using bts;
using bts.settings;
using bts.shell.pnl;
using bts.utils;
@@ -25,10 +25,11 @@ namespace mbts.persist {
const string NAME_SPACE = "settings", DEFAULT_KEY = "default";
static readonly IImmutableProperty<UserSettings, GridSettings>
_fills_propi = ImmutableProperty.create<UserSettings, GridSettings>(us => us.fills_grid, (us, gs) => us.with(provided_fills_gridsettings: gs)),
_mview_propi = ImmutableProperty.create<UserSettings, GridSettings>(us => us.market_view_grid, (us, gs) => us.with(provided_market_view_gridsettings: gs)),
_synth_propi = ImmutableProperty.create<UserSettings, GridSettings>(us => us.synthetic_management_grid, (us, gs) => us.with(provided_synthetic_management_gridsettings: gs)),
_reconcile_report_propi = ImmutableProperty.create<UserSettings, GridSettings>(us => us.reconcile_report_grid, (us, gs) => us.with(reconcile_report_grid: gs));
_fills_propi = ImmutableProperty.create<UserSettings, GridSettings>(us => us.fills_grid, (us, gs) => us.with(fills: gs)),
_day_fills_propi = ImmutableProperty.create<UserSettings, GridSettings>(us => us.day_fills_grid, (us, gs) => us.with(day_fills: gs)),
_mview_propi = ImmutableProperty.create<UserSettings, GridSettings>(us => us.market_view_grid, (us, gs) => us.with(market_view: gs)),
_synth_propi = ImmutableProperty.create<UserSettings, GridSettings>(us => us.synthetic_management_grid, (us, gs) => us.with(synthetic_management: gs)),
_reconcile_report_propi = ImmutableProperty.create<UserSettings, GridSettings>(us => us.reconcile_report_grid, (us, gs) => us.with(reconcile_report: gs));
static readonly IImmutableProperty<UserSettings, PNLSettings>
_pnl_propi = ImmutableProperty.create<UserSettings, PNLSettings>(us => us.pnl, (us, pnl) => us.with(pnl: pnl));
@@ -36,6 +37,7 @@ namespace mbts.persist {
readonly object _default_settings_lock = new object();
readonly BehaviorSubject<UserSettings> _default_settings_subject = new BehaviorSubject<UserSettings>(UserSettings.factory_defaults);
readonly IEnumerable<IFillsGridSettingsMigrationRule> _fills_migration_rules;
readonly IEnumerable<IDayFillsGridSettingsMigrationRule> _day_fills_migration_rules;
readonly IEnumerable<IMarketViewGridSettingsMigrationRule> _mview_migration_rules;
readonly IEnumerable<IPNLSettingsMigrationRule> _pnl_migration_rules;
readonly IEnumerable<ISyntheticManagementMigrationRule> _synth_migration_rules;
@@ -48,6 +50,7 @@ namespace mbts.persist {
public UserSettingsHub(
IUserPersist persist,
[ImportMany] IEnumerable<IFillsGridSettingsMigrationRule> fills_migration_rules,
[ImportMany] IEnumerable<IDayFillsGridSettingsMigrationRule> day_fills_migration_rules,
[ImportMany] IEnumerable<IMarketViewGridSettingsMigrationRule> mview_migration_rules,
[ImportMany] IEnumerable<IPAndLGridSettingsMigrationRule> pandl_migration_rules,
[ImportMany] IEnumerable<IPNLSettingsMigrationRule> pnl_migration_rules,
@@ -56,6 +59,7 @@ namespace mbts.persist {
//
_persist = persist;
_fills_migration_rules = fills_migration_rules ?? Enumerable.Empty<IFillsGridSettingsMigrationRule>();
_day_fills_migration_rules = day_fills_migration_rules ?? Enumerable.Empty<IDayFillsGridSettingsMigrationRule>();
_mview_migration_rules = mview_migration_rules ?? Enumerable.Empty<IMarketViewGridSettingsMigrationRule>();
_pnl_migration_rules = pnl_migration_rules ?? Enumerable.Empty<IPNLSettingsMigrationRule>();
_synth_migration_rules = synth_migration_rules ?? Enumerable.Empty<ISyntheticManagementMigrationRule>();
@@ -152,6 +156,13 @@ namespace mbts.persist {
_reconcile_report_migration_rules,
_reconcile_report_propi);
public IWindowSettingsManager<GridSettings> create_day_fills_settings_manager(
GridSettings instance_settings) =>
_create_settings_manager(
instance_settings,
_day_fills_migration_rules,
_day_fills_propi);
public async Task save_default(UserSettings value) {
// notify observers before persisting so the changes are reflected immediately in the ui
lock (_default_settings_lock) {
@@ -0,0 +1,71 @@
#nullable enable
namespace mbts.ui.shell {
using ProtoBuf;
using Spark.Core.Protobuf;
using System;
using System.ComponentModel;
[ProtoContract]
public class WindowPosition : IProtobuf<WindowPosition> {
[ProtoMember(3)]
public int width { get; set; }
[ProtoMember(4)]
public int height { get; set; }
[ProtoMember(5)]
public int left { get; set; }
[ProtoMember(6)]
public int top { get; set; }
[ProtoMember(7)]
public bool is_maximized { get; set; }
[ProtoMember(8)]
public string? host_id { get; set; }
[ProtoMember(9)]
public int tab_index { get; set; }
[ProtoMember(100)]
public bool horizontal { get; set; }
[ProtoMember(101), DefaultValue(true)]
public bool show_text { get; set; } = true;
[ProtoMember(102), DefaultValue(true)]
public bool always_on_top { get; set; } = true;
[ProtoMember(104)]
public string? custom_title { get; set; }
public bool Equals(WindowPosition? other) =>
other is not null &&
width == other.width &&
height == other.height &&
left == other.left &&
top == other.top &&
is_maximized == other.is_maximized &&
host_id == other.host_id &&
tab_index == other.tab_index &&
horizontal == other.horizontal &&
show_text == other.show_text &&
always_on_top == other.always_on_top &&
custom_title == other.custom_title;
public override bool Equals(object? obj) =>
Equals(obj as WindowPosition);
public override int GetHashCode() =>
GetType().GetHashCode();
public WindowPosition Clone() =>
ProtobufSerializationHelper.clone(this);
object ICloneable.Clone() =>
Clone();
}
}
@@ -0,0 +1,45 @@
#nullable enable
namespace mbts.ui.shell {
using bts.utils;
using ProtoBuf;
using Spark.Core.Protobuf;
using System;
using System.Collections.Generic;
[ProtoContract]
public class WindowSettings : IProtobuf<WindowSettings> {
[ProtoMember(1)]
public string? owner { get; set; }
[ProtoMember(2)]
public byte[]? app_data { get; set; }
[ProtoMember(8)]
public WindowPosition? position { get; set; }
[ProtoMember(9)]
public string? title { get; set; }
public bool Equals(WindowSettings? other) =>
other is not null &&
owner == other.owner &&
app_data.safe_sequence_equals(other.app_data) &&
position.safe_equals(other.position) &&
title == other.title;
public override bool Equals(object? obj) =>
Equals(obj as WindowSettings);
public override int GetHashCode() =>
GetType().GetHashCode();
public WindowSettings Clone() =>
ProtobufSerializationHelper.clone(this);
object ICloneable.Clone() =>
Clone();
}
}
@@ -1,13 +1,12 @@
#nullable enable
namespace bts.api.position {
namespace Spark.Trading {
using bts;
using bts.api;
using bts.api.core;
using bts.api.orderman;
using bts.api.position;
using bts.shell.pnl;
using mbts.ui;
using Spark.Trading;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
@@ -17,10 +16,10 @@ namespace bts.api.position {
IObservable<TableUpdate<(SecurityImmutable?, PositionUnitImmutable), int>> on_positions { get; }
IObservable<TableUpdate<(SecurityImmutable? sec, RetrievedExchangePositionImmutable exch_pos), AccountSecurityKey>> on_exchange_positions { get; }
IObservable<TableUpdate<ReconcileReportRowData, AccountSecurityKey>> merged_positions { get; }
IObservable<TableUpdate<DayFillsRowData, DayFillsRowKey>> day_fills { get; }
// pnl
IObservable<TableUpdate<(SecurityImmutable?, PNLUnitImmutable, QuantityConversionData<double>), int>> on_pnl { get; }
IObservable<TableUpdate<PNLRowData, AccountSecurityKey>> security_account_pnl { get; }
IObservable<TableUpdate<PNLRowData, AccountSecurityKey>> pnl { get; }
IObservable<TableUpdate<(SecurityImmutable?, PositionUnitImmutable), int>> on_security_positions(
uint security_key);
+11 -24
View File
@@ -1,19 +1,22 @@
#nullable enable
namespace bts.api.position {
namespace Spark.Trading {
using bts;
using bts.api;
using bts.api.core;
using bts.api.orderman;
using bts.api.position;
using bts.collections;
using bts.shell.pnl;
using bts.spark;
using mbts;
using mbts.analytics;
using mbts.spark;
using mbts.ui;
using Spark.Core;
using Spark.Core.Reactive;
using Spark.Model.Trading;
using Spark.Trading;
using System;
using System.Collections.Generic;
@@ -64,27 +67,11 @@ namespace bts.api.position {
.Table()
.Cache();
on_pnl = admin_model
.permission_filter(
_position_service.subscribei_pnl_data().Naggle(interval, scheduler),
p => p.Pos.AccountId)
.join(security_store, p => p.Pos.SecurityId)
.Select(
tup => (tup.sec, tup.val, new QuantityConversionData<double>(
security_auxiliary_model.get_display_quantity_divisor(tup.sec),
QuantityConversionOpType.DivideActual)),
tup => tup.val.RecordId)
.TableCheckedAutoCorrect(
EqualityComparer<(SecurityImmutable?, PNLUnitImmutable, QuantityConversionData<double>)>.Default)
.Where(t => t.has_changes())
.Cache();
day_fills = DayFillsDataSource.create(bus, security_store);
// security account pnl
security_account_pnl = on_pnl
#if DEBUG
.AssertIncremental(p => new AccountSecurityKey(p.Item2.Pos.AccountId, p.Item2.Pos.SecurityId))
#endif
.SelectKeyValue(PNLRowDataFactory.create, PNLRowData.key_fn)
pnl = bus.subscribe(SparkTags.ReportBlackboardTags.PNL.PNLData)
.Select(d => d.position_data.ToDictionary(u => u.id(), PNLRowData.from_pnl_unit))
.Table(PNLRowData.key_fn)
.FullJoin(
order_data.working_account_security_orders,
PNLRowData.key_fn,
@@ -120,9 +107,9 @@ namespace bts.api.position {
public IObservable<TableUpdate<(SecurityImmutable? sec, RetrievedExchangePositionImmutable exch_pos), AccountSecurityKey>> on_exchange_positions { get; }
public IObservable<TableUpdate<(SecurityImmutable?, PositionUnitImmutable), int>> on_positions { get; }
public IObservable<TableUpdate<(SecurityImmutable?, PNLUnitImmutable, QuantityConversionData<double>), int>> on_pnl { get; }
public IObservable<TableUpdate<PNLRowData, AccountSecurityKey>> pnl { get; }
public IObservable<TableUpdate<ReconcileReportRowData, AccountSecurityKey>> merged_positions { get; }
public IObservable<TableUpdate<PNLRowData, AccountSecurityKey>> security_account_pnl { get; }
public IObservable<TableUpdate<DayFillsRowData, DayFillsRowKey>> day_fills { get; }
public IObservable<TableUpdate<(SecurityImmutable?, PositionUnitImmutable), int>> on_security_positions(uint security) =>
_security_positions_demuxer.subscribe(security);
@@ -1,5 +1,5 @@
#nullable enable
namespace bts.api.position {
namespace Spark.Trading {
using bts.api.core;
using Spark.Api.Position;
@@ -1,9 +1,11 @@
namespace mbts.spark {
using bts;
using bts.api;
using bts.api.analytics;
using bts.api.core;
using bts.collections;
using bts.shell;
using bts.shell.pnl;
using bts.spark;
using mbts.analytics;
@@ -12,7 +14,9 @@ namespace mbts.spark {
using mbts.ui.shell;
using mbts.ui.utility;
using Spark.Core.Data;
using Spark.Core.Reactive;
using Spark.Trading;
using Spark.ViewModel;
using System;
@@ -35,7 +39,13 @@ namespace mbts.spark {
[ImportingConstructor]
public AnalyticsShellModule(
IBus bus, WindowManager wm, UserSettingsHub settings_hub, OrdersModel orders_model) {
IBus bus,
WindowManager wm,
UserSettingsHub settings_hub,
OrdersModel orders_model,
IPositionModel position_model,
ISecurityMetadataStore sec_meta_store,
Lazy<UserTuple> user) {
_wm = wm;
_bus = bus;
var reports_demuxer = new TableUpdateDemuxer<ReportImmutable?, int>(default, false);
@@ -49,6 +59,10 @@ namespace mbts.spark {
new AnalyticsExpirationParametersWindowFactory(this, bus),
new SlideReportWindowFactory(this, bus, reports_demuxer.subscribe),
new ComboReportWindowFactory(this, bus, reports_demuxer.subscribe),
new PNLWindowFactory(
this, bus, settings_hub, orders_model, position_model, sec_meta_store),
new DayFillsWindowFactory(
this, bus, settings_hub, position_model, sec_meta_store, user.Value)
};
var vol_surfaces_src = _bus.subscribe(SparkTags.VolSurfaceListTag).OnDispatcher();
var reports_src = _bus.subscribe(SparkTags.ReportBlackboardTags.ListTag).OnDispatcher();
@@ -58,6 +72,8 @@ namespace mbts.spark {
nullable_reports_src.Subscribe(reports_demuxer),
reports_demuxer,
vm.launch_exp_params_view_cmd.subscribe_executed(_launch_exp_params_view),
vm.launch_pnl_cmd.subscribe_executed(_launch_pnl),
vm.launch_day_fills_cmd.subscribe_executed(_launch_day_fills),
// vol surface
vm.vol_surface_launcher_vm.launch_cmd.subscribe_executed(_launch_vol_surface),
vm.vol_surface_launcher_vm.create_cmd.subscribe_executed(_create_vol_surface),
@@ -114,6 +130,12 @@ namespace mbts.spark {
_bus.post(SparkTags.show_analytics_exp_params, settings);
}
void _launch_pnl() =>
_bus.post(SparkTags.ShowPNLTag, null);
void _launch_day_fills() =>
_bus.post(SparkTags.show_day_fills, DayFillsSettings.Default());
void _launch_vol_surface(int id) {
var windows = _wm.list_windows();
if (windows.OfType<VolSurfaceWindow>().TryGetFirst(w => w.vs_id == id, out var win)) {
@@ -180,7 +202,8 @@ namespace mbts.spark {
_bus.post(SparkTags.ShowSlideReportTag, SlideReportSettings.Default(id));
void _create_combo_report(string _) {
var vm = new ComboReportSettingsVM(_bus.subscribe(SparkTags.AccountsTag));
var vm = new ComboReportSettingsVM(
_bus.subscribe(SparkTags.AccountsTag), _bus.subscribe(SparkTags.SecuritiesTag));
vm.load_from(new(new Report { ReportType = Report.Types.ReportType.Slide }));
var win = new ComboReportCreationDialog() {
DataContext = vm
@@ -13,6 +13,10 @@ namespace mbts.spark {
public KeyValueLauncherVM<int, string> slide_report_launcher_vm { get; } = new() { type_name = "Slide Report" };
public KeyValueLauncherVM<int, string> combo_report_launcher_vm { get; } = new() { type_name = "Combo Report" };
// pnl
public EventCommand launch_pnl_cmd { get; } = new();
public EventCommand launch_day_fills_cmd { get; } = new();
public string? selected_window_type {
get => _selected_window_type;
set => Set(ref _selected_window_type, value);
@@ -3,9 +3,11 @@
x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:bshell="clr-namespace:bts.shell"
xmlns:u="clr-namespace:mbts.ui"
xmlns:c="clr-namespace:mbts.ui.controls"
xmlns:shell="clr-namespace:mbts.ui.shell"
xmlns:trading="clr-namespace:Spark.Trading"
x:Name="me"
Background="Transparent"
MinWidth="250"
@@ -17,23 +19,25 @@
<Setter Property="BorderThickness" Value="0" />
</Style>
<Style x:Key="LaunchButton" TargetType="Button" BasedOn="{StaticResource LargeMenuButton}">
<Setter Property="Height" Value="32" />
<Setter Property="MinWidth" Value="190" />
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="Padding" Value="16,6,6,6" />
</Style>
<DataTemplate x:Key="LaunchItemTemplate">
<Button
Height="32"
MinWidth="190"
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Padding="12,6,6,6"
Command="{Binding DataContext.launch_cmd, RelativeSource={RelativeSource AncestorType=ItemsControl}}"
CommandParameter="{Binding key}"
Style="{StaticResource LargeMenuButton}"
>
Style="{StaticResource LaunchButton}">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" SharedSizeGroup="Label"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Text="{Binding value}" VerticalAlignment="Center" Margin="4,0,7,0" />
<TextBlock Text="{Binding value}" VerticalAlignment="Center" Margin="0,0,7,0" />
<Button
Grid.Column="1"
HorizontalAlignment="Right"
@@ -93,6 +97,8 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Button
@@ -174,5 +180,32 @@
/>
</ContentControl>
<ToggleButton
Grid.Row="8"
c:RadioButtonGroupManager.Value="pnl"
c:RadioButtonGroupManager.Manager="{StaticResource WindowTypeRadioButtonGroupManager}"
Margin="0,6,0,0"
Content="P&amp;L Reports"
IsChecked="{Binding Path='(u:ExpandCollapseAnimator.IsExpanded)', ElementName=PNLContent, Mode=TwoWay}"
Style="{StaticResource LargeMenuToggleButton}" />
<ContentControl Grid.Row="9" Height="0">
<Grid x:Name="PNLContent">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Button
Content="{x:Static bshell:PNLWindow.WINDOW_TITLE}"
Command="{Binding launch_pnl_cmd}"
Style="{StaticResource LaunchButton}" />
<Button
Grid.Row="1"
Content="{x:Static trading:DayFillsWindow.WINDOW_TITLE}"
Command="{Binding launch_day_fills_cmd}"
Style="{StaticResource LaunchButton}" />
</Grid>
</ContentControl>
</Grid>
</UserControl>
@@ -25,6 +25,7 @@
VerticalAlignment="Stretch"
HorizontalAlignment="Stretch"
Margin="12,12,10,12"
MaxHeight="400"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
Grid.IsSharedSizeScope="True"
ItemsSource="{Binding columns}"
@@ -65,18 +65,15 @@
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<Grid
Grid.Row="2"
Background="{x:Static u:BTSColors.dialog_skirt_brush}">
<Grid Grid.Row="2" Background="{u:BTSBrush dialog_skirt}">
<Grid.ColumnDefinitions>
<!--PAD LEFT-->
<ColumnDefinition Width="12" />
<!--ADD ITEM BUTTON-->
<ColumnDefinition Width="Auto" />
<!--SPACING-->
<ColumnDefinition Width="8" />
<!--TIME PICKER-->
<ColumnDefinition Width="80" />
<ColumnDefinition Width="Auto" />
<!--PAD RIGHT-->
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
@@ -91,7 +88,6 @@
x:Name="time_picker"
Grid.Column="3"
Background="White"
Width="80"
TimeTuple="{Binding new_actual_time}"
KeyDown="time_picker_KeyDown">
<Validation.ErrorTemplate>
@@ -257,6 +257,9 @@
ContextMenuOpening="_on_context_menu_opening">
<c:DIYGrid.ContextMenu>
<ContextMenu>
<MenuItem
Header="Populate Empty Expirations"
Command="{Binding populate_empty_exps_cmd}" />
<MenuItem Header="Settings">
<MenuItem.Icon>
<Image
@@ -134,7 +134,14 @@
// don't initialize more than once
if (_time_editor_popup != null) return;
var adorner_layer = AdornerLayer.GetAdornerLayer(adorned_grid);
_time_editor_popup = new PopupAdorner(adorned_grid, vol_time_popup_button, _get_time_editor_control(), HorizontalPosition.Left, VerticalPosition.Top, 0.5 * ((ToggleButton)sender).ActualWidth, 0d) { IsHitTestVisible = true };
_time_editor_popup = new PopupAdorner(
adorned_grid,
vol_time_popup_button,
_get_time_editor_control(),
HorizontalPosition.Left,
VerticalPosition.Top,
44,
0d) { IsHitTestVisible = true };
_time_editor_popup.SetBinding(PopupAdorner.DataContextProperty, "globals");
_time_editor_popup.SetBinding(PopupAdorner.IsOpenProperty, new Binding("vol_time_popup_open") { Mode = BindingMode.TwoWay });
_time_editor_popup.Opened += _time_editor_popup_Opened;
@@ -46,7 +46,7 @@
var dummy_view = new Border {
Background = BTSColors.UI.default_background.to_brush().frozen(),
Padding = new(8),
Child = new TextBlock { Text = "Dummy Window" }
Child = new TextBlock { Text = "Loading ..." }
};
_dummy_view = dummy_view;
@@ -2,44 +2,46 @@
using System.Collections.Generic;
using System.Composition;
using System.Threading.Tasks;
namespace mbts.ui.shell {
public interface IBookmarks {
void save_bookmark(IShellWindow window);
void save_bookmark(WindowState window);
void remove(WindowState window);
Task save_bookmark(IShellWindow window);
void save_bookmark(WindowSettings window);
void remove(WindowSettings window);
void clear();
IEnumerable<WindowState> bookmarks { get; }
IEnumerable<WindowSettings> bookmarks { get; }
}
[Export(typeof(IBookmarks))]
public class BookmarksModel : IBookmarks {
readonly ISettingsCollector _settings_collector;
readonly Dictionary<string, WindowState> _bookmarks = new Dictionary<string, WindowState>();
readonly Dictionary<string, WindowSettings> _bookmarks = new();
[ImportingConstructor]
public BookmarksModel(ISettingsCollector settings) {
_settings_collector = settings;
}
public void save_bookmark(IShellWindow window) {
var state = _settings_collector.get_window_state(window);
public async Task save_bookmark(IShellWindow window) {
var state = await _settings_collector.get_window_state(window);
if (state != null) {
_bookmarks[state.title] = state;
}
}
public void save_bookmark(WindowState window) {
public void save_bookmark(WindowSettings window) =>
_bookmarks[window.title] = window;
}
public void clear() {
_bookmarks.Clear();
}
public void remove(WindowState window) {
public void remove(WindowSettings window) {
_bookmarks.Remove(window.title);
}
public IEnumerable<WindowState> bookmarks => _bookmarks.Values;
public IEnumerable<WindowSettings> bookmarks => _bookmarks.Values;
}
}
@@ -1,6 +1,5 @@
namespace bts.shell {
using bts.api;
using bts.api.position;
using bts.spark;
using mbts.co2;
@@ -9,6 +8,7 @@
using mbts.ui;
using Spark.Core.Data;
using Spark.Trading;
using System.Collections.Generic;
using System.Composition;
@@ -111,10 +111,10 @@ namespace mbts.spark {
new CellAnimation(Columns.Position, CellAnimation.Type.DownArrow, Brushes.Red),
new CellAnimation(Columns.DayChange, CellAnimation.Type.UpArrow, Brushes.Green),
new CellAnimation(Columns.DayChange, CellAnimation.Type.DownArrow, Brushes.Red),
new CellAnimation(Columns.WorkingBids, CellAnimation.Type.Border, BTSColors.warning_brush),
new CellAnimation(Columns.WorkingBids, CellAnimation.Type.Border, BTSColors.warning.to_brush()),
new CellAnimation(Columns.WorkingBids, CellAnimation.Type.Border, new SolidColorBrush(BTSColors.MarketData.bid)),
new CellAnimation(Columns.WorkingBids, CellAnimation.Type.Border, Brushes.Green),
new CellAnimation(Columns.WorkingAsks, CellAnimation.Type.Border, BTSColors.warning_brush),
new CellAnimation(Columns.WorkingAsks, CellAnimation.Type.Border, BTSColors.warning.to_brush()),
new CellAnimation(Columns.WorkingAsks, CellAnimation.Type.Border, new SolidColorBrush(BTSColors.MarketData.ask)),
new CellAnimation(Columns.WorkingAsks, CellAnimation.Type.Border, Brushes.Red));
private static readonly TimeSpan flash_duration = TimeSpan.FromSeconds(2);
@@ -15,6 +15,8 @@
using mbts.utils;
using Spark.Api.Position;
using Spark.Core;
using Spark.Trading;
using System;
using System.Collections.Generic;
@@ -32,7 +34,7 @@
readonly OrdersModel _orders_model;
readonly AnimationManager _animation = new();
readonly MyOrderSummarizer _order_summarizer;
readonly DeferrableActionWrapper _raise_invalidated;
readonly DeferrableAction _raise_invalidated;
readonly Property<double> _bid_price;
readonly Property<double> _ask_price;
@@ -317,7 +319,7 @@
IMDConsumerHandle _md => security_md.md;
public void raise_invalidated() =>
_raise_invalidated.execute();
_raise_invalidated.Invoke();
public void refresh() {
bool dirty = false;
@@ -36,7 +36,7 @@ namespace bts.shell.market_view {
}
public static GridSettings DefaultGridSettings =>
GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criteria, enable_background_color: true);
GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criteria);
public static fills.FillsSettings DefaultAuxiliaryFills {
get {
@@ -86,7 +86,7 @@ namespace bts.shell.market_view {
}
}
// and enable background color upgrade
return s.with(columns, enable_background_color: true);
return s.with(columns);
}
static class DefaultColumns {
@@ -102,8 +102,21 @@ namespace bts.shell.market_view {
public static GridColumnSettings bid_implied_size => _mk(Columns.BidImpliedQty, ColHeader.ImpliedQty, ColWidth.MergedQty, fg: BTSColors.MarketData.bid);
public static GridColumnSettings bid_direct_size => _mk(Columns.BidDirectQty, ColHeader.DirectQty, ColWidth.MergedQty, fg: BTSColors.MarketData.bid);
public static GridColumnSettings bid_merged_size => _mk(Columns.BidMergedQty, ColHeader.MergedQty, ColWidth.MergedQty, fg: BTSColors.MarketData.bid);
public static GridColumnSettings bid => _mk(Columns.Bid, ColHeader.Bid, ColWidth.MViewPrice, fg: BTSColors.header_text, bg: BTSColors.MarketData.bid);
public static GridColumnSettings ask => _mk(Columns.Ask, ColHeader.Ask, ColWidth.MViewPrice, fg: BTSColors.header_text, bg: BTSColors.MarketData.ask);
public static GridColumnSettings bid => _mk(
Columns.Bid,
ColHeader.Bid,
ColWidth.MViewPrice,
fg: BTSColors.header_text,
bg: BTSColors.MarketData.bid);
public static GridColumnSettings ask => _mk(
Columns.Ask,
ColHeader.Ask,
ColWidth.MViewPrice,
fg: BTSColors.header_text,
bg: BTSColors.MarketData.ask);
public static GridColumnSettings ask_merged_size => _mk(Columns.AskMergedQty, ColHeader.MergedQty, ColWidth.MergedQty, fg: BTSColors.MarketData.ask);
public static GridColumnSettings ask_direct_size => _mk(Columns.AskDirectQty, ColHeader.DirectQty, ColWidth.MergedQty, fg: BTSColors.MarketData.ask);
public static GridColumnSettings ask_implied_size => _mk(Columns.AskImpliedQty, ColHeader.ImpliedQty, ColWidth.MergedQty, fg: BTSColors.MarketData.ask);
@@ -137,8 +150,8 @@ namespace bts.shell.market_view {
}
public static IEnumerable<GridColumnSettings> all =>
ReflectionHelper.static_property_delegates_of_type<GridColumnSettings>(typeof(DefaultColumns))
.Select(g => g());
ReflectionHelper.static_property_getters<GridColumnSettings>(typeof(DefaultColumns))
.Select(pg => pg.get());
static GridColumnSettings _mk(Columns key, string display_name = null, double width = 80, bool is_visible = true, Color? fg = null, Color? bg = null, HorizontalAlignment h_align = HorizontalAlignment.Right) =>
new(col_id(key), display_name, is_visible, font_color_override: fg, width: width, horizontal_alignment: h_align, background_color_override: bg);
@@ -3,7 +3,6 @@ namespace mbts.spark {
using bts.api;
using bts.api.core;
using bts.api.orderman;
using bts.api.position;
using bts.collections;
using bts.shell.market_view;
using bts.utils;
@@ -18,8 +17,10 @@ namespace mbts.spark {
using mbts.ui.utility;
using mbts.utils;
using Spark.Core;
using Spark.Core.Data;
using Spark.Core.Reflection;
using Spark.Trading;
using System;
using System.Collections.Generic;
@@ -47,8 +48,8 @@ namespace mbts.spark {
/// Viewmodel class designed for <see cref="ui.spark.MarketViewView"/>
/// </summary>
partial class MarketViewVM : DisposableViewModelBase, IHandleRowSelection {
static readonly IReadOnlyList<Func<MarketViewVM, IDataGridColumnFilter<Row>>> _filter_getters =
ReflectionHelper.property_delegates_of_type<MarketViewVM, IDataGridColumnFilter<Row>>().ToReadOnlyList();
static readonly IEnumerable<Func<MarketViewVM, IDataGridColumnFilter<Row>>> _filter_getters =
ReflectionHelper.property_getters<MarketViewVM, IDataGridColumnFilter<Row>>().Cut2();
static readonly IComparer<SecurityMD> _sec_md_key_comparer = Comparer<uint>.Default.wrap(SecurityMD.key_fn);
static readonly IComparer<Row> _row_key_comparer = _sec_md_key_comparer.wrap<SecurityMD, Row>(r => r.security_md);
@@ -63,7 +64,7 @@ namespace mbts.spark {
readonly IList<SecurityMD> _wrapped_rows;
readonly ListCollectionView _rows_view;
readonly Property<Row> _current_row;
readonly DeferrableActionWrapper _refresh_filter;
readonly DeferrableAction _refresh_filter;
Func<Row, bool> _filter;
IComparer<Row> _comparer;
@@ -187,7 +188,7 @@ namespace mbts.spark {
// row vm filter
// Althoguh securities are filtered at the row 'model' level (SecurityMD), the column base filters have to be applied at the row vm level,
// because they access market data, which is polled periodically and cached in the row vm.
_refresh_filter = new DeferrableActionWrapper(() => _filter_changed?.Invoke());
_refresh_filter = new DeferrableAction(() => _filter_changed?.Invoke());
var row_filter_source = Observable.Create<Func<Row, bool>>(o => {
notify();
_filter_changed += notify;
@@ -196,7 +197,7 @@ namespace mbts.spark {
o.OnNext(get_filter_states().build_predicate());
});
foreach (var f in _all_filters) {
f.filter_changed += _refresh_filter.execute;
f.filter_changed += _refresh_filter.Invoke;
}
_dispose = Disposable.Create(
@@ -491,7 +492,7 @@ namespace mbts.spark {
_ => null
};
state.grid = GridSettingsHelper.hide_cols(state.grid, new[] { ui.spark.FillsView.Columns.Security });
var sec_keys = securities.Select(SecurityDataHelper.key_fn);
var sec_keys = securities.Select(SecurityImmutable.key_fn);
if (securities.All(s => s.ContractCase == Security.ContractOneofCase.Synthetic)) {
state.root_securities = sec_keys.ToArray();
} else {
@@ -506,7 +507,8 @@ namespace mbts.spark {
IEnumerable<SecurityImmutable> securities, ColKey column) {
var (title_desc, fg) = _orderbook_title(column);
var filters = new bts.shell.orderbook.FilterStates {
security_criteria = SecurityCriteria.from_keys(securities.Select(SecurityDataHelper.key_fn)),
security_criteria = SecurityCriteria.from_keys(
securities.Select(SecurityImmutable.key_fn)),
order_types = securities.All(s => s.ContractCase == Security.ContractOneofCase.Synthetic) ?
new[] { new AlgoID(CustomOrderDefinition.CustomOneofCase.Spreader) } :
AlgoID.exchange_algo_keys,
@@ -1,7 +1,6 @@
using bts;
using bts.api;
using bts.api.core;
using bts.api.position;
using bts.collections;
using bts.shell;
using bts.shell.fills;
@@ -17,6 +16,7 @@ using mbts.ui.utility;
using mbts.utils;
using Spark.Core.Data;
using Spark.Trading;
using System;
using System.Collections.Generic;
@@ -1,5 +1,4 @@
using bts.api;
using bts.api.position;
using bts.proto;
using bts.settings;
using bts.shell.market_view;
@@ -10,6 +9,7 @@ using mbts.ui;
using mbts.ui.settings;
using Spark.Core.Data;
using Spark.Trading;
using System;
using System.Composition;
@@ -83,18 +83,6 @@ namespace bts.shell {
}
}
[Export(typeof(IMarketViewGridSettingsMigrationRule))]
class InitBackgroundOverrideMigrationRule : IMarketViewGridSettingsMigrationRule {
public bool apply(GridSettings settings, out GridSettings new_settings) {
if (!settings.enable_background_color) {
new_settings = settings.with(enable_background_color: true);
return true;
}
new_settings = default;
return false;
}
}
[Export(typeof(IMarketViewGridSettingsMigrationRule))]
class EnsureSelectionHighlightTranslucency : IMarketViewGridSettingsMigrationRule {
public bool apply(GridSettings settings, out GridSettings new_settings) =>
@@ -132,8 +132,8 @@ namespace bts.shell.time_and_sales {
}
public static IEnumerable<GridColumnSettings> all =>
ReflectionHelper.static_property_delegates_of_type<GridColumnSettings>(typeof(DefaultColumns))
.Select(g => g());
ReflectionHelper.static_property_getters<GridColumnSettings>(typeof(DefaultColumns))
.Select(pg => pg.get());
static GridColumnSettings _mk_col(
ColKey key,
@@ -17,6 +17,7 @@
using mbts.user.settings;
using mbts.utils;
using Spark.Core;
using Spark.Core.Reflection;
using System;
@@ -46,7 +47,7 @@
readonly RowFactory _row_factory = new();
readonly LoggerContext _log;
readonly IWindowSettingsManager<GridSettings> _settings_manager;
readonly DeferrableActionWrapper
readonly DeferrableAction
_refresh_filter,
_refresh_sort,
_refresh_selected_rows;
@@ -96,9 +97,9 @@
delta_filter = new DoubleMinMax<TimeAndSalesRowVM>(r => r.display_delta, nameof(TimeAndSalesRowVM.display_delta));
// deferrable filter/sort refresh
_refresh_filter = new DeferrableActionWrapper(_refresh_filter_impl);
_refresh_sort = new DeferrableActionWrapper(_refresh_sort_impl);
_refresh_selected_rows = new DeferrableActionWrapper(() => selected_rows_changed?.Invoke(_selected_rows));
_refresh_filter = new DeferrableAction(_refresh_filter_impl);
_refresh_sort = new DeferrableAction(_refresh_sort_impl);
_refresh_selected_rows = new DeferrableAction(() => selected_rows_changed?.Invoke(_selected_rows));
// grid settings
grid_settings_manager = new SimpleGridSettingsManager<TimeAndSalesRowVM>(
@@ -131,11 +132,11 @@
// 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);
f.filter_changed += _refresh_filter.Invoke;
return Disposable.Create(() => f.filter_changed -= _refresh_filter.Invoke);
}));
_sort_manager.active_sorting_changed += _refresh_sort.execute;
resources.Add(Disposable.Create(() => _sort_manager.active_sorting_changed -= _refresh_sort.execute));
_sort_manager.active_sorting_changed += _refresh_sort.Invoke;
resources.Add(Disposable.Create(() => _sort_manager.active_sorting_changed -= _refresh_sort.Invoke));
_dispose = Disposable.Create(resources.ToArray());
static string fmt_sec(TimeAndSalesRowVM row) => row.security.ToString();
@@ -238,7 +239,7 @@
var sorted_rows = rows.ToArray();
var snapshot = _selected_rows;
Array.Sort(sorted_rows, _comparer_backing);
using (_refresh_selected_rows.defer_execution()) {
using (_refresh_selected_rows.defer()) {
for (int i = 0; i < sorted_rows.Length; i++) {
if (rows[i].row_key != sorted_rows[i].row_key)
rows[i] = sorted_rows[i];
@@ -281,15 +282,15 @@
}
IEnumerable<IDataGridColumnFilter<TimeAndSalesRowVM>> _filters =>
ReflectionHelper.property_delegates_of_type<TimeAndSalesVM, IDataGridColumnFilter<TimeAndSalesRowVM>>()
.Select(fn => fn(this));
ReflectionHelper.property_getters<TimeAndSalesVM, IDataGridColumnFilter<TimeAndSalesRowVM>>()
.Select(pg => pg.get(this));
public (TimeAndSalesFilterSettings filters, IReadOnlyList<SortingCriteria> sorting_criteria, GridSettings grid_settings) create() =>
(_get_filter_states(), _sorting_criteria, grid_settings_manager.create());
public void load(TimeAndSalesFilterSettings filters, IEnumerable<SortingCriteria> sorting_criteria, GridSettings grid_settings) {
using (_refresh_filter.defer_execution())
using (_refresh_sort.defer_execution()) {
using (_refresh_filter.defer())
using (_refresh_sort.defer()) {
_log.info($"begin load settings ({++_load_settings_count})...");
var timer = new Stopwatch();
timer.Start();
@@ -389,7 +390,7 @@
bd.removeRange(e.RemovedItems.OfType<TimeAndSalesRowVM>());
}
_selected_rows = bd.ToImmutable();
_refresh_selected_rows.execute();
_refresh_selected_rows.Invoke();
}
static IComparer<TimeAndSalesRowVM> _get_column_comparer(string column_name) =>
@@ -426,7 +426,7 @@
</c:ContractPickerPopup.Background>
<c:ContractPickerPopup.HeaderTemplate>
<DataTemplate>
<TextBlock Foreground="{x:Static u:BTSColors.header_text_brush}" Text="{Binding}"/>
<TextBlock Foreground="{u:BTSColor header_text}" Text="{Binding}" />
</DataTemplate>
</c:ContractPickerPopup.HeaderTemplate>
</c:ContractPickerPopup>
@@ -320,7 +320,14 @@ namespace mbts.ui.spark {
if (_vm.GetErrors(nameof(SyntheticEditorVM.tick_factors)).Cast<string>().Any())
this.draw_border(drawing_context, _tick_factors_picker.value, null, new Pen(Brushes.Red, 1));
string error_text = string.Join(", ", _vm.AllErrors);
this.draw_relative_text(RelativePosition.Below, error_text, drawing_context, _name_text_box.value, BTSColors.header_error_text_brush, 0, y_offset);
this.draw_relative_text(
RelativePosition.Below,
error_text,
drawing_context,
_name_text_box.value,
BTSColors.header_error_text.to_brush(),
0,
y_offset);
}
}
}
@@ -69,9 +69,9 @@ namespace bts.shell {
if (securities.Count == 1) {
var sec = securities.First();
switch (sec.ContractCase) {
case Security.ContractOneofCase.Future: _show_synthetic_create(new ContractLeg[] { SyntheticDataHelper.Defaults.ContractLeg(sec) }); break;
case Security.ContractOneofCase.Spread: _show_synthetic_create(sec.Spread.Legs.Select(l => l.CloneToMutable())); break;
case Security.ContractOneofCase.Synthetic: _show_synthetic_create(sec.Synthetic.Legs.Select(l => l.CloneToMutable())); break;
case api.Security.ContractOneofCase.Future: _show_synthetic_create(new ContractLeg[] { SyntheticDataHelper.Defaults.ContractLeg(sec) }); break;
case api.Security.ContractOneofCase.Spread: _show_synthetic_create(sec.Spread.Legs.Select(l => l.CloneToMutable())); break;
case api.Security.ContractOneofCase.Synthetic: _show_synthetic_create(sec.Synthetic.Legs.Select(l => l.CloneToMutable())); break;
default: Log.Ui.warn($"{GetType()} unable to process security: {sec}"); break;
}
} else
@@ -79,7 +79,7 @@ namespace bts.shell {
}
void _show_synthetic_strategy(SecurityImmutable security) {
if (security.ContractCase != Security.ContractOneofCase.Synthetic)
if (security.ContractCase != api.Security.ContractOneofCase.Synthetic)
Log.Ui.warn($"{GetType()} observed a non-synthetic-security posted on {nameof(SparkTags.ShowSyntheticStrategyTag)}: {security}");
else
_show_synthetic_strategy_async(security).ignore();
@@ -92,7 +92,7 @@ namespace bts.shell {
}
void _show_synthetic_clone((SecurityImmutable security, ExecutionStrategyImmutable strategy) args) {
if (args.security.ContractCase == Security.ContractOneofCase.Synthetic) {
if (args.security.ContractCase == api.Security.ContractOneofCase.Synthetic) {
var mutable_sec = args.security.CloneToMutable();
mutable_sec.Id = 0;
mutable_sec.Synthetic.Name = _get_clone_name(mutable_sec.Synthetic.Name);
@@ -103,10 +103,10 @@ namespace bts.shell {
void _show_synthetic_create(IEnumerable<ContractLeg> legs) {
var syn = SyntheticDataHelper.Defaults.SyntheticContract("Synthetic", legs);
var sec = new SecurityImmutable(new Security {
var sec = new SecurityImmutable(new api.Security {
Synthetic = syn,
Symbol = legs.FirstOrDefault()?.Security.Symbol ?? string.Empty,
ContractSpec = SecurityDataHelper.Defaults.ContractSpecification
ContractSpec = Security.Defaults.ContractSpecification
});
_show_synthetic_editor(new SyntheticEditorVM(_bus, _model.spreader, sec, new ExecutionStrategyImmutable(SyntheticDataHelper.Defaults.ExecutionStrategy(sec))));
}
@@ -0,0 +1,24 @@
namespace bts.shell {
using mbts.spark.filters;
using mbts.ui;
using ProtoBuf;
[ProtoContract]
class SyntheticManagementFilterSettings {
[ProtoMember(1)]
public string description;
[ProtoMember(2)]
public TimeFilterTuple create_time;
[ProtoMember(3)]
public string name;
[ProtoMember(4)]
public IntMinMaxState n_legs;
[ProtoMember(5)]
public UIntMinMaxState n_working_orders;
[ProtoMember(6)]
public string security_key;
[ProtoMember(7)]
public uint[] user;
}
}
@@ -0,0 +1,105 @@
namespace bts.shell {
using mbts.ui;
using mbts.ui.settings;
using ProtoBuf;
using System.Collections.Generic;
using Columns = mbts.ui.spark.SyntheticManagementView.Columns;
using ColHeaders = mbts.ui.controls.DIYGrid.DefaultColumnHeaders;
using ColWidths = mbts.ui.controls.DIYGrid.DefaultColumnWidths;
[ProtoContract]
class SyntheticManagementSettings {
public const int Version = 1;
[ProtoMember(1)]
public readonly List<SortingCriteria> sorting_criteria;
[ProtoMember(2)]
public readonly SyntheticManagementFilterSettings filters;
[ProtoMember(3)]
public readonly GridSettings grid;
[ProtoMember(4)]
public readonly SparkMenuDisplaySettings menu_display;
public SyntheticManagementSettings()
: this(new List<SortingCriteria>(), null, null) { }
public SyntheticManagementSettings(
List<SortingCriteria> sorting_criteria,
SyntheticManagementFilterSettings filters,
GridSettings grid = default)
: this(sorting_criteria, filters, grid, SparkMenuDisplaySettings.Default) { }
public SyntheticManagementSettings(
List<SortingCriteria> sorting_criteria,
SyntheticManagementFilterSettings filters,
GridSettings grid,
SparkMenuDisplaySettings menu_display) {
this.sorting_criteria = sorting_criteria;
this.filters = filters;
this.grid = grid;
this.menu_display = menu_display;
}
public SyntheticManagementSettings with(
List<SortingCriteria> sorting_criteria = null,
SyntheticManagementFilterSettings filters = null,
GridSettings grid = null,
SparkMenuDisplaySettings? menu_display = null) =>
new(
sorting_criteria ?? this.sorting_criteria,
filters ?? this.filters,
grid ?? this.grid,
menu_display ?? this.menu_display);
public static GridSettings default_grid_settings =>
GridSettings.Default.with(DefaultColumns.all, DefaultColumns.default_sorting_criteria);
public static string col_id(Columns col) =>
col.ToString();
static class DefaultColumns {
public static GridColumnSettings name =>
new(col_id(Columns.Name), ColHeaders.Name, width: ColWidths.Security);
public static GridColumnSettings description =>
new(col_id(Columns.Description), ColHeaders.Description, width: ColWidths.Description);
public static GridColumnSettings n_legs =>
new(col_id(Columns.n_legs), ColHeaders.N_Legs, width: ColWidths.N_Legs);
public static GridColumnSettings n_working_orders => new(
col_id(Columns.n_working_orders),
ColHeaders.N_Working_Orders,
width: ColWidths.N_Working_Orders);
public static GridColumnSettings security_key => new(
col_id(Columns.SecurityKey),
ColHeaders.SecurityKey,
is_visible: false,
width: ColWidths.SecurityKey);
public static GridColumnSettings user =>
new(col_id(Columns.User), ColHeaders.User, is_visible: false, width: ColWidths.User);
public static IEnumerable<SortingCriteria> default_sorting_criteria {
get {
yield return new SortingCriteria(name.id, true);
}
}
public static IEnumerable<GridColumnSettings> all {
get {
yield return name;
yield return description;
yield return n_legs;
yield return n_working_orders;
yield return security_key;
yield return user;
}
}
}
}
}
@@ -22,13 +22,13 @@ using System.Windows;
using static bts.shell.SyntheticManagementWindowFactory;
namespace mbts.spark {
class SyntheticManagementWindow : SparkWindow<StartupData>, ISharedWindow {
class SyntheticManagementWindow : SparkWindow<SyntheticManagementSettings>, ISharedWindow {
const string
_window_type = "SyntheticManagement",
_import_title = "Import Synthetics";
static readonly TimeSpan _import_op_sec_map_timeout = TimeSpan.FromSeconds(30);
SingleValuePump<SyntheticManagementDialogVM> _vm = new SingleValuePump<SyntheticManagementDialogVM>();
StartupData _state;
SyntheticManagementSettings _state;
OrdersModel _orders_model;
SyntheticManagementView _view;
SparkMenuDisplayVM _menu_display_vm;
@@ -36,7 +36,7 @@ namespace mbts.spark {
List<SparkCommand> _commands;
readonly IWindowSettingsManager<GridSettings> _settings_manager;
public SyntheticManagementWindow(SyntheticManagementWindowFactory factory, IBus bus, OrdersModel orders_model, StartupData state, IWindowSettingsManager<GridSettings> settings_manager)
public SyntheticManagementWindow(SyntheticManagementWindowFactory factory, IBus bus, OrdersModel orders_model, SyntheticManagementSettings state, IWindowSettingsManager<GridSettings> settings_manager)
: base("Synthetic Management", bus, factory, SparkCommands.ShowSyntheticManagement.icon) {
_orders_model = orders_model;
_state = state;
@@ -56,9 +56,9 @@ namespace mbts.spark {
public override string window_type => _window_type;
public override UIElement Content => _view;
public override IEnumerable<SparkCommand> Commands => _commands;
public override StartupData SaveState => _state = _vm.value.create().with(menu_display: _menu_display_vm.safe_create());
public override SyntheticManagementSettings SaveState => _state = _vm.value.create().with(menu_display: _menu_display_vm.safe_create());
public override double MinWidth =>
StartupData.DefaultGridSettings.columns.Sum(gcs => gcs.width)
SyntheticManagementSettings.default_grid_settings.columns.Sum(gcs => gcs.width)
+ SPARK_MENU_COLLAPSED_WIDTH
+ LAUNCHER_BUTTON_BORDER_WIDTH
+ EXTRA_FOR_NO_HORIZONTAL_SCROLLBAR_WIDTH;
@@ -82,7 +82,7 @@ namespace mbts.spark {
can_execute, select_security_id
), SparkCommand.create("Change", Icons.ModifySynthetic, SparkTags.ShowSyntheticStrategyTag).complete(
current_row_source,
r => r != null, r => r?.security ?? SecurityDataHelper.Defaults.SecurityImmutable
r => r != null, r => r?.security ?? Security.Defaults.SecurityImmutable
), SparkCommand.create("Clone", Icons.CloneSynthetic, SparkTags.ShowSyntheticCloneTag).complete(
current_row_connectable_builder.create(observe_row_strategy),
rs => rs.HasValue, select_row_strategy_tuple
@@ -133,7 +133,7 @@ namespace mbts.spark {
(SecurityImmutable, ExecutionStrategyImmutable) select_row_strategy_tuple(RowStrategy? rs) => rs.HasValue ? (rs.Value.security, rs.Value.strategy) : default;
bool can_execute(RowModificationParams? rmp) => rmp.HasValue && !rmp.Value.has_working_orders;
_vm.value = new SyntheticManagementDialogVM(_bus, _orders_model, _settings_manager, _state.sorting_criteria, _state.filters ?? new FilterStates());
_vm.value = new SyntheticManagementDialogVM(_bus, _orders_model, _settings_manager, _state.sorting_criteria, _state.filters ?? new SyntheticManagementFilterSettings());
if (_view == null) _view = new SyntheticManagementView { DataContext = _vm.value };
else _view.DataContext = _vm.value;
@@ -3,23 +3,18 @@ using bts.settings;
using mbts.persist;
using mbts.spark;
using mbts.spark.filters;
using mbts.ui;
using mbts.ui.settings;
using ProtoBuf;
using System;
using System.Collections.Generic;
using System.Composition;
using System.Reactive.Linq;
using System.Threading.Tasks;
using static mbts.ui.controls.DIYGrid;
using static mbts.ui.spark.SyntheticManagementView;
namespace bts.shell {
class SyntheticManagementWindowFactory : ShellWindowFactory<SyntheticManagementWindowFactory.StartupData> {
class SyntheticManagementWindowFactory : ShellWindowFactory<SyntheticManagementSettings> {
readonly IBus _bus;
readonly OrdersModel _orders_model;
readonly UserSettingsHub _settings_hub;
@@ -33,100 +28,20 @@ namespace bts.shell {
public static string col_id(Columns col) => col.ToString();
public override Task<IShellWindow> load(StartupData state) =>
public override Task<IShellWindow> load(SyntheticManagementSettings state) =>
Task.FromResult<IShellWindow>(_create(state));
public async void show(SparkTags.Nothing nothing) =>
_bus.post(SparkTags.ShowWindow, await load(new StartupData()));
_bus.post(SparkTags.ShowWindow, await load(new SyntheticManagementSettings()));
IShellWindow _create(StartupData state) =>
IShellWindow _create(SyntheticManagementSettings state) =>
new SyntheticManagementWindow(this, _bus, _orders_model, state, _settings_hub.create_synth_settings_manager(state.grid));
[ProtoContract]
public class StartupData {
public const int Version = 1;
[ProtoMember(1)]
public readonly List<SortingCriteria> sorting_criteria;
[ProtoMember(2)]
public readonly FilterStates filters;
[ProtoMember(3)]
public readonly GridSettings grid;
[ProtoMember(4)]
public readonly SparkMenuDisplaySettings menu_display;
public StartupData() : this(new List<SortingCriteria>(), null, null) { }
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.filters = filters;
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_criteria);
static class DefaultColumns {
public static GridColumnSettings name => new GridColumnSettings(col_id(Columns.Name), DefaultColumnHeaders.Name, width: DefaultColumnWidths.Security);
public static GridColumnSettings description => new GridColumnSettings(col_id(Columns.Description), DefaultColumnHeaders.Description, width: DefaultColumnWidths.Description);
public static GridColumnSettings n_legs => new GridColumnSettings(col_id(Columns.n_legs), DefaultColumnHeaders.N_Legs, width: DefaultColumnWidths.N_Legs);
public static GridColumnSettings n_working_orders => new GridColumnSettings(col_id(Columns.n_working_orders), DefaultColumnHeaders.N_Working_Orders, width: DefaultColumnWidths.N_Working_Orders);
public static GridColumnSettings security_key => new GridColumnSettings(col_id(Columns.SecurityKey), DefaultColumnHeaders.SecurityKey, is_visible: false, width: DefaultColumnWidths.SecurityKey);
public static GridColumnSettings user => new GridColumnSettings(col_id(Columns.User), DefaultColumnHeaders.User, is_visible: false, width: DefaultColumnWidths.User);
public static IEnumerable<SortingCriteria> default_sorting_criteria {
get {
yield return new SortingCriteria(name.id, true);
}
}
public static IEnumerable<GridColumnSettings> all {
get {
yield return name;
yield return description;
yield return n_legs;
yield return n_working_orders;
yield return security_key;
yield return user;
}
}
}
}
[ProtoContract]
public class FilterStates {
[ProtoMember(1)]
public string description;
[ProtoMember(2)]
public TimeFilterTuple create_time;
[ProtoMember(3)]
public string name;
[ProtoMember(4)]
public IntMinMaxState n_legs;
[ProtoMember(5)]
public UIntMinMaxState n_working_orders;
[ProtoMember(6)]
public string security_key;
[ProtoMember(7)]
public uint[] user;
}
// migration rules
[Export(typeof(ISyntheticManagementMigrationRule))]
class AddMissingColumnsMigrationRule : ISyntheticManagementMigrationRule {
public bool apply(GridSettings settings, out GridSettings new_settings) =>
settings.add_missing_columns(StartupData.DefaultGridSettings.columns, out new_settings);
settings.add_missing_columns(SyntheticManagementSettings.default_grid_settings.columns, out new_settings);
}
}
}
@@ -1,6 +1,7 @@
using bts;
using bts.api;
using bts.collections;
using bts.shell;
using bts.spark;
using bts.utils;
@@ -18,7 +19,6 @@ using System.Reactive.Linq;
using System.Windows.Data;
using System.Windows.Input;
using static bts.shell.SyntheticManagementWindowFactory;
using static mbts.ui.controls.DIYGrid;
using static mbts.ui.spark.SyntheticManagementView;
@@ -29,7 +29,7 @@ namespace mbts.spark {
readonly IWindowSettingsManager<GridSettings> _settings_manager;
public SyntheticManagementDialogVM(IBus bus, OrdersModel orders_model, IWindowSettingsManager<GridSettings> settings_manager) : this(bus, orders_model, settings_manager, null, null) { }
public SyntheticManagementDialogVM(IBus bus, OrdersModel orders_model, IWindowSettingsManager<GridSettings> settings_manager, IReadOnlyCollection<SortingCriteria> sorting, FilterStates filters)
public SyntheticManagementDialogVM(IBus bus, OrdersModel orders_model, IWindowSettingsManager<GridSettings> settings_manager, IReadOnlyCollection<SortingCriteria> sorting, SyntheticManagementFilterSettings filters)
: base(orders_model.spreader.synthetic_tuples.Select(t => t.state.Values), sorting) {
_bus = bus;
_orders_model = orders_model;
@@ -54,7 +54,7 @@ namespace mbts.spark {
Columns.n_working_orders,
n_working_orders_filter,
DataGridFilterKnownTemplates.UIntMinMax) {
id = col_id(Columns.n_working_orders),
id = SyntheticManagementSettings.col_id(Columns.n_working_orders),
CommandBinding = new Binding(nameof(Row.show_order_book)),
TextBinding = new Binding(nameof(Row.n_working_orders)),
Header = DefaultColumnHeaders.N_Working_Orders,
@@ -65,7 +65,7 @@ namespace mbts.spark {
//
void add_col(Columns col_key, string header, Func<Row, string> get_text, string prop, IDataGridColumnFilter filter, string filter_template, double width) =>
columns.Add(new RenderTextColumn<Row, Columns>(col_key, get_text, filter, filter_template) {
id = col_id(col_key),
id = SyntheticManagementSettings.col_id(col_key),
Header = header,
sort_member_path = prop,
Width = width
@@ -96,8 +96,8 @@ namespace mbts.spark {
public GridSettings get_grid_save_state() =>
_settings_manager.instance_settings == null ? null : grid_settings_manager.create();
public StartupData create() =>
new StartupData(rows_view.get_sorting_criteria(columns), _get_filter_states(), get_grid_save_state());
public SyntheticManagementSettings create() =>
new SyntheticManagementSettings(rows_view.get_sorting_criteria(columns), _get_filter_states(), get_grid_save_state());
protected override Row row_factory(SyntheticTuple row_model) =>
new Row(_bus, row_model, _orders_model);
@@ -105,8 +105,8 @@ namespace mbts.spark {
protected override void on_row_removed(Row row) =>
row.Dispose();
FilterStates _get_filter_states() =>
new FilterStates {
SyntheticManagementFilterSettings _get_filter_states() =>
new SyntheticManagementFilterSettings {
description = description_filter.get_state(),
create_time = create_time_filter.get_state(),
name = name_filter.get_state(),
@@ -1,25 +1,28 @@
using mbts.ui;
using mbts.ui.controls;
using System.Collections.Generic;
using System.Windows.Media;
namespace bts.shell {
public static class ActivityLogCategory {
public static ILogViewerCategory order = new LogViewerCategory("Order", BTSColors.Orders.sent_brush);
public static ILogViewerCategory fill = new LogViewerCategory("Fill", BTSColors.Orders.filled_dark_brush);
public static ILogViewerCategory cancel = new LogViewerCategory("Cancel", BTSColors.Orders.working_cancel_brush);
public static ILogViewerCategory modify = new LogViewerCategory("Modify", BTSColors.Orders.modified_brush);
public static ILogViewerCategory warn = new LogViewerCategory("Warn", Brushes.Gold);
public static IEnumerable<ILogViewerCategory> all_categories {
get {
yield return order;
yield return fill;
yield return cancel;
yield return modify;
yield return warn;
}
}
}
}
using mbts.ui;
using mbts.ui.controls;
using System.Collections.Generic;
using System.Windows.Media;
namespace bts.shell {
public static class ActivityLogCategory {
public static ILogViewerCategory order { get; } = _mk("Order", BTSColors.Orders.sent);
public static ILogViewerCategory fill { get; } = _mk("Fill", BTSColors.Orders.filled_dark);
public static ILogViewerCategory cancel { get; } = _mk("Cancel", BTSColors.Orders.working_cancel);
public static ILogViewerCategory modify { get; } = _mk("Modify", BTSColors.Orders.modified);
public static ILogViewerCategory warn { get; } = _mk("Warn", Colors.Gold);
public static IEnumerable<ILogViewerCategory> all_categories {
get {
yield return order;
yield return fill;
yield return cancel;
yield return modify;
yield return warn;
}
}
static ILogViewerCategory _mk(string name, Color color) =>
new LogViewerCategory(name, color.to_brush().frozen());
}
}
@@ -219,7 +219,14 @@
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Rectangle Grid.ColumnSpan="3" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Fill="{x:Static u:BTSColors.dialog_skirt_brush}" UseLayoutRounding="True"/>
<Rectangle
Grid.ColumnSpan="3"
VerticalAlignment="Stretch"
HorizontalAlignment="Stretch"
Fill="{u:BTSBrush dialog_skirt}"
UseLayoutRounding="True" />
<Button
x:Name="custom_badge_color_picker_button"
Background="{Binding selected_definition.badge_fill}"
@@ -12,6 +12,8 @@ using mbts.ui.shell;
using mbts.ui.utility;
using mbts.utils;
using Spark.Core;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
@@ -44,7 +46,7 @@ namespace mbts.spark {
readonly DelegateProperty<bool> _is_favorite, _is_dirty, _can_undo, _can_redo;
readonly Property<string> _name, _abbreviation;
readonly ObservableKeyedCollection<IAlgoVM, AlgoKey> _algo_roots = new ObservableKeyedCollection<IAlgoVM, AlgoKey>(vm => vm.id);
readonly DeferrableActionWrapper _refresh_on_local_changes;
readonly DeferrableAction _refresh_on_local_changes;
readonly EnumMaskInt32<AlgoEditingPermissions> _permissions_mask = new EnumMaskInt32<AlgoEditingPermissions>();
int? _favorite_index;
@@ -100,22 +102,22 @@ namespace mbts.spark {
_can_redo.Changed += on_can_redo_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 DeferrableAction(on_local_changed);
// load initial state
// visible_algo_root is selected_template.algo_root if user can add templates, otherwise algo_root
// - this behavior is configurable in 'AlgoStudioOptions' in UI.proto (01/28/2018)
resources.Add(_algo_root.observe_current(true).Subscribe(_visible_algo_root.set));
// set hooks/subscriptions
using (_refresh_on_local_changes.supress_execution()) {
using (_refresh_on_local_changes.supress()) {
resources.AddRange(
custom_badge_color.observe_nullable(true).Subscribe(v => Set(ref _badge_fill, (v ?? algo_root.safe_get_badge_color()).to_brush(), nameof(badge_fill))),
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.Invoke, 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.Abbreviation.GroupName, _abbreviation.observe_current(true).Select(a => string.IsNullOrEmpty(a) ? VisualStateNames.Abbreviation.Unpopulated : VisualStateNames.Abbreviation.Populated)),
_algo_root.observe_current(true).SubscribeEach(vm => {
if (vm != null) {
root_algo_color_item.assign_color(vm.meta.Color.argb_color());
return vm.subscribe_definition().Subscribe(_ => _refresh_on_local_changes.execute());
return vm.subscribe_definition().Subscribe(_ => _refresh_on_local_changes.Invoke());
}
return null;
}),
@@ -274,7 +276,7 @@ namespace mbts.spark {
public void undo() => _restore(_edit_stack.try_undo);
public void redo() => _restore(_edit_stack.try_redo);
public void load_committed() {
using (_refresh_on_local_changes.defer_execution())
using (_refresh_on_local_changes.defer())
_assign_from_data(_committed.Value);
_on_committed_changed();
}
@@ -324,7 +326,7 @@ namespace mbts.spark {
_assert_can_load(data.key);
if (algo_root != null)
_edit_stack.push_distinct(_version.value);
using (_refresh_on_local_changes.defer_execution())
using (_refresh_on_local_changes.defer())
_assign_from_data(data);
_on_committed_changed();
}
@@ -380,7 +382,7 @@ namespace mbts.spark {
OrderTypeVMFactory.create(AlgoData.from_custom_def(definition), is_expanded: true);
void _on_metadata(AlgoDefinitionMetadata metadata) {
using (_refresh_on_local_changes.supress_execution()) {
using (_refresh_on_local_changes.supress()) {
_abbreviation.set(metadata.abbreviation);
custom_badge_color.set_nullable(metadata.badge_color);
_version.increment_version();
@@ -403,7 +405,7 @@ namespace mbts.spark {
void _restore(TryGetValue<Snapshot> try_get_snapshot) {
while (try_get_snapshot(out Snapshot next_state)) {
if (!_version.value.Equals(next_state)) {
using (_refresh_on_local_changes.defer_execution()) {
using (_refresh_on_local_changes.defer()) {
_assign_from_data(next_state);
return;
}
@@ -63,7 +63,7 @@ namespace mbts.ui.spark {
if (pvm is IAlgoParamVM<QuantityMeasureImmutable?>) return QuantityMeasureTemplate;
if (pvm is IAlgoParamVM<ExecutionStrategy>) return ExecutionStrategyTemplate;
if (pvm is IAlgoParamVM<Google.Protobuf.WellKnownTypes.Timestamp>) return TimestampTemplate;
var targ = ReflectionHelper.GetGenericTypeArgs(pvm.GetType(), generic_algo_param_itype).FirstOrDefault();
var targ = ReflectionHelper.get_generic_type_args(pvm.GetType(), generic_algo_param_itype).FirstOrDefault();
if (targ != null) {
if (targ.IsEnum)
return EnumTemplate;
@@ -0,0 +1,55 @@
#nullable enable
namespace Spark.Trading {
using mbts.spark.filters;
using mbts.ui;
using mbts.ui.controls;
using System;
using System.Collections.Generic;
static class DayFillsColumn {
public static DayFillsColumn<TColFilter> create<TColFilter>(
DayFillsColumnType key,
IComparer<DayFillsRowData> comparer_model,
IDataGridColumnPersistentFilter<DayFillsRowData, TColFilter> filter_model,
string filter_template) {
var (get_filter, set_filter) =
DIYGridFilterModel.get_filter_prop_delegates<DayFillsFilterSettings, TColFilter>(key.ToString());
return create(key, comparer_model, filter_model, get_filter, set_filter, filter_template);
}
public static DayFillsColumn<TColFilter> create<TColFilter>(
DayFillsColumnType key,
IComparer<DayFillsRowData> comparer_model,
IDataGridColumnPersistentFilter<DayFillsRowData, TColFilter> filter_model,
Func<DayFillsFilterSettings, TColFilter> get_col_filter,
Action<DayFillsFilterSettings, TColFilter> set_col_filter,
string filter_template) =>
new(key, comparer_model, filter_model, get_col_filter, set_col_filter, filter_template);
}
class DayFillsColumn<TColFilter> : DIYGridColumnModel<DayFillsColumnType, DayFillsRowData, DayFillsFilterSettings>, IDayFillsColumn, DIYGrid.IFilterableColumn {
public DayFillsColumn(
DayFillsColumnType key,
IComparer<DayFillsRowData> comparer_model,
IDataGridColumnPersistentFilter<DayFillsRowData, TColFilter> filter_model,
Func<DayFillsFilterSettings, TColFilter> get_col_filter,
Action<DayFillsFilterSettings, TColFilter> set_col_filter,
string filter_template) : base(
key,
comparer_model,
filter_model,
filter_template,
f => get_col_filter(f),
(f, cf_obj) => {
if (cf_obj is TColFilter cf) {
set_col_filter(f, cf);
}
return f;
}) { }
IDataGridColumnFilter<DayFillsRowData> IFilterableDIYGridColumn<DayFillsRowData, DayFillsColumnType>.filter_model => filter_model;
IDataGridColumnFilter IFilterableDIYGridColumn.filter_model => filter_model;
IDataGridColumnFilter DIYGrid.IFilterableColumn.filter_model => filter_model;
}
}
@@ -0,0 +1,33 @@
namespace Spark.Trading {
enum DayFillsColumnType {
FillTime,
User,
Account,
Exchange,
Security,
Symbol,
Side,
Quantity,
Price,
Bid,
Ask,
Driver,
Theo,
PNL,
PositionDelta,
PositionGamma,
PositionVega,
PositionTheta,
PositionOptionEquivalent,
FillKind,
FillStatus,
SecurityKey,
OrderKey,
FillKey
}
static class DayFillsColumnTypeExtensions {
public static string col_id(this DayFillsColumnType col) =>
col.ToString();
}
}
@@ -0,0 +1,48 @@
#nullable enable
namespace Spark.Trading {
using bts;
using bts.api;
using bts.api.core;
using mbts.analytics;
using mbts.spark;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reactive.Linq;
class DayFillsDataSource {
public static IObservable<TableUpdate<DayFillsRowData, DayFillsRowKey>> create(
IBus bus, SecurityStore sec_store) {
var users = bus.subscribe(SparkTags.Users);
var inverse_users = users
.Select(d => d.ToDictionary(kv => kv.Value.name, kv => kv.Value))
.Table(u => u.name);
var pnl_data_source = bus.subscribe(SparkTags.ReportBlackboardTags.PNL.PNLData);
return create(pnl_data_source, inverse_users, sec_store);
}
public static IObservable<TableUpdate<DayFillsRowData, DayFillsRowKey>> create(
IObservable<PNLData> pnl_data_source,
IObservable<TableUpdate<UserTuple, string>> inverse_users,
SecurityStore sec_store) =>
// join pnl data w/ security and user
pnl_data_source
.Select(d => d.day_trades
.Select(DayFillsRowData.from_trade)
.ToDictionary(DayFillsRowData.key_fn))
.Table(DayFillsRowData.key_fn)
.join_table(sec_store, rd => rd.security_key)
.Select(tup => new DayFillsRowData(tup.val.trade, tup.sec), DayFillsRowData.key_fn)
.LeftJoin(
inverse_users,
DayFillsRowData.key_fn,
user => user.name,
row_data => row_data.user_name,
(row_data, row_key, user, user_name) => new DayFillsRowData(
row_data.trade, row_data.security, user.id),
(row_data, row_key, user_name) => row_data,
DayFillsRowData.key_fn);
}
}
@@ -0,0 +1,184 @@
#nullable enable
namespace Spark.Trading {
using bts.api;
using bts.api.orderman;
using bts.utils;
using mbts.spark.filters;
using mbts.ui;
using mbts.ui.controls;
using ProtoBuf;
using Spark.Core.Protobuf;
using System;
using System.Collections.Generic;
[ProtoContract]
class DayFillsFilterSettings : IProtobuf<DayFillsFilterSettings>{
[ProtoMember(1)]
[DIYGridColumnID(nameof(DayFillsColumnType.FillTime))]
public TimeFilterTuple? fill_time { get; set; }
[ProtoMember(2)]
[DIYGridColumnID(nameof(DayFillsColumnType.User))]
public uint[]? user { get; set; }
[ProtoMember(3)]
[DIYGridColumnID(nameof(DayFillsColumnType.Account))]
public uint[]? account { get; set; }
[ProtoMember(4)]
[DIYGridColumnID(nameof(DayFillsColumnType.Exchange))]
public Venue[]? exchange { get; set; }
[ProtoMember(5)]
[DIYGridColumnID(nameof(DayFillsColumnType.Security))]
public string? security { get; set; }
[ProtoMember(6)]
[DIYGridColumnID(nameof(DayFillsColumnType.Symbol))]
public string[]? symbol { get; set; }
[ProtoMember(7)]
[DIYGridColumnID(nameof(DayFillsColumnType.Side))]
public Side[]? side { get; set; }
[ProtoMember(8)]
[DIYGridColumnID(nameof(DayFillsColumnType.Quantity))]
public DoubleMinMaxState? quantity { get; set; }
[ProtoMember(9)]
[DIYGridColumnID(nameof(DayFillsColumnType.Price))]
public DoubleMinMaxState? price { get; set; }
[ProtoMember(10)]
[DIYGridColumnID(nameof(DayFillsColumnType.Bid))]
public DoubleMinMaxState? bid { get; set; }
[ProtoMember(11)]
[DIYGridColumnID(nameof(DayFillsColumnType.Ask))]
public DoubleMinMaxState? ask { get; set; }
[ProtoMember(12)]
[DIYGridColumnID(nameof(DayFillsColumnType.Driver))]
public DoubleMinMaxState? driver { get; set; }
[ProtoMember(13)]
[DIYGridColumnID(nameof(DayFillsColumnType.Theo))]
public DoubleMinMaxState? theo { get; set; }
[ProtoMember(14)]
[DIYGridColumnID(nameof(DayFillsColumnType.PNL))]
public DoubleMinMaxState? pnl { get; set; }
[ProtoMember(15)]
[DIYGridColumnID(nameof(DayFillsColumnType.PositionDelta))]
public DoubleMinMaxState? pos_delta { get; set; }
[ProtoMember(16)]
[DIYGridColumnID(nameof(DayFillsColumnType.PositionGamma))]
public DoubleMinMaxState? pos_gamma { get; set; }
[ProtoMember(17)]
[DIYGridColumnID(nameof(DayFillsColumnType.PositionVega))]
public DoubleMinMaxState? pos_vega { get; set; }
[ProtoMember(18)]
[DIYGridColumnID(nameof(DayFillsColumnType.PositionTheta))]
public DoubleMinMaxState? pos_theta { get; set; }
[ProtoMember(19)]
[DIYGridColumnID(nameof(DayFillsColumnType.PositionOptionEquivalent))]
public DoubleMinMaxState? pos_oev { get; set; }
[ProtoMember(20)]
[DIYGridColumnID(nameof(DayFillsColumnType.FillKind))]
public Fill.Types.FillKind[]? fill_kind { get; set; }
[ProtoMember(21)]
[DIYGridColumnID(nameof(DayFillsColumnType.FillStatus))]
public Fill.Types.FillStatus[]? fill_status { get; set; }
[ProtoMember(22)]
[DIYGridColumnID(nameof(DayFillsColumnType.SecurityKey))]
public string? security_key { get; set; }
[ProtoMember(23)]
[DIYGridColumnID(nameof(DayFillsColumnType.OrderKey))]
public string? order_key { get; set; }
[ProtoMember(24)]
[DIYGridColumnID(nameof(DayFillsColumnType.FillKey))]
public string? fill_key { get; set; }
public Func<DayFillsRowData, bool> build_predicate() {
var pb = new ColumnPredicateBuilder<DayFillsRowData>();
pb.add_time_filter(fill_time ?? TimeFilterTuple.empty, r => r.fill_time);
pb.add_discrete_values(user.empty_if_null(), r => r.user_id);
pb.add_discrete_values(account.empty_if_null(), r => r.account_id);
pb.add_discrete_values(exchange.empty_if_null(), r => r.exchange);
pb.add_regex(security, r => r.security.ToString());
pb.add_discrete_values(symbol, r => r.symbol);
pb.add_discrete_values(side, r => r.side);
pb.add_numeric(quantity, r => r.quantity);
pb.add_numeric(price, r => r.price);
pb.add_numeric(bid, r => r.bid);
pb.add_numeric(ask, r => r.ask);
pb.add_numeric(driver, r => r.driver);
pb.add_numeric(theo, r => r.theo);
pb.add_numeric(pnl, r => r.pnl);
pb.add_numeric(pos_delta, r => r.pos_delta);
pb.add_numeric(pos_gamma, r => r.pos_gamma);
pb.add_numeric(pos_vega, r => r.pos_vega);
pb.add_numeric(pos_theta, r => r.pos_theta);
pb.add_numeric(pos_oev, r => r.pos_oev);
pb.add_discrete_values(fill_kind, r => r.fill_kind);
pb.add_discrete_values(fill_status, r => r.fill_status);
pb.add_regex(security_key, r => r.security_key);
pb.add_regex(order_key, r => r.order_key);
pb.add_regex(fill_key, r => r.fill_key);
return pb.to_predicate();
}
public DayFillsFilterSettings Clone() =>
ProtobufSerializationHelper.clone(this);
public bool Equals(DayFillsFilterSettings? other) =>
other is not null &&
EqualityComparer.nullable_equals(fill_time, other.fill_time) &&
user.safe_sequence_equals(other.user) &&
account.safe_sequence_equals(other.account) &&
exchange.safe_sequence_equals(other.exchange) &&
security == other.security &&
symbol.safe_sequence_equals(other.symbol) &&
side.safe_sequence_equals(other.side) &&
quantity.safe_equals(other.quantity) &&
price.safe_equals(other.price) &&
bid.safe_equals(other.bid) &&
ask.safe_equals(other.ask) &&
driver.safe_equals(other.driver) &&
theo.safe_equals(other.theo) &&
pnl.safe_equals(other.pnl) &&
pos_delta.safe_equals(other.pos_delta) &&
pos_gamma.safe_equals(other.pos_gamma) &&
pos_vega.safe_equals(other.pos_vega) &&
pos_theta.safe_equals(other.pos_theta) &&
pos_oev.safe_equals(other.pos_oev) &&
fill_kind.safe_sequence_equals(other.fill_kind) &&
fill_status.safe_sequence_equals(other.fill_status) &&
security_key == other.security_key &&
order_key == other.order_key &&
fill_key == other.fill_key;
public override bool Equals(object? obj) =>
Equals(obj as DayFillsFilterSettings);
public override int GetHashCode() =>
GetType().GetHashCode();
object ICloneable.Clone() =>
Clone();
}
}
@@ -0,0 +1,12 @@
#nullable enable
namespace Spark.Trading {
using System;
[Flags]
enum DayFillsMatchType {
None = 0,
Quantity = 1,
Price = 1 << 1
}
}
@@ -0,0 +1,26 @@
#nullable enable
namespace Spark.Trading {
using bts;
using bts.api.core;
using System;
using System.Collections.Generic;
using RowData = DayFillsRowData;
using RowKey = DayFillsRowKey;
class DayFillsModel {
public DayFillsModel(
IObservable<TableUpdate<RowData, RowKey>> day_fills,
IObservable<IReadOnlyDictionary<uint, AccountTuple>> accounts,
IObservable<IReadOnlyDictionary<uint, UserTuple>> users) {
this.day_fills = day_fills;
this.accounts = accounts;
this.users = users;
}
public IObservable<TableUpdate<RowData, RowKey>> day_fills { get; }
public IObservable<IReadOnlyDictionary<uint, AccountTuple>> accounts { get; }
public IObservable<IReadOnlyDictionary<uint, UserTuple>> users { get; }
}
}
@@ -0,0 +1,102 @@
#nullable enable
namespace Spark.Trading {
using bts;
using bts.api;
using bts.api.orderman;
using bts.utils;
using mbts;
using mbts.analytics;
using mbts.spark;
using System;
readonly struct DayFillsRowData : IEquatable<DayFillsRowData> {
public DayFillsRowData(
IPNLTradeRow trade, SecurityImmutable? security = null, uint user_id = 0) {
this.trade = trade;
this.security = security;
this.user_id = user_id;
}
public static Func<DayFillsRowData, DayFillsRowKey> key_fn => rd => rd.row_key;
public DayFillsRowKey row_key => new(fill_key);
public IPNLTradeRow trade { get; }
// user
public UserTuple user => new(user_id, user_name);
public uint user_id { get; }
public string user_name => trade.tl_row.user;
// account
public AccountTuple account => new(account_id, account_name);
public uint account_id => trade.tl_row.account_id;
public string account_name => trade.tl_row.account;
// security
public SecurityImmutable? security { get; }
public uint security_key => trade.tl_row.security_key;
public Venue exchange =>
trade.tl_row.security_expiration?.exchange ?? Venue.Unset;
public string? symbol => security?.Symbol;
// order
public int order_key => trade.tl_row.order_key;
public Side side => trade.tl_row.size switch {
> 0 => Side.Buy,
< 0 => Side.Sell,
_ => Side.Undefined
};
// fill
public string fill_key => trade.tl_row.key;
public DateTime fill_time => trade.tl_row.time_entered.ToLocalTime();
public Fill.Types.FillKind fill_kind => trade.tl_row.fill_kind;
public Fill.Types.FillStatus fill_status => trade.tl_row.fill_status;
public double quantity => trade.tl_row.size;
public double price => trade.tl_row.price;
// market
public double bid => trade.top_of_book.bid;
public double ask => trade.top_of_book.ask;
public double driver => trade.driver;
// theos/greeks
public double theo => trade.theo;
public double pnl => trade.pnl;
public double pos_delta => trade.pos_delta;
public double pos_gamma => trade.pos_gamma;
public double pos_vega => trade.pos_vega;
public double pos_theta => trade.pos_theta;
public double pos_oev => trade.pos_oev;
public bts.api.domain.TickDisplaySettingsImmutable price_display(
bts.api.domain.SecurityMetadataItemImmutable? meta = null) {
var rv = meta.HasValue && meta.Value.HasValue && meta.Value.Value.HasPriceDisplay ?
meta.Value.Value.PriceDisplay : Security.Defaults.price_display_settingsi;
if (security.HasValue) {
rv = rv.with(
tick_factors: security.spec_or_default().tick_factors().to_api_tick_factors());
}
return rv;
}
public static DayFillsRowData from_trade(IPNLTradeRow trade) =>
new(trade);
public DayFillsRowData with(Optional<SecurityImmutable?> security, uint? user_id = null) =>
new(trade, security.value_or(this.security), user_id ?? this.user_id);
public bool Equals(DayFillsRowData other) =>
Equals(trade, other.trade) &&
EqualityComparer.nullable_equals(security, other.security) &&
user == other.user;
public override bool Equals(object? obj) =>
obj is DayFillsRowData other && Equals(other);
public override int GetHashCode() =>
HashCode.Combine(trade);
}
}
@@ -0,0 +1,34 @@
#nullable enable
namespace Spark.Trading {
using System;
readonly struct DayFillsRowKey : IEquatable<DayFillsRowKey>, IComparable<DayFillsRowKey> {
readonly string _value;
public DayFillsRowKey(string value) =>
_value = value ?? throw new ArgumentNullException(nameof(value));
public string value => _value ?? string.Empty;
public int CompareTo(DayFillsRowKey other) =>
value.CompareTo(other.value);
public bool Equals(DayFillsRowKey other) =>
value == other.value;
public override bool Equals(object? obj) =>
obj is DayFillsRowKey other && Equals(other);
public override int GetHashCode() =>
value?.GetHashCode() ?? 0;
public override string ToString() =>
value.ToString();
public static bool operator ==(DayFillsRowKey l, DayFillsRowKey r) =>
l.Equals(r);
public static bool operator !=(DayFillsRowKey l, DayFillsRowKey r) =>
!(l == r);
}
}
@@ -0,0 +1,114 @@
#nullable enable
namespace Spark.Trading {
using bts;
using bts.api;
using bts.utils;
using mbts;
using mbts.ui.controls;
using mbts.ui.shell;
using System;
using System.Collections.Generic;
using TickDisplaySettingsImmutable = bts.api.domain.TickDisplaySettingsImmutable;
class DayFillsRowVM : DisposableViewModelBase, DIYGrid.IRowVM, IEquatable<DayFillsRowVM> {
// guarentees deterministic sorting if the rows in the collection have unique row_keys
public static readonly IComparer<DayFillsRowVM> key_comparer =
Comparer<DayFillsRowKey>.Default.wrap<DayFillsRowKey, DayFillsRowVM>(r => r.row_key)
.to_safe();
DayFillsRowData _data;
// display
TickDisplaySettingsImmutable _quantity_display = Security.Defaults.quantity_display_settingsi;
TickDisplaySettingsImmutable _theo_display = Security.Defaults.price_display_settingsi
.with(tick_factors: new() {
TickBase = 10000,
TickUnit = 1
});
public DayFillsRowVM(DayFillsRowData data) =>
_data = data;
public event Action? invalidated;
public DayFillsRowData data {
get => _data;
set {
using var _ = detect_property_changes();
_data = value;
}
}
public DayFillsRowKey row_key => _data.row_key;
public UserTuple user => _data.user;
public AccountTuple account => _data.account;
// security
public SecurityImmutable? security => _data.security;
public uint security_key => _data.security_key;
public Venue exchange => _data.exchange;
public string? symbol => _data.symbol;
// order
public int order_key => _data.order_key;
public Side side => _data.side;
public string fill_key => _data.fill_key;
public DateTime fill_time => _data.fill_time;
public bts.api.orderman.Fill.Types.FillKind fill_kind => _data.fill_kind;
public bts.api.orderman.Fill.Types.FillStatus fill_status => _data.fill_status;
public double quantity => _data.quantity;
public double price => _data.price;
// market
public double bid => _data.bid;
public double ask => _data.ask;
public double driver => _data.driver;
// theos/greeks
public double theo => _data.theo;
public double pnl => _data.pnl;
public double pos_delta => _data.pos_delta;
public double pos_gamma => _data.pos_gamma;
public double pos_vega => _data.pos_vega;
public double pos_theta => _data.pos_theta;
public double pos_oev => _data.pos_oev;
// display
public TickDisplaySettingsImmutable quantity_display {
get => _quantity_display;
set => Set(ref _quantity_display, value);
}
public TickDisplaySettingsImmutable price_display => _data.price_display();
public TickDisplaySettingsImmutable driver_display =>
(security?.ContractCase ?? Security.ContractOneofCase.None) switch {
Security.ContractOneofCase.Future => price_display,
_ => Security.Defaults.price_display_settingsi.with(tick_factors: new() {
TickBase = 10000,
TickUnit = 1
})
};
public TickDisplaySettingsImmutable theo_display {
get => _theo_display;
set => Set(ref _theo_display, value);
}
public void raise_invalidated() =>
invalidated?.Invoke();
public bool Equals(DayFillsRowVM? other) =>
order_key == other?.order_key;
public override bool Equals(object? obj) =>
Equals(obj as DayFillsRowVM);
public override int GetHashCode() =>
order_key.GetHashCode();
}
}
@@ -0,0 +1,201 @@
#nullable enable
namespace Spark.Trading {
using bts.shell;
using bts.utils;
using mbts.ui;
using mbts.ui.settings;
using ProtoBuf;
using Spark.Core.Protobuf;
using Spark.Core.Reflection;
using System;
using System.Collections.Generic;
using ColKey = DayFillsColumnType;
using ColHeader = mbts.ui.controls.DIYGrid.DefaultColumnHeaders;
using ColWidth = mbts.ui.controls.DIYGrid.DefaultColumnWidths;
using System.Windows;
using System.Linq;
using System.Windows.Media;
using bts.collections;
[ProtoContract]
class DayFillsSettings : IProtobuf<DayFillsSettings> {
public const int VERSION = 1;
[ProtoMember(1)]
List<SortingCriteria>? _sorting_criteria;
public IList<SortingCriteria> sorting_criteria =>
_sorting_criteria ??= new(1);
[ProtoMember(2)]
public GridSettings? grid { get; set; }
[ProtoMember(3)]
public DayFillsFilterSettings? filter { get; set; }
[ProtoMember(4)]
public SparkMenuDisplaySettings menu_display { get; set; } = SparkMenuDisplaySettings.Default;
public static DayFillsSettings Default() {
var rv = new DayFillsSettings() {
filter = new()
};
rv.sorting_criteria.AddRange(DefaultColumns.default_sorting_criteria);
rv.grid = default_grid();
return rv;
}
public static GridSettings default_grid() =>
GridSettings.Default.with(columns: DefaultColumns.all);
public bool Equals(DayFillsSettings? other) =>
other is not null &&
grid.safe_equals(other.grid) &&
sorting_criteria.safe_sequence_equals(other.sorting_criteria) &&
filter.safe_equals(other.filter) &&
menu_display.Equals(other.menu_display);
public override bool Equals(object? obj) =>
Equals(obj as DayFillsSettings);
public override int GetHashCode() =>
GetType().GetHashCode();
public DayFillsSettings Clone() =>
ProtobufSerializationHelper.clone(this);
object ICloneable.Clone() =>
Clone();
static class DefaultColumns {
public static GridColumnSettings fill_time => _mk(
ColKey.FillTime, ColHeader.FillTime, ColWidth.Time);
public static GridColumnSettings user => _mk(
ColKey.User, ColHeader.User, ColWidth.User, false);
public static GridColumnSettings account => _mk(
ColKey.Account, ColHeader.Account, ColWidth.Account);
public static GridColumnSettings exchange => _mk(
ColKey.Exchange, ColHeader.Exchange, ColWidth.Exchange);
public static GridColumnSettings security => _mk(
ColKey.Security, ColHeader.Security, ColWidth.Security);
public static GridColumnSettings symbol => _mk(
ColKey.Symbol, ColHeader.Symbol, ColWidth.Symbol);
public static GridColumnSettings side => _mk(
ColKey.Side, ColHeader.Side, ColWidth.Side, false, fw: FontWeights.Bold);
public static GridColumnSettings quantity => _mkn(
ColKey.Quantity, ColHeader.Qty, ColWidth.Qty);
public static GridColumnSettings price => _mkn(
ColKey.Price, ColHeader.Price, ColWidth.Price);
public static GridColumnSettings bid => _mkn(
ColKey.Bid, ColHeader.Bid, ColWidth.Price, false);
public static GridColumnSettings ask => _mkn(
ColKey.Ask, ColHeader.Ask, ColWidth.Price, false);
public static GridColumnSettings driver => _mkn(
ColKey.Driver, ColHeader.Driver, ColWidth.Price);
public static GridColumnSettings theo => _mkn(
ColKey.Theo, ColHeader.Theo, ColWidth.Price);
public static GridColumnSettings pnl => _mkn(
ColKey.PNL, ColHeader.PNLHeaders.PNL, ColWidth.Price);
public static GridColumnSettings pos_delta => _mkn(
ColKey.PositionDelta, "Delta", ColWidth.Price);
public static GridColumnSettings pos_gamma => _mkn(
ColKey.PositionGamma, "Gamma", ColWidth.Price);
public static GridColumnSettings pos_vega => _mkn(
ColKey.PositionVega, "Vega", ColWidth.Price);
public static GridColumnSettings pos_theta => _mkn(
ColKey.PositionTheta, "Theta", ColWidth.Price);
public static GridColumnSettings pos_oev => _mkn(
ColKey.PositionOptionEquivalent, "OEV", ColWidth.Price);
public static GridColumnSettings fill_kind => _mk(
ColKey.FillKind, ColHeader.FillKind, ColWidth.FillKind, false);
public static GridColumnSettings fill_status => _mk(
ColKey.FillStatus, ColHeader.FillStatus, ColWidth.FillStatus);
public static GridColumnSettings fill_key => _mk(
ColKey.FillKey, ColHeader.FillKey, ColWidth.FillKey, false);
public static GridColumnSettings order_key => _mk(
ColKey.OrderKey, ColHeader.OrderKey, ColWidth.OrderKey, false);
public static GridColumnSettings security_key => _mk(
ColKey.SecurityKey, ColHeader.SecurityKey, ColWidth.SecurityKey, false);
public static IEnumerable<SortingCriteria> default_sorting_criteria {
get {
yield return new(fill_time.id, false);
}
}
public static IEnumerable<GridColumnSettings> all =>
ReflectionHelper.static_property_getters<GridColumnSettings>(typeof(DefaultColumns))
.Select(pg => pg.get());
/// <summary>
/// Makes a [non-numeric] column
/// </summary>
static GridColumnSettings _mk(
ColKey key,
string? display_name = null,
double width = 80,
bool is_visible = true,
Color? fg = null,
Color? bg = null,
HorizontalAlignment h_align = HorizontalAlignment.Left,
FontWeight? fw = null) =>
new(
key.ToString(),
display_name,
is_visible,
font_color_override: fg,
width: width,
horizontal_alignment: h_align,
background_color_override: bg,
font_weight_override: fw);
/// <summary>
/// Makes a numeric column
/// </summary>
static GridColumnSettings _mkn(
ColKey key,
string? display_name = null,
double width = 80,
bool is_visible = true,
Color? fg = null,
Color? bg = null,
HorizontalAlignment h_align = HorizontalAlignment.Right) =>
new(
key.ToString(),
display_name,
is_visible,
font_color_override: fg,
width: width,
horizontal_alignment: h_align,
background_color_override: bg);
}
}
}
@@ -0,0 +1,251 @@
#nullable enable
namespace Spark.Trading {
using bts.api.core;
using bts.api.orderman;
using bts.collections;
using bts.utils;
using mbts;
using mbts.collections;
using mbts.persist;
using mbts.spark;
using mbts.spark.filters;
using mbts.ui;
using mbts.ui.controls;
using mbts.ui.settings;
using mbts.ui.shell;
using mbts.ui.utility;
using mbts.utils;
using Spark.Core.Data;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Reactive.Linq;
using static mbts.ui.controls.DIYGrid;
using ColKey = DayFillsColumnType;
using FilterType = mbts.spark.filters.DataGridFilterKnownTemplates;
using RowData = DayFillsRowData;
using RowKey = DayFillsRowKey;
using RowVM = DayFillsRowVM;
class DayFillsVM : DisposableViewModelBase, IHandleGridSorting {
readonly IWindowSettingsManager<GridSettings> _settings_manager;
readonly DIYGridRowsModel<RowData, ColKey, DayFillsFilterSettings> _rows_model;
readonly ObservableKeyedCollection<IDayFillsColumn, ColKey> _columns = new(c => c.id);
public DayFillsVM(
DayFillsModel model,
IWindowSettingsManager<GridSettings> settings_manager,
ISecurityMetadataStore security_metadata) {
_settings_manager = settings_manager;
columns = _columns.WrapSelector(c => c.column_view);
column_models = _columns.AsReadOnlyKeyedCollection().WrapSelector(
c => (IDIYGridColumnModel)c);
// filters
var fill_time_filter = new TimeFilterVM<RowData>(r => r.fill_time);
var user_filter = DiscreteValuesFilterVM.Common.user<RowData>(
model.users.Select(us => us.Values), r => r.user);
var account_filter = DiscreteValuesFilterVM.Common.account<RowData>(
model.accounts.Select(us => us.Values), r => r.account);
var exchange_filter = DiscreteValuesFilterVM.Common.exchange<RowData>(
r => r.exchange);
var security_filter = new RegexFilterVM<RowData>(r => r.security.ToString());
var symbol_filter = DiscreteValuesFilterVM.Common.symbol<RowData>(
r => r.symbol ?? string.Empty);
var side_filter = DiscreteValuesFilterVM.Common.side<RowData>(r => r.side);
var quantity_filter = new DoubleMinMax<RowData>(r => r.quantity);
var price_filter = new DoubleMinMax<RowData>(r => r.price);
var bid_filter = new DoubleMinMax<RowData>(r => r.bid);
var ask_filter = new DoubleMinMax<RowData>(r => r.ask);
var driver_filter = new DoubleMinMax<RowData>(r => r.driver);
var theo_filter = new DoubleMinMax<RowData>(r => r.theo);
var pnl_filter = new DoubleMinMax<RowData>(r => r.pnl);
var pos_delta_filter = new DoubleMinMax<RowData>(r => r.pos_delta);
var pos_gamma_filter = new DoubleMinMax<RowData>(r => r.pos_gamma);
var pos_vega_filter = new DoubleMinMax<RowData>(r => r.pos_vega);
var pos_theta_filter = new DoubleMinMax<RowData>(r => r.pos_theta);
var pos_oev_filter = new DoubleMinMax<RowData>(r => r.pos_oev);
var fill_status_filter = DiscreteValuesFilterVM.Create<RowData, Fill.Types.FillStatus>(
EnumHelper.get_values<Fill.Types.FillStatus>(), r => r.fill_status);
var fill_kind_filter = DiscreteValuesFilterVM.Create<RowData, Fill.Types.FillKind>(
EnumHelper.get_values<Fill.Types.FillKind>(), r => r.fill_kind);
var security_key_filter = new RegexFilterVM<RowData>(r => r.security_key.ToString());
var order_key_filter = new RegexFilterVM<RowData>(r => r.order_key.ToString());
var fill_key_filter = new RegexFilterVM<RowData>(r => r.fill_key.ToString());
// columns
add_col(ColKey.FillTime, fill_time_filter, FilterType.TimeFilter);
add_col(ColKey.User, user_filter, FilterType.DiscreteValues);
add_col(ColKey.Account, account_filter, FilterType.DiscreteValues);
add_col(ColKey.Exchange, exchange_filter, FilterType.DiscreteValues);
add_col(ColKey.Security, security_filter, FilterType.Regex);
add_col(ColKey.Symbol, symbol_filter, FilterType.DiscreteValues);
add_col(ColKey.Side, side_filter, FilterType.DiscreteValues);
add_col(ColKey.Quantity, quantity_filter, FilterType.DoubleMinMax);
add_col(ColKey.Price, price_filter, FilterType.DoubleMinMax);
add_col(ColKey.Bid, bid_filter, FilterType.DoubleMinMax);
add_col(ColKey.Ask, ask_filter, FilterType.DoubleMinMax);
add_col(ColKey.Driver, driver_filter, FilterType.DoubleMinMax);
add_col(ColKey.Theo, theo_filter, FilterType.DoubleMinMax);
add_col(ColKey.PNL, pnl_filter, FilterType.DoubleMinMax);
add_col(ColKey.PositionDelta, pos_delta_filter, FilterType.DoubleMinMax);
add_col(ColKey.PositionGamma, pos_gamma_filter, FilterType.DoubleMinMax);
add_col(ColKey.PositionVega, pos_vega_filter, FilterType.DoubleMinMax);
add_col(ColKey.PositionTheta, pos_theta_filter, FilterType.DoubleMinMax);
add_col(ColKey.PositionOptionEquivalent, pos_oev_filter, FilterType.DoubleMinMax);
add_col(ColKey.FillKind, fill_kind_filter, FilterType.DiscreteValues);
add_col(ColKey.FillStatus, fill_status_filter, FilterType.DiscreteValues);
add_col(ColKey.SecurityKey, security_key_filter, FilterType.Regex);
add_col(ColKey.OrderKey, order_key_filter, FilterType.Regex);
add_col(ColKey.FillKey, fill_key_filter, FilterType.Regex);
// rows
_rows_model = DIYGridRowsModel.create(
DayFillsWindow.WINDOW_TYPE_NAME,
ColKey.FillKey,
_columns.WrapSelector(c => c.as_filterable()),
_columns.WrapSelector(c => c.as_sortable()),
_get_column_comparer,
fs => fs.build_predicate());
// grid settings
grid_settings_manager = new SimpleGridSettingsManager<RowVM>(
columns, null, rows, _load_col_settings);
var row_observers = RXCollection.observers<RowVM, RowData, RowKey>(
rows, create_row_vm, r => r.data, update_row_vm, false);
_dispose = Disposable.Create(
_settings_manager.subscribe_current().OnDispatcher().Subscribe(
grid_settings_manager.load_from),
_rows_model.observe_comparer().OnDispatcher().Subscribe(row_observers.comp),
model.day_fills.Filter(_rows_model.observe_filter()).OnDispatcher().Subscribe(
row_observers.table));
void add_col<TFilter>(
ColKey col_key,
IDataGridColumnPersistentFilter<RowData, TFilter> filter,
string filter_template) {
var comp = _get_column_comparer(col_key);
var col = DayFillsColumn.create(col_key, comp, filter, filter_template);
var grid = _settings_manager.current_settings();
if (GridSettingsHelper.try_find_column(grid.columns, col_key, out var cs)) {
col.settings = cs;
}
_columns.Add(col);
}
RowVM create_row_vm(RowData rd) {
var rvm = new RowVM(rd);
if (!rd.security.HasValue) {
return rvm;
}
var meta = security_metadata.get(rd.security.Value);
if (!meta.HasValue) {
return rvm;
}
if (meta.Value.HasQuantityDisplay) {
rvm.quantity_display = meta.Value.QuantityDisplay;
}
return rvm;
}
RowVM update_row_vm(RowVM rvm, RowData rd) {
rvm.data = rd;
return rvm;
}
}
public IReadOnlyObservableCollection<IDIYGridColumnModel> column_models { get; }
public IReadOnlyObservableCollection<ColumnBase> columns { get; }
public ObservableCollection<RowVM> rows { get; } = new();
public SimpleGridSettingsManager<RowVM> grid_settings_manager { get; }
public DayFillsSettings get_settings() {
var rv = new DayFillsSettings {
grid = grid_settings_manager.create(),
filter = get_filter_settings()
};
rv.sorting_criteria.AddRange(_rows_model.get_sorting_criteria());
return rv;
}
public DayFillsFilterSettings get_filter_settings() {
var fs = new DayFillsFilterSettings();
_rows_model.assign_to_filter(fs);
return fs;
}
public void load_settings(DayFillsSettings settings) {
_rows_model.on_settings(settings.filter ?? new(), settings.sorting_criteria);
if (settings.grid is not null) {
load_grid_settings(settings.grid);
}
}
public void load_grid_settings(GridSettings grid_settings) =>
grid_settings_manager.load_from(grid_settings);
public void on_sorting(object sender, DIYGridSortingEventArgs e) =>
_rows_model.on_sorting(e);
static IComparer<RowData> _get_column_comparer(ColKey column) {
return column switch {
ColKey.FillTime => wrap(r => r.fill_time),
ColKey.User => wrap(r => r.user),
ColKey.Account => wrap(r => r.account),
ColKey.Exchange => wrap(r => r.exchange),
ColKey.Security => wrap(r => r.security),
ColKey.Symbol => wrap(r => r.symbol),
ColKey.Side => wrap(r => r.side),
ColKey.Quantity => wrap(r => r.quantity),
ColKey.Price => wrap(r => r.price),
ColKey.Bid => wrap(r => r.bid),
ColKey.Ask => wrap(r => r.ask),
ColKey.Driver => wrap(r => r.driver),
ColKey.Theo => wrap(r => r.theo),
ColKey.PNL => wrap(r => r.pnl),
ColKey.PositionDelta => wrap(r => r.pos_delta),
ColKey.PositionGamma => wrap(r => r.pos_gamma),
ColKey.PositionVega => wrap(r => r.pos_vega),
ColKey.PositionTheta => wrap(r => r.pos_theta),
ColKey.PositionOptionEquivalent => wrap(r => r.pos_oev),
ColKey.FillKind => wrap(r => r.fill_kind),
ColKey.FillStatus => wrap(r => r.fill_status),
ColKey.SecurityKey => wrap(r => r.security_key),
ColKey.OrderKey => wrap(r => r.order_key),
ColKey.FillKey => wrap(r => r.fill_key),
_ => throw ExceptionBuilder.Argument.unexpected_case(column, nameof(column)),
};
static IComparer<RowData> wrap<T>(Func<RowData, T> selector) =>
Comparer<T>.Default.wrap(selector);
}
void _load_col_settings(GridSettings grid_settings) {
var col_settings_id_map = grid_settings.columns.ToDictionary(
cs => EnumHelper.parse<ColKey>(cs.id));
if (col_settings_id_map.Count == _columns.Count) {
CollectionHelper.sync_with_never_duplicate(
_columns,
grid_settings.columns,
cs => throw new InvalidOperationException(),
c => c.id,
cs => EnumHelper.parse<ColKey>(cs.id));
}
// don't assume that columns:column_settings have a perfect 1:1 relationship (they
// should, but it is possible we accidentally break the settings as grids/uis change)
foreach (var col in _columns) {
if (col_settings_id_map.TryGetValue(col.id, out var cs)) {
col.column_view.load_from(cs);
}
}
}
}
}
@@ -0,0 +1,340 @@
<UserControl
x:Class="Spark.Trading.DayFillsView"
x:ClassModifier="internal"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:api="clr-namespace:bts.api;assembly=spark_api"
xmlns:bv="clr-namespace:bts.view"
xmlns:u="clr-namespace:mbts.ui"
xmlns:c="clr-namespace:mbts.ui.controls"
xmlns:cv="clr-namespace:mbts.ui.converters"
xmlns:trading="clr-namespace:Spark.Trading"
u:WindowStyle.UnsafeWindow="{Binding Path='(u:WindowStyle.UnsafeWindow)', RelativeSource={RelativeSource AncestorType=bv:SparkWindowView}}"
FocusManager.IsFocusScope="True"
Background="{StaticResource CommonBackground}">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/view/Controls/DataGridEx/Filters/Views/FilterTemplates.xaml"/>
</ResourceDictionary.MergedDictionaries>
<!--
For some reason, the default style for TextCell (i.e., without an x:Key), is completely
ignored. This is particularly annoying because it means the Style attribute must be
specified for every TextCell in the RowTemplate
-->
<Style x:Key="TextCell" TargetType="c:TextCell">
<Setter Property="HorizontalAlignment" Value="Stretch" />
<Setter Property="HorizontalContentAlignment" Value="{Binding Path='(c:DIYGrid.Column).horizontal_alignment', RelativeSource={RelativeSource Self}}" />
<Setter Property="Padding" Value="{x:Static c:DIYGrid.DefaultCellPadding}" />
<Setter Property="Background" Value="{Binding Path='(c:DIYGrid.Column).background_brush', RelativeSource={RelativeSource Self}}" />
<Setter Property="FontFamily" Value="{Binding Path='(c:DIYGrid.Column).font_family', RelativeSource={RelativeSource Self}}" />
<Setter Property="FontSize" Value="{Binding Path='(c:DIYGrid.Column).font_size', RelativeSource={RelativeSource Self}}" />
<Setter Property="FontWeight" Value="{Binding Path='(c:DIYGrid.Column).font_weight', RelativeSource={RelativeSource Self}}" />
<Setter Property="Foreground" Value="{Binding Path='(c:DIYGrid.Column).font_brush', RelativeSource={RelativeSource Self}}" />
<Setter Property="SnapsToDevicePixels" Value="True" />
</Style>
</ResourceDictionary>
</UserControl.Resources>
<AdornerDecorator>
<Grid>
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<c:DIYGrid
x:Name="_grid"
Grid.Row="0"
Columns="{Binding columns, Mode=OneWay}"
CurrentRow="{Binding current_row}"
Rows="{Binding rows}"
SelectionHighlight="{Binding grid_settings_manager.selection_highlight, Mode=OneWay}"
SyncColumnSortDirectionWithSortDescriptions="False">
<c:DIYGrid.InputBindings>
<MouseBinding MouseAction="LeftDoubleClick" Command="{x:Static c:DIYGrid.DefaultRowCommand}"/>
<KeyBinding Key="Return" Command="{x:Static c:DIYGrid.DefaultRowCommand}" />
</c:DIYGrid.InputBindings>
<c:DIYGrid.CommandBindings>
<CommandBinding
Command="{x:Static c:DIYGrid.DefaultRowCommand}"
Executed="{x:Static c:DIYGrid.DefaultRowActionExecuted}"
CanExecute="{x:Static c:DIYGrid.DefaultRowActionCanExecute}"
/>
</c:DIYGrid.CommandBindings>
<c:DIYGrid.RowTemplate>
<DataTemplate>
<Grid
x:Name="RowView"
c:DIYGrid.SyncWithColumnGeometry="True"
Height="{Binding RowHeight, RelativeSource={RelativeSource AncestorType=c:DIYGrid}}">
<u:StateManager.Groups>
<u:StateGroupsManager AttachToMembers="True">
<u:StateDefinitionCollection>
<u:ModalStateDefinition Mode="Quantity">
<u:StateDefinition State="{Binding
Path='(u:StateDefinition.Group).(u:StateGroupsManager.Target).(Grid.DataContext).(trading:DayFillsRowVM.quantity)',
RelativeSource={RelativeSource Self},
Converter={x:Static trading:DayFillsView.numeric_sign_state_converter}}" />
</u:ModalStateDefinition>
<u:ModalStateDefinition Mode="PNL">
<u:StateDefinition State="{Binding
Path='(u:StateDefinition.Group).(u:StateGroupsManager.Target).(Grid.DataContext).(trading:DayFillsRowVM.pnl)',
RelativeSource={RelativeSource Self},
Converter={x:Static trading:DayFillsView.numeric_sign_state_converter}}" />
</u:ModalStateDefinition>
<u:ModalStateDefinition Mode="PositionDelta">
<u:StateDefinition State="{Binding
Path='(u:StateDefinition.Group).(u:StateGroupsManager.Target).(Grid.DataContext).(trading:DayFillsRowVM.pos_delta)',
RelativeSource={RelativeSource Self},
Converter={x:Static trading:DayFillsView.numeric_sign_state_converter}}" />
</u:ModalStateDefinition>
</u:StateDefinitionCollection>
</u:StateGroupsManager>
</u:StateManager.Groups>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup Name="QuantityStates">
<VisualState Name="QuantityZero" />
<VisualState Name="QuantityInvalid" />
<VisualState Name="QuantityPositive">
<Storyboard>
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="quantity" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{u:BTSBrush MarketData.bid}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="side" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{u:BTSBrush MarketData.bid}" />
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
<VisualState Name="QuantityNegative">
<Storyboard>
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="quantity" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{u:BTSBrush MarketData.ask}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="side" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{u:BTSBrush MarketData.ask}" />
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
</VisualStateGroup>
<VisualStateGroup Name="PNLStates">
<VisualState Name="PNLZero" />
<VisualState Name="PNLInvalid" />
<VisualState Name="PNLPositive">
<Storyboard>
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="pnl" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{u:BTSBrush PNL.profit}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="pnl" Storyboard.TargetProperty="FontWeight">
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static FontWeights.Bold}" />
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
<VisualState Name="PNLNegative">
<Storyboard>
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="pnl" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{u:BTSBrush PNL.loss}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="pnl" Storyboard.TargetProperty="FontWeight">
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static FontWeights.Bold}" />
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
</VisualStateGroup>
<VisualStateGroup Name="PositionDeltaStates">
<VisualState Name="PositionDeltaZero" />
<VisualState Name="PositionDeltaInvalid" />
<VisualState Name="PositionDeltaPositive">
<Storyboard>
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="pos_delta" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{u:BTSBrush PNL.profit}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="pos_delta" Storyboard.TargetProperty="FontWeight">
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static FontWeights.Bold}" />
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
<VisualState Name="PositionDeltaNegative">
<Storyboard>
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="pos_delta" Storyboard.TargetProperty="Foreground">
<DiscreteObjectKeyFrame KeyTime="0" Value="{u:BTSBrush PNL.loss}" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames
Storyboard.TargetName="pos_delta" Storyboard.TargetProperty="FontWeight">
<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static FontWeights.Bold}" />
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.FillTime}"
Text="{Binding fill_time}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.User}"
Text="{Binding user}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.Account}"
Text="{Binding account}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.Exchange}"
Text="{Binding exchange}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.Security}"
Text="{Binding security}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.Symbol}"
Text="{Binding symbol}"
Style="{StaticResource TextCell}" />
<c:TextCell
x:Name="side"
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.Side}"
Text="{Binding side}"
Style="{StaticResource TextCell}" />
<c:TextCell
x:Name="quantity"
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.Quantity}"
Style="{StaticResource TextCell}">
<MultiBinding Converter="{x:Static cv:TickDisplayConverter.Instance}">
<Binding Path="quantity" />
<Binding Path="quantity_display" />
</MultiBinding>
</c:TextCell>
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.Price}"
Style="{StaticResource TextCell}">
<MultiBinding Converter="{x:Static cv:TickDisplayConverter.Instance}">
<Binding Path="price" />
<Binding Path="price_display" />
</MultiBinding>
</c:TextCell>
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.Bid}"
Style="{StaticResource TextCell}">
<MultiBinding Converter="{x:Static cv:TickDisplayConverter.Instance}">
<Binding Path="bid" />
<Binding Path="price_display" />
</MultiBinding>
</c:TextCell>
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.Ask}"
Style="{StaticResource TextCell}">
<MultiBinding Converter="{x:Static cv:TickDisplayConverter.Instance}">
<Binding Path="ask" />
<Binding Path="price_display" />
</MultiBinding>
</c:TextCell>
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.Driver}"
Style="{StaticResource TextCell}">
<MultiBinding Converter="{x:Static cv:TickDisplayConverter.Instance}">
<Binding Path="driver" />
<Binding Path="driver_display" />
</MultiBinding>
</c:TextCell>
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.Theo}"
Style="{StaticResource TextCell}">
<MultiBinding Converter="{x:Static cv:TickDisplayConverter.Instance}">
<Binding Path="theo" />
<Binding Path="theo_display" />
</MultiBinding>
</c:TextCell>
<c:TextCell
x:Name="pnl"
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.PNL}"
Text="{Binding pnl, StringFormat='#,0.000'}"
Style="{StaticResource TextCell}" />
<c:TextCell
x:Name="pos_delta"
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.PositionDelta}"
Text="{Binding pos_delta, StringFormat='#,0.000'}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.PositionGamma}"
Text="{Binding pos_gamma, StringFormat='#,0.000'}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.PositionVega}"
Text="{Binding pos_vega, StringFormat='#,0.000'}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.PositionTheta}"
Text="{Binding pos_theta, StringFormat='#,0.000'}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.PositionOptionEquivalent}"
Text="{Binding pos_oev, StringFormat='#,0.000'}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.FillKind}"
Text="{Binding fill_kind}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.FillStatus}"
Text="{Binding fill_status}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.SecurityKey}"
Text="{Binding security_key}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.OrderKey}"
Text="{Binding order_key}"
Style="{StaticResource TextCell}" />
<c:TextCell
c:DIYGrid.ColumnKey="{x:Static trading:DayFillsColumnType.FillKey}"
Text="{Binding fill_key}"
Style="{StaticResource TextCell}" />
</Grid>
</DataTemplate>
</c:DIYGrid.RowTemplate>
</c:DIYGrid>
</Grid>
</AdornerDecorator>
</UserControl>
@@ -0,0 +1,24 @@
#nullable enable
namespace Spark.Trading {
using mbts.ui.converters;
using System.Windows.Controls;
using System.Windows.Data;
/// <summary>
/// Interaction logic for DayFillsView.xaml
/// </summary>
partial class DayFillsView : UserControl {
public DayFillsView() =>
InitializeComponent();
public static IValueConverter numeric_sign_state_converter =>
ValueConverter.create<double, string>(v =>
v switch {
> 0.0 => "Positive",
< 0.0 => "Negative",
0.0 => "Zero",
_ => "Invalid"
});
}
}
@@ -0,0 +1,139 @@
#nullable enable
namespace Spark.Trading {
using bts;
using bts.api;
using bts.api.core;
using bts.collections;
using bts.shell;
using bts.spark;
using bts.view;
using mbts;
using mbts.config;
using mbts.persist;
using mbts.spark;
using mbts.ui;
using mbts.ui.settings;
using mbts.ui.spark;
using mbts.ui.utility;
using Spark.Core.Data;
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
using System.Diagnostics.Contracts;
using System.Linq;
using System.Reactive.Linq;
using System.Windows;
class DayFillsWindow : SparkWindow<DayFillsSettings>, ISharedWindow {
public const string WINDOW_TYPE_NAME = "DayFills";
public const string WINDOW_TITLE = "Day P&L";
readonly List<SparkCommand> _commands = new();
readonly IWindowSettingsManager<GridSettings> _settings_manager;
readonly IPositionModel _position_model;
readonly ISecurityMetadataStore _security_metadata;
readonly UserTuple _user;
DayFillsModel? _model;
DayFillsView? _view;
DayFillsVM? _vm;
SparkMenuDisplayVM? _menu_display_vm;
DayFillsSettings _settings;
public DayFillsWindow(
IBus bus,
ISaveWindow<DayFillsSettings> save,
IPositionModel position_model,
ISecurityMetadataStore security_metadata,
DayFillsSettings settings,
IWindowSettingsManager<GridSettings> settings_manager,
UserTuple user)
: base(WINDOW_TITLE, bus, save, Icons.DayFills) {
thread_id = Configuration.get<bts.config.MultiThreadedWindows>().day_fills ?
WINDOW_TYPE_NAME : null;
_position_model = position_model;
_security_metadata = security_metadata;
_settings = settings;
_settings_manager = settings_manager;
_user = user;
_dispose = Disposable.Create(() => {
Disposable.dispose(ref _menu_display_vm);
Disposable.dispose(ref _vm);
});
}
public string? thread_id { get; }
public override string window_type => WINDOW_TYPE_NAME;
public override IEnumerable<SparkCommand> Commands => _commands;
public override DayFillsSettings SaveState {
get {
if (_vm is not null) {
_settings = _vm.get_settings();
_settings.menu_display = _menu_display_vm?.create() ??
SparkMenuDisplaySettings.Default;
}
return _settings;
}
}
public override UIElement Content =>
_view ?? throw new InvalidOperationException("Internal view is null");
public override double MinWidth {
get {
if (_settings.grid is null) {
return base.MinWidth;
}
var grid_width = _settings.grid.columns.Where(c => c.is_visible).Sum(gcs => gcs.width);
return grid_width
+ SPARK_MENU_COLLAPSED_WIDTH
+ LAUNCHER_BUTTON_BORDER_WIDTH
+ EXTRA_FOR_NO_HORIZONTAL_SCROLLBAR_WIDTH;
}
}
[MemberNotNull(nameof(_model), nameof(_view), nameof(_vm), nameof(_menu_display_vm))]
public void thread_init() {
Contract.Requires(_model is null);
Contract.Requires(_view is null);
Contract.Requires(_vm is null);
Contract.Requires(_menu_display_vm is null);
Contract.Requires(!_commands.Any());
var accounts_src = _bus.subscribe(SparkTags.AccountsTag);
var users_src = _bus.subscribe(SparkTags.Users);
_model = new(_position_model.day_fills, accounts_src, users_src);
_vm = new(_model, _settings_manager, _security_metadata);
_vm.load_settings(_settings);
_view = new DayFillsView {
DataContext = _vm
};
_menu_display_vm = new();
_menu_display_vm.load_from(_settings.menu_display);
var settings_cmd = SparkCommands.window_settings_command(new DialogCommand(() => {
var vm = new ShellSettingsDialogVM<GridSettings, SimpleGridSettingsVM>(
_settings_manager,
us => us.fills_grid,
UserSettings.FileExtensions.GRID,
s => _vm.grid_settings_manager.create_vm(
// 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.
s.with(_vm.columns.Select(c => c.create())))
);
vm.SubscribeDisposed(literal_title_source.OnDispatcher().Subscribe(t => vm.title = t));
var dialog = new ShellSettingsDialog { DataContext = vm };
vm.RequestClose += (s, e) => WindowUtilities.force_close(dialog);
return dialog;
}));
_commands.AddRange(settings_cmd, _menu_display_vm.spark_cmd);
}
protected override void OnParentViewCreated(SparkWindowView parent_view) =>
_menu_display_vm.safe_bind_to_view(parent_view);
}
}
@@ -0,0 +1,54 @@
#nullable enable
namespace Spark.Trading {
using bts;
using bts.api;
using bts.api.core;
using bts.api.position;
using bts.shell;
using mbts.persist;
using mbts.spark;
using mbts.ui;
using Spark.Core.Data;
using System;
using System.Reactive.Linq;
using System.Threading.Tasks;
class DayFillsWindowFactory : ShellWindowFactory<DayFillsSettings> {
readonly IBus _bus;
readonly UserSettingsHub _settings_hub;
readonly IPositionModel _position_model;
readonly ISecurityMetadataStore _security_metadata;
readonly UserTuple _user;
public DayFillsWindowFactory(
IShellModule module,
IBus bus,
UserSettingsHub settings_hub,
IPositionModel position_model,
ISecurityMetadataStore security_metadata,
UserTuple user)
: base(module, DayFillsWindow.WINDOW_TYPE_NAME) {
_bus = bus;
_settings_hub = settings_hub;
_position_model = position_model;
_security_metadata = security_metadata;
_user = user;
_dispose = bus.subscribe(SparkTags.show_day_fills).OnDispatcher().Subscribe(_show);
}
public override Task<IShellWindow> load(DayFillsSettings state) =>
Task.FromResult(_create(state));
void _show(DayFillsSettings settings) =>
_bus.post(SparkTags.ShowWindow, _create(settings));
IShellWindow _create(DayFillsSettings state) {
var settings_man = _settings_hub.create_day_fills_settings_manager(state.grid);
return new DayFillsWindow(
_bus, this, _position_model, _security_metadata, state, settings_man, _user);
}
}
}
@@ -0,0 +1,17 @@
namespace Spark.Trading {
using mbts.ui;
using mbts.ui.controls;
interface IDayFillsColumn : IFilterableDIYGridColumn<DayFillsRowData, DayFillsColumnType, DayFillsFilterSettings>, ISortableDIYGridColumn<DayFillsColumnType> {
DIYGrid.ColumnBase column_view { get; }
}
static class DayFillsColumnExtensions {
public static IFilterableDIYGridColumn<DayFillsRowData, DayFillsColumnType, DayFillsFilterSettings> as_filterable(
this IDayFillsColumn rr_column) =>
rr_column;
public static ISortableDIYGridColumn<DayFillsColumnType> as_sortable(this IDayFillsColumn rr_column) =>
rr_column;
}
}
@@ -22,14 +22,14 @@ namespace mbts.spark {
readonly OrdersModel _model;
TickDisplaySettingsImmutable _quantity_display_settings =
SecurityDataHelper.Defaults.quantity_display_settingsi;
Security.Defaults.quantity_display_settingsi;
Brush? _badge_fill;
Color? _root_algo_badge_color;
OrderMetadata? _order_metadata;
bool _is_selected;
public FillsRowVM(FillTuple fill_tuple, OrdersModel model) :
base(fill_tuple.security ?? SecurityDataHelper.Defaults.SecurityImmutable) {
base(fill_tuple.security ?? Security.Defaults.SecurityImmutable) {
this.fill_tuple = fill_tuple;
_model = model;
}
@@ -8,10 +8,10 @@ namespace mbts.spark {
using mbts.ui.controls;
using mbts.ui.spark;
class FillsSideColumn : DIYGrid.SideColumn<FillTuple, FillsView.Columns>, IFillsColumn {
class FillsSideColumn : DIYGrid.SideColumn<FillsRowVM, FillsView.Columns>, IFillsColumn {
public FillsSideColumn(
IDataGridColumnPersistentFilter<FillTuple, Side[]> filter_model)
: base(FillsView.Columns.Side, r => r.fill.Side, filter_model) {
: base(FillsView.Columns.Side, r => r.side, filter_model) {
this.filter_model = filter_model;
}
@@ -19,8 +19,9 @@ namespace mbts.spark {
public new IDataGridColumnPersistentFilter<FillTuple, Side[]> filter_model { get; }
IDataGridColumnFilter<FillTuple> IFilterableDIYGridColumn<FillTuple, FillsView.Columns>.filter_model => filter_model;
IDataGridColumnFilter IFilterableDIYGridColumn.filter_model => filter_model;
IDataGridColumnFilter<FillTuple> IFilterableDIYGridColumn<FillTuple, FillsView.Columns>.filter_model =>
filter_model;
FillsView.Columns IDIYGridColumn<FillsView.Columns>.id => key;
public FillsFilterStates assign_filter_settings(FillsFilterStates filter_settings) {
@@ -75,12 +75,13 @@ namespace mbts.spark {
DiscreteValuesFilterVM.Create<FillTuple, SecurityImmutable, SecurityCriteria>(
fills_source.distinct_on(
ft => ft.fill.FillKey,
ft => ft.security ?? SecurityDataHelper.Defaults.SecurityImmutable,
s => s.Id)
ft => ft.security ?? Security.Defaults.SecurityImmutable,
s => s.Id,
EqualityComparer<SecurityImmutable>.Default)
.Select(t => (
t.added.Concat(t.changed),
t.removed.Concat(t.changes.Select(ch => ch.Old)))),
r => r.security ?? SecurityDataHelper.Defaults.SecurityImmutable,
r => r.security ?? Security.Defaults.SecurityImmutable,
SecurityCriteria.from_securities,
SecurityCriteria.get_to_securities(bus.subscribe(SparkTags.SecuritiesTag)),
equality_comparer: SecurityEqualityComparer.instance_immutable,
@@ -451,7 +452,7 @@ namespace mbts.spark {
case Columns.OrderType: return wrap_default(ft => ft.order?.order_type() ?? OrderType.None);
case Columns.RootAlgoType: return wrap_default(ft => ft.root_algo.HasValue ? ft.root_algo.Value.value.CustomCase : OrderType.None);
case Columns.Price: return wrap(ft => ft.fill.LastPrice);
case Columns.Security: return wrap(ft => ft.security ?? SecurityDataHelper.Defaults.SecurityImmutable);
case Columns.Security: return wrap(ft => ft.security ?? Security.Defaults.SecurityImmutable);
case Columns.SecurityKey: return wrap(ft => ft.fill.SecurityKey);
case Columns.Side: return wrap_default(ft => ft.fill.Side);
case Columns.Size: return wrap(ft => ft.fill.LastShares);
@@ -18,12 +18,8 @@
</ResourceDictionary.MergedDictionaries>
<cv:TickDisplayConverter x:Key="TickDisplayConverter"/>
<cv:ValueMap x:Key="SideToBrushConverter" Default="{x:Static Brushes.Transparent}">
<cv:KeyValue Key="{u:Enum Buy, Type=api:Side}">
<SolidColorBrush Color="{x:Static bid_color, MemberType={u:Nested u:BTSColors.MarketData}}" Opacity="0.33" />
</cv:KeyValue>
<cv:KeyValue Key="{u:Enum Sell, Type=api:Side}">
<SolidColorBrush Color="{x:Static ask_color, MemberType={u:Nested u:BTSColors.MarketData}}" Opacity="0.33" />
</cv:KeyValue>
<cv:KeyValue Key="{u:Enum Buy, Type=api:Side}" Value="{u:BTSBrush MarketData.bid, Opacity=0.33}" />
<cv:KeyValue Key="{u:Enum Sell, Type=api:Side}" Value="{u:BTSBrush MarketData.ask, Opacity=0.33}" />
</cv:ValueMap>
</ResourceDictionary>
</UserControl.Resources>
@@ -65,7 +65,7 @@ namespace bts.shell {
var settings_manager = new WindowSettingsManager<GridSettings>(_settings_hub,
state.grid,
get: us => us.fills_grid,
set: (us, gs) => us.with(provided_fills_gridsettings: gs));
set: (us, gs) => us.with(fills: gs));
return new FillsWindow(this, _bus, _orders_model, state, settings_manager);
}
@@ -60,6 +60,7 @@ namespace bts.shell.fills {
public static GridColumnSettings quantity => new GridColumnSettings(col_id(Columns.Size), DefaultColumnHeaders.Qty, width: DefaultColumnWidths.Qty, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings price => new GridColumnSettings(col_id(Columns.Price), DefaultColumnHeaders.Price, width: DefaultColumnWidths.Price, horizontal_alignment: System.Windows.HorizontalAlignment.Right);
public static GridColumnSettings fill_kind => new GridColumnSettings(col_id(Columns.FillKind), DefaultColumnHeaders.FillKind, width: DefaultColumnWidths.FillKind);
public static GridColumnSettings fill_status => new GridColumnSettings(col_id(Columns.FillStatus), DefaultColumnHeaders.FillStatus, width: DefaultColumnWidths.FillStatus);
public static GridColumnSettings fill_key => new GridColumnSettings(col_id(Columns.FillKey), DefaultColumnHeaders.FillKey, width: DefaultColumnWidths.FillKey);
public static GridColumnSettings order_key => new GridColumnSettings(col_id(Columns.OrderKey), DefaultColumnHeaders.OrderKey, width: DefaultColumnWidths.OrderKey);
public static GridColumnSettings security_key => new GridColumnSettings(col_id(Columns.SecurityKey), DefaultColumnHeaders.SecurityKey, is_visible: false, width: DefaultColumnWidths.SecurityKey);
Loaded 100 of 387 files, more files were not shown because too many files have changed in this diff. Show more