From 7dadad63c27fa3ace4a767825e6209407f87449a Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 17 Sep 2011 23:21:18 +1000 Subject: [PATCH] More Channel Rework --- Graphs/gLineChart.cpp | 18 ++++++++++++++++-- SleepLib/loader_plugins/resmed_loader.cpp | 6 +----- SleepLib/schema.cpp | 7 ++++--- SleepLib/schema.h | 5 ++--- docs/channels.xml | 6 +++--- mainwindow.cpp | 4 ++-- 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/Graphs/gLineChart.cpp b/Graphs/gLineChart.cpp index 087c621f..8b7b5206 100644 --- a/Graphs/gLineChart.cpp +++ b/Graphs/gLineChart.cpp @@ -105,8 +105,22 @@ void gLineChart::paint(gGraph & w,int left, int top, int width, int height) qWarning() << "gLineChart::Plot() NULL Session Record.. This should not happen"; continue; } - ci=(*m_day)[svi]->eventlist.find(m_code); - if (ci==(*m_day)[svi]->eventlist.end()) continue; + schema::Channel ch=schema::channel[m_code]; + bool fndbetter=false; + for (QList::iterator l=ch.m_links.begin();l!=ch.m_links.end();l++) { + schema::Channel *c=*l; + ci=(*m_day)[svi]->eventlist.find(c->name()); + if (ci!=(*m_day)[svi]->eventlist.end()) { + fndbetter=true; + break; + } + + } + if (!fndbetter) { + ci=(*m_day)[svi]->eventlist.find(m_code); + if (ci==(*m_day)[svi]->eventlist.end()) continue; + } + QVector & evec=ci.value(); num_points=0; diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index bc2259b6..fef75c11 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -575,13 +575,10 @@ bool ResmedLoader::LoadBRP(Session *sess,EDFParser &edf) es.gain*=60; es.physical_dimension="L/M"; code=CPAP_FlowRate; - sess->machine()->registerChannel(code); } else if (edf.edfsignals[s]->label.startsWith("Mask Pres")) { - code=CPAP_MaskPressure; - sess->machine()->registerChannel(code); + code=CPAP_MaskPressureHi; } else if (es.label.startsWith("Resp Event")) { code=CPAP_RespEvent; - sess->machine()->registerChannel(code); } else { qDebug() << "Unobserved ResMed BRP Signal " << edf.edfsignals[s]->label; continue; @@ -593,7 +590,6 @@ bool ResmedLoader::LoadBRP(Session *sess,EDFParser &edf) a->AddWaveform(edf.startdate,es.data,recs,duration); sess->setMin(code,a->min()); sess->setMax(code,a->max()); - //sess->eventlist[code].push_back(a); //delete edf.edfsignals[s]->data; //edf.edfsignals[s]->data=NULL; // so it doesn't get deleted when edf gets trashed. } diff --git a/SleepLib/schema.cpp b/SleepLib/schema.cpp index 603cfb1a..71e6e489 100644 --- a/SleepLib/schema.cpp +++ b/SleepLib/schema.cpp @@ -165,7 +165,7 @@ bool ChannelList::Load(QString filename) continue; } scope=Scopes[scopestr]; - name=e.attribute("name","").toLower(); + name=e.attribute("name",""); details=e.attribute("details",""); label=e.attribute("label",""); @@ -213,8 +213,9 @@ bool ChannelList::Load(QString filename) groups[group][name]=chan; if (linkid>0) { if (channels.contains(linkid)) { - Channel *it=channels[id]; - chan->m_links.push_back(it); + Channel *it=channels[linkid]; + it->m_links.push_back(chan); + int i=0; } else { qWarning() << "Linked channel must be defined first in" << filename <<"line" << line; } diff --git a/SleepLib/schema.h b/SleepLib/schema.h index 1b949dc9..fb31f089 100644 --- a/SleepLib/schema.h +++ b/SleepLib/schema.h @@ -71,9 +71,8 @@ public: return EmptyChannel; } Channel & operator[](QString name) { - QString tmp=name.toLower(); - if (names.contains(tmp)) - return *names[tmp]; + if (names.contains(name)) + return *names[name]; else return EmptyChannel; } diff --git a/docs/channels.xml b/docs/channels.xml index 1aaf1d92..f5b0fede 100644 --- a/docs/channels.xml +++ b/docs/channels.xml @@ -24,9 +24,9 @@ One id code per item - - - + + + diff --git a/mainwindow.cpp b/mainwindow.cpp index 962db77a..d4e452b6 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -200,12 +200,12 @@ void MainWindow::Startup() if (overview) overview->ReloadGraphs(); qprogress->hide(); qstatus->setText(""); - schema::Channel & item=schema::channel["SysOneResistSet"]; + /*schema::Channel & item=schema::channel["SysOneResistSet"]; if (!item.isNull()) { for (QHash::iterator i=item.m_options.begin();i!=item.m_options.end();i++) { qDebug() << i.key() << i.value(); } - } + }*/ //qstatusbar->clearMessage(); }