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

obsolescence qt hex stream out command was moved to QT::hex .

Browse Source
This commit is contained in:
LoudSnorer 2023-02-12 07:09:39 -05:00
parent 99a3c009f7
commit 10a583dfb7
9 changed files with 110 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oscar/SleepLib/loader_plugins/cms50_loader.cpp
View File

@ -28,6 +28,18 @@
#include <QVBoxLayout>
#include <QPushButton>
// The qt5.15 obsolescence of hex requires this change.
// this solution to QT's obsolescence is only used in debug statements
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
#define QTHEX Qt::hex
#define QTDEC Qt::dec
#else
#define QTHEX hex
#define QTDEC dec
#endif
using namespace std;
#include "cms50_loader.h"
@ -302,7 +314,7 @@ int CMS50Loader::doImportMode()
m_startTime = QDateTime(oda,oti);
oxisessions[m_startTime] = oxirec;
qDebug() << "Session start (according to CMS50)" << m_startTime << hex << buffer.at(idx + 1) << buffer.at(idx + 2) << ":" << dec << hour << minute ;
qDebug() << "Session start (according to CMS50)" << m_startTime << QTHEX << buffer.at(idx + 1) << buffer.at(idx + 2) << ":" << QTDEC << hour << minute ;
cb_reset = 1;

12
oscar/SleepLib/loader_plugins/cms50f37_loader.cpp
View File

@ -29,6 +29,16 @@
#include <QVBoxLayout>
#include <QPushButton>
// The qt5.15 obsolescence of hex requires this change.
// this solution to QT's obsolescence is only used in debug statements
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
#define QTHEX Qt::hex
#define QTDEC Qt::dec
#else
#define QTHEX hex
#define QTDEC dec
#endif
using namespace std;
#include "cms50f37_loader.h"
@ -541,7 +551,7 @@ void CMS50F37Loader::processBytes(QByteArray bytes)
break;
default:
qDebug() << "cms50f37 - pB: unknown cms50F result?" << hex << (int)res;
qDebug() << "cms50f37 - pB: unknown cms50F result?" << QTHEX << (int)res;
break;
}

12
oscar/SleepLib/loader_plugins/icon_loader.cpp
View File

