diff --git a/src/client/spark/view/Spark/PAndL/PAndLVM.cs b/src/client/spark/view/Spark/PAndL/PAndLVM.cs index 453ade6d4..ed7e1b948 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLVM.cs +++ b/src/client/spark/view/Spark/PAndL/PAndLVM.cs @@ -25,16 +25,17 @@ namespace mbts.spark { // need to respond to settings change somehow as the // combobox that selected_pnl_calc_type is bound to will be // gone from this form. - // ditto start of day changes + // ditto start of day changes, but this will be a bit more involved + // since we'll need to create a new PnLCalculator when this changes. (infrequent, if ever) _selected_pnl_calc_type.Value = (startup_data != null && startup_data.calc_type != pnl_calc_type.none) ? startup_data.calc_type : pnl_calc_type.midpoint; _selected_pnl_calc_type.Changed += pnl_calc_type_changed; - var start_of_day_ts = (startup_data != null && startup_data.start_of_day_time.HasValue) ? startup_data.start_of_day_time.Value : new TimeSpan(17, 0, 0); + _start_of_day_ts = (startup_data != null && startup_data.start_of_day_time.HasValue) ? startup_data.start_of_day_time.Value : new TimeSpan(17, 0, 0); var pnl = model.on_pnl_data .Sample(_POSITION_UPDATE_PERIOD) .OnDispatcher() .Subscribe(p => { if (p != null) { - PnLCalculator calc = new PnLCalculator(p.state.Values, _selected_pnl_calc_type.Value, start_of_day_ts); + PnLCalculator calc = new PnLCalculator(p.state.Values, _selected_pnl_calc_type.Value, _start_of_day_ts); var summary_position_rows = calc.get_summary_position(); _pnl_data.sync_with(summary_position_rows); _last_pnl_update_time = DateTime.Now; @@ -172,6 +173,10 @@ namespace mbts.spark { } } + public TimeSpan start_of_day { + get { return _start_of_day_ts; } + } + #region Filters public IDataGridColumnPersistentFilter account_filter { get; } = new RegexFilterVM(r => r.account, nameof(PnLSummaryRow.account)); @@ -217,6 +222,7 @@ namespace mbts.spark { readonly Property _selected_pnl_calc_type; double _total_aggregate_pnl, _total_aggregate_net_pos, _total_aggregate_buy_qty, _total_aggregate_sell_qty; + TimeSpan _start_of_day_ts; DateTime _last_pnl_update_time = DateTime.MinValue; ObservableCollection _pnl_data = new ObservableCollection(); diff --git a/src/client/spark/view/Spark/PAndL/PAndLWindow.cs b/src/client/spark/view/Spark/PAndL/PAndLWindow.cs index ee394c947..9b2d09dc0 100644 --- a/src/client/spark/view/Spark/PAndL/PAndLWindow.cs +++ b/src/client/spark/view/Spark/PAndL/PAndLWindow.cs @@ -31,7 +31,7 @@ namespace mbts.spark { _vm.get_sorting_states(), _vm.get_filters_states(), _vm.selected_pnl_calc_type, - new TimeSpan(17,0,0) + _vm.start_of_day ); public override UIElement Content => _view; public override double MinWidth => 894;