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

Merge branch 'master' into sanity-check-STR-file

Browse Source
This commit is contained in:
Phil Olynyk 2020-02-16 21:42:09 -05:00
commit 99de650018
5 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oscar/SleepLib/loader_plugins/dreem_loader.cpp
View File

@ -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;
}

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

@ -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

6
oscar/SleepLib/loader_plugins/zeo_loader.cpp
View File

@ -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;
}

7
oscar/SleepLib/profiles.cpp
View File

@ -565,7 +565,12 @@ 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..

29
oscar/mainwindow.cpp
View File

@ -1064,35 +1064,17 @@ void MainWindow::importCPAPDataCards(const QList<ImportPath> & 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<ImportPath> & 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();
}
@ -2485,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];