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

Started on adding firstImportDay, need to fix scanFiles and PaerseSTR

Browse Source
This commit is contained in:
Phil Olynyk 2019-08-23 09:56:17 -04:00
parent b518461f8c
commit 4c121cc53a
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1848,7 +1848,24 @@ int ResmedLoader::Open(const QString & dirpath)
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
// Create machine object (unless it's already registered) // Create machine object (unless it's already registered)
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
Machine *mach = p_profile->CreateMachine(info);
QDateTime firstImportDay = QDateTime("2010January01T00:01:00"); // Before Series 8 machines (I think)
Machine *mach = p_profile->lookupMachine(info.serial, info.loadername);
if ( mach ) { // we have seen this machine
qDebug() << "We have seen this machime";
QDate lastDate = p_profile->LastDay(MT_CPAP);
firstImportDay = lastDate.addDay(-1);
} else { // Starting from new beginnings - new or purged
qDebug() << "New machine or just purged";
QDateTime ignoreBefore = p_profile->session->ignoreOlderSessionsDate();
bool ignoreOldSessions = p_profile->session->ignoreOlderSessions();
mach = p_profile->CreateMachine( info );
if (ignoreOldSessions)
firstImportDay = ignoreBefore;
}
qDebug() << "First day to import: " << firstImportDay.toString();
bool importing_backups = false; bool importing_backups = false;
bool create_backups = p_profile->session->backupCardData(); bool create_backups = p_profile->session->backupCardData();
@ -1940,7 +1957,7 @@ int ResmedLoader::Open(const QString & dirpath)
// Build a Date map of all records in STR.edf files, populating ResDayList // Build a Date map of all records in STR.edf files, populating ResDayList
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
ParseSTR(mach, STRmap); ParseSTR(mach, STRmap, firstImportDay);
// We are done with the Parsed STR EDF objects, so delete them // We are done with the Parsed STR EDF objects, so delete them
for (auto it=STRmap.begin(), end=STRmap.end(); it != end; ++it) { for (auto it=STRmap.begin(), end=STRmap.end(); it != end; ++it) {
@ -1987,7 +2004,7 @@ int ResmedLoader::Open(const QString & dirpath)
if (isAborted()) if (isAborted())
return 0; return 0;
scanFiles(mach, datalogPath); scanFiles(mach, datalogPath, firstImportDay);
if (isAborted()) if (isAborted())
return 0; return 0;