Compare commits

..
4 Commits
Author SHA1 Message Date
Jake Norbut 9946c4716f Default PIQ column to not visible 2019-04-30 18:13:22 -05:00
John Colvin ee0e719e76 Merged in SPARK-2361-piq-bid-bug (pull request #221)
SPARK-2361 ladder - hidden PIQ column causes bids not to work

Approved-by: Jake Norbut <jake.norbut@bluetradesys.com>
2019-04-30 23:13:03 +00:00
John Colvin 5d5761288f SPARK-2361 ladder - hidden PIQ column causes bids not to work 2019-04-30 18:04:10 -05:00
Eric Harding 6dbeaa14e2 SPARK-2343 Update.h does not correctly track 'all' collection breaking limits 2019-04-30 10:49:30 -04:00
5 changed files with 22 additions and 11 deletions

No files matched your search

@@ -97,7 +97,7 @@ namespace mbts.spark {
public event Action visible_columns_changed;
public IEnumerable<ColumnType> visible_columns =>
public IEnumerable<ColumnType> visible_column_types =>
columns.Where(c => c.settings.show)
.Select(c => c.column_type);
@@ -253,6 +253,7 @@ namespace mbts.spark {
#endregion
Column[] columns { get; set; } = new Column[0];
IEnumerable<Column> _visible_columns => columns.Where(c => c.settings.show);
public void drag_out_of_bounds() =>
_tactile_adorner?.drag_out_of_bounds();
@@ -330,7 +331,7 @@ namespace mbts.spark {
#region Column Utility Methods
Column _column_for_point(Point point) =>
columns.FirstOrDefault(c => c.x_right > point.X, columns.Length > 0 ? columns[columns.Length - 1] : Column.Empty);
_visible_columns.FirstOrDefault(c => c.x_right > point.X, columns.Length > 0 ? columns[columns.Length - 1] : Column.Empty);
double _column_start(ColumnType col_type) =>
columns.TakeWhile(c => c.column_type != col_type).Sum(c => c.settings.width);
@@ -913,4 +914,4 @@ namespace mbts.spark {
}
}
}
}
}
@@ -38,6 +38,14 @@ namespace mbts.spark {
font_weight = FontWeights.SemiBold.ToOpenTypeWeight()
};
public static LadderColumnSettings DefaultPiqColumnSettings => new LadderColumnSettings {
show = false,
width = 50,
font_family = "Segoe UI",
font_size = 10,
font_weight = FontWeights.SemiBold.ToOpenTypeWeight()
};
[ProtoMember(1)]
public bool show { get; set; }
[ProtoMember(2)]
@@ -250,7 +258,7 @@ namespace mbts.spark {
ask_column = LadderColumnSettings.Default,
price_column = LadderColumnSettings.Default,
last_column = LadderColumnSettings.Default,
piq_column = LadderColumnSettings.Default;
piq_column = LadderColumnSettings.DefaultPiqColumnSettings;
orders_column.background = BTSColors.LadderSpecial.default_column_background;
bid_column.foreground = 0xFFFFFF;
bid_column.background = BTSColors.MarketData.bid;
@@ -15,7 +15,7 @@ namespace mbts.spark {
InitializeComponent();
_column_headers_presenter.Columns = new GridViewColumnCollection();
_ladder.visible_columns_changed += () => _column_headers_presenter.Columns.SetItems(
_ladder.visible_columns.Select(t => ColumnFactory.create(_ladder, t)));
_ladder.visible_column_types.Select(t => ColumnFactory.create(_ladder, t)));
this.vm = vm;
DataContext = vm;
DataContextChanged += datacontext_changed;
+1 -1
View File
@@ -78,7 +78,7 @@ namespace bts.tests
return securities;
}
[Test(Timeout = 30)]
[Test(Timeout = 30)]
public async Task test_position_limits() {
string test_symbol = "CL";
+7 -5
View File
@@ -81,11 +81,6 @@ namespace api {
for (size_t x = 0; x < raw.added_keys.size(); ++x) {
(*state)[raw.added_keys[x]] = raw.added_items[x];
}
std::vector<T> all;
all.reserve(state->size());
for (const auto& item : *state) {
all.push_back(item.second);
}
//
// Change
std::vector<Change<T>> changed;
@@ -94,6 +89,13 @@ namespace api {
changed.push_back(Change<T>{(*state)[raw.changed_keys[x]], raw.changed_items[x]});
(*state)[raw.changed_keys[x]] = raw.changed_items[x];
}
//
// All
std::vector<T> all;
all.reserve(state->size());
for (const auto& item : *state) {
all.push_back(item.second);
}
return Update<T, TKey, ServiceType>(all, raw.added_items, changed, removed);
}