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

Clean up formatting, add debug and warnings, fix STR length test to allow multiple daily imports.

Browse Source
This commit is contained in:
Phil Olynyk 2020-08-03 14:01:04 -04:00
parent 5cefc90a16
commit 961fdb13db
5 changed files with 186 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,8 +335,9 @@ int ResmedLoader::Open(const QString & dirpath)
if ( mach ) { // we have seen this machine if ( mach ) { // we have seen this machine
qDebug() << "We have seen this machime"; qDebug() << "We have seen this machime";
mach->setInfo( info ); // update info mach->setInfo( info ); // update info
// QDate lastDate = p_profile->LastDay(MT_CPAP); QDate lastDate = mach->LastDay(); // use the last day for this machine
// firstImportDay = lastDate.addDays(-1); // firstImportDay = lastDate.addDays(-1); // start the day before, to pick up partial days
firstImportDay = lastDate.addDays(1); // start the day after until we figure out the purge
} else { // Starting from new beginnings - new or purged } else { // Starting from new beginnings - new or purged
qDebug() << "New machine or just purged"; qDebug() << "New machine or just purged";
p_profile->forceResmedPrefs(); p_profile->forceResmedPrefs();
@ -421,9 +422,9 @@ int ResmedLoader::Open(const QString & dirpath)
QDate date = stredf->edfHdr.startdate_orig.date(); QDate date = stredf->edfHdr.startdate_orig.date();
long int days = stredf->GetNumDataRecords(); long int days = stredf->GetNumDataRecords();
qDebug() << importFile.section("/",-2,-1) << "starts at" << date << "for" << days << "ends" << date.addDays(days-1); qDebug() << importFile.section("/",-2,-1) << "starts at" << date << "for" << days << "ends" << date.addDays(days-1);
if (STRmap.contains(date)) { // Keep the longer of the two STR files if (STRmap.contains(date)) { // Keep the longer of the two STR files - or newer if equal!
qDebug() << importFile.section("/",-3,-1) << "overlaps" << STRmap[date].filename.section("/",-3,-1) << "for" << days << "ends" << date.addDays(days-1); qDebug() << importFile.section("/",-3,-1) << "overlaps" << STRmap[date].filename.section("/",-3,-1) << "for" << days << "ends" << date.addDays(days-1);
if (days > STRmap[date].days) { if (days >= STRmap[date].days) {
qDebug() << "Removing" << STRmap[date].filename.section("/",-3,-1) << "with" << STRmap[date].days; qDebug() << "Removing" << STRmap[date].filename.section("/",-3,-1) << "with" << STRmap[date].days;
STRmap.remove(date); STRmap.remove(date);
} else { } else {
@ -1049,13 +1050,13 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
if (rit != resdayList.end()) { if (rit != resdayList.end()) {
// Already seen this record.. should check if the data is the same, but meh. // Already seen this record.. should check if the data is the same, but meh.
// At least check the maskeventcount to see if it changed... // At least check the maskeventcount to see if it changed...
// if ( maskeventcount* != rit...maskevents ) { if ( maskeventcount->dataArray[0] != rit.value().str.maskevents ) {
// qDebug() << "Maske events don't match, purge" << rit...date().toString; qDebug() << "Maske events don't match, purge" << rit.value().date.toString();
// purge... // purge...
// } }
#ifdef SESSION_DEBUG // #ifdef SESSION_DEBUG
qDebug() << "Skipping" << date.toString() << "Already saw this one"; qDebug() << "Skipping" << date.toString() << "Already saw this one";
#endif // #endif
continue; continue;
} }

8
oscar/SleepLib/machine.cpp
View File

@ -688,6 +688,7 @@ bool Machine::Load(ProgressDialog *progress)
} }
if ( ! LoadSummary(progress)) { if ( ! LoadSummary(progress)) {
qDebug() << "Recreating the Summary index XML file";
// No XML index file, so assume upgrading, or it simply just got screwed up or deleted... // No XML index file, so assume upgrading, or it simply just got screwed up or deleted...
progress->setMessage(QObject::tr("Scanning Files")); progress->setMessage(QObject::tr("Scanning Files"));
progress->setProgressValue(0); progress->setProgressValue(0);
@ -751,6 +752,7 @@ bool Machine::Load(ProgressDialog *progress)
size = filelist.size(); size = filelist.size();
progress->setMessage("Reading summary files"); progress->setMessage("Reading summary files");
qDebug() << "Reading summary files (.000)";
progress->setProgressValue(0); progress->setProgressValue(0);
QApplication::processEvents(); QApplication::processEvents();
@ -787,6 +789,7 @@ bool Machine::Load(ProgressDialog *progress)
progress->setProgressValue(size); progress->setProgressValue(size);
} }
progress->setMessage("Loading Session Info"); progress->setMessage("Loading Session Info");
qDebug() << "Loading Session Info";
QApplication::processEvents(); QApplication::processEvents();
loadSessionInfo(); loadSessionInfo();
@ -804,7 +807,9 @@ bool Machine::SaveSession(Session *sess)
{ {
QString path = getDataPath(); QString path = getDataPath();
if (sess->IsChanged() && sess->first() != 0) { sess->Store(path); } if (sess->IsChanged() && sess->first() != 0) {
sess->Store(path);
}
return true; return true;
} }
@ -1018,6 +1023,7 @@ bool Machine::LoadSummary(ProgressDialog * progress)
} }
} }
progress->setMessage(QObject::tr("Loading Summary Data")); progress->setMessage(QObject::tr("Loading Summary Data"));
qDebug() << "Loading Summary Data";
QApplication::processEvents(); QApplication::processEvents();
if (loader()) { if (loader()) {

4
oscar/SleepLib/profiles.cpp
View File

@ -630,7 +630,7 @@ void Profile::LoadMachineData(ProgressDialog *progress)
if (loader) { if (loader) {
if (mach->version() < loader->Version()) { if (mach->version() < loader->Version()) {
qDebug() << "LoadMachineData data format error, machine version" << mach->version() << "loader version" << loader->Version(); qDebug() << "LoadMachineData" << mach->loaderName() << "data format error, machine version" << mach->version() << "loader version" << loader->Version();
progress->hide(); progress->hide();
DataFormatError(mach); DataFormatError(mach);
progress->show(); progress->show();
@ -638,7 +638,7 @@ void Profile::LoadMachineData(ProgressDialog *progress)
try { try {
mach->Load(progress); mach->Load(progress);
} catch (OldDBVersion& e) { } catch (OldDBVersion& e) {
qDebug() << "LoadMachineData mach->load failure, machine version" << mach->version() << "loader version" << loader->Version(); qDebug() << "LoadMachineData" << mach->loaderName() << "load failure, machine version" << mach->version() << "loader version" << loader->Version();
Q_UNUSED(e) Q_UNUSED(e)
progress->hide(); progress->hide();
DataFormatError(mach); DataFormatError(mach);

204
oscar/SleepLib/session.cpp
View File

@ -119,13 +119,13 @@ bool Session::OpenEvents()
QString filename = eventFile(); QString filename = eventFile();
qDebug() << "Loading" << s_machine->loaderName().toLocal8Bit().data() << "Events:" << filename.toLocal8Bit().data();
bool b = LoadEvents(filename); bool b = LoadEvents(filename);
if ( ! b) { if ( ! b) {
// qWarning() << "Error Loading Events" << filename; qWarning() << "Error Loading Events" << filename;
return false; return false;
} }
// qDebug() << "Loading" << s_machine->loaderName().toLocal8Bit().data() << "Events:" << filename.toLocal8Bit().data();
return s_events_loaded = true; return s_events_loaded = true;
} }
@ -139,13 +139,13 @@ bool Session::Destroy()
QString summaryfile = s_machine->getSummariesPath() + base + ".000"; QString summaryfile = s_machine->getSummariesPath() + base + ".000";
QString eventfile = s_machine->getEventsPath() + base + ".001"; QString eventfile = s_machine->getEventsPath() + base + ".001";
if ( ! dir.remove(summaryfile)) { if ( ! dir.remove(summaryfile)) {
// qDebug() << "Could not delete" << summaryfile; qWarning() << "Could not delete" << summaryfile;
} }
if ( ! dir.remove(eventfile)) { if ( ! dir.remove(eventfile)) {
// qDebug() << "Could not delete" << eventfile; qWarning() << "Could not delete" << eventfile;
} }
return s_machine->unlinkSession(this); //!dir.exists(base + ".000") && !dir.exists(base + ".001"); return s_machine->unlinkSession(this);
} }
bool Session::Store(QString path) bool Session::Store(QString path)
@ -180,103 +180,104 @@ bool Session::Store(QString path)
return a; return a;
} }
/*QDataStream & operator<<(QDataStream & out, const Session & session)
{
session.StoreSummaryData(out);
return out;
}
void Session::StoreSummaryData(QDataStream & out) const //QDataStream & operator<<(QDataStream & out, const Session & session)
{ //{
out << summary_version; // session.StoreSummaryData(out);
out << (quint32)s_session; // return out;
out << s_first; // Session Start Time //}
out << s_last; // Duration of sesion in seconds. //
//void Session::StoreSummaryData(QDataStream & out) const
out << settings; //{
out << m_cnt; // out << summary_version;
out << m_sum; // out << (quint32)s_session;
out << m_avg; // out << s_first; // Session Start Time
out << m_wavg; // out << s_last; // Duration of sesion in seconds.
//
out << m_min; // out << settings;
out << m_max; // out << m_cnt;
// out << m_sum;
out << m_physmin; // out << m_avg;
out << m_physmax; // out << m_wavg;
//
out << m_cph; // out << m_min;
out << m_sph; // out << m_max;
//
out << m_firstchan; // out << m_physmin;
out << m_lastchan; // out << m_physmax;
//
out << m_valuesummary; // out << m_cph;
out << m_timesummary; // out << m_sph;
//
out << m_gain; // out << m_firstchan;
// out << m_lastchan;
out << m_availableChannels; //
// out << m_valuesummary;
out << m_timeAboveTheshold; // out << m_timesummary;
out << m_upperThreshold; //
out << m_timeBelowTheshold; // out << m_gain;
out << m_lowerThreshold; //
// out << m_availableChannels;
out << s_summaryOnly; //
} // out << m_timeAboveTheshold;
// out << m_upperThreshold;
QDataStream & operator>>(QDataStream & in, Session & session) // out << m_timeBelowTheshold;
{ // out << m_lowerThreshold;
session.LoadSummaryData(in); //
return in; // out << s_summaryOnly;
} //}
//
//QDataStream & operator>>(QDataStream & in, Session & session)
void Session::LoadSummaryData(QDataStream & in) //{
{ // session.LoadSummaryData(in);
quint16 version; // return in;
in >> version; //}
//
quint32 t32; //
in >> t32; // Sessionid; //void Session::LoadSummaryData(QDataStream & in)
s_session = t32; //{
// quint16 version;
in >> s_first; // Start time // in >> version;
in >> s_last; // Duration //
// quint32 t32;
in >> settings; // in >> t32; // Sessionid;
in >> m_cnt; // s_session = t32;
in >> m_sum; //
in >> m_avg; // in >> s_first; // Start time
in >> m_wavg; // in >> s_last; // Duration
//
in >> m_min; // in >> settings;
in >> m_max; // in >> m_cnt;
// in >> m_sum;
in >> m_physmin; // in >> m_avg;
in >> m_physmax; // in >> m_wavg;
//
in >> m_cph; // in >> m_min;
in >> m_sph; // in >> m_max;
in >> m_firstchan; //
in >> m_lastchan; // in >> m_physmin;
// in >> m_physmax;
in >> m_valuesummary; //
in >> m_timesummary; // in >> m_cph;
// in >> m_sph;
in >> m_gain; // in >> m_firstchan;
// in >> m_lastchan;
in >> m_availableChannels; //
in >> m_timeAboveTheshold; // in >> m_valuesummary;
in >> m_upperThreshold; // in >> m_timesummary;
in >> m_timeBelowTheshold; //
in >> m_lowerThreshold; // in >> m_gain;
//
in >> s_summaryOnly; // in >> m_availableChannels;
// in >> m_timeAboveTheshold;
s_enabled = 1; // in >> m_upperThreshold;
} */ // in >> m_timeBelowTheshold;
// in >> m_lowerThreshold;
//
// in >> s_summaryOnly;
//
// s_enabled = 1;
//}
QDataStream & operator>>(QDataStream & in, SessionSlice & slice) QDataStream & operator>>(QDataStream & in, SessionSlice & slice)
{ {
@ -796,6 +797,7 @@ bool Session::StoreEvents()
file.close(); file.close();
return true; return true;
} }
bool Session::LoadEvents(QString filename) bool Session::LoadEvents(QString filename)
{ {
quint32 magicnum, machid, sessid; quint32 magicnum, machid, sessid;

110
oscar/mainwindow.cpp
View File

@ -439,7 +439,8 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
qDebug() << "Opening profile" << profileName; qDebug() << "Opening profile" << profileName;
auto pit = Profiles::profiles.find(profileName); auto pit = Profiles::profiles.find(profileName);
if (pit == Profiles::profiles.end()) return false; if (pit == Profiles::profiles.end())
return false;
Profile * prof = pit.value(); Profile * prof = pit.value();
if (p_profile) { if (p_profile) {
@ -853,13 +854,6 @@ QList<ImportPath> MainWindow::detectCPAPCards()
QList<ImportPath> detectedCards; QList<ImportPath> detectedCards;
importScanCancelled = false; importScanCancelled = false;
QString lastpath = (*p_profile)[STR_PREF_LastCPAPPath].toString(); QString lastpath = (*p_profile)[STR_PREF_LastCPAPPath].toString();
// #if defined (Q_OS_LINUX)
// if (detectedCards.size() == 0) {
// qDebug() << "Skipping card detection on Linux";
// return detectedCards;
// }
// #endif
QList<MachineLoader *>loaders = GetLoaders(MT_CPAP); QList<MachineLoader *>loaders = GetLoaders(MT_CPAP);
QTime time; QTime time;
@ -1782,58 +1776,60 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
QList<Session *>::iterator s; QList<Session *>::iterator s;
QList<Session *> list; QList<Session *> list;
QList<SessionID> sidlist; //// QList<SessionID> sidlist; // obsolete, see below
for (s = day->begin(); s != day->end(); ++s) { for (s = day->begin(); s != day->end(); ++s) {
list.push_back(*s); list.append(*s);
qDebug() << "Purging session ID:" << (*s)->session() << "["+QDateTime::fromTime_t((*s)->session()).toString()+"]"; qDebug() << "Purging session ID:" << (*s)->session() << "["+QDateTime::fromTime_t((*s)->session()).toString()+"]";
qDebug() << "First Time:" << QDateTime::fromMSecsSinceEpoch((*s)->realFirst()).toString(); qDebug() << "First Time:" << QDateTime::fromMSecsSinceEpoch((*s)->realFirst()).toString();
qDebug() << "Last Time:" << QDateTime::fromMSecsSinceEpoch((*s)->realLast()).toString(); qDebug() << "Last Time:" << QDateTime::fromMSecsSinceEpoch((*s)->realLast()).toString();
sidlist.push_back((*s)->session()); //// sidlist.append((*s)->session());
} }
QHash<QString, SessionID> skipfiles; //////// The imported_files.csv has been removed from SH 1.1 //////////
// Read the already imported file list // QHash<QString, SessionID> skipfiles;
// // Read the already imported file list
QFile impfile(cpap->getDataPath()+"/imported_files.csv"); //
if (impfile.exists()) { // QFile impfile(cpap->getDataPath()+"/imported_files.csv");
qDebug() << "Obsolet file exists" << impfile.fileName(); // if (impfile.exists()) {
if (impfile.open(QFile::ReadOnly)) { // qDebug() << "Obsolet file exists" << impfile.fileName();
QTextStream impstream(&impfile); // if (impfile.open(QFile::ReadOnly)) {
QString serial; // QTextStream impstream(&impfile);
impstream >> serial; // QString serial;
if (cpap->serial() == serial) { // impstream >> serial;
QString line, file, str; // if (cpap->serial() == serial) {
SessionID sid; // QString line, file, str;
bool ok; // SessionID sid;
do { // bool ok;
line = impstream.readLine(); // do {
file = line.section(',',0,0); // line = impstream.readLine();
str = line.section(',',1); // file = line.section(',',0,0);
sid = str.toInt(&ok); // str = line.section(',',1);
if (!sidlist.contains(sid)) { // sid = str.toInt(&ok);
skipfiles[file] = sid; // if (!sidlist.contains(sid)) {
} // skipfiles[file] = sid;
} while (!impstream.atEnd()); // }
} // } while (!impstream.atEnd());
} // }
impfile.close(); // }
// Delete the file // impfile.close();
impfile.remove(); // // Delete the file
// impfile.remove();
// Rewrite the file without the sessions being removed. //
if (impfile.open(QFile::WriteOnly)) { // // Rewrite the file without the sessions being removed.
QTextStream out(&impfile); // if (impfile.open(QFile::WriteOnly)) {
out << cpap->serial(); // QTextStream out(&impfile);
QHash<QString, SessionID>::iterator skit; // out << cpap->serial();
QHash<QString, SessionID>::iterator skit_end = skipfiles.end(); // QHash<QString, SessionID>::iterator skit;
for (skit = skipfiles.begin(); skit != skit_end; ++skit) { // QHash<QString, SessionID>::iterator skit_end = skipfiles.end();
QString a = QString("%1,%2\n").arg(skit.key()).arg(skit.value());; // for (skit = skipfiles.begin(); skit != skit_end; ++skit) {
out << a; // QString a = QString("%1,%2\n").arg(skit.key()).arg(skit.value());;
} // out << a;
out.flush(); // }
} // out.flush();
impfile.close(); // }
} // end of obsolte file code // impfile.close();
// } // end of obsolte file code
///////////////////////////////////////////////////////////////////////////////////////
QFile rxcache(p_profile->Get("{" + STR_GEN_DataFolder + "}/RXChanges.cache" )); QFile rxcache(p_profile->Get("{" + STR_GEN_DataFolder + "}/RXChanges.cache" ));
rxcache.remove(); rxcache.remove();
@ -1845,7 +1841,7 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
for (int i = 0; i < list.size(); i++) { for (int i = 0; i < list.size(); i++) {
Session *sess = list.at(i); Session *sess = list.at(i);
sess->Destroy(); sess->Destroy(); // remove the summary and event files
delete sess; delete sess;
} }
@ -2017,13 +2013,13 @@ void MainWindow::purgeMachine(Machine * mach)
deleted = true; deleted = true;
} }
#else #else
qDebug() << "Couldn't remove directory" << path; qWarning() << "Couldn't remove directory" << path;
#endif #endif
} else { } else {
deleted = true; deleted = true;
} }
if ( ! deleted) { if ( ! deleted) {
qDebug() << "Leaving backup folder intact"; qWarning() << "Leaving backup folder intact";
} }
PopulatePurgeMenu(); PopulatePurgeMenu();