*** empty log message ***

svn path=/trunk/boinc/; revision=11994
This commit is contained in:
David Anderson 2007-01-29 16:19:51 +00:00
parent 3dd612227f
commit b161d44800
4 changed files with 16 additions and 6 deletions

View File

@ -1288,3 +1288,13 @@ Rom 28 Jan 2007
clientgui/
BOINCGridCtrl.cpp, .h
ViewProjectsGrid.cpp, .h
David 29 Jan 2007
- core client: fix account-manager resource share logic
- manager: Statistics tab fixes (from Mifistor)
client/
client_state.C
client_types.C
clientgui/
ViewStatistics.cpp

View File

@ -1308,7 +1308,7 @@ int CLIENT_STATE::reset_project(PROJECT* project) {
}
project->duration_correction_factor = 1;
project->ams_resource_share = 0;
project->ams_resource_share = -1;
write_state_file();
return 0;
}

View File

@ -264,7 +264,7 @@ int PROJECT::write_state(MIOFILE& out, bool gui_rpc) {
attached_via_acct_mgr?" <attached_via_acct_mgr/>\n":"",
(this == gstate.scheduler_op->cur_proj)?" <scheduler_rpc_in_progress/>\n":""
);
if (ams_resource_share) {
if (ams_resource_share >= 0) {
out.printf(" <ams_resource_share>%f</ams_resource_share>\n",
ams_resource_share
);
@ -333,7 +333,7 @@ void PROJECT::copy_state_fields(PROJECT& p) {
attached_via_acct_mgr = p.attached_via_acct_mgr;
duration_correction_factor = p.duration_correction_factor;
ams_resource_share = p.ams_resource_share;
if (ams_resource_share) {
if (ams_resource_share > 0) {
resource_share = ams_resource_share;
}
}

View File

@ -1430,15 +1430,15 @@ void CPaintStatistics::OnLeftMouseDown(wxMouseEvent& event) {
m_GraphZoomStart = true;
}else if (m_Legend_dY > 0){
if((double(pt.y) > m_Legend_select_Y_start) && (double(pt.y) < m_Legend_select_Y_end) && (double(pt.x) > m_Legend_select_X_start) && (double(pt.x) < m_Legend_select_X_end)){
int i1 = (int)floor((double(pt.y) - m_Legend_select_Y_start) / m_Legend_dY) + m_Legend_Shift_Mode1;
int i1 = (int)floor((double(pt.y) - m_Legend_select_Y_start) / m_Legend_dY);
switch (m_ModeViewStatistic){
case 1:
m_NextProjectStatistic = i1;
m_NextProjectStatistic = i1 + m_Legend_Shift_Mode1;
m_Zoom_Auto = true;
m_GraphMarker1 = false;
break;
case 2:
m_ViewHideProjectStatistic = i1;
m_ViewHideProjectStatistic = i1 + m_Legend_Shift_Mode2;
break;
}
m_full_repaint = true;