chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-07 03:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sexy barchart gradients are back

Browse Source
This commit is contained in:
Mark Watkins 2011-06-11 21:22:33 +10:00
parent 8200684efe
commit 3c64b9ad72
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8306,7 +8306,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307790758 /home/mark/projects/git/sleepyhead/src/version.h 1307791312 /home/mark/projects/git/sleepyhead/src/version.h
1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -8344,7 +8344,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1307790757 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307791311 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/graphics.h> <wx/graphics.h>

18
src/graphs/graph.cpp
View File

@ -1612,7 +1612,23 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w)
rect=wxRect(t1,u1,t2,u2); rect=wxRect(t1,u1,t2,u2);
} }
dir=wxEAST; dir=wxEAST;
RoundedRectangle(rect.x,rect.y,rect.width,rect.height,1,color[0]); //,*wxLIGHT_GREY,dir); //RoundedRectangle(rect.x,rect.y,rect.width,rect.height,1,color[0]); //,*wxLIGHT_GREY,dir);
wxColor & col1=color[0];
wxColor & col2=*((wxColor *)wxLIGHT_GREY);
glBegin(GL_QUADS);
//red color
glColor4ub(col1.Red(),col1.Green(),col1.Blue(),col1.Alpha());
glVertex2f(rect.x, rect.y+rect.height);
glVertex2f(rect.x, rect.y);
//blue color
glColor4ub(col2.Red(),col2.Green(),col2.Blue(),col2.Alpha());
glVertex2f(rect.x+rect.width,rect.y);
glVertex2f(rect.x+rect.width, rect.y+rect.height);
glEnd();
wxColor c(0,0,0,255); wxColor c(0,0,0,255);
LinedRoundedRectangle(rect.x,rect.y,rect.width,rect.height,0,1,c); LinedRoundedRectangle(rect.x,rect.y,rect.width,rect.height,0,1,c);
//DrawRectangle(rect.x,rect.y,rect.width,rect.height); //DrawRectangle(rect.x,rect.y,rect.width,rect.height);

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 4725; static const long BUILD = 4728;
static const long REVISION = 9029; static const long REVISION = 9052;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 3761; static const long BUILDS_COUNT = 3769;
#define RC_FILEVERSION 0,7,4725,9029 #define RC_FILEVERSION 0,7,4728,9052
#define RC_FILEVERSION_STRING "0, 7, 4725, 9029\0" #define RC_FILEVERSION_STRING "0, 7, 4728, 9052\0"
static const char FULLVERSION_STRING[] = "0.7.4725.9029"; static const char FULLVERSION_STRING[] = "0.7.4728.9052";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0; static const long BUILD_HISTORY = 0;