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

*** empty log message *** 

svn path=/trunk/boinc/; revision=11458
This commit is contained in:
Rom Walton 2006-11-03 08:50:36 +00:00
parent db10852294
commit c8442c01c8
7 changed files with 100 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
checkin_notes
View File

@ -12076,3 +12076,18 @@ David 2 Nov 2006
top_teams.php
lib/
prefs.C
Rom 3 Nov 2006
- MGR: The preferences dialog should only allow somebody to override
settings that they have changed.
- MGR: Adjust the advanced view resources tab so that it'll use the
free and total space on a remote pc instead of calling the wxWidget
GetFreeDiskSpace API.
clientgui/
sg_DlgPreferences.cpp, .h
ViewResources.cpp
lib/
boinc_cmd.C
gui_rpc_client.h
gui_rpc_client_ops.C

19
clientgui/ViewResources.cpp
View File

@ -210,20 +210,19 @@ bool CViewResources::OnRestoreState(wxConfigBase* pConfig) {
}
void CViewResources::OnListRender( wxTimerEvent& WXUNUSED(event) ) {
wxString diskspace;
CMainDocument* pDoc = wxGetApp().GetDocument();
wxString diskspace;
double boinctotal=0.0;
wxASSERT(pDoc);
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
//clear former data
m_pieCtrlBOINC->m_Series.Clear();
m_pieCtrlTotal->m_Series.Clear();
//get data for BOINC projects disk usage
if (wxGetApp().GetDocument()->GetResourceCount()>0) {
CMainDocument* pDoc = wxGetApp().GetDocument();
wxASSERT(pDoc);
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
if (pDoc->GetResourceCount() > 0) {
PROJECTS *proj=&(pDoc->resource_status);
wxASSERT(proj);
//update data for boinc projects pie chart
@ -258,10 +257,8 @@ void CViewResources::OnListRender( wxTimerEvent& WXUNUSED(event) ) {
}
//data for pie chart 2 (total disk usage)
wxPiePart part;
wxLongLong llTotal,llFree;
::wxGetDiskSpace(wxGetCwd(),&llTotal,&llFree);
double free = llFree.ToDouble();
double total = llTotal.ToDouble();
double free = pDoc->host.d_free;
double total = pDoc->host.d_total;
//free disk space
FormatDiskSpace2(free,diskspace);
part.SetLabel(_("free disk space - ") + diskspace);

101
clientgui/sg_DlgPreferences.cpp
View File

@ -618,6 +618,8 @@ bool CDlgPreferences::ClearPreferenceSettings() {
bool CDlgPreferences::ReadPreferenceSettings() {
CMainDocument* pDoc = wxGetApp().GetDocument();
GLOBAL_PREFS current_global_preferences;
unsigned int i;
wxASSERT(pDoc);
@ -625,40 +627,40 @@ bool CDlgPreferences::ReadPreferenceSettings() {
// Populate values and arrays from preferences
if (pDoc->rpc.get_global_prefs_override_struct(m_prefs) == 0) {
if (pDoc->rpc.get_global_prefs_override_struct(current_global_preferences) == 0) {
m_bCustomizedPreferences = true;
} else {
m_bCustomizedPreferences = false;
m_prefs = pDoc->state.global_prefs;
current_global_preferences = pDoc->state.global_prefs;
}
// Do work only between:
// Start:
m_WorkBetweenBeginCtrl->Append(wxArrayString(iTimeOfDayArraySize, astrTimeOfDayStrings));
m_strWorkBetweenBegin = astrTimeOfDayStrings[m_prefs.start_hour];
m_strWorkBetweenBegin = astrTimeOfDayStrings[current_global_preferences.start_hour];
// End:
m_WorkBetweenEndCtrl->Append(wxArrayString(iTimeOfDayArraySize, astrTimeOfDayStrings));
m_strWorkBetweenEnd = astrTimeOfDayStrings[m_prefs.end_hour];
m_strWorkBetweenEnd = astrTimeOfDayStrings[current_global_preferences.end_hour];
// Connect to internet only between:
// Start:
m_ConnectBetweenBeginCtrl->Append(wxArrayString(iTimeOfDayArraySize, astrTimeOfDayStrings));
m_strConnectBetweenBegin = astrTimeOfDayStrings[m_prefs.net_start_hour];
m_strConnectBetweenBegin = astrTimeOfDayStrings[current_global_preferences.net_start_hour];
// End:
m_ConnectBetweenEndCtrl->Append(wxArrayString(iTimeOfDayArraySize, astrTimeOfDayStrings));
m_strConnectBetweenEnd = astrTimeOfDayStrings[m_prefs.net_end_hour];
m_strConnectBetweenEnd = astrTimeOfDayStrings[current_global_preferences.net_end_hour];
// Use no more than %s of disk space
wxArrayString aDiskUsage = wxArrayString(iDiskUsageArraySize, astrDiskUsageStrings);
wxString strDiskUsage = wxEmptyString;
int iDiskUsageIndex = iDiskUsageArraySize;
if (m_prefs.disk_max_used_gb > 0) {
if (m_prefs.disk_max_used_gb < 1) {
strDiskUsage.Printf(_("%d MB"), (int)(m_prefs.disk_max_used_gb * 1000));
if (current_global_preferences.disk_max_used_gb > 0) {
if (current_global_preferences.disk_max_used_gb < 1) {
strDiskUsage.Printf(_("%d MB"), (int)(current_global_preferences.disk_max_used_gb * 1000));
} else {
strDiskUsage.Printf(_("%4.2f GB"), m_prefs.disk_max_used_gb);
strDiskUsage.Printf(_("%4.2f GB"), current_global_preferences.disk_max_used_gb);
}
// Null out strDiskUsage if it is a duplicate
@ -688,8 +690,8 @@ bool CDlgPreferences::ReadPreferenceSettings() {
wxString strCPUUsage = wxEmptyString;
int iCPUUsageIndex = iCPUUsageArraySize - 4;
if (m_prefs.cpu_usage_limit > 0) {
strCPUUsage.Printf(_("%d%%"), (int)m_prefs.cpu_usage_limit);
if (current_global_preferences.cpu_usage_limit > 0) {
strCPUUsage.Printf(_("%d%%"), (int)current_global_preferences.cpu_usage_limit);
// Null out strCPUUsage if it is a duplicate
for (i=0; i < aCPUUsage.Count(); i++) {
@ -714,18 +716,18 @@ bool CDlgPreferences::ReadPreferenceSettings() {
}
// Do work while computer is in use?
m_bWorkWhileInUse = m_prefs.run_if_user_active;
m_bWorkWhileInUse = current_global_preferences.run_if_user_active;
// Do work while computer is on battery?
m_bWorkWhileOnBattery = m_prefs.run_on_batteries;
m_bWorkWhileOnBattery = current_global_preferences.run_on_batteries;
// Do work after computer is idle for:
wxArrayString aWorkWhenIdle = wxArrayString(iWorkWhenIdleArraySize, astrWorkWhenIdleStrings);
wxString strWorkWhenIdle = wxEmptyString;
int iWorkWhenIdleIndex = 2;
if (m_prefs.idle_time_to_run > 0) {
strWorkWhenIdle.Printf(_("%d"), (int)m_prefs.idle_time_to_run);
if (current_global_preferences.idle_time_to_run > 0) {
strWorkWhenIdle.Printf(_("%d"), (int)current_global_preferences.idle_time_to_run);
// Null out strWorkWhenIdle if it is a duplicate
for (i=0; i < aWorkWhenIdle.Count(); i++) {
@ -772,42 +774,79 @@ bool CDlgPreferences::ReadSkinSettings() {
bool CDlgPreferences::SavePreferenceSettings() {
CMainDocument* pDoc = wxGetApp().GetDocument();
CMainDocument* pDoc = wxGetApp().GetDocument();
GLOBAL_PREFS global_preferences_override;
GLOBAL_PREFS_MASK global_preferences_mask;
int iTest = 0;
double dTest = 0.0;
wxASSERT(pDoc);
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
// Copy all the defaults from global_prefs
m_prefs = pDoc->state.global_prefs;
// Do work only between:
m_strWorkBetweenBegin.ToLong((long*)&m_prefs.start_hour);
m_strWorkBetweenEnd.ToLong((long*)&m_prefs.end_hour);
m_strWorkBetweenBegin.ToLong((long*)&iTest);
if (iTest != current_global_preferences.start_hour) {
global_preferences_override.start_hour = iTest;
global_preferences_mask.start_hour = true;
}
m_strWorkBetweenEnd.ToLong((long*)&iTest);
if (iTest != current_global_preferences.end_hour) {
global_preferences_override.end_hour = iTest;
global_preferences_mask.end_hour = true;
}
// Connect to internet only between:
m_strConnectBetweenBegin.ToLong((long*)&m_prefs.net_start_hour);
m_strConnectBetweenEnd.ToLong((long*)&m_prefs.net_end_hour);
m_strConnectBetweenBegin.ToLong((long*)&iTest);
if (iTest != current_global_preferences.net_start_hour) {
global_preferences_override.net_start_hour = iTest;
global_preferences_mask.net_start_hour = true;
}
m_strConnectBetweenEnd.ToLong((long*)&iTest);
if (iTest != current_global_preferences.net_end_hour) {
global_preferences_override.net_end_hour = iTest;
global_preferences_mask.net_end_hour = true;
}
// Use no more than %s of disk space
m_strMaxDiskUsage.ToDouble((double*)&m_prefs.disk_max_used_gb);
m_strMaxDiskUsage.ToDouble((double*)&dTest);
if (m_strMaxDiskUsage.Find(wxT("GB")) == -1) {
m_prefs.disk_max_used_gb /= 1000;
dTest /= 1000;
}
if (dTest != current_global_preferences.disk_max_used_gb) {
global_preferences_override.disk_max_used_gb = dTest;
global_preferences_mask.disk_max_used_gb = true;
}
// Use no more than %s of the processor
m_strMaxCPUUsage.ToDouble((double*)&m_prefs.cpu_usage_limit);
m_strMaxCPUUsage.ToDouble((double*)&dTest);
if (dTest != current_global_preferences.cpu_usage_limit) {
global_preferences_override.cpu_usage_limit = dTest;
global_preferences_mask.cpu_usage_limit = true;
}
// Do work while computer is in use?
m_prefs.run_if_user_active = m_bWorkWhileInUse;
if (m_bWorkWhileInUse != current_global_preferences.run_if_user_active) {
global_preferences_override.run_if_user_active = m_bWorkWhileInUse;
global_preferences_mask.run_if_user_active = true;
}
// Do work while computer is on battery?
m_prefs.run_on_batteries = m_bWorkWhileOnBattery;
if (m_bWorkWhileOnBattery != current_global_preferences.run_on_batteries) {
global_preferences_override.run_on_batteries = m_bWorkWhileOnBattery;
global_preferences_mask.run_on_batteries = true;
}
// Do work after computer is idle for:
m_strWorkWhenIdle.ToDouble((double*)&m_prefs.idle_time_to_run);
m_strWorkWhenIdle.ToDouble((double*)&dTest);
if (dTest != current_global_preferences.idle_time_to_run) {
global_preferences_override.idle_time_to_run = dTest;
global_preferences_mask.idle_time_to_run = true;
}
pDoc->rpc.set_global_prefs_override_struct(m_prefs);
pDoc->rpc.set_global_prefs_override_struct(global_preferences_override, global_preferences_mask);
pDoc->rpc.read_global_prefs_override();
return true;
}

2
clientgui/sg_DlgPreferences.h
View File

@ -178,7 +178,7 @@ private:
wxString m_strWorkWhenIdle;
bool m_bCustomizedPreferences;
////@end CDlgPreferences member variables
GLOBAL_PREFS m_prefs;
GLOBAL_PREFS current_global_preferences;
};

6
lib/boinc_cmd.C
View File

@ -454,10 +454,10 @@ int main(int argc, char** argv) {
printf("retval %d max %d\n", retval, p.max_cpus);
} else if (!strcmp(cmd, "--test4")) {
GLOBAL_PREFS p;
memset(&p, 0, sizeof(p));
p.defaults();
GLOBAL_PREFS_MASK m;
p.max_cpus = 2;
retval = rpc.set_global_prefs_override_struct(p);
m.max_cpus = true;
retval = rpc.set_global_prefs_override_struct(p, m);
printf("retval %d\n", retval);
} else if (!strcmp(cmd, "--quit")) {
retval = rpc.quit();

2
lib/gui_rpc_client.h
View File

@ -568,7 +568,7 @@ public:
int get_global_prefs_override(std::string&);
int set_global_prefs_override(std::string&);
int get_global_prefs_override_struct(GLOBAL_PREFS&);
int set_global_prefs_override_struct(GLOBAL_PREFS&);
int set_global_prefs_override_struct(GLOBAL_PREFS&, GLOBAL_PREFS_MASK&);
};
struct RPC {

4
lib/gui_rpc_client_ops.C
View File

@ -2115,14 +2115,14 @@ int RPC_CLIENT::get_global_prefs_override_struct(GLOBAL_PREFS& prefs) {
return 0;
}
int RPC_CLIENT::set_global_prefs_override_struct(GLOBAL_PREFS& prefs) {
int RPC_CLIENT::set_global_prefs_override_struct(GLOBAL_PREFS& prefs, GLOBAL_PREFS_MASK& mask) {
SET_LOCALE sl;
char buf[64000];
MIOFILE mf;
string s;
mf.init_buf(buf);
prefs.write(mf);
prefs.write_subset(mf, mask);
s = buf;
return set_global_prefs_override(s);
}