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

Merged Therapy & Expiratory Pressure..

Browse Source
This commit is contained in:
Mark Watkins 2011-08-07 11:26:28 +10:00
parent 2876103f77
commit 25a3c0ed50
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Graphs/glcommon.cpp
View File

@ -117,6 +117,7 @@ void DrawTextQueue(gGraphWindow & wid)
if (wid.parentWidget()!=0) { if (wid.parentWidget()!=0) {
QPainter painter(&wid); QPainter painter(&wid);
painter.setRenderHint(QPainter::TextAntialiasing,true);
// TODO.. Prerotate the 90degree stuff here and keep the matrix for all of these.. // TODO.. Prerotate the 90degree stuff here and keep the matrix for all of these..
for (int i=0;i<TextQueRot.size();i++) { for (int i=0;i<TextQueRot.size();i++) {
TextBuffer & t=TextQueRot[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.qglColor(color);
//wid.renderText(x,wid.GetScrY()-y,0,text,*font); //wid.renderText(x,wid.GetScrY()-y,0,text,*font);
QPainter painter(&wid); QPainter painter(&wid);
painter.setRenderHint(QPainter::TextAntialiasing,true);
RDrawText(painter,text,x,y,0,color,font); RDrawText(painter,text,x,y,0,color,font);
painter.end(); painter.end();
} }

1
Graphs/graphwindow.cpp
View File

@ -847,6 +847,7 @@ void gGraphWindow::Render(int w, int h)
for (QList<gLayer *>::iterator l=layers.begin();l!=layers.end();l++) { for (QList<gLayer *>::iterator l=layers.begin();l!=layers.end();l++) {
(*l)->Plot(*this,w,h); (*l)->Plot(*this,w,h);
} }
DrawTextQueue(*this); DrawTextQueue(*this);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);

2
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -632,7 +632,7 @@ bool ResmedLoader::LoadSAD(Session *sess,EDFParser &edf)
for (int s=0;s<edf.GetNumSignals();s++) { for (int s=0;s<edf.GetNumSignals();s++) {
EDFSignal & es=*edf.edfsignals[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(); long recs=edf.edfsignals[s]->nr*edf.GetNumDataRecords();
ChannelID code; ChannelID code;
if (edf.edfsignals[s]->label=="Pulse") { if (edf.edfsignals[s]->label=="Pulse") {

14
daily.cpp
View File

@ -87,8 +87,8 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw)
SF=new gGraphWindow(parental,tr("Event Flags"),shared); SF=new gGraphWindow(parental,tr("Event Flags"),shared);
FRW=new gGraphWindow(parental,tr("Flow Rate"),SF); FRW=new gGraphWindow(parental,tr("Flow Rate"),SF);
PRD=new gGraphWindow(parental,tr("Pressure"),SF); PRD=new gGraphWindow(parental,tr("Pressure"),SF);
EXPR=new gGraphWindow(parental,tr("Therapy Pressure"),SF); //EXPR=new gGraphWindow(parental,tr("Exp. Pressure"),SF);
THPR=new gGraphWindow(parental,tr("Exp. Pressure"),SF); THPR=new gGraphWindow(parental,tr("Therapy Pressure"),SF);
LEAK=new gGraphWindow(parental,tr("Leaks"),SF); LEAK=new gGraphWindow(parental,tr("Leaks"),SF);
MP=new gGraphWindow(parental,tr("Mask Pressure"),SF); MP=new gGraphWindow(parental,tr("Mask Pressure"),SF);
SNORE=new gGraphWindow(parental,tr("Snore"),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 gXAxis());
THPR->AddLayer(new gYAxis()); THPR->AddLayer(new gYAxis());
THPR->AddLayer(AddCPAP(new gLineChart(CPAP_TherapyPressure,QColor("dark green"),square))); 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); THPR->setMinimumHeight(min_height);
EXPR->AddLayer(new gXAxis()); //EXPR->AddLayer(new gXAxis());
EXPR->AddLayer(new gYAxis()); //EXPR->AddLayer(new gYAxis());
EXPR->AddLayer(AddCPAP(new gLineChart(CPAP_ExpiratoryPressure,QColor("dark green"),square))); //EXPR->setMinimumHeight(min_height);
EXPR->setMinimumHeight(min_height);
LEAK->AddLayer(new gXAxis()); LEAK->AddLayer(new gXAxis());
@ -308,7 +308,7 @@ Daily::Daily(QWidget *parent,QGLWidget * shared, MainWindow *mw)
//int i=splitter->indexOf(NoData); //int i=splitter->indexOf(NoData);
splitter->setStretchFactor(NoData,1); 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 *); int ss=sizeof(graphs)/sizeof(gGraphWindow *);
for (int i=0;i<ss;i++) { for (int i=0;i<ss;i++) {

2
daily.h
View File

@ -82,7 +82,7 @@ private:
gFlagsGroup *fg; gFlagsGroup *fg;
gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP,*PULSE,*SPO2, 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 *> OXIData;
QList<gLayer *> CPAPData; QList<gLayer *> CPAPData;