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

Fixed random graph color problem on certain video chips

Browse Source
This commit is contained in:
Mark Watkins 2011-08-01 22:29:17 +10:00
parent 536d3fa14b
commit 26b2f2cfe6
5 changed files with 34 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Graphs/gLineChart.cpp
View File

@ -14,8 +14,7 @@
gLineChart::gLineChart(ChannelID code,QColor col,bool square_plot, bool disable_accel)
:gLayer(code),m_square_plot(square_plot),m_disable_accel(disable_accel)
{
color.clear();
color.push_back(col);
m_line_color=col;
m_report_empty=false;
}
gLineChart::~gLineChart()
@ -100,7 +99,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
// Draw bounding box
{
glColor3f (0.0, 0.0, 0.0);
w.qglColor(Qt::black);
glLineWidth (1);
glBegin (GL_LINE_LOOP);
glVertex2f (start_px, start_py);
@ -118,9 +117,6 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
return;
}
// Selected the plot line color
QColor & col=color[0];
int num_points=0;
int visible_points=0;
int total_points=0;
@ -194,7 +190,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
double ZR=ZD/sr;
double ZQ=ZR/XR;
double ZW=ZR/(width*ZQ);
const int num_averages=15; // Max n umber of samples taken from samples per pixel for better min/max values
const int num_averages=20; // Max n umber of samples taken from samples per pixel for better min/max values
visible_points+=ZR*ZQ;
if (accel && n>0) {
sam=1;
@ -279,7 +275,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
// In accel mode, each pixel has a min/max Y value.
// m_drawlist's index is the pixel index for the X pixel axis.
int z=floor(px); // Hmmm... round may screw this up.
int z=round(px); // Hmmm... round may screw this up.
if (z<minz) minz=z; // minz=First pixel
if (z>maxz) maxz=z; // maxz=Last pixel
if (minz<0) {
@ -305,11 +301,16 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
qDebug() << "gLineChart::Plot() maxz exceeded graph width" << "maxz = " << maxz << "width =" << width << "scrx =" <<scrx;
maxz=width;
}
for (int i=minz;i<maxz;i++) {
float ax1,ay1;
for (int i=minz+1;i<maxz-1;i++) {
// ax1=(m_drawlist[i-1].x()+m_drawlist[i].x()+m_drawlist[i+1].x())/3.0;
// ay1=(m_drawlist[i-1].y()+m_drawlist[i].y()+m_drawlist[i+1].y())/3.0;
ax1=m_drawlist[i].x();
ay1=m_drawlist[i].y();
vertarray[vertcnt++]=xst+i;
vertarray[vertcnt++]=yst+m_drawlist[i].x();
vertarray[vertcnt++]=yst+ax1;
vertarray[vertcnt++]=xst+i;
vertarray[vertcnt++]=yst+m_drawlist[i].y();
vertarray[vertcnt++]=yst+ay1;
if (vertcnt>=maxverts) break;
}
@ -429,14 +430,13 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
GetTextExtent(b,x,y);
DrawText(b,scrx-w.GetRightMargin()-x-15,scry-w.GetBottomMargin()-10); */
glColor4ub(col.red(),col.green(),col.blue(),255);
// Crop to inside the margins.
glScissor(w.GetLeftMargin(),w.GetBottomMargin(),width,height+2);
glEnable(GL_SCISSOR_TEST);
glDisable(GL_TEXTURE_2D);
glDisable(GL_DEPTH_TEST);
bool antialias=pref["UseAntiAliasing"].toBool();
glDisable(GL_TEXTURE_2D);
if (antialias) {
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); //SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
@ -448,6 +448,8 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
glEnableClientState(GL_VERTEX_ARRAY);
glVertexPointer(2, GL_SHORT, 0, vertarray);
//glColor4ub(m_line_color.red(),m_line_color.green(),m_line_color.blue(),255);
w.qglColor(m_line_color);
glDrawArrays(GL_LINES, 0, vertcnt>>1);
glDisableClientState(GL_VERTEX_ARRAY);
@ -457,5 +459,6 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
}
glDisable(GL_SCISSOR_TEST);
}
glFinish();
}

1
Graphs/gLineChart.h
View File

