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

The second series of updates, everything in SleepLib, but not yet the loader_plugins. They will come next time.

Browse Source
This commit is contained in:
ArieKlerk 2022-02-27 17:01:46 +01:00
parent 1be14922c0
commit 1c45e852c9
25 changed files with 180 additions and 180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oscar/SleepLib/appsettings.h
View File

@ -123,7 +123,7 @@ public:
inline bool squareWavePlots() const { return m_squareWavePlots; }
//! \brief Whether to allow double clicking on Y-Axis labels to change vertical scaling mode
bool allowYAxisScaling() const { return getPref(STR_AS_AllowYAxisScaling).toBool(); }
//! \brief Whether to include serial number in machine settings changes report
//! \brief Whether to include serial number in device settings changes report
bool includeSerial() const { return getPref(STR_AS_IncludeSerial).toBool(); }
//! \brief Whether to print reports in black and white, which can be more legible on non-color printers
bool monochromePrinting() const { return getPref(STR_AS_MonochromePrinting).toBool(); }
@ -180,7 +180,7 @@ public:
void setOverlayType(OverlayDisplayType odt) { setPref(STR_AS_OverlayType, (int)(m_odt=odt)); }
//! \brief Sets whether to allow double clicking on Y-Axis labels to change vertical scaling mode
void setAllowYAxisScaling(bool b) { setPref(STR_AS_AllowYAxisScaling, b); }
//! \brief Sets whether to include machine serial number on machine settings report
//! \brief Sets whether to include device serial number on device settings report
void setIncludeSerial(bool b) { setPref(STR_AS_IncludeSerial, b); }
//! \brief Sets whether to print reports in black and white, which can be more legible on non-color printers
void setMonochromePrinting(bool b) { setPref(STR_AS_MonochromePrinting, b); }

8
oscar/SleepLib/calcs.cpp
View File

