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

Unbreak git, and skip already imported resmed sessions

Browse Source
This commit is contained in:
Mark Watkins 2018-05-03 15:44:19 +10:00
parent f64edd80ca
commit 0b8ada6d64
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -2246,6 +2246,7 @@ void ResDayTask::run()
// Free the memory used by this session // Free the memory used by this session
sess->TrashEvents(); sess->TrashEvents();
loader->sessionMutex.lock(); loader->sessionMutex.lock();
loader->sessionCount++; loader->sessionCount++;
loader->sessionMutex.unlock(); loader->sessionMutex.unlock();
@ -2572,11 +2573,12 @@ int ResmedLoader::Open(const QString & dirpath)
ResMedDay & resday = rdi.value(); ResMedDay & resday = rdi.value();
resday.date = date; resday.date = date;
/*Day * day = p_profile->FindDay(date, MT_CPAP); Day * day = p_profile->FindDay(date, MT_CPAP);
bool reimporting = false;
if (day && day->hasMachine(mach)) { if (day && day->hasMachine(mach)) {
// Sessions found for this machine, check if only summary info // Sessions found for this machine, check if only summary info
if (day->summaryOnly(mach)) { if (day->summaryOnly(mach) && (resday.files.size()> 0)) {
// Note: if this isn't an EDF file, there's really no point doing this here, // Note: if this isn't an EDF file, there's really no point doing this here,
// but the worst case scenario is this session is deleted and reimported.. this just slows things down a bit in that case // but the worst case scenario is this session is deleted and reimported.. this just slows things down a bit in that case
@ -2589,13 +2591,16 @@ int ResmedLoader::Open(const QString & dirpath)
day->removeSession(sess); day->removeSession(sess);
delete sess; delete sess;
} }
reimporting = true;
} else { } else {
continue; continue;
} }
}*/ }
BROKEN WAIT FOR A NEW COMMIT! ResDayTask * rdt = new ResDayTask(this, mach, &resday);
queTask(new ResDayTask(this, mach, &resday)); queTask(rdt);
rdt->reimporting = reimporting;
} }
sessionCount = 0; sessionCount = 0;

3
sleepyhead/SleepLib/loader_plugins/resmed_loader.h
View File

@ -313,9 +313,10 @@ struct ResMedDay {
class ResDayTask:public ImportTask class ResDayTask:public ImportTask
{ {
public: public:
ResDayTask(ResmedLoader * l, Machine * m, ResMedDay * d): loader(l), mach(m), resday(d) {} ResDayTask(ResmedLoader * l, Machine * m, ResMedDay * d): reimporting(false), loader(l), mach(m), resday(d) {}
virtual ~ResDayTask() {} virtual ~ResDayTask() {}
virtual void run(); virtual void run();
bool reimporting;
protected: protected:
ResmedLoader * loader; ResmedLoader * loader;