From c5c6f779f7198488004dd48814d35fd311cdc38a Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Thu, 13 Feb 2020 14:31:32 -0500 Subject: [PATCH 1/6] Fix Zeo and Dreem loaders' mysteriously missing sessions. This was the same issue seen in the Viatom loader, fixed at 5e07187, and the same fix works here. --- oscar/SleepLib/loader_plugins/dreem_loader.cpp | 6 +++++- oscar/SleepLib/loader_plugins/zeo_loader.cpp | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/dreem_loader.cpp b/oscar/SleepLib/loader_plugins/dreem_loader.cpp index 1c4d1d63..6a08dd22 100644 --- a/oscar/SleepLib/loader_plugins/dreem_loader.cpp +++ b/oscar/SleepLib/loader_plugins/dreem_loader.cpp @@ -54,7 +54,11 @@ int DreemLoader::OpenFile(const QString & filename) mach->AddSession(sess); count++; } - mach->Save(); + if (count > 0) { + mach->Save(); + mach->SaveSummaryCache(); + p_profile->StoreMachines(); + } closeCSV(); return count; } diff --git a/oscar/SleepLib/loader_plugins/zeo_loader.cpp b/oscar/SleepLib/loader_plugins/zeo_loader.cpp index 01e0dce9..c9e0c467 100644 --- a/oscar/SleepLib/loader_plugins/zeo_loader.cpp +++ b/oscar/SleepLib/loader_plugins/zeo_loader.cpp @@ -95,7 +95,11 @@ int ZEOLoader::OpenFile(const QString & filename) mach->AddSession(sess); count++; } - mach->Save(); + if (count > 0) { + mach->Save(); + mach->SaveSummaryCache(); + p_profile->StoreMachines(); + } closeCSV(); return count; } From 1a258eae34c6f5201b1845c4d8f40b2dd69cc513 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Thu, 13 Feb 2020 20:37:52 -0500 Subject: [PATCH 2/6] Update machine.info.version after upgrade re-import --- oscar/SleepLib/profiles.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index edf94273..13bb6b27 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -565,7 +565,11 @@ void Profile::DataFormatError(Machine *m) } // Note: I deliberately haven't added a Profile help for this if (backups) { - mainwin->importCPAP(ImportPath(m->getBackupPath(), lookupLoader(m)), QObject::tr("Rebuilding from %1 Backup").arg(m->brand())); + MachineLoader * loader = lookupLoader(m); + int c = mainwin->importCPAP(ImportPath(m->getBackupPath(), loader), + QObject::tr("Rebuilding from %1 Backup").arg(m->brand())); + if ( c > 0 ) + m->info.version = loader->Version(); } else { if (!p_profile->session->backupCardData()) { // Automatic backups not available for Intellipap users yet, so don't taunt them.. From b96f22bcd98299964224a7015ca36a096ed5b3dc Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sun, 16 Feb 2020 20:12:25 -0500 Subject: [PATCH 3/6] Fix double import progress window. --- oscar/mainwindow.cpp | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index 2ec0729b..8195b73b 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -1064,35 +1064,17 @@ void MainWindow::importCPAPDataCards(const QList & datacards) { bool newdata = false; -// QStringList goodlocations; - - ProgressDialog * prog = new ProgressDialog(this); - prog->setMessage(tr("Processing import list...")); - prog->addAbortButton(); - prog->setWindowModality(Qt::ApplicationModal); - - prog->open(); - int c = -1; for (int i = 0; i < datacards.size(); i++) { QString dir = datacards[i].path; MachineLoader * loader = datacards[i].loader; if (!loader) continue; - connect(loader, SIGNAL(updateMessage(QString)), prog, SLOT(setMessage(QString))); - connect(loader, SIGNAL(setProgressMax(int)), prog, SLOT(setProgressMax(int))); - connect(loader, SIGNAL(setProgressValue(int)), prog, SLOT(setProgressValue(int))); - connect(prog, SIGNAL(abortClicked()), loader, SLOT(abortImport())); - - QPixmap image = loader->getPixmap(loader->PeekInfo(dir).series); - image = image.scaled(64,64); - prog->setPixmap(image); if (!dir.isEmpty()) { c = importCPAP(datacards[i], tr("Importing Data")); qDebug() << "Finished Importing data" << c; if (c >= 0) { - // goodlocations.push_back(dir); QDir d(dir.section("/",0,-1)); (*p_profile)[STR_PREF_LastCPAPPath] = d.absolutePath(); } @@ -1101,19 +1083,12 @@ void MainWindow::importCPAPDataCards(const QList & datacards) newdata = true; } } - disconnect(prog, SIGNAL(abortClicked()), loader, SLOT(abortImport())); - disconnect(loader, SIGNAL(setProgressMax(int)), prog, SLOT(setProgressMax(int))); - disconnect(loader, SIGNAL(setProgressValue(int)), prog, SLOT(setProgressValue(int))); - disconnect(loader, SIGNAL(updateMessage(QString)), prog, SLOT(setMessage(QString))); } if (newdata) { finishCPAPImport(); PopulatePurgeMenu(); } - - prog->close(); - prog->deleteLater(); } From 498451df4a9c907577b385adf1237270aec740e8 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Sun, 16 Feb 2020 21:02:30 -0500 Subject: [PATCH 4/6] Fix Windows file dialog for loading Viatom files. --- oscar/mainwindow.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp index 8195b73b..2a4621a2 100644 --- a/oscar/mainwindow.cpp +++ b/oscar/mainwindow.cpp @@ -2460,6 +2460,10 @@ void MainWindow::on_actionImport_Viatom_Data_triggered() w.setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint); w.setOption(QFileDialog::ShowDirsOnly, false); w.setNameFilters(viatom.getNameFilter()); +#if defined(Q_OS_WIN) + // Windows can't handle this name filter. + w.setOption(QFileDialog::DontUseNativeDialog, true); +#endif if (w.exec() == QFileDialog::Accepted) { QString filename = w.selectedFiles()[0]; From 6fed69e71cc6ecda9afdbfecd29c2992811a3d09 Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Sun, 16 Feb 2020 21:12:54 -0500 Subject: [PATCH 5/6] Update database version in loader, not profiles --- oscar/SleepLib/loader_plugins/resmed_loader.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp index 4c815ba4..09974798 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp +++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp @@ -368,6 +368,7 @@ int ResmedLoader::Open(const QString & dirpath) Machine *mach = p_profile->lookupMachine(info.serial, info.loadername); if ( mach ) { // we have seen this machine qDebug() << "We have seen this machime"; + mach->setInfo( info ); // update info // QDate lastDate = p_profile->LastDay(MT_CPAP); // firstImportDay = lastDate.addDays(-1); } else { // Starting from new beginnings - new or purged From bd4918dc302ab7a0b2d03cbb2d935c4f2b995fce Mon Sep 17 00:00:00 2001 From: Phil Olynyk Date: Sun, 16 Feb 2020 21:33:01 -0500 Subject: [PATCH 6/6] Remove version update from importCPAP --- oscar/SleepLib/profiles.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index 13bb6b27..4c079452 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -566,10 +566,11 @@ void Profile::DataFormatError(Machine *m) // Note: I deliberately haven't added a Profile help for this if (backups) { MachineLoader * loader = lookupLoader(m); - int c = mainwin->importCPAP(ImportPath(m->getBackupPath(), loader), - QObject::tr("Rebuilding from %1 Backup").arg(m->brand())); - if ( c > 0 ) - m->info.version = loader->Version(); + /* int c = */ + mainwin->importCPAP(ImportPath(m->getBackupPath(), loader), + QObject::tr("Rebuilding from %1 Backup").arg(m->brand())); +// if ( c > 0 ) +// m->info.version = loader->Version(); } else { if (!p_profile->session->backupCardData()) { // Automatic backups not available for Intellipap users yet, so don't taunt them..