From d8cce2a6268296dc1a67f5c1e9e3dad1c236fa6e Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 30 Jun 2011 14:55:20 +1000 Subject: [PATCH] Some more ResMed graphs.. (PRS1 users, sorry, things will be down/messy for a coupla days while I hack the resmed stuff) --- Graphs/gLineChart.cpp | 6 +- Graphs/graphdata_custom.cpp | 36 ++++++----- SleepLib/loader_plugins/resmed_loader.cpp | 19 ++++-- SleepLib/machine_common.h | 3 +- daily.cpp | 77 +++++++++++++++++++++-- daily.h | 4 +- mainwindow.cpp | 14 +++-- 7 files changed, 121 insertions(+), 38 deletions(-) diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index 97315229..37101d02 100644 --- a/Graphs/gLineChart.cpp +++ b/Graphs/gLineChart.cpp @@ -249,18 +249,16 @@ void gLineChart::Plot(gGraphWindow & w,float scrx,float scry) // m_drawlist's index is the pixel index for the X pixel axis. float zz=(maxy-miny)/2.0; // centreline - float jy=fabs(point[i].y()); + float jy=point[i].y(); int y1=1+(jy-miny)*ymult; - int y2=1+(-jy-miny)*ymult; - int z=floor(px); // Hmmm... round may screw this up. if (zmaxz) maxz=z; // maxz=Last pixel // Update the Y pixel bounds. - if (y2m_drawlist[z].y()) m_drawlist[z].setY(y1); } diff --git a/Graphs/graphdata_custom.cpp b/Graphs/graphdata_custom.cpp index 52e115a4..63bcf52b 100644 --- a/Graphs/graphdata_custom.cpp +++ b/Graphs/graphdata_custom.cpp @@ -25,7 +25,9 @@ void WaveData::Reload(Day *day) min_x=day->first().toMSecsSinceEpoch()/86400000.0; max_x=day->last().toMSecsSinceEpoch()/86400000.0; if (max_xmax_y) max_y=r.y(); } - if (r.y()>max_y) max_y=r.y(); } np[vc]=t; vc++; @@ -66,19 +68,21 @@ void WaveData::Reload(Day *day) //double t1=MAX(fabs(min_y),fabs(max_y)); // Get clever here.. - if (max_y>128) { - double j=MAX(max_y,fabs(min_y)); - min_y=-j; - max_y=j; - } else if (max_y>90) { - max_y=120; - min_y=-120; - } else if (max_y>60) { - min_y=-90; - max_y=90; - } else { - min_y=-60; - max_y=60; + if (min_y<0) { + if (max_y>128) { + double j=MAX(max_y,fabs(min_y)); + min_y=-j; + max_y=j; + } else if (max_y>90) { + max_y=120; + min_y=-120; + } else if (max_y>60) { + min_y=-90; + max_y=90; + } else { + min_y=-60; + max_y=60; + } } if (force_min_y!=force_max_y) { diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index cc2a8285..cf9c8345 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -16,6 +16,8 @@ License: GPL #include "resmed_loader.h" #include "SleepLib/session.h" +extern QProgressBar *qprogress; + EDFParser::EDFParser(QString name) { buffer=NULL; @@ -230,8 +232,8 @@ bool ResmedLoader::Open(QString & path,Profile *profile) QString ext,rest,datestr,s,codestr; SessionID sessionid; QDateTime date; - - for (int i=0;isetValue((float(i+1)/float(size)*33.0)); } Machine *m=NULL; Session *sess=NULL; + int cnt=0; + size=sessfiles.size(); for (map >::iterator si=sessfiles.begin();si!=sessfiles.end();si++) { sessionid=si->first; qDebug("Parsing Session %li",sessionid); @@ -297,7 +302,10 @@ bool ResmedLoader::Open(QString & path,Profile *profile) first=false; } } + if (qprogress) qprogress->setValue(33.0+(float(++cnt)/float(size)*33.0)); } + // m->save(); + if (qprogress) qprogress->setValue(100); return 0; } //bool ResmedLoader::ParseTAL(Machine *mach,Session *sess,EDFParser &edf,int pos) @@ -473,9 +481,12 @@ bool ResmedLoader::LoadPLD(Machine *mach,Session *sess,EDFParser &edf) code=CPAP_MinuteVentilation; ToTimeDelta(mach,sess,edf,edf.edfsignals[s]->data, code,recs,duration,1.0); } else if (edf.edfsignals[s]->label=="RR") { - //code=CPAP_Leak; -// ToTimeDelta(mach,sess,edf,edf.edfsignals[s]->data, code,recs,duration,1.0); + code=CPAP_RespiratoryRate; + ToTimeDelta(mach,sess,edf,edf.edfsignals[s]->data, code,recs,duration,1.0); } else if (edf.edfsignals[s]->label=="Vt") { + code=CPAP_TidalVolume; + ToTimeDelta(mach,sess,edf,edf.edfsignals[s]->data, code,recs,duration,1.0); + } else if (edf.edfsignals[s]->label=="Leak") { code=CPAP_Leak; ToTimeDelta(mach,sess,edf,edf.edfsignals[s]->data, code,recs,duration,1.0); } diff --git a/SleepLib/machine_common.h b/SleepLib/machine_common.h index c7ead6d9..fe6ab058 100644 --- a/SleepLib/machine_common.h +++ b/SleepLib/machine_common.h @@ -35,8 +35,7 @@ enum MachineCode//:qint16 CPAP_Obstructive, CPAP_Hypopnea, CPAP_ClearAirway, CPAP_RERA, CPAP_VSnore, CPAP_FlowLimit, CPAP_Leak, CPAP_Pressure, CPAP_EAP, CPAP_IAP, CPAP_CSR, CPAP_FlowRate, CPAP_MaskPressure, - CPAP_Snore,CPAP_MinuteVentilation, - CPAP_BreathsPerMinute, + CPAP_Snore,CPAP_MinuteVentilation, CPAP_RespiratoryRate, CPAP_TidalVolume, // General CPAP Summary Information CPAP_PressureMin=0x80, CPAP_PressureMax, CPAP_RampTime, CPAP_RampStartingPressure, CPAP_Mode, CPAP_PressureReliefType, diff --git a/daily.cpp b/daily.cpp index 2f6d9b7b..b2bd634c 100644 --- a/daily.cpp +++ b/daily.cpp @@ -115,12 +115,15 @@ Daily::Daily(QWidget *parent,QGLContext *context) : LEAK->setMinimumHeight(150); - AddCPAPData(frw=new WaveData(CPAP_FlowRate,700000)); // Holy crap resmed stuff is huge.. + AddCPAPData(frw=new WaveData(CPAP_FlowRate,700000)); //FlowRate + AddCPAPData(mpw=new WaveData(CPAP_MaskPressure,700000)); //FlowRate + // Holy crap resmed stuff is huge.. AddGraph(FRW=new gGraphWindow(gSplitter,tr("Flow Rate"),SF)); //FRW->AddLayer(new gFooBar()); FRW->AddLayer(new gYAxis()); FRW->AddLayer(new gXAxis()); FRW->AddLayer(new gLineOverlayBar(flags[0],QColor("light green"),"CSR")); + FRW->AddLayer(new gLineChart(mpw,Qt::blue,700000,true)); gLineChart *g=new gLineChart(frw,Qt::black,700000,true); g->ReportEmpty(true); @@ -138,16 +141,34 @@ Daily::Daily(QWidget *parent,QGLContext *context) : FRW->setMinimumHeight(190); AddCPAPData(snore=new EventData(CPAP_Snore,0)); - //snore->ForceMinY(0); - //snore->ForceMaxY(15); AddGraph(SNORE=new gGraphWindow(gSplitter,tr("Snore"),SF)); SNORE->AddLayer(new gXAxis()); SNORE->AddLayer(new gYAxis()); - //SNORE->AddLayer(new gFooBar()); SNORE->AddLayer(new gLineChart(snore,Qt::black,4096,false,false,false)); - SNORE->setMinimumHeight(150); + AddCPAPData(mv=new EventData(CPAP_MinuteVentilation,0)); + AddGraph(MV=new gGraphWindow(gSplitter,tr("Minute Vent."),SF)); + MV->AddLayer(new gXAxis()); + MV->AddLayer(new gYAxis()); + MV->AddLayer(new gLineChart(mv,QColor(0x20,0x20,0x7f),65536,false,false,false)); + MV->setMinimumHeight(150); + + AddCPAPData(tv=new EventData(CPAP_TidalVolume,0)); + AddGraph(TV=new gGraphWindow(gSplitter,tr("Tidal Volume"),SF)); + TV->AddLayer(new gXAxis()); + TV->AddLayer(new gYAxis()); + TV->AddLayer(new gLineChart(tv,QColor(0x7f,0x20,0x20),65536,false,false,false)); + TV->setMinimumHeight(150); + + AddCPAPData(rr=new EventData(CPAP_RespiratoryRate,0)); + AddGraph(RR=new gGraphWindow(gSplitter,tr("Respiratory Rate"),SF)); + RR->AddLayer(new gXAxis()); + RR->AddLayer(new gYAxis()); + RR->AddLayer(new gLineChart(rr,Qt::gray,65536,false,false,false)); + RR->setMinimumHeight(150); + + AddOXIData(pulse=new EventData(OXI_Pulse,0,65536,true)); //pulse->ForceMinY(40); //pulse->ForceMaxY(120); @@ -230,25 +251,71 @@ Daily::Daily(QWidget *parent,QGLContext *context) : FRW->LinkZoom(PRD); FRW->LinkZoom(LEAK); FRW->LinkZoom(SNORE); + FRW->LinkZoom(MV); + FRW->LinkZoom(TV); + FRW->LinkZoom(RR); SF->LinkZoom(FRW); SF->LinkZoom(PRD); SF->LinkZoom(LEAK); SF->LinkZoom(SNORE); + SF->LinkZoom(MV); + SF->LinkZoom(TV); + SF->LinkZoom(RR); PRD->LinkZoom(SF); PRD->LinkZoom(FRW); PRD->LinkZoom(LEAK); PRD->LinkZoom(SNORE); + PRD->LinkZoom(MV); + PRD->LinkZoom(TV); + PRD->LinkZoom(RR); + LEAK->LinkZoom(SF); LEAK->LinkZoom(FRW); LEAK->LinkZoom(PRD); LEAK->LinkZoom(SNORE); + LEAK->LinkZoom(MV); + LEAK->LinkZoom(TV); + LEAK->LinkZoom(RR); + + SNORE->LinkZoom(SF); SNORE->LinkZoom(FRW); SNORE->LinkZoom(PRD); SNORE->LinkZoom(LEAK); + SNORE->LinkZoom(MV); + SNORE->LinkZoom(TV); + SNORE->LinkZoom(RR); + + MV->LinkZoom(SF); + MV->LinkZoom(FRW); + MV->LinkZoom(PRD); + MV->LinkZoom(LEAK); + MV->LinkZoom(SNORE); + MV->LinkZoom(TV); + MV->LinkZoom(RR); + + TV->LinkZoom(SF); + TV->LinkZoom(FRW); + TV->LinkZoom(PRD); + TV->LinkZoom(LEAK); + TV->LinkZoom(SNORE); + TV->LinkZoom(MV); + TV->LinkZoom(RR); + + RR->LinkZoom(SF); + RR->LinkZoom(FRW); + RR->LinkZoom(PRD); + RR->LinkZoom(LEAK); + RR->LinkZoom(SNORE); + RR->LinkZoom(MV); + RR->LinkZoom(TV); + gSplitter->addWidget(SF); gSplitter->addWidget(FRW); + gSplitter->addWidget(MV); + gSplitter->addWidget(TV); + gSplitter->addWidget(RR); gSplitter->addWidget(PRD); gSplitter->addWidget(LEAK); gSplitter->addWidget(SNORE); diff --git a/daily.h b/daily.h index 8e87b898..7bc1c21c 100644 --- a/daily.h +++ b/daily.h @@ -58,9 +58,9 @@ private: void UpdateEventsTree(QTreeWidget * tree,Day *day); gPointData *tap,*tap_eap,*tap_iap,*g_ahi,*frw,*prd,*leakdata,*pressure_iap,*pressure_eap,*snore; - gPointData *pulse,*spo2; + gPointData *pulse,*spo2,*rr,*mv,*tv,*mpw; - gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP,*PULSE,*SPO2,*SNORE; + gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP,*PULSE,*SPO2,*SNORE,*RR,*MV,*TV; list OXIData; list CPAPData; diff --git a/mainwindow.cpp b/mainwindow.cpp index f9afb2ef..b6a4534e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -93,9 +93,11 @@ void MainWindow::Startup() profile->LoadMachineData(); daily=new Daily(ui->tabWidget,shared_context); - overview=new Overview(ui->tabWidget,shared_context); ui->tabWidget->addTab(daily,tr("Daily")); - ui->tabWidget->addTab(overview,tr("Overview")); + + // Disabled Overview until I want to actually look at it again. :) + //overview=new Overview(ui->tabWidget,shared_context); + //ui->tabWidget->addTab(overview,tr("Overview")); qprogress->hide(); qstatus->setText(tr("Ready")); @@ -117,9 +119,11 @@ void MainWindow::on_action_Import_Data_triggered() profile->Import(dirNames[i]); } profile->Save(); - daily->ReloadGraphs(); - overview->ReloadGraphs(); - overview->UpdateGraphs(); + if (daily) daily->ReloadGraphs(); + if (overview) { + overview->ReloadGraphs(); + overview->UpdateGraphs(); + } qstatus->setText(tr("Ready")); qprogress->hide();