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

Initialize ImportContext for non-CPAP devices.

Browse Source 
Now the loaders imported via the Data menu have access to the
unsupported/untested/brick signals and CHECK_VALUE and UNEXPECTED_VALUE
macros.

Now only devices imported via the oximetry wizard are left out,
since we need to revisit that entire workflow.

Also removed the unused Profile::Import() method.
This commit is contained in:
sawinglogz 2021-09-02 13:00:37 -04:00
parent 08f4e2a5b7
commit 4bfe062ae9
3 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
oscar/SleepLib/profiles.cpp
View File

@ -877,27 +877,6 @@ Day *Profile::FindDay(QDate date, MachineType type)
} }
int Profile::Import(QString path)
{
int c = 0;
qDebug() << "Importing " << path;
path = path.replace("\\", "/");
if (path.endsWith("/")) {
path.chop(1);
}
QList<MachineLoader *>loaders = GetLoaders(MT_CPAP);
for(auto & loader : loaders) {
if (c += loader->Open(path)) {
break;
}
}
return c;
}
MachineLoader *GetLoader(QString name) MachineLoader *GetLoader(QString name)
{ {
QList<MachineLoader *> loaders = GetLoaders(); QList<MachineLoader *> loaders = GetLoaders();

5
oscar/SleepLib/profiles.h
View File

@ -88,11 +88,6 @@ class Profile : public Preferences
QString path() { return p_path; } QString path() { return p_path; }
/*! \brief Import Machine Data
\param path containing import location
*/
int Import(QString path);
//! \brief Removes a given day from the date, destroying the daylist date record if empty //! \brief Removes a given day from the date, destroying the daylist date record if empty
bool unlinkDay(Day * day); bool unlinkDay(Day * day);

13
oscar/mainwindow.cpp
View File

@ -2432,7 +2432,20 @@ void MainWindow::importNonCPAP(MachineLoader &loader)
QCoreApplication::processEvents(); QCoreApplication::processEvents();
} }
QString name = loader.loaderName(); QString name = loader.loaderName();
ImportUI importui(p_profile);
ImportContext* ctx = new ProfileImportContext(p_profile);
loader.SetContext(ctx);
connect(ctx, &ImportContext::importEncounteredUnexpectedData, &importui, &ImportUI::onUnexpectedData);
connect(&loader, &MachineLoader::deviceReportsUsageOnly, &importui, &ImportUI::onDeviceReportsUsageOnly);
connect(&loader, &MachineLoader::deviceIsUntested, &importui, &ImportUI::onDeviceIsUntested);
connect(&loader, &MachineLoader::deviceIsUnsupported, &importui, &ImportUI::onDeviceIsUnsupported);
int res = loader.Open(files); int res = loader.Open(files);
loader.SetContext(nullptr);
delete ctx;
if (size > 1) { if (size > 1) {
disconnect(&loader, SIGNAL(setProgressValue(int)), &progress, SLOT(setProgressValue(int))); disconnect(&loader, SIGNAL(setProgressValue(int)), &progress, SLOT(setProgressValue(int)));
disconnect(&progress, SIGNAL(abortClicked()), &loader, SLOT(abortImport())); disconnect(&progress, SIGNAL(abortClicked()), &loader, SLOT(abortImport()));