From 4c0677fca12f6dcdef4826e98be60f353e26dcb6 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Thu, 2 Sep 2021 10:09:11 -0400 Subject: [PATCH] Move ImportContext and ImportUI signals out of PRS1Loader into MachineLoader. This will allow any loader to make use of them. --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 17 +++++------------ oscar/SleepLib/loader_plugins/prs1_loader.h | 14 -------------- oscar/SleepLib/machine_loader.cpp | 1 + oscar/SleepLib/machine_loader.h | 9 +++++++++ 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 63505b03..f4a5f3a4 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -51,13 +51,6 @@ QString ts(qint64 msecs) } -// TODO: See the LogUnexpectedMessage TODO about generalizing this for other loaders. -void PRS1Loader::LogUnexpectedMessage(const QString & message) -{ - m_ctx->LogUnexpectedMessage(message); -} - - ChannelID PRS1_Mode = 0; ChannelID PRS1_TimedBreath = 0, PRS1_HumidMode = 0, PRS1_TubeTemp = 0; ChannelID PRS1_FlexLock = 0, PRS1_TubeLock = 0, PRS1_RampType = 0; @@ -458,7 +451,6 @@ PRS1Loader::PRS1Loader() #endif m_type = MT_CPAP; - m_ctx = nullptr; } PRS1Loader::~PRS1Loader() @@ -751,9 +743,9 @@ int PRS1Loader::Open(const QString & selectedPath) ImportContext* ctx = new ProfileImportContext(p_profile); SetContext(ctx); connect(ctx, &ImportContext::importEncounteredUnexpectedData, &ui, &ImportUI::onUnexpectedData); - connect(this, &PRS1Loader::deviceReportsUsageOnly, &ui, &ImportUI::onDeviceReportsUsageOnly); - connect(this, &PRS1Loader::deviceIsUntested, &ui, &ImportUI::onDeviceIsUntested); - connect(this, &PRS1Loader::deviceIsUnsupported, &ui, &ImportUI::onDeviceIsUnsupported); + connect(this, &MachineLoader::deviceReportsUsageOnly, &ui, &ImportUI::onDeviceReportsUsageOnly); + connect(this, &MachineLoader::deviceIsUntested, &ui, &ImportUI::onDeviceIsUntested); + connect(this, &MachineLoader::deviceIsUnsupported, &ui, &ImportUI::onDeviceIsUnsupported); #endif c += OpenMachine(machinePath); #if 1 @@ -928,6 +920,7 @@ static QString chunkComparison(const PRS1DataChunk* a, const PRS1DataChunk* b) void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machine * m) { + Q_ASSERT(m_ctx); SessionID sid; long ext; @@ -2718,7 +2711,7 @@ QList PRS1Loader::ParseFile(const QString & path) || (lastchunk->htype != chunk->htype)) { QString message = "*** unexpected change in header data"; qWarning() << path << message; - LogUnexpectedMessage(message); + m_ctx->LogUnexpectedMessage(message); // There used to be error-recovery code here, written before we checked CRCs. // If we ever encounter data with a valid CRC that triggers the above warnings, // we can then revisit how to handle it. diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.h b/oscar/SleepLib/loader_plugins/prs1_loader.h index bda34f90..17d23851 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.h +++ b/oscar/SleepLib/loader_plugins/prs1_loader.h @@ -57,8 +57,6 @@ struct PRS1Waveform { quint8 sample_format; }; -class ImportContext; - class PRS1DataChunk; class PRS1ParsedEvent; @@ -180,9 +178,6 @@ class PRS1Loader : public CPAPLoader PRS1Loader(); virtual ~PRS1Loader(); - void SetContext(ImportContext* ctx) { m_ctx = ctx; } - inline ImportContext* context() { return m_ctx; } - //! \brief Peek into PROP.TXT or properties.txt at given path, and return it as a normalized key/value hash bool PeekProperties(const QString & filename, QHash & props); @@ -235,13 +230,7 @@ class PRS1Loader : public CPAPLoader QHash sesstasks; - signals: - void deviceReportsUsageOnly(MachineInfo & info); - void deviceIsUntested(MachineInfo & info); - void deviceIsUnsupported(MachineInfo & info); - protected: - ImportContext* m_ctx; QString last; QHash PRS1List; @@ -278,9 +267,6 @@ class PRS1Loader : public CPAPLoader //! \brief PRS1 Data files can store multiple sessions, so store them in this list for later processing. QHash new_sessions; - -public: - void LogUnexpectedMessage(const QString & message); }; diff --git a/oscar/SleepLib/machine_loader.cpp b/oscar/SleepLib/machine_loader.cpp index d76fc1de..63c6cf2e 100644 --- a/oscar/SleepLib/machine_loader.cpp +++ b/oscar/SleepLib/machine_loader.cpp @@ -31,6 +31,7 @@ MachineLoader::MachineLoader() :QObject(nullptr) m_abort = false; m_type = MT_UNKNOWN; m_status = NEUTRAL; + m_ctx = nullptr; } MachineLoader::~MachineLoader() diff --git a/oscar/SleepLib/machine_loader.h b/oscar/SleepLib/machine_loader.h index 2b15b860..f3f654f4 100644 --- a/oscar/SleepLib/machine_loader.h +++ b/oscar/SleepLib/machine_loader.h @@ -29,6 +29,7 @@ #endif class MachineLoader; // forward +class ImportContext; enum DeviceStatus { NEUTRAL, IMPORTING, LIVE, DETECTING }; @@ -47,6 +48,9 @@ class MachineLoader: public QObject MachineLoader(); virtual ~MachineLoader(); + void SetContext(ImportContext* ctx) { m_ctx = ctx; } + inline ImportContext* context() { return m_ctx; } + //! \brief Detect if the given path contains a valid folder structure virtual bool Detect(const QString & path) = 0; @@ -110,7 +114,12 @@ signals: void updateMessage(QString); void machineUnsupported(Machine *); + void deviceReportsUsageOnly(MachineInfo & info); + void deviceIsUntested(MachineInfo & info); + void deviceIsUnsupported(MachineInfo & info); + protected: + ImportContext* m_ctx; void finishAddingSessions(); static QPixmap * genericCPAPPixmap;