actually save the start of day rather than overwriting it anew each time

This commit is contained in:
Jake Norbut committed 2018-07-11 13:04:34 -05:00
1 parent a233451333
commit b5950ab8c0
2 files changed
+10 -4

No files matched your search

+9 -3
View File
@@ -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<PnLSummaryRow, string> account_filter { get; } = new RegexFilterVM<PnLSummaryRow>(r => r.account, nameof(PnLSummaryRow.account));
@@ -217,6 +222,7 @@ namespace mbts.spark {
readonly Property<pnl_calc_type> _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<PnLSummaryRow> _pnl_data = new ObservableCollection<PnLSummaryRow>();
@@ -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;