diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index d324e94e..6ccf0d22 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8306,7 +8306,7 @@ -1307790119 /home/mark/projects/git/sleepyhead/src/version.h +1307790758 /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" -1307790156 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1307790757 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index ab13d67c..ac3c4982 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -2015,6 +2015,8 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w) //wxBrush brush(*color[0],wxFDIAGONAL_HATCH); //dc.SetBrush(brush); + glEnable(GL_POINT_SMOOTH); + glEnable( GL_BLEND ); wxColor & col=color[0]; for (int n=0;nVC();n++) { @@ -2061,10 +2063,9 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w) //dc.DrawLine(x1,start_py+25,x1,start_py+height-25); glColor4ub(col.Red(),col.Green(),col.Blue(),col.Alpha()); - glLineWidth (4); - glBegin(GL_LINES); - glVertex2f(x1,start_py+27); - glVertex2f(x1,start_py+23); + glPointSize(6); + glBegin(GL_POINTS); + glVertex2f(x1,start_py+25); glEnd(); //dc.DrawLine(x1,start_py+25,x1,start_py+25); @@ -2076,9 +2077,9 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w) } } else if (lo_type==LOT_Dot) { glColor4ub(col.Red(),col.Green(),col.Blue(),col.Alpha()); - glLineWidth (4); - glBegin(GL_LINES); - glVertex2f(x1,start_py+(height/2)-10); + glPointSize(4); + glBegin(GL_POINTS); + //glVertex2f(x1,start_py+(height/2)-10); glVertex2f(x1,start_py+(height/2)-14); glEnd(); //dc.SetPen(sfp3); diff --git a/src/version.h b/src/version.h index dce8f434..0cd0c12c 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 = 4719; - static const long REVISION = 8992; + static const long BUILD = 4725; + static const long REVISION = 9029; //Miscellaneous Version Types - static const long BUILDS_COUNT = 3743; - #define RC_FILEVERSION 0,7,4719,8992 - #define RC_FILEVERSION_STRING "0, 7, 4719, 8992\0" - static const char FULLVERSION_STRING[] = "0.7.4719.8992"; + 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"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;