diff --git a/Graphs/glcommon.cpp b/Graphs/glcommon.cpp index de1f305a..f573ff3d 100644 --- a/Graphs/glcommon.cpp +++ b/Graphs/glcommon.cpp @@ -117,6 +117,7 @@ void DrawTextQueue(gGraphWindow & wid) if (wid.parentWidget()!=0) { QPainter painter(&wid); + painter.setRenderHint(QPainter::TextAntialiasing,true); // TODO.. Prerotate the 90degree stuff here and keep the matrix for all of these.. for (int i=0;i::iterator l=layers.begin();l!=layers.end();l++) { (*l)->Plot(*this,w,h); } + DrawTextQueue(*this); glDisable(GL_TEXTURE_2D); glDisable(GL_DEPTH_TEST); diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index 15a72c28..63a6ff75 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -632,7 +632,7 @@ bool ResmedLoader::LoadSAD(Session *sess,EDFParser &edf) for (int s=0;snr*edf.GetNumDataRecords(); ChannelID code; if (edf.edfsignals[s]->label=="Pulse") { diff --git a/daily.cpp b/daily.cpp index 2d00ee2b..cef04a36 100644 --- a/daily.cpp +++ b/daily.cpp @@ -87,8 +87,8 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw) SF=new gGraphWindow(parental,tr("Event Flags"),shared); FRW=new gGraphWindow(parental,tr("Flow Rate"),SF); PRD=new gGraphWindow(parental,tr("Pressure"),SF); - EXPR=new gGraphWindow(parental,tr("Therapy Pressure"),SF); - THPR=new gGraphWindow(parental,tr("Exp. Pressure"),SF); + //EXPR=new gGraphWindow(parental,tr("Exp. Pressure"),SF); + THPR=new gGraphWindow(parental,tr("Therapy Pressure"),SF); LEAK=new gGraphWindow(parental,tr("Leaks"),SF); MP=new gGraphWindow(parental,tr("Mask Pressure"),SF); SNORE=new gGraphWindow(parental,tr("Snore"),SF); @@ -150,12 +150,12 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw) THPR->AddLayer(new gXAxis()); THPR->AddLayer(new gYAxis()); THPR->AddLayer(AddCPAP(new gLineChart(CPAP_TherapyPressure,QColor("dark green"),square))); + THPR->AddLayer(AddCPAP(new gLineChart(CPAP_ExpiratoryPressure,QColor("dark blue"),square))); THPR->setMinimumHeight(min_height); - EXPR->AddLayer(new gXAxis()); - EXPR->AddLayer(new gYAxis()); - EXPR->AddLayer(AddCPAP(new gLineChart(CPAP_ExpiratoryPressure,QColor("dark green"),square))); - EXPR->setMinimumHeight(min_height); + //EXPR->AddLayer(new gXAxis()); + //EXPR->AddLayer(new gYAxis()); + //EXPR->setMinimumHeight(min_height); LEAK->AddLayer(new gXAxis()); @@ -308,7 +308,7 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw) //int i=splitter->indexOf(NoData); splitter->setStretchFactor(NoData,1); - gGraphWindow * graphs[]={SF,FRW,MP,MV,TV,PTB,RR,PRD,EXPR,THPR,LEAK,FLG,SNORE,INTPULSE,INTSPO2}; + gGraphWindow * graphs[]={SF,FRW,MP,MV,TV,PTB,RR,PRD,THPR,LEAK,FLG,SNORE,INTPULSE,INTSPO2}; int ss=sizeof(graphs)/sizeof(gGraphWindow *); for (int i=0;i OXIData; QList CPAPData;