From 24364814a091b227a8c622a4a12ec5adf55c7758 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 17 Jun 2011 01:47:42 +1000 Subject: [PATCH] Forgot to reenable cropping --- Projects/CodeBlocks/SleepyHead.depend | 2 +- src/graphs/graph.cpp | 6 +++--- src/version.h | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 79198d13..804ee21d 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8309,7 +8309,7 @@ 1308026543 D -1308238797 /home/mark/projects/git/sleepyhead/src/version.h +1308239244 /home/mark/projects/git/sleepyhead/src/version.h 1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index b16a79ea..d0878ee8 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -2250,8 +2250,8 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry) glColor4ub(col.Red(),col.Green(),col.Blue(),255); // Crop to inside the margins. - //glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height); - //glEnable(GL_SCISSOR_TEST); + glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height); + glEnable(GL_SCISSOR_TEST); glLineWidth (1); bool antialias=pref["UseAntiAliasing"]; @@ -2269,7 +2269,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry) glDisable(GL_LINE_SMOOTH); glDisable(GL_BLEND); } - //glDisable(GL_SCISSOR_TEST); + glDisable(GL_SCISSOR_TEST); } gLineOverlayBar::gLineOverlayBar(gPointData *d,const wxColor * col,wxString _label,LO_Type _lot) diff --git a/src/version.h b/src/version.h index a6e2742b..e3dab06c 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 = 6388; - static const long _REVISION = 18175; + static const long _BUILD = 6390; + static const long _REVISION = 18183; //Miscellaneous Version Types - static const long _BUILDS_COUNT = 7450; - #define _RC_FILEVERSION 0,7,6388,18175 - #define _RC_FILEVERSION_STRING "0, 7, 6388, 18175\0" - static const char _FULLVERSION_STRING[] = "0.7.6388.18175"; + static const long _BUILDS_COUNT = 7453; + #define _RC_FILEVERSION 0,7,6390,18183 + #define _RC_FILEVERSION_STRING "0, 7, 6390, 18183\0" + static const char _FULLVERSION_STRING[] = "0.7.6390.18183"; //These values are to keep track of your versioning state, don't modify them. static const long _BUILD_HISTORY = 0;