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

long vs quint32 issues in Linux. Need for iBreeze on linux with i7core

Browse Source
This commit is contained in:
LoudSnorer 2023-10-30 12:47:22 -04:00
parent fec39bbc3c
commit 1c2db29cce
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -2302,7 +2302,7 @@ QList<PRS1DataChunk *> PRS1Import::CoalesceWaveformChunks(QList<PRS1DataChunk *>
QFileInfo fi(chunk->m_path); QFileInfo fi(chunk->m_path);
bool numeric; bool numeric;
QString session_s = fi.fileName().section(".", 0, -2); QString session_s = fi.fileName().section(".", 0, -2);
qint32 sid = session_s.toInt(&numeric, m_sessionid_base); quint32 sid = session_s.toInt(&numeric, m_sessionid_base);
if (!numeric || sid != chunk->sessionid) { if (!numeric || sid != chunk->sessionid) {
qWarning() << chunk->m_path << "@" << chunk->m_filepos << "session ID mismatch:" << chunk->sessionid; qWarning() << chunk->m_path << "@" << chunk->m_filepos << "session ID mismatch:" << chunk->sessionid;
} }

3
oscar/SleepLib/machine.cpp
View File

@ -628,6 +628,9 @@ void Machine::setInfo(MachineInfo inf)
m_loader = GetLoader(inf.loadername); m_loader = GetLoader(inf.loadername);
} }
QString toHexid(quint32 id) { return QString("%1").arg(id,8,16,QLatin1Char('0')); };
QString Machine::hexid() { return toHexid((qint32)m_id);};
const QString Machine::getDataPath() const QString Machine::getDataPath()
{ {
// TODO: Rework the underlying database so that file storage doesn't rely on consistent presence or absence of the serial number. // TODO: Rework the underlying database so that file storage doesn't rely on consistent presence or absence of the serial number.

3
oscar/SleepLib/machine.h
View File

@ -159,8 +159,7 @@ class Machine
//! \brief Returns the machineID as a lower case hexadecimal string //! \brief Returns the machineID as a lower case hexadecimal string
QString hexid() { return QString::asprintf("%08lx", m_id); } QString hexid() ;
//! \brief Unused, increments the most recent sessionID //! \brief Unused, increments the most recent sessionID
SessionID CreateSessionID() { return highest_sessionid + 1; } SessionID CreateSessionID() { return highest_sessionid + 1; }

5
oscar/SleepLib/machine_common.h
View File

@ -23,10 +23,11 @@ using namespace std;
// Do not change these without considering the consequences.. For one the Loader needs changing & version increase // Do not change these without considering the consequences.. For one the Loader needs changing & version increase
typedef quint32 ChannelID; typedef quint32 ChannelID;
typedef long MachineID; typedef quint32 MachineID;
typedef long SessionID; typedef quint32 SessionID;
typedef float EventDataType; typedef float EventDataType;
typedef qint16 EventStoreType; typedef qint16 EventStoreType;
extern QString toHexid(quint32);
//! \brief Exception class for out of Bounds error.. Unused. //! \brief Exception class for out of Bounds error.. Unused.
class BoundsError {}; class BoundsError {};

15
oscar/SleepLib/session.cpp
View File

@ -21,6 +21,7 @@
#include <algorithm> #include <algorithm>
#include <limits> #include <limits>
#include "SleepLib/machine_common.h"
#include "SleepLib/calcs.h" #include "SleepLib/calcs.h"
#include "SleepLib/profiles.h" #include "SleepLib/profiles.h"
@ -110,7 +111,7 @@ void Session::setEnabled(bool b)
QString Session::eventFile() const QString Session::eventFile() const
{ {
return s_machine->getEventsPath()+QString::asprintf("%08lx.001", s_session); return s_machine->getEventsPath()+toHexid(s_session)+".001";
} }
//const int max_pack_size=128; //const int max_pack_size=128;
@ -145,7 +146,7 @@ bool Session::Destroy()
{ {
QDir dir; QDir dir;
QString base; QString base;
base=QString::asprintf("%08lx", s_session); base=toHexid(s_session);
QString summaryfile = s_machine->getSummariesPath() + base + ".000"; QString summaryfile = s_machine->getSummariesPath() + base + ".000";
QString eventfile = s_machine->getEventsPath() + base + ".001"; QString eventfile = s_machine->getEventsPath() + base + ".001";
@ -320,7 +321,7 @@ bool Session::StoreSummary()
return false; return false;
} }
QString filename = s_machine->getSummariesPath() + QString::asprintf("%08lx.000", s_session) ; QString filename = s_machine->getSummariesPath() + toHexid(s_session) + ".000" ;
QFile file(filename); QFile file(filename);
if (!file.open(QIODevice::WriteOnly)) { if (!file.open(QIODevice::WriteOnly)) {
@ -397,7 +398,7 @@ bool Session::LoadSummary()
// static int sumcnt = 0; // static int sumcnt = 0;
if (s_summary_loaded) return true; if (s_summary_loaded) return true;
QString filename = s_machine->getSummariesPath() + QString::asprintf("%08lx.000", s_session); QString filename = s_machine->getSummariesPath() + toHexid(s_session) + ".000";
if (filename.isEmpty()) { if (filename.isEmpty()) {
qDebug() << "Empty summary filename"; qDebug() << "Empty summary filename";
@ -448,11 +449,11 @@ bool Session::LoadSummary()
} }
qint32 ts32; quint32 ts32;
in >> ts32; // MachineID (dont need this result) in >> ts32; // MachineID (dont need this result)
bool upgrade = false; bool upgrade = false;
if (ts32 != s_machine->id()) { if ( ts32 != s_machine->id()) {
upgrade = true; upgrade = true;
qWarning() << "Machine ID does not match in" << filename << qWarning() << "Machine ID does not match in" << filename <<
" I will try to load anyway in case you know what your doing."; " I will try to load anyway in case you know what your doing.";
@ -678,7 +679,7 @@ bool Session::StoreEvents()
QString path = s_machine->getEventsPath(); QString path = s_machine->getEventsPath();
QDir dir; QDir dir;
dir.mkpath(path); dir.mkpath(path);
QString filename = path+ QString::asprintf("%08lx.001", s_session) ; QString filename = path+ toHexid(s_session) +".001";
QFile file(filename); QFile file(filename);
if (!file.open(QIODevice::WriteOnly)) { if (!file.open(QIODevice::WriteOnly)) {