diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 6ccf0d22..88445cb6 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8306,7 +8306,7 @@ -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 "machine.h" @@ -8344,7 +8344,7 @@ "sleeplib/profiles.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 diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index ac3c4982..45378f05 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -1612,7 +1612,23 @@ void gBarChart::Plot(wxDC & dc, gGraphWindow & w) rect=wxRect(t1,u1,t2,u2); } 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); LinedRoundedRectangle(rect.x,rect.y,rect.width,rect.height,0,1,c); //DrawRectangle(rect.x,rect.y,rect.width,rect.height); diff --git a/src/version.h b/src/version.h index 0cd0c12c..c46c56d5 100644 --- a/src/version.h +++ b/src/version.h @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 4725; - static const long REVISION = 9029; + static const long BUILD = 4728; + static const long REVISION = 9052; //Miscellaneous Version Types - static const long BUILDS_COUNT = 3761; - #define RC_FILEVERSION 0,7,4725,9029 - #define RC_FILEVERSION_STRING "0, 7, 4725, 9029\0" - static const char FULLVERSION_STRING[] = "0.7.4725.9029"; + static const long BUILDS_COUNT = 3769; + #define RC_FILEVERSION 0,7,4728,9052 + #define RC_FILEVERSION_STRING "0, 7, 4728, 9052\0" + static const char FULLVERSION_STRING[] = "0.7.4728.9052"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;