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

gLineChart overlay & flags graph optimisations

Browse Source
This commit is contained in:
Mark Watkins 2011-06-12 20:55:42 +10:00
parent ab8c3e086e
commit 69c190c67c
3 changed files with 112 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8307,7 +8307,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1307873279 /home/mark/projects/git/sleepyhead/src/version.h 1307876090 /home/mark/projects/git/sleepyhead/src/version.h
1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -8345,7 +8345,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1307873276 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1307876090 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/graphics.h> <wx/graphics.h>

205
src/graphs/graph.cpp
View File

@ -1863,8 +1863,8 @@ void gLineChart::Plot(wxDC & dc, gGraphWindow & w)
// Crop to inside the margins. // Crop to inside the margins.
glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height); glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height);
glEnable(GL_SCISSOR_TEST); glEnable(GL_SCISSOR_TEST);
glLineWidth (.25); glLineWidth (.25);
//glEnable(GL_LINE_SMOOTH); //glEnable(GL_LINE_SMOOTH);
//glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); //glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);
@ -2008,80 +2008,93 @@ void gLineOverlayBar::Plot(wxDC & dc, gGraphWindow & w)
double xx=w.max_x-w.min_x; double xx=w.max_x-w.min_x;
if (xx<=0) return; if (xx<=0) return;
double x1,x2; float x1,x2;
float x,y;//,descent,leading;
// Crop to inside the margins.
glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height);
glEnable(GL_SCISSOR_TEST);
wxColor & col=color[0]; wxColor & col=color[0];
for (int n=0;n<data->VC();n++) { for (int n=0;n<data->VC();n++) {
bool done=false; bool done=false;
bool first=true; bool first=true;
for (int i=0;i<data->np[n];i++) { //,done==false int fi=0,li;
if (data->point[n][i].m_y < w.min_x) continue; for (li=0;li<data->np[n];li++) {
// m_x & m_y are both x axis's here.. (m_y is only used for spans)
if (data->point[n][li].m_y < w.min_x) continue;
if (data->point[n][li].m_x > w.max_x) break;
if (first) { if (first) {
first=false; first=false;
if (i>0) i--; if (li>0) li--;
fi=li;
} }
}
glColor4ub(col.Red(),col.Green(),col.Blue(),col.Alpha());
if (lo_type==LOT_Bar) {
glLineWidth (0.25);
glBegin(GL_LINES);
float bottom=start_py+25, top=start_py+height-25;
wxPoint2DDouble & rp=data->point[n][i]; // Draw any lines
x1=w.x2p(rp.m_x); for (int i=fi;i<li;i++) {
x2=w.x2p(rp.m_y); wxPoint2DDouble & rp=data->point[n][i];
if (rp.m_x==rp.m_y) {
// point z is marker code x1=w.x2p(rp.m_x);
glVertex2f(x1,top);
if (x1<=start_px) x1=start_px+1; glVertex2f(x1,bottom);
if (x2<=start_px) continue; }
if (x1>start_px+width) {
//done=true;
break;
} }
if (x2>=start_px+width+1) x2=start_px+width+1; glEnd();
double w1=x2-x1;
float x,y;//,descent,leading; // Draw the dots above
if (lo_type==LOT_Bar) { glPointSize(6);
glBegin(GL_POINTS);
for (int i=fi;i<li;i++) {
wxPoint2DDouble & rp=data->point[n][i];
if (rp.m_x==rp.m_y) {
x1=w.x2p(rp.m_x);
glVertex2f(x1,top);
}
}
glEnd();
// Text Labels & Spans
for (int i=fi;i<li;i++) {
wxPoint2DDouble & rp=data->point[n][i];
x1=w.x2p(rp.m_x);
x2=w.x2p(rp.m_y);
if (rp.m_x==rp.m_y) { if (rp.m_x==rp.m_y) {
if (xx<(1800.0/86400)) { if (xx<(1800.0/86400)) {
GetTextExtent(label,x,y); GetTextExtent(label,x,y);
DrawText(label,x1-(x/2),start_py+height-30+y); DrawText(label,x1-(x/2),start_py+height-30+y);
} }
glColor4ub(col.Red(),col.Green(),col.Blue(),col.Alpha());
glLineWidth (0.25);
glBegin(GL_LINES);
glVertex2f(x1,start_py+25);
glVertex2f(x1,start_py+height-25);
glEnd();
//glEnable(GL_POINT_SMOOTH);
glColor4ub(col.Red(),col.Green(),col.Blue(),col.Alpha());
glPointSize(6);
glBegin(GL_POINTS);
glVertex2f(x1,start_py+height-25);
glEnd();
// glDisable(GL_POINT_SMOOTH);
} else { } else {
float w1=x2-x1;
RoundedRectangle(x1,start_py,w1,height,2,col); RoundedRectangle(x1,start_py,w1,height,2,col);
} }
} else if (lo_type==LOT_Dot) {
glColor4ub(col.Red(),col.Green(),col.Blue(),col.Alpha());
//glEnable(GL_POINT_SMOOTH);
//glEnable(GL_BLEND);
glPointSize(4);
glBegin(GL_POINTS);
glVertex2f(x1,start_py+(height/2)+14);
glEnd();
//glDisable(GL_POINT_SMOOTH);
//glDisable(GL_BLEND);
} }
} else if (lo_type==LOT_Dot) {
//glEnable(GL_POINT_SMOOTH);
//glEnable(GL_BLEND);
glPointSize(4);
glBegin(GL_POINTS);
for (int i=fi;i<li;i++) {
wxPoint2DDouble & rp=data->point[n][i];
x1=w.x2p(rp.m_x);
if (done) break; glVertex2f(x1,start_py+(height/2)+14);
}
glEnd();
//glDisable(GL_POINT_SMOOTH);
//glDisable(GL_BLEND);
} }
if (done) break;
} }
glDisable(GL_SCISSOR_TEST);
} }
gFlagsLine::gFlagsLine(gPointData *d,const wxColor * col,wxString _label,int _line_num,int _total_lines) gFlagsLine::gFlagsLine(gPointData *d,const wxColor * col,wxString _label,int _line_num,int _total_lines)
@ -2102,12 +2115,9 @@ void gFlagsLine::Plot(wxDC & dc, gGraphWindow & w)
double xx=w.max_x-w.min_x; double xx=w.max_x-w.min_x;
if (xx<=0) return; if (xx<=0) return;
//if (!data->NP()) return;
int scrx = w.GetScrX(); int scrx = w.GetScrX();
int scry = w.GetScrY(); int scry = w.GetScrY();
//wxString label=wxString::Format(wxT("%i %i"),scrx,scry);
//dc.DrawText(label,0,0);
int start_px=w.GetLeftMargin(); int start_px=w.GetLeftMargin();
int start_py=w.GetBottomMargin(); int start_py=w.GetBottomMargin();
@ -2115,12 +2125,8 @@ void gFlagsLine::Plot(wxDC & dc, gGraphWindow & w)
int height=scry-(w.GetTopMargin()+w.GetBottomMargin()); int height=scry-(w.GetTopMargin()+w.GetBottomMargin());
static wxColor col1=wxColor(0xd0,0xff,0xd0,0xff); static wxColor col1=wxColor(0xd0,0xff,0xd0,0xff);
// static wxColor col2=wxColor(0xe0,0xe0,0xff,0xff);
static wxColor col2=wxColor(0xff,0xff,0xff,0xff); static wxColor col2=wxColor(0xff,0xff,0xff,0xff);
//dc.SetFont(*smallfont);
//dc.SetTextForeground(*wxBLACK);
float line_h=float(height-2)/float(total_lines); float line_h=float(height-2)/float(total_lines);
line_h=line_h; line_h=line_h;
@ -2139,73 +2145,70 @@ void gFlagsLine::Plot(wxDC & dc, gGraphWindow & w)
glEnd (); glEnd ();
} //else ceil(line_h); }
// Alternating box color
wxColor *barcol=&col2; wxColor *barcol=&col2;
if (line_num & 1) { if (line_num & 1) {
barcol=&col1; barcol=&col1;
} }
// Draw box
RoundedRectangle(start_px,line_top,width-1,line_h+1,0,*barcol); RoundedRectangle(start_px,line_top,width-1,line_h+1,0,*barcol);
// Draw text label
float x,y; float x,y;
GetTextExtent(label,x,y); GetTextExtent(label,x,y);
DrawText(label,start_px-x-6,line_top+(line_h/2)-(y/2)); DrawText(label,start_px-x-6,line_top+(line_h/2)-(y/2));
int x1,x2; float x1,x2,w1;
wxColor & col=color[0]; wxColor & col=color[0];
glColor4ub(col.Red(),col.Green(),col.Blue(),col.Alpha()); glColor4ub(col.Red(),col.Green(),col.Blue(),col.Alpha());
glLineWidth (1); int fi=0,li;
glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height);
glEnable(GL_SCISSOR_TEST);
for (int n=0;n<data->VC();n++) { for (int n=0;n<data->VC();n++) {
bool done=false; bool done=false;
bool first=true; bool first=true;
for (int i=0;i<data->np[n];i++) { //,done==false for (li=0;li<data->np[n];li++) { //,done==false
if (data->point[n][i].m_y < w.min_x) continue; if (data->point[n][li].m_y < w.min_x) continue;
if (data->point[n][li].m_x > w.max_x) break;
if (first) { if (first) {
fi=li;
if (li>0) li--;
first=false; first=false;
if (i>0) i--;
} }
wxPoint2DDouble & rp=data->point[n][i];
x1=w.x2p(rp.m_x);
x2=w.x2p(rp.m_y);
// point z is marker code
if (x1<=start_px) x1=start_px+1;
if (x2<=start_px) continue;
if (x1>start_px+width) {
//done=true;
break;
}
if (x2>=start_px+width+1) x2=start_px+width+1;
double w1=x2-x1;
if (rp.m_x==rp.m_y) {
glBegin(GL_LINES);
glVertex2f(x1,line_top+4);
glVertex2f(x1,line_top+line_h-3);
glEnd();
//dc.DrawLine(x1,line_top+4,x1,line_top+line_h-3);
//dc.SetPen(sfp2);
//dc.DrawLine(x1,w.GetTopMargin()+25,x1,w.GetTopMargin()+25);
} else {
// if ((x1>w.GetLeftMargin()) && (x1<w.GetLeftMargin()+w.Width()))
//gc.SetPen(sfp1);
RoundedRectangle(x1,line_top+4,w1,line_h-6,0,color[0]);
}
if (done) break;
} }
glLineWidth (1);
glBegin(GL_LINES);
float top=floor(line_top)+2;
float bottom=top+floor(line_h)-3;
for (int i=fi;i<li;i++) {
wxPoint2DDouble & rp=data->point[n][i];
if (rp.m_x==rp.m_y) {
x1=w.x2p(rp.m_x);
glVertex2f(x1,top);
glVertex2f(x1,bottom);
}
}
glEnd();
if (done) break; bottom=floor(line_h)-4; // just the height
for (int i=fi;i<li;i++) {
wxPoint2DDouble & rp=data->point[n][i];
if (rp.m_x!=rp.m_y) {
x1=w.x2p(rp.m_x);
x2=w.x2p(rp.m_y);
w1=x2-x1;
RoundedRectangle(x1,top,w1,bottom,0,color[0]);
}
}
} }
glDisable(GL_SCISSOR_TEST);
} }

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 5187; static const long BUILD = 5213;
static const long REVISION = 11633; static const long REVISION = 11763;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 4845; static const long BUILDS_COUNT = 4911;
#define RC_FILEVERSION 0,7,5187,11633 #define RC_FILEVERSION 0,7,5213,11763
#define RC_FILEVERSION_STRING "0, 7, 5187, 11633\0" #define RC_FILEVERSION_STRING "0, 7, 5213, 11763\0"
static const char FULLVERSION_STRING[] = "0.7.5187.11633"; static const char FULLVERSION_STRING[] = "0.7.5213.11763";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0; static const long BUILD_HISTORY = 0;