@ -15,6 +15,16 @@
#include "icon_loader.h"
// The qt5.15 obsolescence of hex requires this change.
// this solution to QT's obsolescence is only used in debug statements
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
#define QTHEX Qt::hex
#define QTDEC Qt::dec
#else
#define QTHEX hex
#define QTDEC dec
#endif
const QString FPHCARE = "FPHCARE";
FPIcon::FPIcon(Profile *profile, MachineID id)
@ -681,7 +691,7 @@ bool FPIconLoader::OpenFLW(Machine *mach, const QString & filename)
} while (p < end);
if (endMarker != 0x7fff) {
qDebug() << fname << "waveform does not end with the corrent marker" << hex << endMarker;
qDebug() << fname << "waveform does not end with the corrent marker" << QTHEX << endMarker;
}
if (sess) {

18
oscar/SleepLib/loader_plugins/mseries_loader.cpp
View File

@ -12,6 +12,16 @@
#include "mseries_loader.h"
// The qt5.15 obsolescence of hex requires this change.
// this solution to QT's obsolescence is only used in debug statements
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
#define QTHEX Qt::hex
#define QTDEC Qt::dec
#else
#define QTHEX hex
#define QTDEC dec
#endif
MSeries::MSeries(Profile *profile, MachineID id)
: CPAP(profile, id)
@ -238,7 +248,7 @@ int MSeriesLoader::Open(const QString & path)
dt = QDateTime::fromTime_t(ts);
date = dt.date();
time = dt.time();
qDebug() << "New Sparse Chunk" << chk << dt << hex << ts;
qDebug() << "New Sparse Chunk" << chk << dt << QTHEX << ts;
cb += 4;
quint8 sum = 0;
@ -265,7 +275,7 @@ int MSeriesLoader::Open(const QString & path)
dt = QDateTime::fromTime_t(ts);
date = dt.date();
time = dt.time();
qDebug() << "Details New Data Chunk" << cnt << dt << hex << ts;
qDebug() << "Details New Data Chunk" << cnt << dt << QTHEX << ts;
cb += 4;
@ -349,7 +359,7 @@ int MSeriesLoader::Open(const QString & path)
dt = QDateTime::fromTime_t(ts);
date = dt.date();
time = dt.time();
//qDebug() << "Summary Data Chunk" << cnt << dt << hex << ts;
//qDebug() << "Summary Data Chunk" << cnt << dt << QTHEX << ts;
cb += 4;
while (cb < endcard) {
@ -364,7 +374,7 @@ int MSeriesLoader::Open(const QString & path)
u2 = (cb[2] << 8 | cb[3]) & 0x7ff; // 0xBX XX??
ts = st + u1 * 60;
dt = QDateTime::fromTime_t(ts);
//qDebug() << "Summary Sub Chunk" << dt << u1 << u2 << hex << ts;
//qDebug() << "Summary Sub Chunk" << dt << u1 << u2 << QTHEX << ts;
cb += 4;
if (cb[0] == 0xff) { break; }

16
oscar/SleepLib/loader_plugins/prs1_parser.cpp
View File

@ -12,6 +12,16 @@
#include "prs1_loader.h"
#include "rawdata.h"
// The qt5.15 obsolescence of hex requires this change.
// this solution to QT's obsolescence is only used in debug statements
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
#define QTHEX Qt::hex
#define QTDEC Qt::dec
#else
#define QTHEX hex
#define QTDEC dec
#endif
const PRS1ParsedEventType PRS1TidalVolumeEvent::TYPE;
const PRS1ParsedEventType PRS1SnoresAtPressureEvent::TYPE;
@ -975,7 +985,7 @@ PRS1DataChunk* PRS1DataChunk::ParseNext(RawDataDevice & f, PRS1Loader* loader)
// Make sure the calculated CRC over the entire chunk (header and data) matches the stored CRC.
if (chunk->calcCrc != chunk->storedCrc) {
// Corrupt data block, warn about it.
qWarning() << chunk->m_path << "@" << chunk->m_filepos << "block CRC calc" << hex << chunk->calcCrc << "!= stored" << hex << chunk->storedCrc;
qWarning() << chunk->m_path << "@" << chunk->m_filepos << "block CRC calc" << QTHEX << chunk->calcCrc << "!= stored" << QTHEX << chunk->storedCrc;
// TODO: When this happens, it's usually because the chunk was truncated and another chunk header
// exists within the blockSize bytes. In theory it should be possible to rewing and resync by
@ -1023,12 +1033,12 @@ bool PRS1DataChunk::ReadHeader(RawDataDevice & f)
// Do a few early sanity checks before any variable-length header data.
if (this->blockSize == 0) {
qWarning() << this->m_path << "@" << hex << this->m_filepos << "blocksize 0, skipping remainder of file";
qWarning() << this->m_path << "@" << QTHEX << this->m_filepos << "blocksize 0, skipping remainder of file";
break;
}
if (this->fileVersion < 2 || this->fileVersion > 3) {
if (this->m_filepos > 0) {
qWarning() << this->m_path << "@" << hex << this->m_filepos << "corrupt PRS1 header, skipping remainder of file";
qWarning() << this->m_path << "@" << QTHEX << this->m_filepos << "corrupt PRS1 header, skipping remainder of file";
} else {
qWarning() << this->m_path << "unsupported PRS1 header version" << this->fileVersion;
}

13
oscar/SleepLib/loader_plugins/prs1_parser_asv.cpp
View File

@ -10,6 +10,17 @@
#include "prs1_parser.h"
#include "prs1_loader.h"
// The qt5.15 obsolescence of hex requires this change.
// this solution to QT's obsolescence is only used in debug statements
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
#define QTHEX Qt::hex
#define QTDEC Qt::dec
#else
#define QTHEX hex
#define QTDEC dec
#endif
//********************************************************************************************
// MARK: -
// MARK: 50 and 60 Series
@ -1245,7 +1256,7 @@ bool PRS1DataChunk::ParseSettingsF5V3(const unsigned char* data, int size)
break;
default:
UNEXPECTED_VALUE(code, "known setting");
qDebug() << "Unknown setting:" << hex << code << "in" << this->sessionid << "at" << pos;
qDebug() << "Unknown setting:" << QTHEX << code << "in" << this->sessionid << "at" << pos;
this->AddEvent(new PRS1UnknownDataEvent(QByteArray((const char*) data, size), pos, len));
break;
}

12
oscar/SleepLib/loader_plugins/prs1_parser_vent.cpp
View File

@ -10,6 +10,16 @@
#include "prs1_parser.h"
#include "prs1_loader.h"
// The qt5.15 obsolescence of hex requires this change.
// this solution to QT's obsolescence is only used in debug statements
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
#define QTHEX Qt::hex
#define QTDEC Qt::dec
#else
#define QTHEX hex
#define QTDEC dec
#endif
static QString hex(int i)
{
return QString("0x") + QString::number(i, 16).toUpper();
@ -1010,7 +1020,7 @@ bool PRS1DataChunk::ParseSettingsF3V6(const unsigned char* data, int size)
break;
default:
UNEXPECTED_VALUE(code, "known setting");
qDebug() << "Unknown setting:" << hex << code << "in" << this->sessionid << "at" << pos;
qDebug() << "Unknown setting:" << QTHEX << code << "in" << this->sessionid << "at" << pos;
this->AddEvent(new PRS1UnknownDataEvent(QByteArray((const char*) data, size), pos, len));
break;
}

14
oscar/SleepLib/loader_plugins/prs1_parser_xpap.cpp
View File

@ -10,6 +10,18 @@
#include "prs1_parser.h"
#include "prs1_loader.h"
// The qt5.15 obsolescence of hex requires this change.
// this solution to QT's obsolescence is only used in debug statements
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
#define QTHEX Qt::hex
#define QTDEC Qt::dec
#else
#define QTHEX hex
#define QTDEC dec
#endif
//********************************************************************************************
// MARK: 50 Series
@ -2104,7 +2116,7 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
break;
default:
UNEXPECTED_VALUE(code, "known setting");
qDebug() << "Unknown setting:" << hex << code << "in" << this->sessionid << "at" << pos;
qDebug() << "Unknown setting:" << QTHEX << code << "in" << this->sessionid << "at" << pos;
this->AddEvent(new PRS1UnknownDataEvent(QByteArray((const char*) data, size), pos, len));
break;
}

13
oscar/SleepLib/loader_plugins/weinmann_loader.cpp
View File

@ -17,6 +17,17 @@
#include "weinmann_loader.h"
// The qt5.15 obsolescence of hex requires this change.
// this solution to QT's obsolescence is only used in debug statements
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
#define QTHEX Qt::hex
#define QTDEC Qt::dec
#else
#define QTHEX hex
#define QTDEC dec
#endif
Weinmann::Weinmann(Profile *profile, MachineID id)
: CPAP(profile, id)
{
@ -74,7 +85,7 @@ int WeinmannLoader::ParseIndex(QFile & wmdata)
int val = e.attribute("val").toInt(&ok);
if (ok) {
index[e.attribute("name")] = val;
qDebug() << e.attribute("name") << "=" << hex << val;
qDebug() << e.attribute("name") << "=" << QTHEX << val;
}
}
n = n.nextSibling();