From 19550f28cd0f963bdf0bbcc8be9f785868c88a24 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 18 Jun 2011 05:59:33 +1000 Subject: [PATCH] YAxis minor-tick alignment fix --- Projects/CodeBlocks/SleepyHead.depend | 7 ++++--- Projects/CodeBlocks/SleepyHead.layout | 4 ++-- src/graphs/graph.cpp | 29 ++------------------------- src/version.h | 12 +++++------ 4 files changed, 14 insertions(+), 38 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 29fe5b57..df5ba739 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8309,7 +8309,7 @@ 1308026543 D -1308334550 /home/mark/projects/git/sleepyhead/src/version.h +1308340491 /home/mark/projects/git/sleepyhead/src/version.h 1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed @@ -8362,7 +8362,7 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1308334546 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1308340490 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp "freetype-gl/font-manager.h" "freetype-gl/texture-font.h" "graph.h" @@ -11073,8 +11073,9 @@ -1308328238 source:/home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.cpp +1308337622 source:/home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.cpp "gl_pbuffer.h" + diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout index 565ba2a3..3a5be89a 100644 --- a/Projects/CodeBlocks/SleepyHead.layout +++ b/Projects/CodeBlocks/SleepyHead.layout @@ -16,13 +16,13 @@ - + - + diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index 3a3a4891..34b0c810 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -1591,33 +1591,7 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry) double min_ytick=rxy*yt; - //if (miny>=0) { - //} else { - //} - /*double max_yticks=1/max_yticksdiv; - - double yy=w.max_y-w.min_y; - double ymult=height/yy; - double major_ytick=max_yticksdiv*yy; - - double min_ytick,q; - - if (w.min_y>=0) { - int yrounding[9]={1,2,5,10,20,30,40,50,100}; // time rounding - int ry; - for (ry=0;ry<9;ry++) { - // st=round(st2*rounding[ry])/rounding[ry]; - min_ytick=round(major_ytick*yrounding[ry])/yrounding[ry]; - q=yy/min_ytick; // number of ticks that fits in range - if (q<=max_yticks) break; // compared to number of ticks that fit on screen. - } - } else { - min_ytick=60; - } - if (min_ytick<=0.25) - min_ytick=0.25; */ - - int ty,h; + float ty,h; const int maxverts=2048; int vertcnt=0; @@ -1626,6 +1600,7 @@ void gYAxis::Plot(gGraphWindow &w,float scrx,float scry) glColor4ub(linecol1.Red(),linecol1.Green(),linecol1.Blue(),linecol1.Alpha()); glLineWidth(1); + for (double i=miny+(min_ytick/2.0); i