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=11288
This commit is contained in:
Charlie Fenton 2006-10-17 00:18:04 +00:00
parent 19bf09e5fb
commit cd179397f0
3 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
checkin_notes
View File

@ -11081,7 +11081,6 @@ David 12 Oct 2006
Charlie 12 Oct 2006
- More fixes to wxPieCtrl for Mac.
client/
clientgui/
ViewResources.cpp
common/
@ -11128,3 +11127,10 @@ David 16 Oct 2006
db/
mysql.h (removed)
Charlie 16 Oct 2006
- New colors for wxPieCtrl from Frank Weiler.
clientgui/
ViewResources.cpp,h

28
clientgui/ViewResources.cpp
View File

@ -28,10 +28,11 @@
#include "BOINCListCtrl.h"
#include "ViewResources.h"
#include "Events.h"
#include <wx/arrimpl.cpp>
#include "res/usage.xpm"
WX_DEFINE_OBJARRAY(wxArrayColour);
IMPLEMENT_DYNAMIC_CLASS(CViewResources, CBOINCBaseView)
BEGIN_EVENT_TABLE (CViewResources, CBOINCBaseView)
@ -47,6 +48,23 @@ CViewResources::CViewResources()
CViewResources::CViewResources(wxNotebook* pNotebook) :
CBOINCBaseView(pNotebook)
{
//add 14 colors for boinc projects (anyone who have more projects attached ?)
m_aProjectColours.Add(wxTheColourDatabase->Find("SPRING GREEN"));
m_aProjectColours.Add(wxTheColourDatabase->Find("SKY BLUE"));
m_aProjectColours.Add(wxTheColourDatabase->Find("ORANGE"));
m_aProjectColours.Add(wxTheColourDatabase->Find("VIOLET"));
m_aProjectColours.Add(wxTheColourDatabase->Find("GOLD"));
m_aProjectColours.Add(wxTheColourDatabase->Find("MAROON"));
m_aProjectColours.Add(wxTheColourDatabase->Find("FIREBRICK"));
m_aProjectColours.Add(wxTheColourDatabase->Find("LIME GREEN"));
m_aProjectColours.Add(wxTheColourDatabase->Find("ORCHID"));
m_aProjectColours.Add(wxTheColourDatabase->Find("SALMON"));
m_aProjectColours.Add(wxTheColourDatabase->Find("SIENNA"));
m_aProjectColours.Add(wxTheColourDatabase->Find("INDIAN RED"));
m_aProjectColours.Add(wxTheColourDatabase->Find("CORAL"));
m_aProjectColours.Add(wxTheColourDatabase->Find("GREEN YELLOW"));
wxFlexGridSizer* itemFlexGridSizer = new wxFlexGridSizer(3, 0, 0);
wxASSERT(itemFlexGridSizer);
@ -103,6 +121,9 @@ CViewResources::CViewResources(wxNotebook* pNotebook) :
itemFlexGridSizer->Add(m_pTaskPane, 1, wxGROW|wxALL, 1);
itemFlexGridSizer->Add(m_pieCtrlTotal, 1, wxGROW|wxALL, 1);
itemFlexGridSizer->Add(m_pieCtrlBOINC, 1, wxGROW|wxALL, 1);
//force same size for both piectrls
itemFlexGridSizer->SetFlexibleDirection(wxVERTICAL);
itemFlexGridSizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED);
SetSizer(itemFlexGridSizer);
@ -214,7 +235,8 @@ void CViewResources::OnListRender( wxTimerEvent& WXUNUSED(event) ) {
wxPiePart part;
part.SetLabel(projectname + wxT(" - ") + diskspace);
part.SetValue(usage);
part.SetColour(wxColour(50*count,255-(count*50),255-(count*50)));
part.SetColour(m_aProjectColours[count>MAX_PROJECTCOLORINDEX ? count % MAX_PROJECTCOLORINDEX : count]);
//part.SetColour(wxColour(50*count,255-(count*50),255-(count*50)));
m_pieCtrlBOINC->m_Series.Add(part);
}
//force a repaint of the legend (doesn't work if not explicitly resized)

5
clientgui/ViewResources.h
View File

@ -27,7 +27,10 @@
#include "BOINCBaseView.h"
#include "common/wxPieCtrl.h"
#include <wx/dynarray.h>
WX_DECLARE_OBJARRAY(wxColour, wxArrayColour);
#define MAX_PROJECTCOLORINDEX 13
class CViewResources : public CBOINCBaseView
{
@ -47,6 +50,8 @@ protected:
wxPieCtrl* m_pieCtrlBOINC;
wxPieCtrl* m_pieCtrlTotal;
wxArrayColour m_aProjectColours;
virtual void UpdateSelection();
wxInt32 FormatProjectName( wxInt32 item, wxString& strBuffer ) const;