chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

ResMed S9 importer fixes - Scan slightly wider for close sessions, and only load one file if both edf.gz and .edf are somehow in the same backup source

Browse Source
This commit is contained in:
Mark Watkins 2012-01-14 15:59:01 +10:00
parent 25662f2a92
commit f771a26868
5 changed files with 49 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -300,7 +300,6 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile)
} else if (filename.toLower()=="e") {
// don't really give a crap about .004 files yet.
}
//if (qprogress) qprogress->Pulse();
}
SessionID sid;
@ -322,24 +321,21 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile)
QString session_s=fi.fileName().section(".",0,-2);
ext=ext_s.toLong(&ok);
if (!ok) continue;
if (!ok)
continue;
sid=session_s.toLong(&ok);
if (!ok) continue;
if (!ok)
continue;
if (m->SessionExists(sid)) continue; // could skip this and error check data by reloading summary.
//if (sessfiles[session].capacity()==0) sessfiles[session].resize(3);
if (m->SessionExists(sid))
continue; // could skip this and error check data by reloading summary.
if ((ext==1) || (ext==0)) {
OpenFile(m,fi.canonicalFilePath()); // Open just the summary files first round
} else {
sessfiles[sid].push_back(fi.canonicalFilePath()); // and keep the rest of the names
}
//cnt++;
//if (qprogress) qprogress->setValue((float(cnt)/float(size)*33.0));
//QApplication::processEvents();
}
}
cnt=0;
@ -353,7 +349,6 @@ int PRS1Loader::OpenMachine(Machine *m,QString path,Profile *profile)
if (name.endsWith(".002")) {
OpenFile(m,name);
} else if (name.endsWith(".005")) {
//OpenFile(m,name);
OpenWaveforms(sid,name);
}
}

