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

Resize redraw test

Browse Source
This commit is contained in:
Mark Watkins 2011-06-29 14:53:18 +10:00
parent 172f0bd7d7
commit 52aa96b9af
4 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Graphs/gLineChart.cpp
View File

@ -207,14 +207,14 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
bool firstpx=true; bool firstpx=true;
for (int i=idx;i<siz;i+=sam) { for (int i=idx;i<siz;i+=sam) {
if (point[i].x() < minx) continue; // Skip stuff before the start of our data window if (point[i].x() < minx) continue; // Skip stuff before the start of our data window
if (first) { if (first) {
first=false; first=false;
if (i>=sam) i-=sam; // Start with the previous sample (which will be in clipping area) if (i>=sam) i-=sam; // Start with the previous sample (which will be in clipping area)
} }
if (point[i].x() > maxx) done=true; // Let this iteration finish.. (This point will be in far clipping) if (point[i].x() > maxx) done=true; // Let this iteration finish.. (This point will be in far clipping)
px=1+((point[i].x() - minx) * xmult); // Scale the time scale X to pixel scale X px=1+((point[i].x() - minx) * xmult); // Scale the time scale X to pixel scale X
@ -245,13 +245,6 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
lastpx=start_px+px; lastpx=start_px+px;
lastpy=start_py+py; lastpy=start_py+py;
} else { } else {
// Just clip ugly in accel mode.. Too darn complicated otherwise
/* if (px<0) {
px=0;
}
if (px>width) {
px=width;
} */
// In accel mode, each pixel has a min/max Y value. // In accel mode, each pixel has a min/max Y value.
// m_drawlist's index is the pixel index for the X pixel axis. // m_drawlist's index is the pixel index for the X pixel axis.
@ -260,10 +253,9 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
int y1=1+(jy-miny)*ymult; int y1=1+(jy-miny)*ymult;
int y2=1+(-jy-miny)*ymult; int y2=1+(-jy-miny)*ymult;
//py=1+((point[i].m_y - miny) * ymult); // Same for Y scale
int z=round(px); int z=floor(px); // Hmmm... round may screw this up.
if (z<minz) minz=z; // minz=First pixel if (z<minz) minz=z; // minz=First pixel
if (z>maxz) maxz=z; // maxz=Last pixel if (z>maxz) maxz=z; // maxz=Last pixel
@ -284,6 +276,7 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
vertarray[vertcnt++]=start_py+m_drawlist[i].x(); vertarray[vertcnt++]=start_py+m_drawlist[i].x();
vertarray[vertcnt++]=start_px+i+1; vertarray[vertcnt++]=start_px+i+1;
vertarray[vertcnt++]=start_py+m_drawlist[i].y(); vertarray[vertcnt++]=start_py+m_drawlist[i].y();
#if defined(EXTRA_ASSERTS) #if defined(EXTRA_ASSERTS)
assert(vertcnt<maxverts); assert(vertcnt<maxverts);
#endif #endif
@ -306,14 +299,14 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry)
// 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);
//glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
//glAlphaFunc(GL_LESS,0.8);
glLineWidth (1); glLineWidth (1);
bool antialias=pref["UseAntiAliasing"].toBool(); bool antialias=pref["UseAntiAliasing"].toBool();
if (antialias) { if (antialias) {
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); //SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
//glBlendFunc(GL_ONE, GL_SRC_ALPHA); //glBlendFunc(GL_ONE, GL_SRC_ALPHA);
glEnable(GL_LINE_SMOOTH); glEnable(GL_LINE_SMOOTH);
glHint(GL_LINE_SMOOTH_HINT, GL_NICEST); glHint(GL_LINE_SMOOTH_HINT, GL_NICEST);

13
Graphs/graphwindow.cpp
View File

@ -17,7 +17,7 @@ gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLWidget * s
m_mouseRDown=m_mouseLDown=false; m_mouseRDown=m_mouseLDown=false;
m_block_zoom=false; m_block_zoom=false;
m_drag_foobar=false; m_drag_foobar=false;
m_draw_background=true; m_gradient_background=true;
m_foobar_pos=0; m_foobar_pos=0;
m_foobar_moved=0; m_foobar_moved=0;
SetMargins(10, 15, 0, 0); SetMargins(10, 15, 0, 0);
@ -40,7 +40,7 @@ gGraphWindow::gGraphWindow(QWidget *parent, const QString & title, QGLContext *
SetMargins(10, 15, 0, 0); SetMargins(10, 15, 0, 0);
m_block_zoom=false; m_block_zoom=false;
m_drag_foobar=false; m_drag_foobar=false;
m_draw_background=false; m_gradient_background=false;
m_foobar_pos=0; m_foobar_pos=0;
m_foobar_moved=0; m_foobar_moved=0;
lastlayer=NULL; lastlayer=NULL;
@ -666,6 +666,9 @@ void gGraphWindow::resizeGL(int w, int h)
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity(); glLoadIdentity();
// Only needs doing on a mac
updateGL();
} }
void gGraphWindow::Render(float w, float h) void gGraphWindow::Render(float w, float h)
@ -678,13 +681,13 @@ void gGraphWindow::Render(float w, float h)
glMatrixMode(GL_MODELVIEW); glMatrixMode(GL_MODELVIEW);
glLoadIdentity();*/ glLoadIdentity();*/
if (m_draw_background) { if (m_gradient_background) {
glBegin(GL_QUADS); glBegin(GL_QUADS);
glColor3f(1.0,1.0,1.0); // Gradient start glColor4f(1.0,1.0,1.0,.5); // Gradient start
glVertex2f(0, h); glVertex2f(0, h);
glVertex2f(0, 0); glVertex2f(0, 0);
glColor3f(0.8,0.8,1.0); // Gradient End glColor4f(0.8,0.8,1.0,.5); // Gradient End
glVertex2f(w, 0); glVertex2f(w, 0);
glVertex2f(w, h); glVertex2f(w, h);
glEnd(); glEnd();

6
Graphs/graphwindow.h
View File

@ -138,8 +138,8 @@ public:
bool BlockZoom() { return m_block_zoom; }; bool BlockZoom() { return m_block_zoom; };
QGLContext *gl_context; QGLContext *gl_context;
//FTFont *texfont; //FTFont *texfont;
void SetDrawBackground(bool b) { m_draw_background=b; }; void SetGradientBackground(bool b) { m_gradient_background=b; };
bool DrawBackground() { return m_draw_background; }; bool GradientBackground() { return m_gradient_background; };
protected: protected:
void initializeGL(); void initializeGL();
@ -150,7 +150,7 @@ public:
bool m_block_zoom; bool m_block_zoom;
bool m_drag_foobar; bool m_drag_foobar;
double m_foobar_pos,m_foobar_moved; double m_foobar_pos,m_foobar_moved;
bool m_draw_background; bool m_gradient_background;
std::list<gLayer *> layers; std::list<gLayer *> layers;
QString m_title; QString m_title;
int m_scrX; int m_scrX;

8
daily.cpp
View File

@ -210,7 +210,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
l->color.push_back(QColor(0x40,0x40,0x40,255)); l->color.push_back(QColor(0x40,0x40,0x40,255));
l->color.push_back(QColor(0x60,0xff,0x60,0xff)); //80ff80 l->color.push_back(QColor(0x60,0xff,0x60,0xff)); //80ff80
G_AHI->AddLayer(l); G_AHI->AddLayer(l);
G_AHI->SetDrawBackground(false); G_AHI->SetGradientBackground(false);
//G_AHI->setMaximumSize(2000,30); //G_AHI->setMaximumSize(2000,30);
//TAP->setMaximumSize(2000,30); //TAP->setMaximumSize(2000,30);
NoData=new QLabel(tr("No CPAP Data"),gSplitter); NoData=new QLabel(tr("No CPAP Data"),gSplitter);
@ -258,10 +258,8 @@ Daily::Daily(QWidget *parent,QGLContext *context) :
gSplitter->setChildrenCollapsible(true); // We set this per widget.. gSplitter->setChildrenCollapsible(true); // We set this per widget..
for (int i=1;i<gSplitter->count();i++) gSplitter->setCollapsible(gSplitter->indexOf(SF),false);
gSplitter->setCollapsible(i,true); gSplitter->setStretchFactor(gSplitter->indexOf(SF),0);
gSplitter->setCollapsible(0,false);
gSplitter->setCollapsible(1,false);
ui->graphSizer->layout(); ui->graphSizer->layout();
QTextCharFormat format = ui->calendar->weekdayTextFormat(Qt::Saturday); QTextCharFormat format = ui->calendar->weekdayTextFormat(Qt::Saturday);