@ -31,6 +31,7 @@ protected:
bool m_report_empty;
bool m_square_plot;
bool m_disable_accel;
QColor m_line_color;
};
#endif // GLINECHART_H

4
Graphs/glcommon.cpp
View File

@ -177,7 +177,7 @@ void RoundedRectangle(int x,int y,int w,int h,int radius,const QColor color)
void LinedRoundedRectangle(int x,int y,int w,int h,int radius,int lw,QColor color)
{
glDisable(GL_TEXTURE_2D);
//glDisable(GL_TEXTURE_2D);
glShadeModel(GL_SMOOTH);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
@ -196,7 +196,7 @@ void LinedRoundedRectangle(int x,int y,int w,int h,int radius,int lw,QColor colo
glVertex2i(x,y+radius);
glEnd();
glEnable(GL_TEXTURE_2D);
//glEnable(GL_TEXTURE_2D);
glDisable(GL_BLEND);
}

20
Graphs/graphwindow.cpp
View File

@ -757,6 +757,8 @@ void gGraphWindow::OnMouseLeftRelease(QMouseEvent * event)
if (qx+mx>rmax_x) {
qx=rmax_x-mx;
}
glFlush();
glFinish();
SetXBounds(qx,qx+mx);
did_draw=true;
} else {
@ -775,13 +777,15 @@ void gGraphWindow::OnMouseLeftRelease(QMouseEvent * event)
m_mouseLDown=false;
m_drag_foobar=false;
if (!did_draw) {
if (r!=m_mouseRBrect)
if (r!=m_mouseRBrect) {
updateGL();
}
} else {
if (pref["LinkGraphMovement"].toBool()) {
for (QList<gGraphWindow *>::iterator g=link_zoom.begin();g!=link_zoom.end();g++) {
(*g)->SetXBounds(min_x,max_x);
}
glFinish();
}
}
LastGraphLDown=NULL;
@ -801,7 +805,7 @@ void gGraphWindow::initializeGL()
setAutoBufferSwap(false);
glDisable(GL_LIGHTING);
glDisable(GL_DEPTH_TEST);
glEnable(GL_TEXTURE_2D);
glDisable(GL_TEXTURE_2D);
m_scrX=width();
m_scrY=height();
@ -846,6 +850,8 @@ void gGraphWindow::Render(int w, int h)
(*l)->Plot(*this,w,h);
}
DrawTextQueue(*this);
glDisable(GL_TEXTURE_2D);
glDisable(GL_DEPTH_TEST);
}
void gGraphWindow::paintGL()
@ -857,27 +863,29 @@ void gGraphWindow::paintGL()
if (m_scrY<=0) return;
InitGraphs();
glDisable(GL_DEPTH_TEST);
//glDisable(GL_DEPTH_TEST);
Render(m_scrX,m_scrY);
if (m_mouseLDown) {
if (m_mouseRBrect.width()>0)
glDisable(GL_DEPTH_TEST);
glColor4ub(50,50,200,64);
//glDisable(GL_DEPTH_TEST);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glBegin(GL_QUADS);
glColor4ub(140,50,200,64);
glVertex2f(m_mouseRBrect.x(),m_mouseRBrect.y());
glVertex2f(m_mouseRBrect.x()+m_mouseRBrect.width(),m_mouseRBrect.y());
glColor4ub(50,50,200,64);
glVertex2f(m_mouseRBrect.x()+m_mouseRBrect.width(),m_mouseRBrect.y()+m_mouseRBrect.height());
glVertex2f(m_mouseRBrect.x(),m_mouseRBrect.y()+m_mouseRBrect.height());
glEnd();
glDisable(GL_BLEND);
//glFinish();
//RoundedRectangle(m_mouseRBrect.x(),m_mouseRBrect.y(),m_mouseRBrect.width(),m_mouseRBrect.height(),5,QColor(50,50,200,64));
//glEnable(GL_DEPTH_TEST);
}
glEnable(GL_DEPTH_TEST);
//glEnable(GL_DEPTH_TEST);
swapBuffers(); // Dump to screen.

2
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -395,7 +395,7 @@ int ResmedLoader::Open(QString & path,Profile *profile)
sess->max(a[i]);
sess->avg(a[i]);
sess->wavg(a[i]);
//sess->p90(a[i]);
sess->p90(a[i]);
sess->cph(a[i]);
}
}