Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

MGR: Check the size of the stats vectors before attempting to tabulate the results.

This commit is contained in:
Rom Walton 2013-04-09 12:26:25 -04:00
parent 17ddcfe941
commit 6637619379
1 changed files with 34 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
clientgui/ViewStatistics.cpp
View File

@ -1537,38 +1537,41 @@ void CPaintStatistics::DrawAll(wxDC &dc) {
saved_sum_stat.host_expavg_credit = 0.0;
saved_sum_stat.day = 0.0;
prev_proj_stat = saved_sum_stat;
std::vector<DAILY_STATS>::iterator sum_iter = sumstats.begin();
std::vector<DAILY_STATS>::const_iterator proj_iter = (*i)->statistics.begin();
for (;;) {
if ((*proj_iter).day >= min_val_x) {
if ((*proj_iter).day < (*sum_iter).day) {
sum_iter = sumstats.insert(sum_iter, stat);
*sum_iter = saved_sum_stat;
(*sum_iter).day = (*proj_iter).day;
} else {
saved_sum_stat = *sum_iter;
}
if ((*proj_iter).day > (*sum_iter).day) {
AddToStats(prev_proj_stat, *sum_iter);
} else {
AddToStats(*proj_iter, *sum_iter);
}
++sum_iter;
if (sum_iter == sumstats.end()) {
break;
}
}
if ((*proj_iter).day <= (*sum_iter).day) {
prev_proj_stat = *proj_iter;
++proj_iter;
if (proj_iter == (*i)->statistics.end()) {
for (; sum_iter != sumstats.end(); ++sum_iter) {
AddToStats(prev_proj_stat, *sum_iter);
if (sumstats.size() && (*i)->statistics.size()) {
std::vector<DAILY_STATS>::iterator sum_iter = sumstats.begin();
std::vector<DAILY_STATS>::const_iterator proj_iter = (*i)->statistics.begin();
for (;;) {
if ((*proj_iter).day >= min_val_x) {
if ((*proj_iter).day < (*sum_iter).day) {
sum_iter = sumstats.insert(sum_iter, stat);
*sum_iter = saved_sum_stat;
(*sum_iter).day = (*proj_iter).day;
} else {
saved_sum_stat = *sum_iter;
}
if ((*proj_iter).day > (*sum_iter).day) {
AddToStats(prev_proj_stat, *sum_iter);
} else {
AddToStats(*proj_iter, *sum_iter);
}
++sum_iter;
if (sum_iter == sumstats.end()) {
break;
}
}
if ((*proj_iter).day <= (*sum_iter).day) {
prev_proj_stat = *proj_iter;
++proj_iter;
if (proj_iter == (*i)->statistics.end()) {
for (; sum_iter != sumstats.end(); ++sum_iter) {
AddToStats(prev_proj_stat, *sum_iter);
}
break;
}
break;
}
}
}