diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index b23aa8e8..49ceaf0d 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -1278,8 +1278,9 @@ bool PRS1Loader::OpenWaveforms(Session *session,QString filename) } session->updateLast(start+qint64(wdur[i])*1000L); } - // if (!session->eventlist.contains(CPAP_RespRate)) // only ASV machines have it.. + if (num_signals<2) { CalcRespiratoryRate(session); + } return true; } // Generate RespiratoryRate graph @@ -1290,9 +1291,7 @@ void PRS1Loader::CalcRespiratoryRate(Session *session) flow=session->eventlist[CPAP_FlowRate][ws]; if (flow->count() > 5) { rr=new EventList(EVL_Event);//EVL_Waveform,1,0,0,0,60000); - ChannelID resp="RespRate2"; - //if (session->eventlist.contains(resp)) resp+="2"; - session->eventlist[resp].push_back(rr); + session->eventlist[CPAP_RespRate].push_back(rr); filterFlow(flow,rr); } } diff --git a/daily.cpp b/daily.cpp index 8877b615..4a60e9db 100644 --- a/daily.cpp +++ b/daily.cpp @@ -630,7 +630,7 @@ void Daily::Load(QDate date) html+=(" MinAvg90%Max"); ChannelID chans[]={ CPAP_Pressure,CPAP_EPAP,CPAP_IPAP,CPAP_PS,CPAP_PTB, - CPAP_MinuteVent,CPAP_RespRate,CPAP_RespEvent,CPAP_FLG, + CPAP_MinuteVent,CPAP_RespRate, CPAP_RespEvent,CPAP_FLG, CPAP_Leak,CPAP_Snore,CPAP_IE,CPAP_Ti,CPAP_Te, CPAP_TgMV, CPAP_TidalVolume, OXI_Pulse, OXI_SPO2 };