chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-28 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up gLineChart debugging info

Browse Source
This commit is contained in:
Mark Watkins 2011-06-17 02:03:34 +10:00
parent 24364814a0
commit 206297da83
3 changed files with 20 additions and 16 deletions
Projects/CodeBlocks
SleepyHead.depend
src
graphs
graph.cpp
version.h

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8309,7 +8309,7 @@
1308026543 D
1308239244 /home/mark/projects/git/sleepyhead/src/version.h
1308240204 /home/mark/projects/git/sleepyhead/src/version.h
1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed
<wx/dcbuffer.h>
@ -8362,7 +8362,7 @@
"sleeplib/profiles.h"
"sleeplib/machine_loader.h"
1308238538 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
1308240152 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
"freetype-gl/font-manager.h"
"freetype-gl/texture-font.h"
"graph.h"

20
src/graphs/graph.cpp
View File

@ -2041,6 +2041,8 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
bool done,first;
double x0,x1,xL;
int visible_points=0;
for (int n=0;n<data->VC();n++) { // for each segment
int siz=data->np[n];
@ -2084,7 +2086,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
double ZQ=ZR/XR;
double ZW=ZR/(width*ZQ);
const int num_averages=15; // Number of samples taken from samples per pixel for better min/max values
visible_points+=ZR*ZQ;
if (accel && n>0) {
sam=1;
}
@ -2237,16 +2239,18 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
#endif
}
}
wxString b;
int j=vertcnt/2;
if (accel) j/=2;
b << siz << wxT(" ") << (idx) << wxT(" ") << (siz/sam) << wxT(" ") << j;
DrawText(b,scrx-190,scry-w.GetTopMargin()-14);
}
wxString b;
int j=vertcnt/2;
if (accel) j/=2;
b << visible_points << wxT(" ") << (sam) << wxT(" ") << num_points << wxT(" ") << j;
float x,y;
GetTextExtent(b,x,y);
DrawText(b,scrx-w.GetRightMargin()-x-15,scry-w.GetTopMargin()-10);
glColor4ub(col.Red(),col.Green(),col.Blue(),255);
// Crop to inside the margins.
@ -2260,6 +2264,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
glEnable(GL_LINE_SMOOTH);
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
}
glEnableClientState(GL_VERTEX_ARRAY);
glVertexPointer(2, GL_SHORT, 0, vertarray);
glDrawArrays(GL_LINES, 0, vertcnt>>1);
@ -2331,7 +2336,6 @@ void gLineOverlayBar::Plot(gGraphWindow & w,float scrx,float scry)
int quadcnt=0;
static GLshort quadarray[maxverts+8];
float bottom=start_py+25, top=start_py+height-25;
wxColor & col=color[0];
for (int n=0;n<data->VC();n++) {

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long _MAJOR = 0;
static const long _MINOR = 7;
static const long _BUILD = 6390;
static const long _REVISION = 18183;
static const long _BUILD = 6402;
static const long _REVISION = 18233;
//Miscellaneous Version Types
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";
static const long _BUILDS_COUNT = 7475;
#define _RC_FILEVERSION 0,7,6402,18233
#define _RC_FILEVERSION_STRING "0, 7, 6402, 18233\0"
static const char _FULLVERSION_STRING[] = "0.7.6402.18233";
//These values are to keep track of your versioning state, don't modify them.
static const long _BUILD_HISTORY = 0;