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

iBreeze abjusted leak gain so graphs match iMatrix software.

Browse Source
This commit is contained in:
LoudSnorer 2023-11-14 16:06:48 -05:00
parent 1dfe5de5fc
commit 085e11d4ee
1 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
oscar/SleepLib/loader_plugins/resvent_loader.cpp
View File

@ -15,7 +15,7 @@
// i.e. there is no need to change the version when adding support for new devices // i.e. there is no need to change the version when adding support for new devices
//******************************************************************************************** //********************************************************************************************
#define TEST_MACROS_ENABLEDoff #define TEST_MACROS_ENABLEDoff // Turn off for offical release.
#include <test_macros.h> #include <test_macros.h>
#include <QCoreApplication> #include <QCoreApplication>
@ -77,18 +77,17 @@ int countDaysWithRecordData(QDir& dir) {
bool isDir = dir.cd(filename); bool isDir = dir.cd(filename);
if (isDir) { if (isDir) {
// It is a directory. // It is a directory.
// check if name is between 1 and 31. for day in month // check if name is between 1 and 31. for day in month
int dayInMonth = filename.toInt(); int dayInMonth = filename.toInt();
if ( dayInMonth>0 && dayInMonth<=31) { if ( dayInMonth>0 && dayInMonth<=31) {
count++; // in month folder.
} else { count++;
count += countDaysWithRecordData(dir); } else {
} // recurse into folder.
count += countDaysWithRecordData(dir);
}
//Change back to parent. //Change back to parent.
dir.cdUp(); dir.cdUp();
//} else {
// It is a file.
//count++;
} }
} }
return count; return count;
@ -197,8 +196,8 @@ QVector<QDate> GetSessionsDate(const QString& dirpath) {
} }
enum class EventType { enum class EventType {
UsageSec= 1, //UsageSec = 1,
UnixStart = 2, //UnixStart = 2,
ObstructiveApnea = 17, ObstructiveApnea = 17,
CentralApnea = 18, CentralApnea = 18,
Hypopnea = 19, Hypopnea = 19,
@ -206,12 +205,6 @@ enum class EventType {
RERA = 21, RERA = 21,
PeriodicBreathing = 22, PeriodicBreathing = 22,
Snore = 23 Snore = 23
#if defined(TEST_MACROS_ENABLED)
, EventTypeMIN = 16
, EventTypeMAX = 24
// SNI - SNore ???
//
#endif
}; };
struct EventData { struct EventData {
@ -263,6 +256,10 @@ QString GetSessionFolder(const QString& dirpath, const QDate& session_date) {
bool VerifyEvent(EventData& eventData) { bool VerifyEvent(EventData& eventData) {
switch (eventData.type) { switch (eventData.type) {
case EventType::Snore:
case EventType::FlowLimitation:
case EventType::PeriodicBreathing:
case EventType::Hypopnea:
case EventType::ObstructiveApnea: // OA case EventType::ObstructiveApnea: // OA
case EventType::CentralApnea: // CA and same clear airway. case EventType::CentralApnea: // CA and same clear airway.
// adjust time of event to be after the event ends rather than when the event starts. // adjust time of event to be after the event ends rather than when the event starts.
@ -271,24 +268,11 @@ bool VerifyEvent(EventData& eventData) {
case EventType::RERA: case EventType::RERA:
eventData.duration = 0 ; // duration is large and suppress duration display of eariler OA events. eventData.duration = 0 ; // duration is large and suppress duration display of eariler OA events.
break; break;
case EventType::Hypopnea:
case EventType::FlowLimitation:
case EventType::PeriodicBreathing:
case EventType::Snore:
// do nothing
break;
default: default:
// not an event DEBUGFW Q((int)eventData.type) O(eventData.date_time) Q(eventData.duration);
break; break;
} }
#if defined(TEST_MACROS_ENABLED)
if (( eventData.type<= EventType::EventTypeMIN) || (eventData.type >= EventType::EventTypeMAX) ) {
DEBUGFC Q((int)eventData.type) O(eventData.date_time) Q(eventData.duration);
} else {
DEBUGFW Q((int)eventData.type) O(eventData.date_time) Q(eventData.duration);
}
#endif
return true; return true;
} }
@ -366,7 +350,8 @@ EventList* GetEventList(const QString& name, Session* session, float sample_rate
return session->AddEventList(CPAP_EPAP, EVL_Event); return session->AddEventList(CPAP_EPAP, EVL_Event);
} }
else if (name == "Leak") { else if (name == "Leak") {
return session->AddEventList(CPAP_Leak, EVL_Event); // was was adjusted from the default 1.0 to 13. so that the graph of gain would match iMatrix values.
return session->AddEventList(CPAP_Leak, EVL_Event, 13.0);
} }
else if (name == "Vt") { else if (name == "Vt") {
return session->AddEventList(CPAP_TidalVolume, EVL_Event); return session->AddEventList(CPAP_TidalVolume, EVL_Event);
@ -424,6 +409,7 @@ void ReadWaveFormsHeaders(QFile& f, QVector<ChunkData>& wave_forms, Session* ses
f.seek(kDescriptionCountOffset); f.seek(kDescriptionCountOffset);
const auto description_count = read_from_file<uint16_t>(f); const auto description_count = read_from_file<uint16_t>(f);
wave_forms.resize(description_count); wave_forms.resize(description_count);
//DEBUGFW Q(chunk_duration_in_sec) Q(description_count);
for (unsigned int i = 0; i < description_count; i++) { for (unsigned int i = 0; i < description_count; i++) {
const auto description_header_offset = kMainHeaderSize + i * kDescriptionHeaderSize; const auto description_header_offset = kMainHeaderSize + i * kDescriptionHeaderSize;
@ -436,6 +422,12 @@ void ReadWaveFormsHeaders(QFile& f, QVector<ChunkData>& wave_forms, Session* ses
wave_forms[i].event_list = GetEventList(name, session, wave_forms[i].sample_rate); wave_forms[i].event_list = GetEventList(name, session, wave_forms[i].sample_rate);
wave_forms[i].samples_by_chunk = samples_by_chunk; wave_forms[i].samples_by_chunk = samples_by_chunk;
wave_forms[i].start_time = usage.start_time.toMSecsSinceEpoch(); wave_forms[i].start_time = usage.start_time.toMSecsSinceEpoch();
DEBUGFW Q(name)
Q(samples_by_chunk)
QQ("sampleRate",wave_forms[i].sample_rate )
QQ("epoch", wave_forms[i].start_time )
DATETIME(wave_forms[i].start_time)
;
} }
} }