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

Merge branch 'master' into translations

Browse Source
This commit is contained in:
ArieKlerk 2020-03-28 17:06:10 +01:00
commit bf198ab98f
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -8142,6 +8142,11 @@ void PRS1Import::ParseWaveforms()
} }
if (s2 > 0) { if (s2 > 0) {
// NOTE: The 900X (F5V3) clamps the values at 127 (15.875 cmH2O) for some reason.
//
// Previous autoSV machines (950P-961P, F5V0-F5V2) didn't, nor do 1030X (F3V6).
// 1130X (also F3V6) is unknown, but likely follows the 1030X. Older ventilators
// (F3V3) are also unknown.
EventList * pres = session->AddEventList(CPAP_MaskPressureHi, EVL_Waveform, pressure_gain, 0.0f, 0.0f, 0.0f, double(dur) / double(s2)); EventList * pres = session->AddEventList(CPAP_MaskPressureHi, EVL_Waveform, pressure_gain, 0.0f, 0.0f, 0.0f, double(dur) / double(s2));
pres->AddWaveform(ti, (unsigned char *)data[1].data(), data[1].size(), dur); pres->AddWaveform(ti, (unsigned char *)data[1].data(), data[1].size(), dur);
} }

30
oscar/tests/prs1tests.cpp
View File

@ -390,28 +390,26 @@ QString prs1OutputPath(const QString & inpath, const QString & serial, const QSt
void iterateTestCards(const QString & root, void (*action)(const QString &)) void iterateTestCards(const QString & root, void (*action)(const QString &))
{ {
QDir dir(root); QDir dir(root);
dir.setFilter(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoSymLinks); dir.setFilter(QDir::NoDotAndDotDot | QDir::Dirs);
dir.setSorting(QDir::Name); dir.setSorting(QDir::Name);
QFileInfoList flist = dir.entryInfoList(); QFileInfoList flist = dir.entryInfoList();
// Look through each folder in the given root // Look through each folder in the given root
for (auto & fi : flist) { for (auto & fi : flist) {
if (fi.isDir()) { QStringList machinePaths = s_loader->FindMachinesOnCard(fi.canonicalFilePath());
QStringList machinePaths = s_loader->FindMachinesOnCard(fi.canonicalFilePath());
// Tests should be run newest to oldest, since older sets tend to have more // Tests should be run newest to oldest, since older sets tend to have more
// complete data. (These are usually previously cleared data in the Clear0/Cn // complete data. (These are usually previously cleared data in the Clear0/Cn
// directories.) The machines themselves will write out the summary data they // directories.) The machines themselves will write out the summary data they
// remember when they see an empty folder, without event or waveform data. // remember when they see an empty folder, without event or waveform data.
// And since these tests (by design) overwrite existing output, we want the // And since these tests (by design) overwrite existing output, we want the
// earlier (more complete) data to be what's written last. // earlier (more complete) data to be what's written last.
// //
// Since the loader itself keeps only the first set of data it sees for a session, // Since the loader itself keeps only the first set of data it sees for a session,
// we want to leave its earliest-to-latest ordering in place, and just reverse it // we want to leave its earliest-to-latest ordering in place, and just reverse it
// here. // here.
for (auto i = machinePaths.crbegin(); i != machinePaths.crend(); i++) { for (auto i = machinePaths.crbegin(); i != machinePaths.crend(); i++) {
action(*i); action(*i);
}
} }
} }
} }