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

Make sure to include EDF files in the S9 DATALOG folder itself

Browse Source
This commit is contained in:
Mark Watkins 2018-05-04 20:22:55 +10:00
parent 204425473f
commit b14b1abd4d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1380,9 +1380,16 @@ int ResmedLoader::scanFiles(Machine * mach, const QString & datalog_path)
#ifdef DEBUG_EFFICIENCY #ifdef DEBUG_EFFICIENCY
time.start(); time.start();
#endif #endif
QFileInfoList EDFfiles;
QDir dir(datalog_path); QDir dir(datalog_path);
// First list any EDF files in DATALOG folder
QStringList filter;
filter << "*.edf";
dir.setNameFilters(filter);
QFileInfoList EDFfiles = dir.entryInfoList();
dir.setNameFilters(QStringList());
dir.setFilter(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot); dir.setFilter(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot);
QString filename; QString filename;
bool ok; bool ok;
@ -2240,13 +2247,13 @@ void ResDayTask::run()
sess->UpdateSummaries(); sess->UpdateSummaries();
// Save is not threadsafe? // Save is not threadsafe? (meh... it seems to be)
// loader->saveMutex.lock(); // loader->saveMutex.lock();
sess->Store(mach->getDataPath()); sess->Store(mach->getDataPath());
// loader->saveMutex.unlock(); // loader->saveMutex.unlock();
loader->sessionMutex.lock(); loader->sessionMutex.lock();
mach->AddSession(sess); mach->AddSession(sess); // AddSession definitely ain't.
loader->sessionMutex.unlock(); loader->sessionMutex.unlock();
// Free the memory used by this session // Free the memory used by this session

4
sleepyhead/preferencesdialog.ui
View File

@ -57,7 +57,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>6</number>
</property> </property>
<widget class="QWidget" name="importTab"> <widget class="QWidget" name="importTab">
<attribute name="title"> <attribute name="title">
@ -2247,7 +2247,7 @@ p, li { white-space: pre-wrap; }
<item row="2" column="1"> <item row="2" column="1">
<widget class="QComboBox" name="openingTabCombo"> <widget class="QComboBox" name="openingTabCombo">
<property name="toolTip"> <property name="toolTip">
<string>Which tab to open at startup. (Note: It will default to Profile if there is no open Profile)</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Which tab to open on loading a profile. (Note: It will default to Profile if there is no open Profile)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="currentText"> <property name="currentText">
<string>Profile</string> <string>Profile</string>