chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 19:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up comments and trim file paths

Browse Source
This commit is contained in:
Phil Olynyk 2020-05-16 17:31:18 -04:00
parent 53d0c0fbe4
commit cf32639b06
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
oscar/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -471,12 +471,6 @@ int ResmedLoader::Open(const QString & dirpath)
if (!(filename.endsWith("edf.gz", Qt::CaseInsensitive) || filename.endsWith("edf", Qt::CaseInsensitive))) if (!(filename.endsWith("edf.gz", Qt::CaseInsensitive) || filename.endsWith("edf", Qt::CaseInsensitive)))
continue; continue;
QString datestr = filename.section("STR-",-1).section(".edf",0,0); // +"01"; QString datestr = filename.section("STR-",-1).section(".edf",0,0); // +"01";
// date = QDate().fromString(datestr,"yyyyMMdd");
//
// if (STRmap.contains(date)) {
// qDebug() << filename << "overlaps anothor STR file";
// continue;
// }
ResMedEDFInfo * stredf = new ResMedEDFInfo(); ResMedEDFInfo * stredf = new ResMedEDFInfo();
if ( ! stredf->Open(fi.canonicalFilePath() ) ) { if ( ! stredf->Open(fi.canonicalFilePath() ) ) {
@ -963,7 +957,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
int days = str.GetNumDataRecords(); int days = str.GetNumDataRecords();
totalRecs += days; totalRecs += days;
#ifdef STR_DEBUG #ifdef STR_DEBUG
qDebug() << "STR file is" << file.filename; qDebug() << "STR file is" << file.filename.section("/", -3, -1);
qDebug() << "First day" << QDateTime::fromMSecsSinceEpoch(str.startdate, EDFInfo::localNoDST).date().toString() << "for" << days << "days"; qDebug() << "First day" << QDateTime::fromMSecsSinceEpoch(str.startdate, EDFInfo::localNoDST).date().toString() << "for" << days << "days";
#endif #endif
} }
@ -984,12 +978,12 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
QDate lastDay = date.addDays(size-1); QDate lastDay = date.addDays(size-1);
#ifdef STR_DEBUG #ifdef STR_DEBUG
qDebug() << "Processing" << strfile << date.toString() << size << str.GetNumSignals(); qDebug() << "Processing" << strfile.section("/", -3, -1) << date.toString() << size << str.GetNumSignals();
qDebug() << "Last day is" << lastDay; qDebug() << "Last day is" << lastDay;
#endif #endif
if ( lastDay < firstImport ) { if ( lastDay < firstImport ) {
qDebug() << "LastDay before firstImport, skipping" << strfile; qDebug() << "LastDay before firstImport, skipping" << strfile.section("/", -3, -1);
continue; continue;
} }
@ -1561,9 +1555,9 @@ void BackupSTRfiles( const QString strpath, const QString importPath, const QStr
QDate date = stredf->edfHdr.startdate_orig.date(); QDate date = stredf->edfHdr.startdate_orig.date();
long int days = stredf->GetNumDataRecords(); long int days = stredf->GetNumDataRecords();
if (STRmap.contains(date)) { if (STRmap.contains(date)) {
qDebug() << "STRmap already contains" << date.toString("YYYY-MM-dd") << "for" << days << "ending" << date.addDays(days-1); qDebug() << "STRmap already contains" << date.toString("yyyy-MM-dd") << "for" << days << "ending" << date.addDays(days-1);
if ( days <= STRmap[date].days ) { if ( days <= STRmap[date].days ) {
qDebug() << "Skipping" << filename.section("/",-2,-1); qDebug() << "Skipping" << filename.section("/",-2,-1) << "Keeping" << STRmap[date].filename.section("/",-2,-1);
delete stredf; delete stredf;
continue; continue;
} }