From 7e485171c9ac8dbfdec8aaf21b6e653539215ef8 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 7 Jun 2011 19:47:42 +1000 Subject: [PATCH] Fix to Candlestick Text Label Rendering --- Projects/CodeBlocks/SleepyHead.depend | 6 +++--- src/graphs/graph.cpp | 3 ++- src/version.h | 12 ++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 8d0c65d3..93411aee 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8295,7 +8295,7 @@ -1307438188 /home/mark/projects/git/sleepyhead/src/version.h +1307440007 /home/mark/projects/git/sleepyhead/src/version.h 1307418393 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" @@ -8312,7 +8312,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1307437773 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1307438186 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -8332,7 +8332,7 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1307436574 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1307439942 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index 25ea7f90..a2dd6462 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -1031,7 +1031,8 @@ void gCandleStick::Plot(wxDC & dc, gGraphWindow & w) } str+=wxString::Format(wxT("%0.2f"),data->point[0][i].x); dc.GetTextExtent(str, &textX, &textY); - if (t2>textX+5) { + textX+=10; + if (t2>(textX)) { int j=t1+((t2/2)-(textX/2)); if (m_direction==wxVERTICAL) { dc.DrawRotatedText(str,start_px+barwidth+2+textY,j,270); diff --git a/src/version.h b/src/version.h index f8421391..eeea1d6b 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 = 3410; - static const long REVISION = 1760; + static const long BUILD = 3413; + static const long REVISION = 1781; //Miscellaneous Version Types - static const long BUILDS_COUNT = 696; - #define RC_FILEVERSION 0,7,3410,1760 - #define RC_FILEVERSION_STRING "0, 7, 3410, 1760\0" - static const char FULLVERSION_STRING[] = "0.7.3410.1760"; + static const long BUILDS_COUNT = 709; + #define RC_FILEVERSION 0,7,3413,1781 + #define RC_FILEVERSION_STRING "0, 7, 3413, 1781\0" + static const char FULLVERSION_STRING[] = "0.7.3413.1781"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;