From ed686a7f2cd94dab64df1ed0a59d722d6d7083d7 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 1 Jul 2011 17:47:11 +1000 Subject: [PATCH] Assert fixes --- Graphs/graphdata_custom.h | 2 +- SleepLib/loader_plugins/resmed_loader.cpp | 2 +- daily.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Graphs/graphdata_custom.h b/Graphs/graphdata_custom.h index e6a401c5..9693a536 100644 --- a/Graphs/graphdata_custom.h +++ b/Graphs/graphdata_custom.h @@ -42,7 +42,7 @@ public: class WaveData:public gPointData { public: - WaveData(MachineCode _code,int _size=800000); + WaveData(MachineCode _code,int _size=1000000); virtual ~WaveData(); virtual void Reload(Day *day=NULL); protected: diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index d2b4eb0b..3d9c5580 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -521,7 +521,7 @@ bool ResmedLoader::LoadPLD(Machine *mach,Session *sess,EDFParser &edf) ToTimeDelta(mach,sess,edf,edf.edfsignals[s]->data, code,recs,duration); } else if (edf.edfsignals[s]->label=="Therapy Pres") { code=CPAP_Pressure; - ToTimeDelta(mach,sess,edf,edf.edfsignals[s]->data, code,recs,duration,100.0); //50.0 + ToTimeDelta(mach,sess,edf,edf.edfsignals[s]->data, code,recs,duration,50.0); //50.0 } else if (edf.edfsignals[s]->label=="MV") { code=CPAP_MinuteVentilation; //ToTimeDelta(mach,sess,edf,edf.edfsignals[s]->data, code,recs,duration,1.0); diff --git a/daily.cpp b/daily.cpp index ab6e4ac4..23040d86 100644 --- a/daily.cpp +++ b/daily.cpp @@ -115,7 +115,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : LEAK->setMinimumHeight(150); - AddCPAPData(frw=new WaveData(CPAP_FlowRate,700000)); //FlowRate + AddCPAPData(frw=new WaveData(CPAP_FlowRate,1000000)); //FlowRate // AddCPAPData(mpw=new WaveData(CPAP_MaskPressure,700000)); //FlowRate // Holy crap resmed stuff is huge.. AddGraph(FRW=new gGraphWindow(gSplitter,tr("Flow Rate"),SF)); @@ -124,7 +124,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : 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); + gLineChart *g=new gLineChart(frw,Qt::black,4000,true); g->ReportEmpty(true); FRW->AddLayer(g); FRW->AddLayer(new gLineOverlayBar(flags[3],QColor("blue"),"H"));