@ -579,7 +579,7 @@ void FlowParser::calc(bool calcResp, bool calcTv, bool calcTi, bool calcTe, bool
// Scan the upper breath
for (int j = bs; j < bm; j++) {
// convert flow to ml/s to L/min and divide by samples per second
// convert flow from ml/s to l/min and divide by samples per second
c = double(qAbs(m_filtered[j])) * 1000.0 / 60.0 / sps;
val2 += c;
//val2+=c*c; // for RMS
@ -589,7 +589,7 @@ void FlowParser::calc(bool calcResp, bool calcTv, bool calcTi, bool calcTe, bool
bool usebothhalves = false;
if (usebothhalves) {
for (int j = bm; j < be; j++) {
// convert flow to ml/s to L/min and divide by samples per second
// convert flow from ml/s to l/min and divide by samples per second
c = double(qAbs(m_filtered[j])) * 1000.0 / 60.0 / sps;
val1 += c;
//val1 += c*c; // for RMS
@ -860,7 +860,7 @@ void FlowParser::flagUserEvents(ChannelID code, EventDataType restriction, Event
if (dur >= duration) { // is the event greater than the duration threshold?
// Unless duplicates have been specifically allowed, scan for any apnea's already detected by the machine
// Unless duplicates have been specifically allowed, scan for any apnea's already detected by the device
if (allowDuplicates || !SearchApnea(m_session, et, dur)) {
if (!uf) {
// Create event list if not already done
@ -1287,7 +1287,7 @@ int calcLeaks(Session *session)
// Choose the formula for calculating mask leakage as a function of pressure.
LeakCalculator* calc = new ProfileLeakCalculator(p_profile);
// Prefer IPAPSet/PressureSet for machines (PRS1) that use these, since they use Pressure to report averages.
// Prefer IPAPSet/PressureSet for devices (PRS1) that use these, since they use Pressure to report averages.
ChannelID pressure_channel = CPAP_Pressure; // default
for (auto & ch : { CPAP_IPAPSet, CPAP_IPAP, CPAP_PressureSet }) {
if (session->eventlist.contains(ch)) {

2
oscar/SleepLib/calcs.h
View File

@ -149,7 +149,7 @@ int calcAHIGraph(Session *session);
//! \brief Calculates AHI for a session between start & end (a support function for the sliding window graph)
EventDataType calcAHI(Session *session, qint64 start = -1, qint64 end = -1);
//! \brief Scans for leaks over Redline and flags as large leaks, unless machine provided them already
//! \brief Scans for leaks over Redline and flags as large leaks, unless device provided them already
void flagLargeLeaks(Session *session);
//! \brief Leaks calculations for PRS1

20
oscar/SleepLib/common.cpp
View File

@ -521,7 +521,7 @@ QString STR_TR_Orientation;
QString STR_TR_Motion;
// Machine type names.
// Device type names.
QString STR_TR_CPAP; // Constant Positive Airway Pressure
QString STR_TR_BIPAP; // Bi-Level Positive Airway Pressure
QString STR_TR_BiLevel; // Another name for BiPAP
@ -548,13 +548,13 @@ QString STR_TR_SA; // Short form of SensAwake
QString STR_TR_LE; // Short form of Leak Event
QString STR_TR_EP; // Short form of Expiratory Puff
QString STR_TR_VS; // Short form of Vibratory Snore
QString STR_TR_VS2; // Short form of Secondary Vibratory Snore (Some Philips Respironics Machines have two sources)
QString STR_TR_VS2; // Short form of Secondary Vibratory Snore (Some Philips Respironics devices have two sources)
QString STR_TR_RERA; // Acronym for Respiratory Effort Related Arousal
QString STR_TR_PP; // Short form for Pressure Pulse
QString STR_TR_P; // Short form for Pressure Event
QString STR_TR_RE; // Short form of Respiratory Effort Related Arousal
QString STR_TR_NR; // Short form of Non Responding event? (forgot sorry)
QString STR_TR_NRI; // Sorry I Forgot.. it's a flag on Intellipap machines
QString STR_TR_NRI; // Sorry I Forgot.. it's a flag on Intellipap devices
QString STR_TR_O2; // SpO2 Desaturation
QString STR_TR_PC; // Short form for Pulse Change
QString STR_TR_UF1; // Short form for User Flag 1
@ -668,7 +668,7 @@ void initializeStrings()
STR_UNIT_FOOT = QObject::tr("ft");
STR_UNIT_POUND = QObject::tr("lb");
STR_UNIT_OUNCE = QObject::tr("oz");
STR_UNIT_KG = QObject::tr("Kg");
STR_UNIT_KG = QObject::tr("kg");
STR_UNIT_CMH2O = QObject::tr("cmH2O");
STR_UNIT_Hours = QObject::tr("Hours");
STR_UNIT_Minutes = QObject::tr("Minutes");
@ -681,11 +681,11 @@ void initializeStrings()
STR_UNIT_Percentage = QString("%");
STR_UNIT_Hz = QObject::tr("Hz"); // Hertz
STR_UNIT_BPM = QObject::tr("bpm"); // Beats per Minute
STR_UNIT_LPM = QObject::tr("L/min"); // Litres per Minute
STR_UNIT_LPM = QObject::tr("l/min"); // Litres per Minute
STR_UNIT_Litres = QObject::tr("Litres");
STR_UNIT_ml = QObject::tr("ml"); // millilitres
STR_UNIT_BreathsPerMinute = QObject::tr("Breaths/min"); // Breaths per minute
STR_UNIT_Unknown = QObject::tr("?");
STR_UNIT_Unknown = QString("?");
STR_UNIT_Ratio = QObject::tr("ratio");
STR_UNIT_Severity = QObject::tr("Severity (0-1)");
STR_UNIT_Degrees = QObject::tr("Degrees");
@ -730,7 +730,7 @@ void initializeStrings()
STR_TR_Default = QObject::tr("Default");
// Machine type names.
// Device type names.
STR_TR_CPAP = QObject::tr("CPAP"); // Constant Positive Airway Pressure
STR_TR_BIPAP = QObject::tr("BiPAP"); // Bi-Level Positive Airway Pressure
STR_TR_BiLevel = QObject::tr("Bi-Level"); // Another name for BiPAP
@ -758,13 +758,13 @@ void initializeStrings()
STR_TR_EP = QObject::tr("EP"); // Short form of Expiratory Puff
STR_TR_VS = QObject::tr("VS"); // Short form of Vibratory Snore
STR_TR_VS2 =
QObject::tr("VS2"); // Short form of Secondary Vibratory Snore (Some Philips Respironics Machines have two sources)
QObject::tr("VS2"); // Short form of Secondary Vibratory Snore (Some Philips Respironics devices have two sources)
STR_TR_RERA = QObject::tr("RERA"); // Acronym for Respiratory Effort Related Arousal
STR_TR_PP = QObject::tr("PP"); // Short form for Pressure Pulse
STR_TR_P = QObject::tr("P"); // Short form for Pressure Event
STR_TR_RE = QObject::tr("RE"); // Short form of Respiratory Effort Related Arousal
STR_TR_NR = QObject::tr("NR"); // Short form of Non Responding event? (forgot sorry)
STR_TR_NRI = QObject::tr("NRI"); // Sorry I Forgot.. it's a flag on Intellipap machines
STR_TR_NRI = QObject::tr("NRI"); // Sorry I Forgot.. it's a flag on Intellipap devices
STR_TR_O2 = QObject::tr("O2"); // SpO2 Desaturation
STR_TR_PC = QObject::tr("PC"); // Short form for Pulse Change
STR_TR_UF1 = QObject::tr("UF1"); // Short form for User Flag 1
@ -823,7 +823,7 @@ void initializeStrings()
STR_TR_Brand = QObject::tr("Brand");
STR_TR_Serial = QObject::tr("Serial");
STR_TR_Series = QObject::tr("Series");
STR_TR_Machine = QObject::tr("Machine");
STR_TR_Machine = QObject::tr("Device");
STR_TR_Channel = QObject::tr("Channel");
STR_TR_Settings = QObject::tr("Settings");

6
oscar/SleepLib/common.h
View File

@ -244,7 +244,7 @@ extern QString STR_TR_Inclination;
extern QString STR_TR_Orientation;
extern QString STR_TR_Motion;
// Machine type names.
// Device type names.
extern QString STR_TR_CPAP; // Constant Positive Airway Pressure
extern QString STR_TR_BIPAP; // Bi-Level Positive Airway Pressure
extern QString STR_TR_BiLevel; // Another name for BiPAP
@ -272,13 +272,13 @@ extern QString STR_TR_LE; // Short form of Leak Event
extern QString STR_TR_EP; // Short form of Expiratory Puff
extern QString STR_TR_VS; // Short form of Vibratory Snore
extern QString
STR_TR_VS2; // Short form of Secondary Vibratory Snore (Some Philips Respironics Machines have two sources)
STR_TR_VS2; // Short form of Secondary Vibratory Snore (Some Philips Respironics devices have two sources)
extern QString STR_TR_RERA; // Acronym for Respiratory Effort Related Arousal
extern QString STR_TR_PP; // Short form for Pressure Pulse
extern QString STR_TR_P; // Short form for Pressure Event
extern QString STR_TR_RE; // Short form of Respiratory Effort Related Arousal
extern QString STR_TR_NR; // Short form of Non Responding event? (forgot sorry)
extern QString STR_TR_NRI; // Sorry I Forgot.. it's a flag on Intellipap machines
extern QString STR_TR_NRI; // Sorry I Forgot.. it's a flag on Intellipap devices
extern QString STR_TR_O2; // SpO2 Desaturation
extern QString STR_TR_PC; // Short form for Pulse Change
extern QString STR_TR_UF1; // Short form for User Flag 1

16
oscar/SleepLib/day.cpp
View File

@ -182,7 +182,7 @@ QString Day::calcMiddleLabel(ChannelID code)
}
QString Day::calcMaxLabel(ChannelID code)
{
return QString("%1 %2").arg(p_profile->general->prefCalcMax() ? QObject::tr("99.5%") : STR_TR_Max).arg(schema::channel[code].label());
return QString("%1 %2").arg(p_profile->general->prefCalcMax() ? QString("99.5%") : STR_TR_Max).arg(schema::channel[code].label());
}
QString Day::calcPercentileLabel(ChannelID code)
{
@ -752,7 +752,7 @@ qint64 Day::total_time()
return total; //d_totaltime;
}
// Total session time in milliseconds, only considering machinetype
// Total session time in milliseconds, only considering device type
qint64 Day::total_time(MachineType type)
{
qint64 d_totaltime = 0;
@ -1145,7 +1145,7 @@ bool Day::noSettings(Machine * mach)
// If this day generally has just summary data.
return true;
} else if ((mach == sess->machine()) && sess->noSettings()) {
// Focus only on machine mach
// Focus only on device match
return true;
}
}
@ -1159,7 +1159,7 @@ bool Day::summaryOnly(Machine * mach)
// If this day generally has just summary data.
return true;
} else if ((mach == sess->machine()) && sess->summaryOnly()) {
// Focus only on machine mach
// Focus only on device match
return true;
}
}
@ -1420,7 +1420,7 @@ void Day::removeMachine(Machine * mach)
QList<Session*> list = sessions; // make a copy so the iterator doesn't get broken by removals
for (auto & sess : list) {
if (sess->machine() == mach) {
// This indicates a problem with the Machine class not tracking all of its sessions, for
// This indicates a problem with the device class not tracking all of its sessions, for
// example if there's a duplicate session ID.
qCritical() << "Day object" << this->date().toString()
<< "session" << sess->session() << "refers to machine" << mach->serial();
@ -1456,7 +1456,7 @@ int Day::getCPAPMode()
// schema::Channel & chan = schema::channel[modechan];
// TODO: This is an awful hack that depends on the enum ordering of the machine-specific CPAP mode.
// TODO: This is an awful hack that depends on the enum ordering of the device-specific CPAP mode.
// See the comment in getCPAPModeStr().
int mode = (CPAPMode)(int)qRound(settings_wavg(modechan));
@ -1474,7 +1474,7 @@ QString Day::getCPAPModeStr()
schema::Channel & chan = schema::channel[modechan];
// TODO: This is an awful hack that depends on the enum ordering of the machine-specific CPAP mode.
// TODO: This is an awful hack that depends on the enum ordering of the device-specific CPAP mode.
// Instead, we should calculate how long each mode was in operation and
// determine the one that was running the longest, along with the settings
// while that mode was in operation.
@ -1514,7 +1514,7 @@ QString Day::getPressureRelief()
ChannelID pr_level_chan = loader->PresReliefLevel();
ChannelID pr_mode_chan = loader->PresReliefMode();
// Separate calculation for SleepStyle machines
// Separate calculation for SleepStyle devices
if (mach->info.loadername == "SleepStyle") {
pr_str = loader->PresReliefLabel();

28
oscar/SleepLib/day.h
View File

@ -17,7 +17,7 @@
#include "SleepLib/session.h"
/*! \class OneTypePerDay
\brief An Exception class to catch multiple machine records per day
\brief An Exception class to catch multiple device records per day
*/
class OneTypePerDay
{
@ -27,7 +27,7 @@ class Machine;
class Session;
/*! \class Day
\brief Contains a list of all Sessions for single date, for a single machine
\brief Contains a list of all Sessions for single date, for a single device
*/
class Day
{
@ -35,13 +35,13 @@ class Day
Day();
~Day();
//! \brief Add a new machine to this day record
//! \brief Add a new device to this day record
bool addMachine(Machine *m);
//! \brief Returns a machine record if present of specified machine type
//! \brief Returns a device record if present of specified device type
Machine *machine(MachineType type);
//! \brief Returns a list of sessions for the specified machine type
//! \brief Returns a list of sessions for the specified device type
QList<Session *> getSessions(MachineType type, bool ignore_enabled = false);
//! \brief Add Session to this Day object (called during Load)
@ -92,16 +92,16 @@ class Day
//! \brief Returns if the cache contains SummaryType information about the requested code
bool hasData(ChannelID code, SummaryType type);
//! \brief Returns true if Day has specific machine type
//! \brief Returns true if Day has specific device type
inline bool hasMachine(MachineType mt) const { return machines.contains(mt); }
//! \brief Returns true if Day has specific machine record
//! \brief Returns true if Day has specific device record
bool hasMachine(Machine * mach);
//! \brief Returns true if any sessions have records matching specific machine type
//! \brief Returns true if any sessions have records matching specific device type
bool searchMachine(MachineType mt);
//! \brief Removes any lingering references to a specific machine record and emits a warning if there were any
//! \brief Removes any lingering references to a specific device record and emits a warning if there were any
void removeMachine(Machine * mach);
//! \brief Returns the Average of all Sessions setting 'code' for this day
@ -138,10 +138,10 @@ class Day
//! \brief Returns the last session time of this day
qint64 last();
//! \brief Returns the first session time of this machine type for this day
//! \brief Returns the first session time of this device type for this day
qint64 first(MachineType type);
//! \brief Returns the last session time of this machine type for this day
//! \brief Returns the last session time of this device type for this day
qint64 last(MachineType type);
@ -160,10 +160,10 @@ class Day
//! \brief Returns the total time in milliseconds for this day
qint64 total_time();
//! \brief Returns the total time in milliseconds for this day for given machine type
//! \brief Returns the total time in milliseconds for this day for given device type
qint64 total_time(MachineType type);
//! \brief Returns true if this day has enabled sessions for supplied machine type
//! \brief Returns true if this day has enabled sessions for supplied device type
bool hasEnabledSessions(MachineType);
//! \brief Returns true if this day has enabled sessions
@ -236,7 +236,7 @@ class Day
//! \brief Returns a list of channels of supplied types, according to channel orders
QList<ChannelID> getSortedMachineChannels(quint32 chantype);
//! \brief Returns a list of machine specific channels of supplied types, according to channel orders
//! \brief Returns a list of device specific channels of supplied types, according to channel orders
QList<ChannelID> getSortedMachineChannels(MachineType type, quint32 chantype);
// Some ugly CPAP specific stuff

22
oscar/SleepLib/importcontext.cpp
View File

@ -32,7 +32,7 @@ void ImportContext::LogUnexpectedMessage(const QString & message)
void ImportContext::FlushUnexpectedMessages()
{
if (m_unexpectedMessages.count() > 0 && m_machine) {
// Compare this to the list of messages previously seen for this machine
// Compare this to the list of messages previously seen for this device
// and only alert if there are new ones.
QSet<QString> newMessages = m_unexpectedMessages - m_machine->previouslySeenUnexpectedData();
if (newMessages.count() > 0) {
@ -149,7 +149,7 @@ void ImportUI::onUnexpectedData(const MachineInfo & info, QSet<QString> & /*newM
QMessageBox::information(QApplication::activeWindow(),
QObject::tr("Untested Data"),
QObject::tr("Your %1 %2 (%3) generated data that OSCAR has never seen before.").arg(info.brand).arg(info.model).arg(info.modelnumber) +"\n\n"+
QObject::tr("The imported data may not be entirely accurate, so the developers would like a .zip copy of this machine's SD card and matching clinician .pdf reports to make sure OSCAR is handling the data correctly.")
QObject::tr("The imported data may not be entirely accurate, so the developers would like a .zip copy of this device's SD card and matching clinician .pdf reports to make sure OSCAR is handling the data correctly.")
,QMessageBox::Ok);
}
@ -158,9 +158,9 @@ void ImportUI::onDeviceReportsUsageOnly(const MachineInfo & info)
if (m_profile->cpap->brickWarning()) {
QApplication::processEvents();
QMessageBox::information(QApplication::activeWindow(),
QObject::tr("Non Data Capable Machine"),
QString(QObject::tr("Your %1 CPAP machine (Model %2) is unfortunately not a data capable model.").arg(info.brand).arg(info.modelnumber) +"\n\n"+
QObject::tr("I'm sorry to report that OSCAR can only track hours of use and very basic settings for this machine."))
QObject::tr("Non Data Capable Device"),
QString(QObject::tr("Your %1 CPAP Device (Model %2) is unfortunately not a data capable model.").arg(info.brand).arg(info.modelnumber) +"\n\n"+
QObject::tr("I'm sorry to report that OSCAR can only track hours of use and very basic settings for this device."))
,QMessageBox::Ok);
m_profile->cpap->setBrickWarning(false);
}
@ -172,9 +172,9 @@ void ImportUI::onDeviceIsUntested(const MachineInfo & info)
if (m_profile->session->warnOnUntestedMachine() && m->warnOnUntested()) {
m->suppressWarnOnUntested(); // don't warn the user more than once
QMessageBox::information(QApplication::activeWindow(),
QObject::tr("Machine Untested"),
QObject::tr("Your %1 CPAP machine (Model %2) has not been tested yet.").arg(info.brand).arg(info.modelnumber) +"\n\n"+
QObject::tr("It seems similar enough to other machines that it might work, but the developers would like a .zip copy of this machine's SD card and matching clinician .pdf reports to make sure it works with OSCAR.")
QObject::tr("Device Untested"),
QObject::tr("Your %1 CPAP Device (Model %2) has not been tested yet.").arg(info.brand).arg(info.modelnumber) +"\n\n"+
QObject::tr("It seems similar enough to other devices that it might work, but the developers would like a .zip copy of this device's SD card and matching clinician .pdf reports to make sure it works with OSCAR.")
,QMessageBox::Ok);
}
}
@ -182,8 +182,8 @@ void ImportUI::onDeviceIsUntested(const MachineInfo & info)
void ImportUI::onDeviceIsUnsupported(const MachineInfo & info)
{
QMessageBox::information(QApplication::activeWindow(),
QObject::tr("Machine Unsupported"),
QObject::tr("Sorry, your %1 CPAP machine (%2) is not supported yet.").arg(info.brand).arg(info.modelnumber) +"\n\n"+
QObject::tr("The developers need a .zip copy of this machine's SD card and matching clinician .pdf reports to make it work with OSCAR.")
QObject::tr("Device Unsupported"),
QObject::tr("Sorry, your %1 CPAP Device (%2) is not supported yet.").arg(info.brand).arg(info.modelnumber) +"\n\n"+
QObject::tr("The developers need a .zip copy of this device's SD card and matching clinician .pdf reports to make it work with OSCAR.")
,QMessageBox::Ok);
}

4
oscar/SleepLib/importcontext.h
View File

@ -19,7 +19,7 @@ public:
ImportContext();
virtual ~ImportContext();
// Loaders will call this directly. It manages the machine's stored set of previously seen messages
// Loaders will call this directly. It manages the device's stored set of previously seen messages
// and will emit an importEncounteredUnexpectedData signal in its dtor if any are new.
void LogUnexpectedMessage(const QString & message);
@ -28,7 +28,7 @@ signals:
public:
// Emit the importEncounteredUnexpectedData signal if there are any new messages and clear the list.
// TODO: This will no longer need to be public once a context doesn't get reused between machines.
// TODO: This will no longer need to be public once a context doesn't get reused between devices.
void FlushUnexpectedMessages();
virtual bool ShouldIgnoreOldSessions() { return false; }

4
oscar/SleepLib/journal.cpp
View File

@ -22,10 +22,10 @@ const int journal_data_version = 1;
JournalEntry::JournalEntry(QDate date)
{
Machine * jmach = p_profile->GetMachine(MT_JOURNAL);
if (jmach == nullptr) { // Create Journal machine record if it doesn't already exist
if (jmach == nullptr) { // Create Journal Device record if it doesn't already exist
MachineInfo info(MT_JOURNAL,0, "Journal", QObject::tr("Journal Data"), QString(), QString(), QString(), QString("OSCAR"), QDateTime::currentDateTime(), journal_data_version);
// Using machine ID 1 rather than a random number, so in future, if profile.xml gets screwed up they'll get their data back..
// Using device ID 1 rather than a random number, so in future, if profile.xml gets screwed up they'll get their data back..
// TODO: Perhaps search for unlinked journal folders here to save some anger and frustration? :P
MachineID machid = 1;

20
oscar/SleepLib/machine.cpp
View File

@ -1,4 +1,4 @@
/* SleepLib Machine Class Implementation
/* SleepLib Device Class Implementation
*
* Copyright (c) 2019-2022 The OSCAR Team
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
@ -81,14 +81,14 @@ void LoadTask::run()
}
//////////////////////////////////////////////////////////////////////////////////////////
// Machine Base-Class implmementation
// Device Base-Class implmementation
//////////////////////////////////////////////////////////////////////////////////////////
Machine::Machine(Profile *_profile, MachineID id) : profile(_profile)
{
day.clear();
highest_sessionid = 0;
m_suppressUntestedWarning = false;
// TODO: Have the machine write m_suppressUntestedWarning and m_previousUnexpected
// TODO: Have the device write m_suppressUntestedWarning and m_previousUnexpected
// to XML (along with the current OSCAR version number) so that they persist across
// application launches (but reset with each new OSCAR version).
@ -97,7 +97,7 @@ Machine::Machine(Profile *_profile, MachineID id) : profile(_profile)
MachineID temp;
bool found;
// Keep trying until we get a unique machineID for this profile
// Keep trying until we get a unique DeviceID for this profile
do {
temp = rand();
@ -112,14 +112,14 @@ Machine::Machine(Profile *_profile, MachineID id) : profile(_profile)
} else { m_id = id; }
m_loader = nullptr;
// qDebug() << "Create Machine: " << hex << m_id; //%lx",m_id);
// qDebug() << "Create device: " << hex << m_id; //%lx",m_id);
m_type = MT_UNKNOWN;
firstsession = true;
}
Machine::~Machine()
{
saveSessionInfo();
//qDebug() << "Destroy Machine" << info.loadername << hex << m_id;
//qDebug() << "Destroy device" << info.loadername << hex << m_id;
}
Session *Machine::SessionExists(SessionID session)
{
@ -472,7 +472,7 @@ bool Machine::unlinkSession(Session * sess)
{
MachineType mt = sess->type();
// Remove the object from the machine object's session list
// Remove the object from the device object's session list
bool b=sessionlist.remove(sess->session());
QList<QDate> dates;
@ -509,7 +509,7 @@ bool Machine::unlinkSession(Session * sess)
return b;
}
// This functions purpose is murder and mayhem... It deletes all of a machines data.
// This functions purpose is murder and mayhem... It deletes all of a devices data.
bool Machine::Purge(int secret)
{
// Boring api key to stop this function getting called by accident :)
@ -559,7 +559,7 @@ bool Machine::Purge(int secret)
delete sess;
}
// Make sure there aren't any dangling references to this machine
// Make sure there aren't any dangling references to this device
for (auto & d : days) {
d->removeMachine(this);
}
@ -725,7 +725,7 @@ bool Machine::Load(ProgressDialog *progress)
int size = filelist.size();
// Legacy crap.. Summary and Event stuff used to be in one big pile in the machine folder root
// Legacy crap.. Summary and Event stuff used to be in one big pile in the device folder root
for (auto & filename : filelist) {
QFile::rename(path+filename, summarypath+filename);
}

26
oscar/SleepLib/machine.h
View File

@ -1,4 +1,4 @@
/* SleepLib Machine Class Header
/* SleepLib Device Class Header
*
* Copyright (c) 2019-2022 The OSCAR Team
* Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
@ -95,7 +95,7 @@ protected:
class MachineLoader; // forward
/*! \class Machine
\brief This Machine class is the Heart of SleepyLib, representing a single Machine and holding it's data
\brief This device class is the Heart of SleepyLib, representing a single device and holding it's data
*/
class Machine
{
@ -104,14 +104,14 @@ class Machine
public:
/*! \fn Machine(MachineID id=0);
\brief Constructs a Machine object with MachineID id
\brief Constructs a device object with MachineID id
If supplied MachineID is zero, it will generate a new unused random one.
*/
Machine(Profile * _profile, MachineID id = 0);
virtual ~Machine();
//! \brief Load all Machine summary data
//! \brief Load all device summary data
bool Load(ProgressDialog *progress);
bool LoadSummary(ProgressDialog *progress);
@ -123,10 +123,10 @@ class Machine
//! \brief Save individual session
bool SaveSession(Session *sess);
//! \brief Deletes the crud out of all machine data in the SleepLib database
//! \brief Deletes the crud out of all device data in the SleepLib database
bool Purge(int secret);
//! \brief Unlink a session from any Machine related indexes
//! \brief Unlink a session from any device related indexes
bool unlinkSession(Session * sess);
bool unlinkDay(Day * day);
@ -142,7 +142,7 @@ class Machine
//! \brief Returns a pointer to a valid Session object if SessionID exists
Session *SessionExists(SessionID session);
//! \brief Adds the session to this machine object, and the Master Profile list. (used during load)
//! \brief Adds the session to this device object, and the Master Profile list. (used during load)
bool AddSession(Session *s, bool allowOldSessions=false);
//! \brief Find the date this session belongs in, according to profile settings
@ -253,10 +253,10 @@ class Machine
bool m_suppressUntestedWarning;
QSet<QString> m_previousUnexpected;
//! \brief Contains a secondary index of day data, containing just this machines sessions
//! \brief Contains a secondary index of day data, containing just this devices sessions
QMap<QDate, Day *> day;
//! \brief Contains all sessions for this machine, indexed by SessionID
//! \brief Contains all sessions for this device, indexed by SessionID
QHash<SessionID, Session *> sessionlist;
//! \brief The list of sessions that need saving (for multithreaded save code)
@ -303,7 +303,7 @@ class Machine
/*! \class CPAP
\brief A CPAP classed machine object..
\brief A CPAP classed device object..
*/
class CPAP: public Machine
{
@ -315,7 +315,7 @@ class CPAP: public Machine
/*! \class Oximeter
\brief An Oximeter classed machine object..
\brief An Oximeter classed device object..
*/
class Oximeter: public Machine
{
@ -326,7 +326,7 @@ class Oximeter: public Machine
};
/*! \class SleepStage
\brief A SleepStage classed machine object..
\brief A SleepStage classed device object..
*/
class SleepStage: public Machine
{
@ -337,7 +337,7 @@ class SleepStage: public Machine
};
/*! \class PositionSensor
\brief A PositionSensor classed machine object..
\brief A PositionSensor classed device object..
*/
class PositionSensor: public Machine
{

2
oscar/SleepLib/machine_common.cpp
View File

@ -1,4 +1,4 @@
/* SleepLib Common Machine Stuff
/* SleepLib Common Device Stuff
*
* Copyright (c) 2019-2022 The OSCAR Team
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>

18
oscar/SleepLib/machine_common.h
View File

@ -1,4 +1,4 @@
/* SleepLib Common Machine Header
/* SleepLib Common Device Header
*
* Copyright (c) 2019-2022 The OSCAR Team
* Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
@ -49,22 +49,22 @@ qint64 timezoneOffset();
enum SummaryType { ST_CNT, ST_SUM, ST_AVG, ST_WAVG, ST_PERC, ST_90P, ST_MIN, ST_MAX, ST_MID, ST_CPH, ST_SPH, ST_FIRST, ST_LAST, ST_HOURS, ST_SESSIONS, ST_SETMIN, ST_SETAVG, ST_SETMAX, ST_SETWAVG, ST_SETSUM, ST_SESSIONID, ST_DATE };
/*! \enum MachineType
\brief Generalized type of a machine. MT_CPAP is any type of xPAP machine, MT_OXIMETER any type of Oximeter
\brief Generalized type of a device. MT_CPAP is any type of xPAP device, MT_OXIMETER any type of Oximeter
\brief MT_SLEEPSTAGE stage of sleep detector (ZEO importer), MT_JOURNAL for optional notes, MT_POSITION for sleep position detector (Somnopose)
*/
// TODO: This really needs to be a bitmask, since there are increasing numbers of machines that provide
// TODO: This really needs to be a bitmask, since there are increasing numbers of devices that provide
// multiple kinds of data, such as oximetry + motion/position, or sleep stage + oximetry, etc.
//
// Machine/loader classes will use the bitmask to identify which data they are capable of importing.
// It may be that we ultimately prefer to have each machine identify a primary type instead or in addition.
// Device/loader classes will use the bitmask to identify which data they are capable of importing.
// It may be that we ultimately prefer to have each device identify a primary type instead or in addition.
//
// The channel schema's use of these is probably fine.
//
// Days/Sessions/etc. that currently search for data based on the machines they contain will instead
// Days/Sessions/etc. that currently search for data based on the devices they contain will instead
// need to search for channels with data of that MT type. And anywhere else the code makes decisions
// based on MT.
//
// Unfortunately, this also includes previously imported data, as Session encodes the machine's type in
// Unfortunately, this also includes previously imported data, as Session encodes the device's type in
// each file on disk. We might be partially saved by the fact that MT_CPAP and MT_OXIMETER were originally
// 1 and 2, which would only break MT_SLEEPSTAGE and higher.
enum MachineType { MT_UNKNOWN = 0, MT_CPAP, MT_OXIMETER, MT_SLEEPSTAGE, MT_JOURNAL, MT_POSITION, MT_UNCATEGORIZED = 99};
@ -99,7 +99,7 @@ enum CPAPMode { //:short
};
/*! \enum PRTypes
\brief Pressure Relief Types, used by CPAP machines
\brief Pressure Relief Types, used by CPAP devices
*/
enum PRTypes { //:short
PR_UNKNOWN = 0, PR_NONE, PR_CFLEX, PR_CFLEXPLUS, PR_AFLEX, PR_BIFLEX, PR_EPR, PR_SMARTFLEX, PR_EASYBREATHE, PR_SENSAWAKE
@ -128,7 +128,7 @@ struct MachineInfo {
int version;
QDate purgeDate;
//! \brief List of text machine properties, like brand, model, etc...
//! \brief List of text device properties, like brand, model, etc...
QHash<QString, QString> properties;
};

2
oscar/SleepLib/machine_loader.cpp
View File

@ -1,4 +1,4 @@
/* SleepLib Machine Loader Class Implementation
/* SleepLib Device Loader Class Implementation
*
* Copyright (c) 2019-2022 The OSCAR Team
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>

16
oscar/SleepLib/machine_loader.h
View File

@ -1,4 +1,4 @@
/* SleepLib MachineLoader Base Class Header
/* SleepLib DeviceLoader Base Class Header
*
* Copyright (c) 2019-2022 The OSCAR Team
* Copyright (c) 2018 Mark Watkins <mark@jedimark.net>
@ -37,7 +37,7 @@ const QString genericPixmapPath = ":/icons/mask.png";
/*! \class MachineLoader
\brief Base class to derive a new Machine importer from
\brief Base class to derive a new device importer from
*/
class MachineLoader: public QObject
{
@ -54,10 +54,10 @@ class MachineLoader: public QObject
//! \brief Detect if the given path contains a valid folder structure
virtual bool Detect(const QString & path) = 0;
//! \brief Look up and return machine model information stored at path
//! \brief Look up and return device model information stored at path
virtual MachineInfo PeekInfo(const QString & path) { Q_UNUSED(path); return MachineInfo(); }
//! \brief Override this to scan path and detect new machine data
//! \brief Override this to scan path and detect new device data
virtual int Open(const QString & path) = 0;
//! \brief Load all of the given files and update dialog with progress (for non-CPAP devices)
@ -66,16 +66,16 @@ class MachineLoader: public QObject
//! \brief Load a specific (non-CPAP) file
virtual int OpenFile(const QString & path) { Q_UNUSED(path); return 0; }
//! \brief Override to returns the Version number of this MachineLoader
//! \brief Override to returns the Version number of this DeviceLoader
virtual int Version() = 0;
//! \brief Name filter for files for this loader
virtual QStringList getNameFilter() { return QStringList(""); }
// !\\brief Used internally by loaders, override to return base MachineInfo record
// !\\brief Used internally by loaders, override to return base DeviceInfo record
virtual MachineInfo newInfo() { return MachineInfo(); }
//! \brief Override to returns the class name of this MachineLoader
//! \brief Override to returns the class name of this DeviceLoader
virtual const QString & loaderName() = 0;
virtual void process() {}
@ -177,7 +177,7 @@ public:
};
// Put in machine loader class as static??
// Put in device loader class as static??
void RegisterLoader(MachineLoader *loader);
QList<MachineLoader *> GetLoaders(MachineType mt = MT_UNKNOWN);
MachineLoader * lookupLoader(Machine * m);

2
oscar/SleepLib/preferences.cpp
View File

@ -302,7 +302,7 @@ bool Preferences::Open(QString filename)
//////////////////////////////////////////////////////////////////////////////////////
// This is a dirty hack to clean up a legacy issue
// The old Profile system used to have machines in Profile.xml
// The old Profile system used to have devices in Profile.xml
// We need to clean up this mistake up here, because C++ polymorphism won't otherwise
// let us open properly in constructor
//////////////////////////////////////////////////////////////////////////////////////

30
oscar/SleepLib/profiles.cpp
View File

@ -94,7 +94,7 @@ Profile::~Profile()
removeLock();
}
// delete machine objects...
// delete device objects...
for (auto & mach : m_machlist) {
delete mach;
}
@ -253,7 +253,7 @@ bool Profile::OpenMachines()
Machine *m = nullptr;
// Create Machine needs a profile passed to it..
// Create device needs a profile passed to it..
m = CreateMachine(info, m_id);
@ -546,11 +546,11 @@ void Profile::DataFormatError(Machine *m)
if (backups) {
msg = msg + QObject::tr("<b>OSCAR maintains a backup of your devices data card that it uses for this purpose.</b>")+ "<br/><br/>";
msg = msg + QObject::tr("<i>Your old machine data should be regenerated provided this backup feature has not been disabled in preferences during a previous data import.</i>") + "<br/><br/>";
msg = msg + QObject::tr("<i>Your old device data should be regenerated provided this backup feature has not been disabled in preferences during a previous data import.</i>") + "<br/><br/>";
backups = true;
} else {
msg = msg + "<font size=+1>"+STR_MessageBox_Warning+":</font> "+QObject::tr("OSCAR does not yet have any automatic card backups stored for this device.") + "<br/><br/>";
msg = msg + QObject::tr("This means you will need to import this machine data again afterwards from your own backups or data card.") + "<br/><br/>";
msg = msg + QObject::tr("This means you will need to import this device data again afterwards from your own backups or data card.") + "<br/><br/>";
}
msg += "<font size=+1>"+QObject::tr("Important:")+"</font> "+QObject::tr("Once you upgrade, you <font size=+1>cannot</font> use this profile with the previous version anymore.")+"<br/><br/>"+
@ -558,7 +558,7 @@ void Profile::DataFormatError(Machine *m)
msg = msg + "<font size=+1>"+QObject::tr("Are you ready to upgrade, so you can run the new version of OSCAR?")+"</font>";
QMessageBox * question = new QMessageBox(QMessageBox::Warning, QObject::tr("Machine Database Changes"), msg, QMessageBox::Yes | QMessageBox::No);
QMessageBox * question = new QMessageBox(QMessageBox::Warning, QObject::tr("Device Database Changes"), msg, QMessageBox::Yes | QMessageBox::No);
question->setDefaultButton(QMessageBox::Yes);
QFont font("Sans Serif", 11, QFont::Normal);
@ -570,7 +570,7 @@ void Profile::DataFormatError(Machine *m)
// Purge failed.. probably a permissions error.. let the user deal with it.
QMessageBox::critical(nullptr, STR_MessageBox_Error,
QObject::tr("Sorry, the purge operation failed, which means this version of OSCAR can't start.")+"\n\n"+
QObject::tr("The machine data folder needs to be removed manually.")+"\n\n"+
QObject::tr("The device data folder needs to be removed manually.")+"\n\n"+
QObject::tr("This folder currently resides at the following location:")+"\n\n"+
QDir::toNativeSeparators(Get(p_preferences[STR_GEN_DataFolder].toString())), QMessageBox::Ok);
QApplication::exit(-1);
@ -799,7 +799,7 @@ Day *Profile::addDay(QDate date)
return day;
}
// Get Day record if data available for date and machine type,
// Get Day record if data available for date and device type,
// and has enabled session data, else return nullptr
Day *Profile::GetGoodDay(QDate date, MachineType type)
{
@ -807,7 +807,7 @@ Day *Profile::GetGoodDay(QDate date, MachineType type)
if (!day)
return nullptr;
// For a machine match, find at least one enabled Session.
// For a device match, find at least one enabled Session.
for (auto & sess : day->sessions) {
if (((type == MT_UNKNOWN) || (sess->type() == type)) && sess->enabled()) {
@ -826,7 +826,7 @@ Day *Profile::FindGoodDay(QDate date, MachineType type)
if (!day)
return nullptr;
// For a machine match, find at least one enabled Session.
// For a device match, find at least one enabled Session.
for (auto & sess : day->sessions) {
if (((type == MT_UNKNOWN) || (sess->type() == type)) && sess->enabled()) {
return day;
@ -891,7 +891,7 @@ MachineLoader *GetLoader(QString name)
}
// Returns a QVector containing all machine objects regisered of type t
// Returns a QVector containing all device objects regisered of type t
QList<Machine *> Profile::GetMachines(MachineType t)
{
QList<Machine *> vec;
@ -920,7 +920,7 @@ Machine *Profile::GetMachine(MachineType t)
return nullptr;
}
// Find most recently imported machine
// Find most recently imported device
int idx = 0;
for (int i=1; i < vec.size(); i++) {
@ -1157,7 +1157,7 @@ void Scan()
} // namespace Profiles
// Returns a list of all days records matching machine type between start and end date
// Returns a list of all days records matching device type between start and end date
QList<Day *> Profile::getDays(MachineType mt, QDate start, QDate end)
{
QList<Day *> list;
@ -1198,7 +1198,7 @@ QList<Day *> Profile::getDays(MachineType mt, QDate start, QDate end)
return list;
}
// Counts number of days in range with data for specified machine type
// Counts number of days in range with data for specified device type
int Profile::countDays(MachineType mt, QDate start, QDate end)
{
if (!start.isValid()) {
@ -1853,7 +1853,7 @@ EventDataType Profile::calcPercentile(ChannelID code, EventDataType percent, Mac
return v;
}
// Lookup first day record of the specified machine type, or return the first day overall if MT_UNKNOWN
// Lookup first day record of the specified device type, or return the first day overall if MT_UNKNOWN
QDate Profile::FirstDay(MachineType mt)
{
if ((mt == MT_UNKNOWN) || (!m_last.isValid()) || (!m_first.isValid())) {
@ -1873,7 +1873,7 @@ QDate Profile::FirstDay(MachineType mt)
return m_last;
}
// Lookup last day record of the specified machine type, or return the last day overall if MT_UNKNOWN
// Lookup last day record of the specified device type, or return the last day overall if MT_UNKNOWN
QDate Profile::LastDay(MachineType mt)
{
if ((mt == MT_UNKNOWN) || (!m_last.isValid()) || (!m_first.isValid())) {

48
oscar/SleepLib/profiles.h
View File

@ -38,7 +38,7 @@ class SessionSettings;
\class Profile
\author Mark Watkins
\date 28/04/11
\brief The User profile system, containing all information for a user, and an index into all Machine data
\brief The User profile system, containing all information for a user, and an index into all device data
*/
class Profile : public Preferences
{
@ -57,7 +57,7 @@ class Profile : public Preferences
qint64 diskSpaceBackups();
qint64 diskSpace();
//! \brief Force some preferences for ResMed machines
//! \brief Force some preferences for ResMed devices
virtual void forceResmedPrefs();
//! \brief Returns hostname that locked profile, or empty string if unlocked
@ -71,16 +71,16 @@ class Profile : public Preferences
//! \brief Save Profile object (This is an extension to Preference::Save(..))
virtual bool Save(QString filename = "");
//! \brief Add machine to this profiles machlist
//! \brief Add device to this profiles machlist
void AddMachine(Machine *m);
//! \brief Remove machine from this profiles machlist
//! \brief Remove device from this profiles machlist
void DelMachine(Machine *m);
//! \brief Loads all machine (summary) data belonging to this profile
//! \brief Loads all device (summary) data belonging to this profile
void LoadMachineData(ProgressDialog *progress);
//! \brief Unloads all machine (summary) data for this profile to free up memory;
//! \brief Unloads all device (summary) data for this profile to free up memory;
void UnloadMachineData();
//! \brief Barf because data format has changed. This does a purge of CPAP data for machine *m
@ -96,50 +96,50 @@ class Profile : public Preferences
//! \brief Add Day record to Profile Day list
Day *addDay(QDate date);
//! \brief Get Day record if data available for date and machine type, else return nullptr
//! \brief Get Day record if data available for date and device type, else return nullptr
Day *GetDay(QDate date, MachineType type = MT_UNKNOWN);
//! \brief Same as GetDay but does not open the summaries
Day *FindDay(QDate date, MachineType type = MT_UNKNOWN);
//! \brief Get Day record if data available for date and machine type,
//! \brief Get Day record if data available for date and device type,
// and has enabled session data, else return nullptr
Day *GetGoodDay(QDate date, MachineType type);
//! \breif Same as GetGoodDay but does not open the summaries
Day *FindGoodDay(QDate date, MachineType type);
//! \brief Returns a list of all machines of type t
//! \brief Returns a list of all devices of type t
QList<Machine *> GetMachines(MachineType t = MT_UNKNOWN);
//! \brief Returns the machine of type t used on date, nullptr if none..
//! \brief Returns the device of type t used on date, nullptr if none..
Machine *GetMachine(MachineType t, QDate date);
//! \brief return the first machine of type t
//! \brief return the first device of type t
Machine *GetMachine(MachineType t);
//! \brief Returns true if this profile stores this variable identified by key
bool contains(QString key) { return p_preferences.contains(key); }
//! \brief Get all days records of machine type between start and end dates
//! \brief Get all days records of device type between start and end dates
QList<Day *> getDays(MachineType mt, QDate start, QDate end);
//! \brief Returns a count of all days (with data) of machine type, between start and end dates
//! \brief Returns a count of all days (with data) of device type, between start and end dates
int countDays(MachineType mt = MT_UNKNOWN, QDate start = QDate(), QDate end = QDate());
//! \brief Returns a count of all compliant days of machine type between start and end dates
//! \brief Returns a count of all compliant days of device type between start and end dates
int countCompliantDays(MachineType mt, QDate start, QDate end);
//! \brief Returns a count of all event entries for code, matching machine type between start an end dates
//! \brief Returns a count of all event entries for code, matching device type between start an end dates
EventDataType calcCount(ChannelID code, MachineType mt = MT_CPAP, QDate start = QDate(),
QDate end = QDate());
//! \brief Returns a sum of all event data for Channel code, matching machine type between start an end dates
//! \brief Returns a sum of all event data for Channel code, matching device type between start an end dates
double calcSum(ChannelID code, MachineType mt = MT_CPAP, QDate start = QDate(),
QDate end = QDate());
//! \brief Returns a sum of all session durations for machine type, between start and end dates
//! \brief Returns a sum of all session durations for device type, between start and end dates
EventDataType calcHours(MachineType mt = MT_CPAP, QDate start = QDate(), QDate end = QDate());
//! \brief Calculates Channel Average (Sums and counts all events, returning the sum divided by the count.)
@ -166,7 +166,7 @@ class Profile : public Preferences
bool hasChannel(ChannelID code);
//! \brief Looks up if any machines report channel is available
//! \brief Looks up if any devices report channel is available
bool channelAvailable(ChannelID code);
@ -178,27 +178,27 @@ class Profile : public Preferences
EventDataType calcSettingsMax(ChannelID code, MachineType mt = MT_CPAP, QDate start = QDate(),
QDate end = QDate());
//! \brief Calculates the time channel code spends above threshold value for machine type, between start and end dates
//! \brief Calculates the time channel code spends above threshold value for device type, between start and end dates
EventDataType calcAboveThreshold(ChannelID code, EventDataType threshold, MachineType mt = MT_CPAP,
QDate start = QDate(), QDate end = QDate());
//! \brief Calculates the time channel code spends below threshold value for machine type, between start and end dates
//! \brief Calculates the time channel code spends below threshold value for device type, between start and end dates
EventDataType calcBelowThreshold(ChannelID code, EventDataType threshold, MachineType mt = MT_CPAP,
QDate start = QDate(), QDate end = QDate());
Day * findSessionDay(Session * session);
//! \brief Looks for the first date containing a day record matching machinetype
//! \brief Looks for the first date containing a day record matching devicetype
QDate FirstDay(MachineType mt = MT_UNKNOWN);
//! \brief Looks for the last date containing a day record matching machinetype
//! \brief Looks for the last date containing a day record matching devicetype
QDate LastDay(MachineType mt = MT_UNKNOWN);
//! \brief Looks for the first date containing a day record with enabled sessions matching machinetype
//! \brief Looks for the first date containing a day record with enabled sessions matching devicetype
QDate FirstGoodDay(MachineType mt = MT_UNKNOWN);
//! \brief Looks for the last date containing a day record with enabled sessions matching machinetype
//! \brief Looks for the last date containing a day record with enabled sessions matching devicetype
QDate LastGoodDay(MachineType mt = MT_UNKNOWN);
//! \brief Returns this profiles data folder

46
oscar/SleepLib/schema.cpp
View File

@ -152,52 +152,52 @@ void init()
schema::channel.add(GRP_CPAP, new Channel(CPAP_EPAPSet = 0x11A6, WAVEFORM, MT_CPAP, SESSION, "EPAPSet", QObject::tr("EPAP Set"), QObject::tr("EPAP Setting"), QObject::tr("EPAP Set"), STR_UNIT_CMH2O, DEFAULT, QColor("dark green")));
// Flags
schema::channel.add(GRP_CPAP, new Channel(CPAP_CSR = 0x1000, SPAN, MT_CPAP, SESSION, "CSR",
QObject::tr("Cheyne Stokes Respiration"), QObject::tr("An abnormal period of Cheyne Stokes Respiration"), QObject::tr("CSR"), STR_UNIT_Percentage,DEFAULT, COLOR_CSR));
QObject::tr("Cheyne Stokes Respiration (CSR)"), QObject::tr("An abnormal period of Cheyne Stokes Respiration"), QObject::tr("CSR"), STR_UNIT_Percentage,DEFAULT, COLOR_CSR));
schema::channel.add(GRP_CPAP, new Channel(CPAP_PB = 0x1028, SPAN, MT_CPAP, SESSION, "PB",
QObject::tr("Periodic Breathing"),QObject::tr("An abnormal period of Periodic Breathing"), QObject::tr("PB"),STR_UNIT_Percentage, DEFAULT, COLOR_CSR));
QObject::tr("Periodic Breathing (PB)"),QObject::tr("An abnormal period of Periodic Breathing"), QObject::tr("PB"),STR_UNIT_Percentage, DEFAULT, COLOR_CSR));
schema::channel.add(GRP_CPAP, new Channel(CPAP_ClearAirway = 0x1001, FLAG, MT_CPAP, SESSION, "ClearAirway",
QObject::tr("Clear Airway"), QObject::tr("An apnea where the airway is open"), QObject::tr("CA"), STR_UNIT_EventsPerHour, DEFAULT, QColor("purple")));
QObject::tr("Clear Airway (CA)"), QObject::tr("An apnea where the airway is open"), QObject::tr("CA"), STR_UNIT_EventsPerHour, DEFAULT, QColor("purple")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_Obstructive = 0x1002, FLAG, MT_CPAP, SESSION, "Obstructive",
QObject::tr("Obstructive"), QObject::tr("An apnea caused by airway obstruction"), QObject::tr("OA"), STR_UNIT_EventsPerHour, DEFAULT, QColor("#40c0ff")));
QObject::tr("Obstructive Apnea (OA)"), QObject::tr("An apnea caused by airway obstruction"), QObject::tr("OA"), STR_UNIT_EventsPerHour, DEFAULT, QColor("#40c0ff")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_Hypopnea = 0x1003, FLAG, MT_CPAP, SESSION, "Hypopnea",
QObject::tr("Hypopnea"), QObject::tr("A partially obstructed airway"), QObject::tr("H"), STR_UNIT_EventsPerHour, DEFAULT, QColor("blue")));
QObject::tr("Hypopnea (H)"), QObject::tr("A partially obstructed airway"), QObject::tr("H"), STR_UNIT_EventsPerHour, DEFAULT, QColor("blue")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_Apnea = 0x1004, FLAG, MT_CPAP, SESSION, "Apnea",
QObject::tr("Unclassified Apnea"), QObject::tr("An apnea that couldn't be determined as Central or Obstructive."),QObject::tr("UA"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark green")));
QObject::tr("Unclassified Apnea (UA)"), QObject::tr("An apnea that couldn't be determined as Central or Obstructive."),QObject::tr("UA"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark green")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_AllApnea = 0x1010, FLAG, MT_CPAP, SESSION, "AllApnea",
QObject::tr("Apnea"), QObject::tr("An apnea reportred by your CPAP machine."),QObject::tr("A"), STR_UNIT_EventsPerHour, DEFAULT, QColor("#40c0ff")));
QObject::tr("Apnea (A)"), QObject::tr("An apnea reportred by your CPAP device."),QObject::tr("A"), STR_UNIT_EventsPerHour, DEFAULT, QColor("#40c0ff")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_FlowLimit = 0x1005, FLAG, MT_CPAP, SESSION, "FlowLimit",
QObject::tr("Flow Limitation"), QObject::tr("A restriction in breathing from normal, causing a flattening of the flow waveform."), QObject::tr("FL"), STR_UNIT_EventsPerHour, DEFAULT, QColor("#404040")));
QObject::tr("Flow Limitation (FL)"), QObject::tr("A restriction in breathing from normal, causing a flattening of the flow waveform."), QObject::tr("FL"), STR_UNIT_EventsPerHour, DEFAULT, QColor("#404040")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_RERA = 0x1006, FLAG, MT_CPAP, SESSION, "RERA",
QObject::tr("RERA"),QObject::tr("Respiratory Effort Related Arousal: An restriction in breathing that causes an either an awakening or sleep disturbance."), QObject::tr("RE"), STR_UNIT_EventsPerHour, DEFAULT, COLOR_Gold));
QObject::tr("RERA (RE)"),QObject::tr("Respiratory Effort Related Arousal: An restriction in breathing that causes an either an awakening or sleep disturbance."), QObject::tr("RE"), STR_UNIT_EventsPerHour, DEFAULT, COLOR_Gold));
schema::channel.add(GRP_CPAP, new Channel(CPAP_VSnore = 0x1007, FLAG, MT_CPAP, SESSION, "VSnore",
QObject::tr("Vibratory Snore"), QObject::tr("A vibratory snore"), QObject::tr("VS"), STR_UNIT_EventsPerHour, DEFAULT, QColor("red")));
QObject::tr("Vibratory Snore (VS)"), QObject::tr("A vibratory snore"), QObject::tr("VS"), STR_UNIT_EventsPerHour, DEFAULT, QColor("red")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_VSnore2 = 0x1008, FLAG, MT_CPAP, SESSION, "VSnore2",
QObject::tr("Vibratory Snore (VS2) "),QObject::tr("A vibratory snore as detcted by a System One machine"),QObject::tr("VS2"), STR_UNIT_EventsPerHour, DEFAULT, QColor("red")));
QObject::tr("Vibratory Snore (VS2) "),QObject::tr("A vibratory snore as detcted by a System One device"),QObject::tr("VS2"), STR_UNIT_EventsPerHour, DEFAULT, QColor("red")));
// This Large Leak record is just a flag marker, used by Intellipap for one
schema::channel.add(GRP_CPAP, new Channel(CPAP_LeakFlag = 0x100a, FLAG, MT_CPAP, SESSION, "LeakFlag",
QObject::tr("Leak Flag"), QObject::tr("A large mask leak affecting machine performance."), QObject::tr("LF"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light gray")));
QObject::tr("Leak Flag (LF)"), QObject::tr("A large mask leak affecting device performance."), QObject::tr("LF"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light gray")));
// The following is a Large Leak record that references a waveform span
schema::channel.add(GRP_CPAP, new Channel(CPAP_LargeLeak = 0x1158, SPAN, MT_CPAP, SESSION, "LeakSpan",
QObject::tr("Large Leak"),QObject::tr("A large mask leak affecting machine performance."), QObject::tr("LL"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light gray")));
QObject::tr("Large Leak (LL)"),QObject::tr("A large mask leak affecting device performance."), QObject::tr("LL"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light gray")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_NRI = 0x100b, FLAG, MT_CPAP, SESSION, "NRI",
QObject::tr("Non Responding Event"), QObject::tr("A type of respiratory event that won't respond to a pressure increase."), QObject::tr("NR"), STR_UNIT_EventsPerHour, DEFAULT, QColor("orange")));
QObject::tr("Non Responding Event (NR)"), QObject::tr("A type of respiratory event that won't respond to a pressure increase."), QObject::tr("NR"), STR_UNIT_EventsPerHour, DEFAULT, QColor("orange")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_ExP = 0x100c, FLAG, MT_CPAP, SESSION, "ExP",
QObject::tr("Expiratory Puff"), QObject::tr("Intellipap event where you breathe out your mouth."), QObject::tr("EP"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark magenta")));
QObject::tr("Expiratory Puff (EP)"), QObject::tr("Intellipap event where you breathe out your mouth."), QObject::tr("EP"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark magenta")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_SensAwake = 0x100d, FLAG, MT_CPAP, SESSION, "SensAwake",
QObject::tr("SensAwake"),QObject::tr("SensAwake feature will reduce pressure when waking is detected."),QObject::tr("SA"), STR_UNIT_EventsPerHour, DEFAULT, COLOR_Gold));
QObject::tr("SensAwake (SA)"),QObject::tr("SensAwake feature will reduce pressure when waking is detected."),QObject::tr("SA"), STR_UNIT_EventsPerHour, DEFAULT, COLOR_Gold));
schema::channel.add(GRP_CPAP, new Channel(CPAP_UserFlag1 = 0x101e, FLAG, MT_CPAP, SESSION, "UserFlag1",
QObject::tr("User Flag #1"), QObject::tr("A user definable event detected by OSCAR's flow waveform processor."), QObject::tr("UF1"), STR_UNIT_EventsPerHour, DEFAULT, QColor(0xc0,0xc0,0xe0)));
QObject::tr("User Flag #1 (UF1)"), QObject::tr("A user definable event detected by OSCAR's flow waveform processor."), QObject::tr("UF1"), STR_UNIT_EventsPerHour, DEFAULT, QColor(0xc0,0xc0,0xe0)));
schema::channel.add(GRP_CPAP, new Channel(CPAP_UserFlag2 = 0x101f, FLAG, MT_CPAP, SESSION, "UserFlag2",
QObject::tr("User Flag #2"),QObject::tr("A user definable event detected by OSCAR's flow waveform processor."), QObject::tr("UF2"), STR_UNIT_EventsPerHour, DEFAULT, QColor(0xa0,0xa0,0xc0)));
QObject::tr("User Flag #2 (UF2)"),QObject::tr("A user definable event detected by OSCAR's flow waveform processor."), QObject::tr("UF2"), STR_UNIT_EventsPerHour, DEFAULT, QColor(0xa0,0xa0,0xc0)));
schema::channel.add(GRP_CPAP, new Channel(CPAP_UserFlag3 = 0x1024, FLAG, MT_CPAP, SESSION, "UserFlag3",
QObject::tr("User Flag #3"),QObject::tr("A user definable event detected by OSCAR's flow waveform processor."), QObject::tr("UF3"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark grey")));
QObject::tr("User Flag #3 (UF3)"),QObject::tr("A user definable event detected by OSCAR's flow waveform processor."), QObject::tr("UF3"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark grey")));
// Oximetry
schema::channel.add(GRP_OXI, new Channel(OXI_Pulse = 0x1800, WAVEFORM, MT_OXIMETER, SESSION, STR_GRAPH_Oxi_Pulse,
@ -216,10 +216,10 @@ void init()
QObject::tr("Perfusion Index"), QObject::tr("A relative assessment of the pulse strength at the monitoring site"), QObject::tr("Perf. Index %"), STR_UNIT_Percentage, DEFAULT, QColor("magenta")));
schema::channel.add(GRP_OXI, new Channel(OXI_PulseChange = 0x1803, FLAG, MT_OXIMETER, SESSION, STR_GRAPH_Oxi_PulseChange,
QObject::tr("Pulse Change"), QObject::tr("A sudden (user definable) change in heart rate"), QObject::tr("PC"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light grey")));
QObject::tr("Pulse Change (PC)"), QObject::tr("A sudden (user definable) change in heart rate"), QObject::tr("PC"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light grey")));
schema::channel.add(GRP_OXI, new Channel(OXI_SPO2Drop = 0x1804, FLAG, MT_OXIMETER, SESSION, STR_GRAPH_Oxi_SPO2Drop,
QObject::tr("SpO2 Drop"), QObject::tr("A sudden (user definable) drop in blood oxygen saturation"), QObject::tr("SD"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light blue")));
QObject::tr("SpO2 Drop (SD)"), QObject::tr("A sudden (user definable) drop in blood oxygen saturation"), QObject::tr("SD"), STR_UNIT_EventsPerHour, DEFAULT, QColor("light blue")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_FlowRate = 0x1100, WAVEFORM, MT_CPAP, SESSION, STR_GRAPH_FlowRate,
@ -272,7 +272,7 @@ void init()
QObject::tr("Maximum Leak"), QObject::tr("The maximum rate of mask leakage"), QObject::tr("Max Leaks"), STR_UNIT_LPM, DEFAULT, QColor("dark red")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_AHI = 0x1116, WAVEFORM, MT_CPAP, SESSION, "AHI",
QObject::tr("Apnea Hypopnea Index"), QObject::tr("Graph showing running AHI for the past hour"), QObject::tr("AHI"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark red")));
QObject::tr("Apnea Hypopnea Index (AHI)"), QObject::tr("Graph showing running AHI for the past hour"), QObject::tr("AHI"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark red")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_LeakTotal = 0x1117, WAVEFORM, MT_CPAP, SESSION, "LeakTotal",
QObject::tr("Total Leak Rate"), QObject::tr("Detected mask leakage including natural Mask leakages"), QObject::tr("Total Leaks"), STR_UNIT_LPM, DEFAULT, QColor("dark green")));
@ -281,7 +281,7 @@ void init()
QObject::tr("Median Leak Rate"), QObject::tr("Median rate of detected mask leakage"), QObject::tr("Median Leaks"), STR_UNIT_LPM, DEFAULT, QColor("dark green")));
schema::channel.add(GRP_CPAP, new Channel(CPAP_RDI = 0x1119, WAVEFORM, MT_CPAP, SESSION, "RDI",
QObject::tr("Respiratory Disturbance Index"), QObject::tr("Graph showing running RDI for the past hour"), QObject::tr("RDI"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark red")));
QObject::tr("Respiratory Disturbance Index (RDI)"), QObject::tr("Graph showing running RDI for the past hour"), QObject::tr("RDI"), STR_UNIT_EventsPerHour, DEFAULT, QColor("dark red")));
// Positional sensors
schema::channel.add(GRP_POS, new Channel(POS_Orientation = 0x2990, WAVEFORM, MT_POSITION, SESSION, STR_GRAPH_Orientation,

6
oscar/SleepLib/schema.h
View File

@ -52,8 +52,8 @@ enum Function {
///
/// \brief The ChanType enum defines the type of data channel. Bit flags so multiple settings are possible.
/// DATA: A single number such as Height, ZombieMeter.
/// SETTING: Machine setting, such as EPR, temperature, Ramp enabled.
/// FLAG: Event flags reported by CPAP machine. Each flag has its own channel.
/// SETTING: Device setting, such as EPR, temperature, Ramp enabled.
/// FLAG: Event flags reported by CPAP device. Each flag has its own channel.
/// MINOR_FLAG: More event flags such as PressurePulse and TimedBreath.
/// SPAN: A flag that has a timespan associated with it (CSR, LeakSpan, Ramp, ...).
/// WAVEFORM: A waveform such as flow rate.
@ -102,7 +102,7 @@ class Channel
//! \brief Data format such as integer vs RTF, called Field Type in channel initializers in schema.cpp
inline DataType datatype() const { return m_datatype; }
//! \brief Type of machine (CPAP, Oximeter, Journal, etc.) as defined in machine_common.h. Set in channel initializers in schema.cpp
//! \brief Type of device (CPAP, Oximeter, Journal, etc.) as defined in machine_common.h. Set in channel initializers in schema.cpp
inline MachineType machtype() const { return m_machtype; }
//! \brief Unique string identifier for this channel. Must not be translated. Later used as a unique key to identify graph derived from this channel.

2
oscar/SleepLib/serialoximeter.cpp
View File

@ -1,4 +1,4 @@
/* SleepLib Machine Loader Class Implementation
/* SleepLib Device Loader Class Implementation
*
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
* Copyright (c) 2019-2022 The OSCAR Team

2
oscar/SleepLib/serialoximeter.h
View File

@ -1,4 +1,4 @@
/* SleepLib MachineLoader Base Class Header
/* SleepLib DeviceLoader Base Class Header
*
* Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
* Copyright (c) 2019-2022 The OSCAR Team

14
oscar/SleepLib/session.cpp
View File

@ -613,7 +613,7 @@ bool Session::LoadSummary()
in >> m_upperThreshold;
in >> m_timeBelowTheshold;
in >> m_lowerThreshold;
} // else this is ugly.. forced machine database upgrade will solve it though.
} // else this is ugly.. forced device database upgrade will solve it though.
if (version == 13) {
QHash<ChannelID, QVariant>::iterator it = settings.find(CPAP_SummaryOnly);
@ -685,7 +685,7 @@ bool Session::StoreEvents()
header << (quint32)magic; // New Magic Number
header << (quint16)events_version; // File Version
header << (quint16)filetype_data; // File type 1 == Event
header << (quint32)s_machine->id();// Machine Type
header << (quint32)s_machine->id();// Device Type
header << (quint32)s_session; // This session's ID
header << s_first;
header << s_last;
@ -698,7 +698,7 @@ bool Session::StoreEvents()
header << (quint16)compress;
header << (quint16)s_machine->type();// Machine Type
header << (quint16)s_machine->type();// Device Type
QByteArray databytes;
QDataStream out(&databytes, QIODevice::WriteOnly);
@ -833,7 +833,7 @@ bool Session::LoadEvents(QString filename)
header >> magicnum; // Magic Number (quint32)
header >> version; // Version (quint16)
header >> type; // File type (quint16)
header >> machid; // Machine ID (quint32)
header >> machid; // Device ID (quint32)
header >> sessid; //(quint32)
header >> s_first; //(qint64)
header >> s_last; //(qint64)
@ -861,7 +861,7 @@ bool Session::LoadEvents(QString filename)
file.seek(32);
} else {
header >> compmethod; // Compression Method (quint16)
header >> machtype; // Machine Type (quint16)
header >> machtype; // Device Type (quint16)
header >> datasize; // Size of Uncompressed Data (quint32)
header >> crc16; // CRC16 of Uncompressed Data (quint16)
}
@ -898,7 +898,7 @@ bool Session::LoadEvents(QString filename)
in.setByteOrder(QDataStream::LittleEndian);
qint16 mcsize;
in >> mcsize; // number of Machine Code lists
in >> mcsize; // number of Device Code lists
#ifdef DEBUG_EVENTS
qDebug() << "Number of Channels" << mcsize;
#endif
@ -1170,7 +1170,7 @@ void Session::UpdateSummaries()
// Generate unintentional leaks if not present
calcLeaks(this);
// Flag the Large Leaks if unintentional leaks is available, and no LargeLeaks weren't flagged by the machine already.
// Flag the Large Leaks if unintentional leaks is available, and no LargeLeaks weren't flagged by the device already.
flagLargeLeaks(this);
calcSPO2Drop(this);

12
oscar/SleepLib/session.h
View File

@ -51,7 +51,7 @@ public:
};
/*! \class Session
\brief Contains a single Sessions worth of machine event/waveform information.
\brief Contains a single Sessions worth of device event/waveform information.
This class also contains all the primary database logic for SleepLib
*/
@ -61,7 +61,7 @@ class Session
friend class Machine;
public:
/*! \fn Session(Machine *,SessionID);
\brief Create a session object belonging to Machine, with supplied SessionID
\brief Create a session object belonging to device, with supplied SessionID
If sessionID is 0, the next in sequence will be picked
*/
Session(Machine *, SessionID);
@ -200,7 +200,7 @@ class Session
return t;
}
//! \brief Flag this Session as dirty, so Machine object can save it
//! \brief Flag this Session as dirty, so device object can save it
void SetChanged(bool val) {
s_changed = val;
s_events_loaded = val; // dirty hack putting this here
@ -230,7 +230,7 @@ class Session
QHash<ChannelID, EventDataType> m_min; // The actual minimum
QHash<ChannelID, EventDataType> m_max;
// This could go in channels, but different machines interpret it differently
// This could go in channels, but different devices interpret it differently
// Under the new SleepyLib data Device model this can be done, but unfortunately not here..
QHash<ChannelID, EventDataType> m_physmin; // The physical minimum for graph display purposes
QHash<ChannelID, EventDataType> m_physmax; // The physical maximum
@ -394,7 +394,7 @@ class Session
EventDataType offset = 0.0, EventDataType min = 0.0, EventDataType max = 0.0,
EventDataType rate = 0.0, bool second_field = false);
//! \brief Returns this sessions MachineID
//! \brief Returns this sessions DeviceID
Machine *machine() { return s_machine; }
//! \brief Returns true if session only contains summary data
@ -428,7 +428,7 @@ class Session
QString eventFile() const;
//! \brief Returns MachineType for this session
//! \brief Returns DeviceType for this session
MachineType type() { return s_machtype; }