54
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -541,6 +541,9 @@ int ResmedLoader::Open(QString & path,Profile *profile)
int size=flist.size();
sessfiles.clear();
bool gz;
QMap<SessionID,QStringList>::iterator si;
// For each file in flist...
for (int i=0;i<size;i++) {
@ -552,9 +555,12 @@ int ResmedLoader::Open(QString & path,Profile *profile)
continue;
// Accept only .edf and .edf.gz files
if (!((filename.right(4).toLower() == "."+ext_EDF)
|| (filename.right(7).toLower() == "."+ext_EDF+ext_gz)))
continue;
if (filename.right(4).toLower() != "."+ext_EDF) {
if (filename.right(7).toLower() != "."+ext_EDF+ext_gz)
continue;
gz=true;
} else gz=false;
// Extract the session date out of the filename
datestr=filename.section("_",0,1);
@ -574,15 +580,39 @@ int ResmedLoader::Open(QString & path,Profile *profile)
// Moral of the story, when writing firmware and saving in batches, use the same datetimes,
// and provide firmware updates for free to your customers.
////////////////////////////////////////////////////////////////////////////////////////////
if (sessfiles.find(sessionid)==sessfiles.end()) {
if (sessfiles.find(sessionid+2)!=sessfiles.end()) sessionid+=2;
else if (sessfiles.find(sessionid+1)!=sessfiles.end()) sessionid++;
else if (sessfiles.find(sessionid-1)!=sessfiles.end()) sessionid--;
else if (sessfiles.find(sessionid-2)!=sessfiles.end()) sessionid-=2;
si=sessfiles.find(sessionid);
if (si==sessfiles.end()) {
// Scan 3 seconds either way for sessions..
for (int j=1;j<3;j++) {
if ((si=sessfiles.find(sessionid+j)) != sessfiles.end()) {
sessionid+=j;
break;
} else if ((si=sessfiles.find(sessionid-j)) != sessfiles.end()) {
sessionid-=j;
break;
}
}
}
// Push current filename to ordered-by-sessionid list
sessfiles[sessionid].push_back(filename);
if (si!=sessfiles.end()) {
// Ignore if already compressed version of the same file exists.. (just in case)
if (!gz) {
if (si.value().contains(filename+ext_gz,Qt::CaseInsensitive))
continue;
} else {
QString str=filename;
str.chop(3);
if (si.value().contains(str,Qt::CaseInsensitive))
continue;
}
si.value().push_back(filename);
} else {
sessfiles[sessionid].push_back(filename);
}
if ((i%10) ==0) {
// Update the progress bar
@ -603,7 +633,7 @@ int ResmedLoader::Open(QString & path,Profile *profile)
// Scan over file list and knock out of dayused list
/////////////////////////////////////////////////////////////////////////////
int dn;
for (QMap<SessionID,QVector<QString> >::iterator si=sessfiles.begin();si!=sessfiles.end();si++) {
for (QMap<SessionID,QStringList>::iterator si=sessfiles.begin();si!=sessfiles.end();si++) {
sessionid=si.key();
// Earliest possible day number
@ -963,13 +993,12 @@ int ResmedLoader::Open(QString & path,Profile *profile)
}
}
bool gz;
backup_path+=datalog+"/";
/////////////////////////////////////////////////////////////////////////////
// Scan through new file list and import sessions
/////////////////////////////////////////////////////////////////////////////
for (QMap<SessionID,QVector<QString> >::iterator si=sessfiles.begin();si!=sessfiles.end();si++) {
for (QMap<SessionID,QStringList>::iterator si=sessfiles.begin();si!=sessfiles.end();si++) {
sessionid=si.key();
// Skip file if already imported
@ -1246,7 +1275,6 @@ bool ResmedLoader::LoadEVE(Session *sess,EDFParser &edf)
for (int s=0;s<edf.GetNumSignals();s++) {
recs=edf.edfsignals[s]->nr*edf.GetNumDataRecords()*2;
//qDebug() << edf.edfsignals[s]->label << " " << t;
data=(char *)edf.edfsignals[s]->data;
pos=0;
tt=edf.startdate;

2
SleepLib/loader_plugins/resmed_loader.h
View File

@ -213,7 +213,7 @@ protected:
//! This contains the Pressure, Leak, Respiratory Rate, Minute Ventilation, Tidal Volume, etc..
bool LoadPLD(Session *sess,EDFParser &edf);
QMap<SessionID,QVector<QString> > sessfiles;
QMap<SessionID,QStringList> sessfiles;
#ifdef DEBUG_EFFICIENCY
QHash<ChannelID,qint64> channel_efficiency;
QHash<ChannelID,qint64> channel_time;

3
SleepLib/session.h
View File

@ -140,9 +140,6 @@ public:
QHash<ChannelID,double> m_sum;
QHash<ChannelID,EventDataType> m_avg;
QHash<ChannelID,EventDataType> m_wavg;
//QHash<ChannelID,EventDataType> m_90p;
//QHash<ChannelID,EventDataType> m_95p;
//QHash<ChannelID,EventDataType> m_med;
QHash<ChannelID,EventDataType> m_min;
QHash<ChannelID,EventDataType> m_max;
QHash<ChannelID,EventDataType> m_cph; // Counts per hour (eg AHI)

25
update.xml
View File

@ -1,25 +0,0 @@
<!DOCTYPE Upgrade>
<SleepyHead>
<Release version="0.9.2" codename="Roofus" status="beta">
<update type="qtlibs" version="4.8.0" platform="win32" status="stable">
<file name="qtlibs-4.8.0-win32.zip"
url="http://sourceforge.net/projects/sleepyhead/files/AutoUpdate/Win32/qtlibs-4.8.0-win32.zip/download"
hash="ed0312c0f9a51e8774e6556f83b13df8d4195d2b"/>
</update>
<update type="application" version="0.9.2-1" platform="win32" release_date="2012-01-12" status="testing">
<file name="SleepyHead-0.9.2-beta-win32-update.zip"
url="http://sourceforge.net/projects/sleepyhead/files/AutoUpdate/Win32/SleepyHead-0.9.2-beta-win32-update.zip/download"
hash="294cbb319a62b547d88f6879295878975d6b5e56"/>
<notes>
Some bug fixes to the beta, and a test of the auto-updater.
Adds some new functionality to the updater, so test updates can be delivered with out affecting other users.
Please proceed with caution. If unsure, wait for feedback in the forums..
</notes>
</update>
<notes>
This is an updater test, though it does deliver some important bug fixes to the beta..
</notes>
<notes platform="win32">Nothing particularly platform relevant to this Windows build</notes>
<info url="http://sourceforge.net/apps/mediawiki/sleepyhead/index.php?title=ReleaseNotes-0.9.1"/>
</Release>
</SleepyHead>