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

Merge branch 'master' into printing

Browse Source
This commit is contained in:
Seeker4 2019-06-22 18:22:57 -07:00
commit 641ebbde54
3 changed files with 682 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

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

@ -164,8 +164,8 @@ public:
//! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data for fileversion 2 machines: F0V234, F5V012, and maybe others //! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data for fileversion 2 machines: F0V234, F5V012, and maybe others
void ParseHumidifierSettingV2(int humid, bool supportsHeatedTubing=true); void ParseHumidifierSettingV2(int humid, bool supportsHeatedTubing=true);
//! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data for family 0 CPAP/APAP family version 6 machines //! \brief Parse humidifier setting bytes from a .000 or .001 containing compliance/summary data for fileversion 3 machines
void ParseHumidifierSettingF0V6(unsigned char byte1, unsigned char byte2, bool add_setting=false); void ParseHumidifierSettingV3(unsigned char byte1, unsigned char byte2, bool add_setting=false);
//! \brief Figures out which Event Parser to call, based on machine family/version and calls it. //! \brief Figures out which Event Parser to call, based on machine family/version and calls it.
bool ParseEvents(CPAPMode mode); bool ParseEvents(CPAPMode mode);
@ -201,8 +201,11 @@ protected:
//! \brief Extract the stored CRC from the end of the data of a PRS1 chunk //! \brief Extract the stored CRC from the end of the data of a PRS1 chunk
bool ExtractStoredCrc(int size); bool ExtractStoredCrc(int size);
//! \brief Parse a settings slice from a .000 (and maybe .001) file //! \brief Parse a settings slice from a .000 and .001 file
bool ParseSettingsF0V6(const unsigned char* data, int size); bool ParseSettingsF0V6(const unsigned char* data, int size);
//! \brief Parse a settings slice from a .000 and .001 file
bool ParseSettingsF5V3(const unsigned char* data, int size);
}; };
@ -273,7 +276,7 @@ public:
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV machine (which has a different format) //! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV machine (which has a different format)
bool ParseF5Events(); bool ParseF5Events();
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV file version 3 machine (which has a different format again) //! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV file version 3 machine (which has a different format again)
bool ParseF5EventsFV3(); bool ParseEventsF5V3();
protected: protected:
@ -400,6 +403,8 @@ class PRS1ModelInfo
{ {
protected: protected:
QHash<int, QHash<int, QStringList>> m_testedModels; QHash<int, QHash<int, QStringList>> m_testedModels;
QHash<QString,const char*> m_modelNames;
QSet<QString> m_bricks;
public: public:
PRS1ModelInfo(); PRS1ModelInfo();
@ -407,6 +412,8 @@ public:
bool IsSupported(int family, int familyVersion) const; bool IsSupported(int family, int familyVersion) const;
bool IsTested(const QHash<QString,QString> & properties) const; bool IsTested(const QHash<QString,QString> & properties) const;
bool IsTested(const QString & modelNumber, int family, int familyVersion) const; bool IsTested(const QString & modelNumber, int family, int familyVersion) const;
bool IsBrick(const QString & model) const;
const char* Name(const QString & model) const;
}; };

3
oscar/daily.cpp
View File

@ -1457,6 +1457,9 @@ void Daily::Load(QDate date)
val = day->count(code) / hours; val = day->count(code) / hours;
data = QString("%1").arg(val,0,'f',2); data = QString("%1").arg(val,0,'f',2);
} }
// TODO: percentage would be another useful option here for things like
// percentage of patient-triggered breaths, which is much more useful
// than the duration of timed breaths per hour.
values[code] = val; values[code] = val;
QColor altcolor = (brightness(chan.defaultColor()) < 0.3) ? Qt::white : Qt::black; // pick a contrasting color QColor altcolor = (brightness(chan.defaultColor()) < 0.3) ? Qt::white : Qt::black; // pick a contrasting color
html+=QString("<tr><td align='left' bgcolor='%1'><b><font color='%2'><a href='event=%5' style='text-decoration:none;color:%2'>%3</a></font></b></td><td width=20% bgcolor='%1'><b><font color='%2'>%4</font></b></td></tr>\n") html+=QString("<tr><td align='left' bgcolor='%1'><b><font color='%2'><a href='event=%5' style='text-decoration:none;color:%2'>%3</a></font></b></td><td width=20% bgcolor='%1'><b><font color='%2'>%4</font></b></td></tr>\n")