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

Move Machine properties into MachineInfo.

Browse Source 
This will help loaders be less tied to the Machine data structure.
Since Machine contains a MachineInfo, this changes no functionality.
This commit is contained in:
sawinglogz 2021-10-26 14:59:41 -04:00
parent 2281209a20
commit a4fdb03c49
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oscar/SleepLib/loader_plugins/intellipap_loader.cpp
View File

@ -1,4 +1,4 @@
/* SleepLib (DeVilbiss) Intellipap Loader Implementation /* SleepLib (DeVilbiss) Intellipap Loader Implementation
* *
* Notes: Intellipap DV54 requires the SmartLink attachment to access this data. * Notes: Intellipap DV54 requires the SmartLink attachment to access this data.
* *
@ -260,7 +260,7 @@ int IntellipapLoader::OpenDV5(const QString & path)
// Refresh properties data.. // Refresh properties data..
for (QHash<QString, QString>::iterator i = set1.begin(); i != set1.end(); i++) { for (QHash<QString, QString>::iterator i = set1.begin(); i != set1.end(); i++) {
mach->properties[i.key()] = i.value(); mach->info.properties[i.key()] = i.value();
} }
f.close(); f.close();

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

@ -676,7 +676,7 @@ bool PRS1Loader::PeekProperties(MachineInfo & info, const QString & filename, Ma
} }
if (!mach || skip) continue; if (!mach || skip) continue;
mach->properties[key] = props[key]; mach->info.properties[key] = props[key];
}; };
if (!modelnum.isEmpty()) { if (!modelnum.isEmpty()) {

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

@ -136,8 +136,6 @@ protected:
// State that needs to persist between individual events: // State that needs to persist between individual events:
EventDataType m_currentPressure; EventDataType m_currentPressure;
bool m_calcPSfromSet; bool m_calcPSfromSet;
bool m_calcLeaks;
EventDataType m_lpm4, m_ppm;
//! \brief Advance the current mask-on slice if needed and update import data structures accordingly. //! \brief Advance the current mask-on slice if needed and update import data structures accordingly.
bool UpdateCurrentSlice(PRS1DataChunk* chunk, qint64 t); bool UpdateCurrentSlice(PRS1DataChunk* chunk, qint64 t);

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

@ -466,7 +466,7 @@ int ResmedLoader::Open(const QString & dirpath)
// Copy the idmap into machine objects properties, (overwriting any old values) // Copy the idmap into machine objects properties, (overwriting any old values)
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
for (auto i=idmap.begin(), idend=idmap.end(); i != idend; i++) { for (auto i=idmap.begin(), idend=idmap.end(); i != idend; i++) {
mach->properties[i.key()] = i.value(); mach->info.properties[i.key()] = i.value();
} }
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////

3
oscar/SleepLib/machine.h
View File

@ -259,9 +259,6 @@ class Machine
//! \brief Contains all sessions for this machine, indexed by SessionID //! \brief Contains all sessions for this machine, indexed by SessionID
QHash<SessionID, Session *> sessionlist; QHash<SessionID, Session *> sessionlist;
//! \brief List of text machine properties, like brand, model, etc...
QHash<QString, QString> properties;
//! \brief The list of sessions that need saving (for multithreaded save code) //! \brief The list of sessions that need saving (for multithreaded save code)
// QList<Session *> m_savelist; // QList<Session *> m_savelist;

3
oscar/SleepLib/machine_common.h
View File

@ -126,6 +126,9 @@ struct MachineInfo {
QDateTime lastimported; QDateTime lastimported;
int version; int version;
QDate purgeDate; QDate purgeDate;
//! \brief List of text machine properties, like brand, model, etc...
QHash<QString, QString> properties;
}; };

4
oscar/SleepLib/profiles.cpp
View File

@ -257,7 +257,7 @@ bool Profile::OpenMachines()
m = CreateMachine(info, m_id); m = CreateMachine(info, m_id);
if (m) m->properties = prop; if (m) m->info.properties = prop;
elem = elem.nextSiblingElement(); elem = elem.nextSiblingElement();
} }
@ -282,7 +282,7 @@ bool Profile::StoreMachines()
QDomElement pe = doc.createElement("properties"); QDomElement pe = doc.createElement("properties");
me.appendChild(pe); me.appendChild(pe);
for (QHash<QString, QString>::iterator j = m->properties.begin(); j != m->properties.end(); j++) { for (QHash<QString, QString>::iterator j = m->info.properties.begin(); j != m->info.properties.end(); j++) {
QDomElement pp = doc.createElement(j.key()); QDomElement pp = doc.createElement(j.key());
pp.appendChild(doc.createTextNode(j.value())); pp.appendChild(doc.createTextNode(j.value()));
pe.appendChild(pp); pe.appendChild(pp);