From 25a3c0ed50f91bd99603a336c06861f0d09b5d16 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Sun, 7 Aug 2011 11:26:28 +1000
Subject: [PATCH] Merged Therapy & Expiratory Pressure..
---
Graphs/glcommon.cpp | 2 ++
Graphs/graphwindow.cpp | 1 +
SleepLib/loader_plugins/resmed_loader.cpp | 2 +-
daily.cpp | 14 +++++++-------
daily.h | 2 +-
5 files changed, 12 insertions(+), 9 deletions(-)
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<TextQueRot.size();i++) {
TextBuffer & t=TextQueRot[i];
@@ -142,6 +143,7 @@ void DrawText(gGraphWindow &wid,QString text, int x, int y, float angle, QColor
//wid.qglColor(color);
//wid.renderText(x,wid.GetScrY()-y,0,text,*font);
QPainter painter(&wid);
+ painter.setRenderHint(QPainter::TextAntialiasing,true);
RDrawText(painter,text,x,y,0,color,font);
painter.end();
}
diff --git a/Graphs/graphwindow.cpp b/Graphs/graphwindow.cpp
index 7c293c4c..449e09bb 100644
--- a/Graphs/graphwindow.cpp
+++ b/Graphs/graphwindow.cpp
@@ -847,6 +847,7 @@ void gGraphWindow::Render(int w, int h)
for (QList<gLayer *>::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;s<edf.GetNumSignals();s++) {
EDFSignal & es=*edf.edfsignals[s];
- qDebug() << "SAD:" << es.label << es.digital_maximum << es.digital_minimum << es.physical_maximum << es.physical_minimum;
+ //qDebug() << "SAD:" << es.label << es.digital_maximum << es.digital_minimum << es.physical_maximum << es.physical_minimum;
long recs=edf.edfsignals[s]->nr*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<ss;i++) {
diff --git a/daily.h b/daily.h
index 0b0c3b70..6abca147 100644
--- a/daily.h
+++ b/daily.h
@@ -82,7 +82,7 @@ private:
gFlagsGroup *fg;
gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP,*PULSE,*SPO2,
- *SNORE,*RR,*MP,*MV,*TV,*FLG,*PTB,*OF,*INTPULSE,*INTSPO2, *THPR, *EXPR;
+ *SNORE,*RR,*MP,*MV,*TV,*FLG,*PTB,*OF,*INTPULSE,*INTSPO2, *THPR;
QList<gLayer *> OXIData;
QList<gLayer *> CPAPData;