From 6466a8ddad5726a765a94d15cf3012ca0ff3118d Mon Sep 17 00:00:00 2001 From: LoudSnorer Date: Sat, 18 Feb 2023 08:58:47 -0500 Subject: [PATCH] obsolete Hash Methods --- oscar/SleepLib/loader_plugins/prs1_loader.cpp | 34 +++++++++++++------ .../SleepLib/loader_plugins/resmed_loader.cpp | 20 ++++++++--- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/oscar/SleepLib/loader_plugins/prs1_loader.cpp b/oscar/SleepLib/loader_plugins/prs1_loader.cpp index 59a7d59d..96ee3a0c 100644 --- a/oscar/SleepLib/loader_plugins/prs1_loader.cpp +++ b/oscar/SleepLib/loader_plugins/prs1_loader.cpp @@ -7,6 +7,9 @@ * License. See the file COPYING in the main directory of the source code * for more details. */ +#define TEST_MACROS_ENABLEDoff +#include + #include #include #include @@ -987,7 +990,11 @@ bool PRS1Loader::CreateMachineFromProperties(QString propertyfile) static QString relativePath(const QString & inpath) { - QStringList pathlist = QDir::toNativeSeparators(inpath).split(QDir::separator(), QString::SkipEmptyParts); + #if QT_VERSION >= QT_VERSION_CHECK(5,14,0) + QStringList pathlist = QDir::toNativeSeparators(inpath).split(QDir::separator(), Qt::SkipEmptyParts); + #else + QStringList pathlist = QDir::toNativeSeparators(inpath).split(QDir::separator(), QString::SkipEmptyParts); + #endif QString relative = pathlist.mid(pathlist.size()-3).join(QDir::separator()); return relative; } @@ -1367,8 +1374,15 @@ void PRS1Import::CreateEventChannels(const PRS1DataChunk* chunk) // Generate the list of channels created by non-slice events for this device. // We can't just use the full list of non-slice events, since on some devices // PS is generated by slice events (EPAP/IPAP average). - // TODO: convert supported to QSet and clean this up. - QSet supportedNonSliceEvents = QSet::fromList(QList::fromVector(supported)); + // Duplicates need to be removed. QSet does the removal. + #if QT_VERSION < QT_VERSION_CHECK(5,14,0) + // convert QVvector to QList then to QSet + QSet supportedNonSliceEvents = QSet::fromList( QList::fromVector( supported ) ); + #else + // release 5.14 supports the direct conversion. + QSet supportedNonSliceEvents(supported.begin(),supported.end() ) ; + #endif + supportedNonSliceEvents.intersect(PRS1NonSliceChannels); QSet supportedNonSliceChannels; for (auto & e : supportedNonSliceEvents) { @@ -1384,7 +1398,7 @@ void PRS1Import::CreateEventChannels(const PRS1DataChunk* chunk) m_importChannels.remove(c); } } - + // Create all supported channels (except for on-demand ones that only get created if an event appears) for (auto & e : supported) { if (!PRS1OnDemandChannels.contains(e)) { @@ -1424,7 +1438,7 @@ void PRS1Import::AddEvent(ChannelID channel, qint64 t, float value, float gain) qWarning() << "gain mismatch for channel" << channel << "at" << ts(t); } } - + // Add the event C->AddEvent(t, value, gain); } @@ -1433,7 +1447,7 @@ void PRS1Import::AddEvent(ChannelID channel, qint64 t, float value, float gain) bool PRS1Import::UpdateCurrentSlice(PRS1DataChunk* chunk, qint64 t) { bool updated = false; - + if (!m_currentSliceInitialized) { m_currentSliceInitialized = true; m_currentSlice = m_slices.constBegin(); @@ -1452,12 +1466,12 @@ bool PRS1Import::UpdateCurrentSlice(PRS1DataChunk* chunk, qint64 t) break; } } - + if (updated) { // Write out any pending end-of-slice events. FinishSlice(); } - + if (updated && (*m_currentSlice).status == MaskOn) { // Set the interval start times based on the new slice's start time. m_statIntervalStart = 0; @@ -1466,7 +1480,7 @@ bool PRS1Import::UpdateCurrentSlice(PRS1DataChunk* chunk, qint64 t) // Create a new eventlist for this new slice, to allow for a gap in the data between slices. CreateEventChannels(chunk); } - + return updated; } @@ -1538,7 +1552,7 @@ bool PRS1Import::IsIntervalEvent(PRS1ParsedEvent* e) default: break; } - + return intervalEvent; } diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp index 05664c52..ae297793 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp +++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp @@ -7,6 +7,9 @@ * License. See the file COPYING in the main directory of the source code * for more details. */ +#define TEST_MACROS_ENABLED +#include + #include #include #include @@ -31,6 +34,15 @@ #endif +#if QT_VERSION >= QT_VERSION_CHECK(5,15,0) + #define QTCOMBINE insert + //idmap.insert(hash); +#else + #define QTCOMBINE unite + //idmap.unite(hash); +#endif + + ChannelID RMS9_EPR, RMS9_EPRLevel, RMS9_Mode, RMS9_SmartStart, RMS9_HumidStatus, RMS9_HumidLevel, RMS9_PtAccess, RMS9_Mask, RMS9_ABFilter, RMS9_ClimateControl, RMS9_TubeType, RMAS11_SmartStop, RMS9_Temp, RMS9_TempEnable, RMS9_RampEnable, RMAS1x_Comfort, RMAS11_PtView; @@ -1891,7 +1903,7 @@ bool parseIdentFile( QString path, MachineInfo * info, QHash & while (!f.atEnd()) { QString line = f.readLine().trimmed(); QHash hash = parseIdentLine( line, info ); - idmap.unite(hash); + idmap.QTCOMBINE(hash); } f.close(); @@ -1906,19 +1918,19 @@ void scanProductObject( QJsonObject product, MachineInfo *info, QHashserial = product["SerialNumber"].toString(); hash1["SerialNumber"] = product["SerialNumber"].toString(); if (idmap) - idmap->unite(hash1); + idmap->QTCOMBINE(hash1); } if (product.contains("ProductCode")) { info->modelnumber = product["ProductCode"].toString(); hash2["ProductCode"] = info->modelnumber; if (idmap) - idmap->unite(hash2); + idmap->QTCOMBINE(hash2); } if (product.contains("ProductName")) { info->model = product["ProductName"].toString(); hash3["ProductName"] = info->model; if (idmap) - idmap->unite(hash3); + idmap->QTCOMBINE(hash3); int idx = info->model.indexOf("11"); info->series = info->model.left(idx+2); }