mirror of
https://gitlab.com/pholy/OSCAR-code.git
synced 2025-04-05 02:30:44 +00:00
Merge branch 'master' into vAuto-Settings
This commit is contained in:
Phil Olynyk
commit
3418e9e9b4
16
Building/Linux/clean_rm-common-NN.old
Executable file
16
Building/Linux/clean_rm-common-NN.old
Executable file
@ -0,0 +1,16 @@
|
||||
|
||||
# begin common script shell
|
||||
# delete all the folder not deleted by the purge command
|
||||
|
||||
echo "appli_name=${appli_name}"
|
||||
|
||||
list=$(find /usr -name ${appli_name} 2>/dev/null)
|
||||
|
||||
for folder in $list
|
||||
do
|
||||
echo "to delete : '$folder'"
|
||||
rm -r $folder
|
||||
done
|
||||
|
||||
# end common script shell
|
||||
|
||||
@ -4,12 +4,15 @@
|
||||
|
||||
echo "appli_name=${appli_name}"
|
||||
|
||||
list=$(find /usr -name ${appli_name} 2>/dev/null)
|
||||
list=$(find /usr/share -name ${appli_name} 2>/dev/null)
|
||||
|
||||
for folder in $list
|
||||
do
|
||||
echo "to delete : '$folder'"
|
||||
rm -r $folder
|
||||
if [ $folder != '/usr/share/OSCAR' ]
|
||||
then
|
||||
echo "to delete : '$folder'"
|
||||
rm -r $folder
|
||||
fi
|
||||
done
|
||||
|
||||
# end common script shell
|
||||
|
||||
@ -11,6 +11,30 @@
|
||||
<b>This page in other languages:</b>
|
||||
<br><a href=http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes>http://www.apneaboard.com/wiki/index.php/OSCAR_Release_Notes</a></p>
|
||||
<p>
|
||||
<b>Changes and fixes in OSCAR v1.3.5-alpha.X</b>
|
||||
<br>Portions of OSCAR are © 2019-2022 by
|
||||
<i>The OSCAR Team</i></p>
|
||||
<ul>
|
||||
<li>[new] Additional Philips Respironics devices tested and fully supported:
|
||||
<ul>
|
||||
<li>BiPAP Auto (System One 60 Series) (761P)</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
<p>
|
||||
<b>Changes and fixes in OSCAR v1.3.5-alpha.2</b>
|
||||
<br>Portions of OSCAR are © 2019-2022 by
|
||||
<i>The OSCAR Team</i></p>
|
||||
<ul>
|
||||
<li>[new] Additional Philips Respironics devices tested and fully supported:
|
||||
<ul>
|
||||
<li>DreamStation 2 Auto CPAP Advanced with P-Flex (521X120C)</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>[fix] File Export Sessions now exports statistics session data properly.</li>
|
||||
<li>[fix] Fixed a rare crash on import when encountering corrupted Philips Respironics directories.</li>
|
||||
</ul>
|
||||
<p>
|
||||
<b>Changes and fixes in OSCAR v1.3.5-alpha.0</b>
|
||||
<br>Portions of OSCAR are © 2019-2022 by
|
||||
<i>The OSCAR Team</i></p>
|
||||
@ -20,7 +44,6 @@
|
||||
<li>DreamStation 2 Auto CPAP Advanced (520X110C, 520X150C)</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>[fix] File Export Sessions now exports statistics session data properly.</li>
|
||||
<li>[new] Test Mantis integration.</li>
|
||||
</ul>
|
||||
<p>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -7,6 +7,20 @@
|
||||
* License. See the file COPYING in the main directory of the source code
|
||||
* for more details. */
|
||||
|
||||
#define xDEBUG_FUNCTIONS
|
||||
#ifdef DEBUG_FUNCTIONS
|
||||
#include <QRegularExpression>
|
||||
#define DEBUG qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__
|
||||
#define DEBUGF qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__
|
||||
#define DEBUGTF qDebug()<<QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz") << QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__
|
||||
|
||||
#define O( XX ) " " #XX ":" << XX
|
||||
#define OO( XX , YY ) " " #XX ":" << YY
|
||||
#define NAME( id) schema::channel[ id ].label()
|
||||
#define DATE( XX ) QDateTime::fromMSecsSinceEpoch(XX).toString("dd MMM yyyy")
|
||||
#define DATETIME( XX ) QDateTime::fromMSecsSinceEpoch(XX).toString("dd MMM yyyy hh:mm:ss.zzz")
|
||||
#endif
|
||||
|
||||
#include "Graphs/gGraphView.h"
|
||||
|
||||
#include <QDir>
|
||||
@ -470,7 +484,7 @@ void gGraphView::popoutGraph()
|
||||
qDebug() << "widget geometry" << newDockWidget->frameGeometry() << "title bar height" << titleBarHeight;
|
||||
if (newDockHeight > screenHeight) {
|
||||
QMessageBox::warning(nullptr, STR_MessageBox_Warning,
|
||||
QObject::tr("The popout window is full. You should capture the existing\npopout window, delete it, then pop out this graph again."));
|
||||
QObject::tr("The popout window is full. You should capture the existing\npopout window, delete it, then pop out this graph again."));
|
||||
return;
|
||||
}
|
||||
qDebug() << "dock height" << dock->height() << "popout graph height" << popout_graph->height();
|
||||
@ -1151,6 +1165,8 @@ void gGraphView::GetXBounds(qint64 &st, qint64 &et)
|
||||
// Supplies time range to all graph objects in linked group, refreshing if requested
|
||||
void gGraphView::SetXBounds(qint64 minx, qint64 maxx, short group, bool refresh)
|
||||
{
|
||||
bool changed= (minx!=m_minx)||(maxx!=m_maxx);
|
||||
|
||||
for (auto & graph : m_graphs) {
|
||||
if ((graph->group() == group)) {
|
||||
graph->SetXBounds(minx, maxx);
|
||||
@ -1161,6 +1177,7 @@ void gGraphView::SetXBounds(qint64 minx, qint64 maxx, short group, bool refresh)
|
||||
m_maxx = maxx;
|
||||
|
||||
if (refresh) { timedRedraw(0); }
|
||||
if (changed) emit XBoundsChanged(minx ,maxx);
|
||||
}
|
||||
|
||||
void gGraphView::updateScrollBar()
|
||||
|
||||
@ -707,6 +707,7 @@ class gGraphView
|
||||
void updateCurrentTime(double);
|
||||
void updateRange(double,double);
|
||||
void GraphsChanged();
|
||||
void XBoundsChanged(qint64 ,qint64);
|
||||
|
||||
public slots:
|
||||
//! \brief Callback from the ScrollBar, to change scroll position
|
||||
|
||||
@ -7,6 +7,20 @@
|
||||
* License. See the file COPYING in the main directory of the source code
|
||||
* for more details. */
|
||||
|
||||
#define xDEBUG_FUNCTIONS
|
||||
#ifdef DEBUG_FUNCTIONS
|
||||
#include <QRegularExpression>
|
||||
#define DEBUG qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__
|
||||
#define DEBUGF qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__
|
||||
#define DEBUGTF qDebug()<<QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz") << QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__
|
||||
|
||||
#define O( XX ) " " #XX ":" << XX
|
||||
#define OO( XX , YY ) " " #XX ":" << YY
|
||||
#define NAME( id) schema::channel[ id ].label()
|
||||
#define DATE( XX ) QDateTime::fromMSecsSinceEpoch(XX).toString("dd MMM yyyy")
|
||||
#define DATETIME( XX ) QDateTime::fromMSecsSinceEpoch(XX).toString("dd MMM yyyy hh:mm:ss.zzz")
|
||||
#endif
|
||||
|
||||
#include <math.h>
|
||||
#include <QLabel>
|
||||
#include <QDateTime>
|
||||
@ -104,13 +118,11 @@ void gSummaryChart::SetDay(Day *unused_day)
|
||||
m_maxy = 20;
|
||||
|
||||
m_empty = false;
|
||||
m_emptyPrev = true;
|
||||
|
||||
}
|
||||
|
||||
|
||||
//QMap<QDate, int> gSummaryChart::dayindex;
|
||||
//QList<Day *> gSummaryChart::daylist;
|
||||
|
||||
int gSummaryChart::addCalc(ChannelID code, SummaryType type, QColor color)
|
||||
{
|
||||
calcitems.append(SummaryCalcItem(code, type, color));
|
||||
@ -565,7 +577,8 @@ void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion ®io
|
||||
|
||||
totaldays++;
|
||||
|
||||
if (!day) {// || !day->hasMachine(m_machtype)) {
|
||||
if (!day)
|
||||
{
|
||||
// lasty1 = rect.bottom();
|
||||
lastx1 += barw;
|
||||
it++;
|
||||
@ -675,9 +688,13 @@ void gSummaryChart::paint(QPainter &painter, gGraph &graph, const QRegion ®io
|
||||
|
||||
// This could be turning off graphs prematurely..
|
||||
if (cache.size() == 0) {
|
||||
|
||||
m_empty = true;
|
||||
m_emptyPrev = true;
|
||||
graph.graphView()->updateScale();
|
||||
emit summaryChartEmpty(this,m_minx,m_maxx,true);
|
||||
} else if (m_emptyPrev) {
|
||||
m_emptyPrev = false;
|
||||
emit summaryChartEmpty(this,m_minx,m_maxx,false);
|
||||
}
|
||||
|
||||
}
|
||||
@ -1019,8 +1036,8 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
|
||||
|
||||
totaldays++;
|
||||
|
||||
|
||||
if (!day) { // || !day->hasMachine(m_machtype)) {
|
||||
if (!day)
|
||||
{
|
||||
// lasty1 = rect.bottom();
|
||||
lastx1 += barw;
|
||||
nousedays++;
|
||||
@ -1091,6 +1108,7 @@ void gSessionTimesChart::paint(QPainter &painter, gGraph &graph, const QRegion &
|
||||
afterDraw(painter, graph, rect);
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
/// Total Time in Apnea Chart Stuff
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -155,8 +155,9 @@ struct SummaryChartSlice {
|
||||
// QBrush brush;
|
||||
};
|
||||
|
||||
class gSummaryChart : public Layer
|
||||
class gSummaryChart : public QObject , public Layer
|
||||
{
|
||||
Q_OBJECT;
|
||||
public:
|
||||
gSummaryChart(QString label, MachineType machtype);
|
||||
gSummaryChart(ChannelID code, MachineType machtype);
|
||||
@ -171,6 +172,9 @@ public:
|
||||
//! \brief Returns true if no data was found for this day during SetDay
|
||||
virtual bool isEmpty() { return m_empty; }
|
||||
|
||||
//! \brief Allows chart to recalculate empty flag.
|
||||
void reCalculate() {m_empty=false;};
|
||||
|
||||
virtual void populate(Day *, int idx);
|
||||
|
||||
//! \brief Override to setup custom stuff before main loop
|
||||
@ -217,6 +221,8 @@ public:
|
||||
layer->dayindex = dayindex;
|
||||
layer->daylist = daylist;
|
||||
}
|
||||
signals:
|
||||
void summaryChartEmpty(gSummaryChart*,qint64,qint64,bool);
|
||||
|
||||
protected:
|
||||
//! \brief Key was pressed that effects this layer
|
||||
@ -234,6 +240,7 @@ protected:
|
||||
QString m_label;
|
||||
MachineType m_machtype;
|
||||
bool m_empty;
|
||||
bool m_emptyPrev;
|
||||
int hl_day;
|
||||
int tz_offset;
|
||||
float tz_hours;
|
||||
@ -261,6 +268,7 @@ protected:
|
||||
};
|
||||
|
||||
|
||||
|
||||
/*! \class gSessionTimesChart
|
||||
\brief Displays a summary of session times
|
||||
*/
|
||||
|
||||
@ -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); }
|
||||
|
||||
@ -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)) {
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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");
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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();
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
@ -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; }
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -26,6 +26,9 @@ const char AnnoSep = 20;
|
||||
const char AnnoDurMark = 21;
|
||||
const char AnnoEnd = 0;
|
||||
|
||||
// EDFType is used by all the edf loaders - resmed and sleepstyle, so far
|
||||
enum EDFType { EDF_UNKNOWN, EDF_BRP, EDF_PLD, EDF_SAD, EDF_EVE, EDF_CSL, EDF_AEV, EDF_RT };
|
||||
|
||||
/*! \struct EDFHeader
|
||||
\brief Represents the EDF+ header structure, used as a place holder while processing the text data.
|
||||
\note More information on the EDF+ file format can be obtained from http://edfplus.info
|
||||
|
||||
@ -78,7 +78,7 @@ QString getIconDir2 (QString givenpath) {
|
||||
}
|
||||
|
||||
/*
|
||||
* getIconMachines returns a list of all Iocn machine folders in the ICON directory
|
||||
* getIconMachines returns a list of all Iocn device folders in the ICON directory
|
||||
*/
|
||||
QStringList getIconMachines (QString iconPath) {
|
||||
QStringList iconMachines;
|
||||
@ -108,7 +108,7 @@ QStringList getIconMachines (QString iconPath) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Find out what machine model this is
|
||||
// Find out what device model this is
|
||||
QFile sumFile (flist.at(0).absoluteFilePath());
|
||||
|
||||
QString line;
|
||||
@ -139,7 +139,7 @@ bool FPIconLoader::Detect(const QString & givenpath)
|
||||
|
||||
QStringList machines = getIconMachines(iconPath);
|
||||
if (machines.length() <= 0)
|
||||
// Did not find any SleepStyle machine directories
|
||||
// Did not find any SleepStyle device directories
|
||||
return false;
|
||||
|
||||
return true;
|
||||
@ -206,7 +206,7 @@ int FPIconLoader::Open(const QString & path)
|
||||
|
||||
QStringList serialNumbers = getIconMachines(iconPath);
|
||||
if (serialNumbers.length() <= 0)
|
||||
// Did not find any SleepStyle machine directories
|
||||
// Did not find any SleepStyle device directories
|
||||
return false;
|
||||
|
||||
Machine *m;
|
||||
@ -230,7 +230,7 @@ int FPIconLoader::Open(const QString & path)
|
||||
p_profile->DelMachine(m);
|
||||
MachList.erase(MachList.find(info.serial));
|
||||
QMessageBox::warning(nullptr, tr("Import Error"),
|
||||
tr("This Machine Record cannot be imported in this profile.")+"\n\n"+tr("The Day records overlap with already existing content."),
|
||||
tr("This device Record cannot be imported in this profile.")+"\n\n"+tr("The Day records overlap with already existing content."),
|
||||
QMessageBox::Ok);
|
||||
delete m;
|
||||
}
|
||||
@ -508,12 +508,12 @@ hour=(ts >> 12) & 0x1f; */
|
||||
|
||||
// FLW Header Structure
|
||||
// 0x0000-0x01fe
|
||||
// newline (0x0d) seperated list of machine information strings.
|
||||
// newline (0x0d) seperated list of device information strings.
|
||||
// magic? 0201
|
||||
// version 1.5.0
|
||||
// serial number 12 digits
|
||||
// Machine Series "ICON"
|
||||
// Machine Model "Auto"
|
||||
// Device Series "ICON"
|
||||
// Device Model "Auto"
|
||||
// Remainder of header is 0 filled...
|
||||
// 0x01ff 8 bit additive sum checksum byte of previous header bytes
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ const int fpicon_data_version = 3;
|
||||
//********************************************************************************************
|
||||
|
||||
/*! \class FPIcon
|
||||
\brief F&P Icon customized machine object
|
||||
\brief F&P Icon customized device object
|
||||
*/
|
||||
class FPIcon: public CPAP
|
||||
{
|
||||
@ -68,10 +68,10 @@ class FPIconLoader : public CPAPLoader
|
||||
//! \brief Returns SleepLib database version of this F&P Icon loader
|
||||
virtual int Version() { return fpicon_data_version; }
|
||||
|
||||
//! \brief Returns the machine class name of this CPAP machine, "FPIcon"
|
||||
//! \brief Returns the device class name of this CPAP device, "FPIcon"
|
||||
virtual const QString & loaderName() { return fpicon_class_name; }
|
||||
|
||||
// ! \brief Creates a machine object, indexed by serial number
|
||||
// ! \brief Creates a device object, indexed by serial number
|
||||
//Machine *CreateMachine(QString serial);
|
||||
|
||||
virtual MachineInfo newInfo() {
|
||||
|
||||
@ -238,7 +238,7 @@ int IntellipapLoader::OpenDV5(const QString & path)
|
||||
mode = (set_epap > 0) ? MODE_BILEVEL_FIXED : MODE_APAP;
|
||||
break;
|
||||
default:
|
||||
qDebug() << "New machine mode";
|
||||
qDebug() << "New device mode";
|
||||
}
|
||||
|
||||
if (!info.serial.isEmpty()) {
|
||||
@ -246,7 +246,7 @@ int IntellipapLoader::OpenDV5(const QString & path)
|
||||
}
|
||||
|
||||
if (!mach) {
|
||||
qDebug() << "Couldn't get Intellipap machine record";
|
||||
qDebug() << "Couldn't get Intellipap device record";
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -602,11 +602,11 @@ int IntellipapLoader::OpenDV5(const QString & path)
|
||||
// 1a) Flow graph for days without high resolution data is absent
|
||||
// 1b) Pressure graph is high resolution when high res data is available and
|
||||
// only 1 per minute when using low resolution data.
|
||||
// 2) Max and Average leak rates are as reported by DV64 machine but we're
|
||||
// not sure how those measures relate to other machine's data. Leak rate
|
||||
// 2) Max and Average leak rates are as reported by DV64 device but we're
|
||||
// not sure how those measures relate to other device's data. Leak rate
|
||||
// seems to include the intentional mask leak.
|
||||
// 2a) Not sure how SmartLink calculates the pct of time of poor mask fit.
|
||||
// May be same as what we call large leak time for other machines?
|
||||
// May be same as what we call large leak time for other devices?
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
struct DV6TestedModel
|
||||
@ -1735,7 +1735,7 @@ bool load6HighResData () {
|
||||
#endif
|
||||
if (inSession && sess) {
|
||||
// update min and max
|
||||
// then add to machine
|
||||
// then add to device
|
||||
if (sess->first() == 0)
|
||||
qWarning() << "R.BIN first = 0 - 1284";
|
||||
EventDataType min = flow->Min();
|
||||
@ -2129,7 +2129,7 @@ bool load6HighResData () {
|
||||
if (inPB) RE->AddEvent(REstart,(REend-REstart) / 1000L);
|
||||
***/
|
||||
// update min and max
|
||||
// then add to machine
|
||||
// then add to device
|
||||
if (sess->first() == 0)
|
||||
qWarning() << "R.BIN first = 0 - 1665";
|
||||
EventDataType min = flow->Min();
|
||||
@ -2640,10 +2640,10 @@ bool backup6 (const QString & path) {
|
||||
|
||||
bool init6Environment (const QString & path) {
|
||||
|
||||
// Create Machine database record if it doesn't exist already
|
||||
// Create device database record if it doesn't exist already
|
||||
mach = p_profile->CreateMachine(info);
|
||||
if (mach == nullptr) {
|
||||
qWarning() << "Could not create DV6 Machine data structure";
|
||||
qWarning() << "Could not create DV6 device data structure";
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -2695,7 +2695,7 @@ int IntellipapLoader::OpenDV6(const QString & path)
|
||||
emit setProgressValue(0);
|
||||
QCoreApplication::processEvents();
|
||||
|
||||
// 1. Prime the machine database's info field with this machine
|
||||
// 1. Prime the device database's info field with this device
|
||||
info = newInfo();
|
||||
|
||||
// 2. VER.BIN - Parse model number, serial, etc. into info structure
|
||||
@ -2717,7 +2717,7 @@ int IntellipapLoader::OpenDV6(const QString & path)
|
||||
emit updateMessage(QObject::tr("Backing up files..."));
|
||||
QCoreApplication::processEvents();
|
||||
|
||||
// 6. Back up data files (must do after parsing VER.BIN, S.BIN, and creating Machine)
|
||||
// 6. Back up data files (must do after parsing VER.BIN, S.BIN, and creating device)
|
||||
if (!backup6(path))
|
||||
return -1;
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ const int intellipap_data_version = 3;
|
||||
//********************************************************************************************
|
||||
|
||||
/*! \class Intellipap
|
||||
\brief Intellipap customized machine object
|
||||
\brief Intellipap customized device object
|
||||
*/
|
||||
class Intellipap: public CPAP
|
||||
{
|
||||
@ -65,10 +65,10 @@ class IntellipapLoader : public CPAPLoader
|
||||
//! \brief Returns SleepLib database version of this IntelliPap loader
|
||||
virtual int Version() { return intellipap_data_version; }
|
||||
|
||||
//! \brief Returns the machine class name of this IntelliPap, "Intellipap"
|
||||
//! \brief Returns the device class name of this IntelliPap, "Intellipap"
|
||||
virtual const QString &loaderName() { return intellipap_class_name; }
|
||||
|
||||
//! \brief Creates a machine object, indexed by serial number
|
||||
//! \brief Creates a device object, indexed by serial number
|
||||
// Machine *CreateMachine(QString serial);
|
||||
|
||||
//! \brief Registers this MachineLoader with the master list, so Intellipap data can load
|
||||
|
||||
@ -27,7 +27,7 @@ const int mseries_data_version = 2;
|
||||
//********************************************************************************************
|
||||
|
||||
/*! \class MSeries
|
||||
\brief RemStar M-Series customized machine object
|
||||
\brief RemStar M-Series customized device object
|
||||
*/
|
||||
class MSeries: public CPAP
|
||||
{
|
||||
@ -60,7 +60,7 @@ class MSeriesLoader : public MachineLoader
|
||||
//! \brief Return the loaderName, in this case "MSeries"
|
||||
virtual const QString & loaderName() { return mseries_class_name; }
|
||||
|
||||
//! \brief Create a new PRS1 machine record, indexed by Serial number.
|
||||
//! \brief Create a new PRS1 device record, indexed by Serial number.
|
||||
// Machine *CreateMachine(QString serial);
|
||||
|
||||
virtual MachineInfo newInfo() {
|
||||
|
||||
@ -104,6 +104,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
|
||||
{ "562P", 0, 4, "REMstar Auto (System One 60 Series)" },
|
||||
{ "660P", 0, 4, "BiPAP Pro (System One 60 Series)" },
|
||||
{ "760P", 0, 4, "BiPAP Auto (System One 60 Series)" },
|
||||
{ "761P", 0, 4, "BiPAP Auto (System One 60 Series)" },
|
||||
|
||||
{ "501V", 0, 5, "Dorma 500 Auto (System One 60 Series)" }, // (brick)
|
||||
|
||||
@ -133,6 +134,7 @@ static const PRS1TestedModel s_PRS1TestedModels[] = {
|
||||
|
||||
{ "520X110C", 0, 6, "DreamStation 2 Auto CPAP Advanced" }, // based on bottom label, boot screen says "Advanced Auto CPAP"
|
||||
{ "520X150C", 0, 6, "DreamStation 2 Auto CPAP Advanced" }, // from user report
|
||||
{ "521X120C", 0, 6, "DreamStation 2 Auto CPAP Advanced with P-Flex" }, // inferred from 501X120 and presence of "P-Flex" on bottom label
|
||||
|
||||
{ "950P", 5, 0, "BiPAP AutoSV Advanced System One" },
|
||||
{ "951P", 5, 0, "BiPAP AutoSV Advanced System One" },
|
||||
@ -447,7 +449,7 @@ bool PRDS2File::parseDS2Header()
|
||||
qWarning() << "DS2 unexpected middle bytes =" << f << g;
|
||||
}
|
||||
|
||||
QByteArray import_key = readBytes(); // payload key encrypted with machine-specific key
|
||||
QByteArray import_key = readBytes(); // payload key encrypted with device-specific key
|
||||
QByteArray import_key_tag = readBytes(); // tag of import key
|
||||
if (import_key.size() != 32 || import_key_tag.size() != 16) {
|
||||
qWarning() << "DS2 import_key sizes =" << import_key.size() << import_key_tag.size();
|
||||
@ -587,7 +589,7 @@ QStringList PRS1Loader::FindMachinesOnCard(const QString & cardPath)
|
||||
pseries.setSorting(QDir::Name);
|
||||
QFileInfoList plist = pseries.entryInfoList();
|
||||
|
||||
// Look for machine directories (containing a PROP.TXT or properties.txt)
|
||||
// Look for device directories (containing a PROP.TXT or properties.txt)
|
||||
QFileInfoList propertyfiles;
|
||||
for (auto & pfi : plist) {
|
||||
if (pfi.isDir()) {
|
||||
@ -596,18 +598,18 @@ QStringList PRS1Loader::FindMachinesOnCard(const QString & cardPath)
|
||||
QFileInfoList mlist = machineDir.entryInfoList();
|
||||
for (auto & mfi : mlist) {
|
||||
if (QDir::match("PROP*.TXT", mfi.fileName())) {
|
||||
// Found a properties file, this is a machine folder
|
||||
// Found a properties file, this is a device folder
|
||||
propertyfiles.append(mfi);
|
||||
}
|
||||
if (QDir::match("PROP.BIN", mfi.fileName())) {
|
||||
// Found a DreamStation 2 properties file, this is a machine folder
|
||||
// Found a DreamStation 2 properties file, this is a device folder
|
||||
propertyfiles.append(mfi);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Sort machines from oldest to newest.
|
||||
// Sort devices from oldest to newest.
|
||||
std::sort(propertyfiles.begin(), propertyfiles.end(),
|
||||
[](const QFileInfo & a, const QFileInfo & b)
|
||||
{
|
||||
@ -777,7 +779,7 @@ MachineInfo PRS1Loader::PeekInfo(const QString & path)
|
||||
return MachineInfo();
|
||||
}
|
||||
|
||||
// Present information about the newest machine on the card.
|
||||
// Present information about the newest device on the card.
|
||||
QString newpath = machines.last();
|
||||
|
||||
MachineInfo info = newInfo();
|
||||
@ -803,14 +805,14 @@ int PRS1Loader::Open(const QString & selectedPath)
|
||||
}
|
||||
|
||||
QStringList machines = FindMachinesOnCard(path);
|
||||
// Return an error if no machines were found.
|
||||
// Return an error if no devices were found.
|
||||
if (machines.isEmpty()) {
|
||||
qDebug() << "No PRS1 machines found at" << path;
|
||||
qDebug() << "No PRS1 devices found at" << path;
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Import each machine, from oldest to newest.
|
||||
// TODO: Loaders should return the set of machines during detection, so that Open() will
|
||||
// Import each device, from oldest to newest.
|
||||
// TODO: Loaders should return the set of devices during detection, so that Open() will
|
||||
// open a unique device, instead of surprising the user.
|
||||
int c = 0;
|
||||
bool failures = false;
|
||||
@ -954,7 +956,7 @@ bool PRS1Loader::CreateMachineFromProperties(QString propertyfile)
|
||||
emit deviceReportsUsageOnly(info);
|
||||
}
|
||||
|
||||
// Which is needed to get the right machine record..
|
||||
// Which is needed to get the right device record..
|
||||
m_ctx->CreateMachineFromInfo(info);
|
||||
|
||||
if (!s_PRS1ModelInfo.IsTested(props)) {
|
||||
@ -1098,7 +1100,7 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base)
|
||||
if (ext == 5) {
|
||||
// Occasionally waveforms in a session can be split into multiple files.
|
||||
//
|
||||
// This seems to happen when the machine begins writing the waveform file
|
||||
// This seems to happen when the device begins writing the waveform file
|
||||
// before realizing that it will hit its 500-file-per-directory limit
|
||||
// for the remaining session files, at which point it appears to write
|
||||
// the rest of the waveform data along with the summary and event files
|
||||
@ -1128,7 +1130,7 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base)
|
||||
|
||||
SessionID chunk_sid = chunk->sessionid;
|
||||
if (i == 0 && chunk_sid != sid) { // log session ID mismatches
|
||||
// This appears to be benign, probably when a card is out of the machine one night and
|
||||
// This appears to be benign, probably when a card is out of the device one night and
|
||||
// then inserted in the morning. It writes out all of the still-in-memory summaries and
|
||||
// events up through the last night (and no waveform data).
|
||||
//
|
||||
@ -1167,11 +1169,11 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base)
|
||||
switch (ext) {
|
||||
case 0:
|
||||
if (task->compliance) {
|
||||
if (chunksIdentical(chunk, task->summary)) {
|
||||
if (chunksIdentical(chunk, task->compliance)) {
|
||||
// Never seen identical compliance chunks, so keep logging this for now.
|
||||
qDebug() << chunkComparison(chunk, task->summary);
|
||||
qDebug() << chunkComparison(chunk, task->compliance);
|
||||
} else {
|
||||
qWarning() << chunkComparison(chunk, task->summary);
|
||||
qWarning() << chunkComparison(chunk, task->compliance);
|
||||
}
|
||||
delete chunk;
|
||||
continue; // (skipping to avoid duplicates)
|
||||
@ -1345,8 +1347,8 @@ void PRS1Import::CreateEventChannels(const PRS1DataChunk* chunk)
|
||||
{
|
||||
const QVector<PRS1ParsedEventType> & supported = GetSupportedEvents(chunk);
|
||||
|
||||
// Generate the list of channels created by non-slice events for this machine.
|
||||
// We can't just use the full list of non-slice events, since on some machines
|
||||
// Generate the list of channels created by non-slice events for this device.
|
||||
// We can't just use the full list of non-slice events, since on some devices
|
||||
// PS is generated by slice events (EPAP/IPAP average).
|
||||
// TODO: convert supported to QSet and clean this up.
|
||||
QSet<PRS1ParsedEventType> supportedNonSliceEvents = QSet<PRS1ParsedEventType>::fromList(QList<PRS1ParsedEventType>::fromVector(supported));
|
||||
@ -1587,7 +1589,7 @@ bool PRS1Import::ImportEventChunk(PRS1DataChunk* event)
|
||||
// We can't just call it again here for simplicity, since the timestamps of F3V3 stat events
|
||||
// can go past the end of the slice.
|
||||
} else {
|
||||
// For all other machines, the event's time stamp will be within bounds of its slice, so
|
||||
// For all other devices, the event's time stamp will be within bounds of its slice, so
|
||||
// we can use it to find the current slice.
|
||||
UpdateCurrentSlice(event, t);
|
||||
}
|
||||
@ -1709,7 +1711,7 @@ void PRS1Import::ImportEvent(qint64 t, PRS1ParsedEvent* e)
|
||||
|
||||
// TODO: Filter out duplicate/overlapping PB and RE events.
|
||||
//
|
||||
// These actually get reported by the machines, but they cause "unordered time" warnings
|
||||
// These actually get reported by the devices, but they cause "unordered time" warnings
|
||||
// and they throw off the session statistics. Even official reports show the wrong stats,
|
||||
// for example counting each of 3 duplicate PBs towards the total time in PB.
|
||||
//
|
||||
@ -2506,9 +2508,9 @@ void PRS1Import::ImportWaveforms()
|
||||
// - In the case of multiple discontinuities, fitting them is more complicated
|
||||
// > The down side of this approach is that events won't line up exactly the same as official reports.
|
||||
//
|
||||
// Evidently the machines' internal clock drifts slightly, and in some sessions that
|
||||
// Evidently the devices' internal clock drifts slightly, and in some sessions that
|
||||
// means two adjacent (5-minute) waveform chunks have have a +/- 1 second difference in
|
||||
// their notion of the correct time, since the machines only record time at 1-second
|
||||
// their notion of the correct time, since the devices only record time at 1-second
|
||||
// resolution. Presumably the real drift is fractional, but there's no way to tell from
|
||||
// the data.
|
||||
//
|
||||
@ -2531,7 +2533,7 @@ void PRS1Import::ImportWaveforms()
|
||||
if ((waveform->family == 5 && (waveform->familyVersion == 2 || waveform->familyVersion == 3)) ||
|
||||
(waveform->family == 3 && waveform->familyVersion == 6)){
|
||||
// F5V2, F5V3, and F3V6 use a gain of 0.125 rather than 0.1 to allow for a maximum value of 30 cmH2O
|
||||
pressure_gain = 0.125F; // TODO: this should be parameterized somewhere better, once we have a clear idea of which machines use this
|
||||
pressure_gain = 0.125F; // TODO: this should be parameterized somewhere better, once we have a clear idea of which devices use this
|
||||
}
|
||||
|
||||
// Process interleaved samples
|
||||
@ -2950,7 +2952,7 @@ void PRS1Loader::initChannels()
|
||||
channel.add(GRP_CPAP, chan = new Channel(PRS1_AutoOn = 0xe109, SETTING, MT_CPAP, SESSION,
|
||||
"PRS1AutoOn",
|
||||
QObject::tr("Auto On"),
|
||||
QObject::tr("A few breaths automatically starts machine"),
|
||||
QObject::tr("A few breaths automatically starts device"),
|
||||
QObject::tr("Auto On"),
|
||||
"", LOOKUP, Qt::green));
|
||||
chan->addOption(0, STR_TR_Off);
|
||||
@ -2959,7 +2961,7 @@ void PRS1Loader::initChannels()
|
||||
channel.add(GRP_CPAP, chan = new Channel(PRS1_AutoOff = 0xe10a, SETTING, MT_CPAP, SESSION,
|
||||
"PRS1AutoOff",
|
||||
QObject::tr("Auto Off"),
|
||||
QObject::tr("Machine automatically switches off"),
|
||||
QObject::tr("Device automatically switches off"),
|
||||
QObject::tr("Auto Off"),
|
||||
"", LOOKUP, Qt::green));
|
||||
chan->addOption(0, STR_TR_Off);
|
||||
@ -2968,7 +2970,7 @@ void PRS1Loader::initChannels()
|
||||
channel.add(GRP_CPAP, chan = new Channel(PRS1_MaskAlert = 0xe10b, SETTING, MT_CPAP, SESSION,
|
||||
"PRS1MaskAlert",
|
||||
QObject::tr("Mask Alert"),
|
||||
QObject::tr("Whether or not machine allows Mask checking."),
|
||||
QObject::tr("Whether or not device allows Mask checking."),
|
||||
QObject::tr("Mask Alert"),
|
||||
"", LOOKUP, Qt::green));
|
||||
chan->addOption(0, STR_TR_Off);
|
||||
@ -2977,7 +2979,7 @@ void PRS1Loader::initChannels()
|
||||
channel.add(GRP_CPAP, chan = new Channel(PRS1_ShowAHI = 0xe10c, SETTING, MT_CPAP, SESSION,
|
||||
"PRS1ShowAHI",
|
||||
QObject::tr("Show AHI"),
|
||||
QObject::tr("Whether or not machine shows AHI via built-in display."),
|
||||
QObject::tr("Whether or not device shows AHI via built-in display."),
|
||||
QObject::tr("Show AHI"),
|
||||
"", LOOKUP, Qt::green));
|
||||
chan->addOption(0, STR_TR_Off);
|
||||
@ -3020,7 +3022,7 @@ void PRS1Loader::initChannels()
|
||||
channel.add(GRP_CPAP, chan = new Channel(PRS1_AutoTrial = 0xe117, SETTING, MT_CPAP, SESSION,
|
||||
"PRS1AutoTrial",
|
||||
QObject::tr("Auto-Trial Duration"),
|
||||
QObject::tr("The number of days in the Auto-CPAP trial period, after which the machine will revert to CPAP"),
|
||||
QObject::tr("The number of days in the Auto-CPAP trial period, after which the device will revert to CPAP"),
|
||||
QObject::tr("Auto-Trial Dur."),
|
||||
"", LOOKUP, Qt::black));
|
||||
|
||||
@ -3045,7 +3047,7 @@ void PRS1Loader::initChannels()
|
||||
channel.add(GRP_CPAP, new Channel(PRS1_BND = 0x1159, SPAN, MT_CPAP, SESSION,
|
||||
"PRS1_BND",
|
||||
QObject::tr("Breathing Not Detected"),
|
||||
QObject::tr("A period during a session where the machine could not detect flow."),
|
||||
QObject::tr("A period during a session where the device could not detect flow."),
|
||||
QObject::tr("BND"),
|
||||
STR_UNIT_Unknown,
|
||||
DEFAULT, QColor("light purple")));
|
||||
|
||||
@ -104,9 +104,9 @@ protected:
|
||||
int summary_duration;
|
||||
int m_sessionid_base; // base for inferring session ID from filename
|
||||
|
||||
//! \brief Translate the PRS1-specific machine mode to the importable vendor-neutral enum.
|
||||
//! \brief Translate the PRS1-specific device mode to the importable vendor-neutral enum.
|
||||
CPAPMode importMode(int mode);
|
||||
//! \brief Parse all the chunks in a single machine session
|
||||
//! \brief Parse all the chunks in a single device session
|
||||
bool ParseSession(void);
|
||||
|
||||
//! \brief Cache a single slice from a summary or compliance chunk.
|
||||
@ -211,16 +211,16 @@ class PRS1Loader : public CPAPLoader
|
||||
//! \brief Returns the path of the P-Series folder (whatever case) if present on the card
|
||||
QString GetPSeriesPath(const QString & path);
|
||||
|
||||
//! \brief Returns the path for each machine detected on an SD card, from oldest to newest
|
||||
//! \brief Returns the path for each device detected on an SD card, from oldest to newest
|
||||
QStringList FindMachinesOnCard(const QString & cardPath);
|
||||
|
||||
//! \brief Opens the SD folder structure for this machine, scans for data files and imports any new sessions
|
||||
//! \brief Opens the SD folder structure for this device, scans for data files and imports any new sessions
|
||||
int OpenMachine(const QString & path);
|
||||
|
||||
//! \brief Finds the P0,P1,... session paths and property pathname and returns the base (10 or 16) of the session filenames
|
||||
int FindSessionDirsAndProperties(const QString & path, QStringList & paths, QString & propertyfile);
|
||||
|
||||
//! \brief Reads the model number from the property file, evaluates its capabilities, and returns true if the machine is supported
|
||||
//! \brief Reads the model number from the property file, evaluates its capabilities, and returns true if the device is supported
|
||||
bool CreateMachineFromProperties(QString propertyfile);
|
||||
|
||||
//! \brief Scans the given directories for session data and create an import task for each logical session.
|
||||
|
||||
@ -539,7 +539,7 @@ void PRS1DataChunk::ParseHumidifierSetting50Series(int humid, bool add_setting)
|
||||
|
||||
// Check for truly unexpected values:
|
||||
if (humidlevel > 5) UNEXPECTED_VALUE(humidlevel, "<= 5");
|
||||
//if (!humidifier_present) CHECK_VALUES(humidlevel, 0, 1); // Some machines appear to encode the humidlevel setting even when the humidifier is not present.
|
||||
//if (!humidifier_present) CHECK_VALUES(humidlevel, 0, 1); // Some devices appear to encode the humidlevel setting even when the humidifier is not present.
|
||||
}
|
||||
|
||||
|
||||
@ -1103,7 +1103,7 @@ bool PRS1DataChunk::ReadNormalHeaderV3(RawDataDevice & f)
|
||||
unsigned char * header;
|
||||
QByteArray headerB2;
|
||||
|
||||
// This is a new machine, byte 15 is header data block length
|
||||
// This is a new device, byte 15 is header data block length
|
||||
// followed by variable, data byte pairs
|
||||
do {
|
||||
QByteArray extra = f.read(1);
|
||||
|
||||
@ -503,7 +503,7 @@ public:
|
||||
//! \brief Read the chunk's data from a PRS1 file and calculate its CRC, must be called after ReadHeader
|
||||
bool ReadData(class RawDataDevice & f);
|
||||
|
||||
//! \brief Figures out which Compliance Parser to call, based on machine family/version and calls it.
|
||||
//! \brief Figures out which Compliance Parser to call, based on device family/version and calls it.
|
||||
bool ParseCompliance(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .000 file containing compliance data for a P25x brick
|
||||
@ -518,28 +518,28 @@ public:
|
||||
//! \brief Parse a single data chunk from a .000 file containing compliance data for a DreamStation 200X brick
|
||||
bool ParseComplianceF0V6(void);
|
||||
|
||||
//! \brief Figures out which Summary Parser to call, based on machine family/version and calls it.
|
||||
//! \brief Figures out which Summary Parser to call, based on device family/version and calls it.
|
||||
bool ParseSummary();
|
||||
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 0 CPAP/APAP family version 2 or 3 machine
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 0 CPAP/APAP family version 2 or 3 device
|
||||
bool ParseSummaryF0V23(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 0 CPAP/APAP family version 4 machine
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 0 CPAP/APAP family version 4 device
|
||||
bool ParseSummaryF0V4(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 0 CPAP/APAP family version 6 machine
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 0 CPAP/APAP family version 6 device
|
||||
bool ParseSummaryF0V6(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 3 ventilator (family version 0 or 3) machine
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 3 ventilator (family version 0 or 3) device
|
||||
bool ParseSummaryF3V03(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 3 ventilator (family version 6) machine
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 3 ventilator (family version 6) device
|
||||
bool ParseSummaryF3V6(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 5 ASV family version 0-2 machine
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 5 ASV family version 0-2 device
|
||||
bool ParseSummaryF5V012(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 5 ASV family version 3 machine
|
||||
//! \brief Parse a single data chunk from a .001 file containing summary data for a family 5 ASV family version 3 device
|
||||
bool ParseSummaryF5V3(void);
|
||||
|
||||
//! \brief Parse a flex setting byte from a .000 or .001 containing compliance/summary data for CPAP/APAP family versions 2, 3, 4, or 5
|
||||
@ -548,49 +548,49 @@ public:
|
||||
//! \brief Parse a flex setting byte from a .000 or .001 containing compliance/summary data for ASV family versions 0, 1, or 2
|
||||
void ParseFlexSettingF5V012(quint8 flex, int prs1mode);
|
||||
|
||||
//! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data for original System One (50-Series) machines: F0V23 and F5V0
|
||||
//! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data for original System One (50-Series) devices: F0V23 and F5V0
|
||||
void ParseHumidifierSetting50Series(int humid, bool add_setting=false);
|
||||
|
||||
//! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data for F0V4 and F5V012 (60-Series) machines
|
||||
//! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data for F0V4 and F5V012 (60-Series) devices
|
||||
void ParseHumidifierSetting60Series(unsigned char humid1, unsigned char humid2, bool add_setting=false);
|
||||
|
||||
//! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data for F3V3 machines (differs from other 60-Series machines)
|
||||
//! \brief Parse an humidifier setting byte from a .000 or .001 containing compliance/summary data for F3V3 devices (differs from other 60-Series devices)
|
||||
void ParseHumidifierSettingF3V3(unsigned char humid1, unsigned char humid2, bool add_setting=false);
|
||||
|
||||
//! \brief Parse humidifier setting bytes from a .000 or .001 containing compliance/summary data for fileversion 3 machines
|
||||
//! \brief Parse humidifier setting bytes from a .000 or .001 containing compliance/summary data for fileversion 3 devices
|
||||
void ParseHumidifierSettingV3(unsigned char byte1, unsigned char byte2, bool add_setting=false);
|
||||
|
||||
//! \brief Parse tubing type from a .001 containing summary data for fileversion 3 machines
|
||||
//! \brief Parse tubing type from a .001 containing summary data for fileversion 3 devices
|
||||
void ParseTubingTypeV3(unsigned char type);
|
||||
|
||||
//! \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 device family/version and calls it.
|
||||
bool ParseEvents(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 0 CPAP/APAP machine
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 0 CPAP/APAP device
|
||||
bool ParseEventsF0V23(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a 60 Series family 0 CPAP/APAP 60machine
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a 60 Series family 0 CPAP/APAP 60 device
|
||||
bool ParseEventsF0V4(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a DreamStation family 0 CPAP/APAP machine
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a DreamStation family 0 CPAP/APAP device
|
||||
bool ParseEventsF0V6(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 3 ventilator family version 0 or 3 machine
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 3 ventilator family version 0 or 3 device
|
||||
bool ParseEventsF3V03(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 3 ventilator family version 6 machine
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 3 ventilator family version 6 device
|
||||
bool ParseEventsF3V6(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV family version 0 machine
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV family version 0 device
|
||||
bool ParseEventsF5V0(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV family version 1 machine
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV family version 1 device
|
||||
bool ParseEventsF5V1(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV family version 2 machine
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV family version 2 device
|
||||
bool ParseEventsF5V2(void);
|
||||
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV family version 3 machine
|
||||
//! \brief Parse a single data chunk from a .002 file containing event data for a family 5 ASV family version 3 device
|
||||
bool ParseEventsF5V3(void);
|
||||
|
||||
protected:
|
||||
|
||||
@ -264,7 +264,7 @@ bool PRS1DataChunk::ParseSettingsF5V012(const unsigned char* data, int /*size*/)
|
||||
this->ParseHumidifierSetting50Series(data[0x0d], true);
|
||||
pos = 0xe;
|
||||
} else {
|
||||
// 60-Series machines have a 2-byte humidfier setting.
|
||||
// 60-Series devices have a 2-byte humidfier setting.
|
||||
this->ParseHumidifierSetting60Series(data[0x0d], data[0x0e], true);
|
||||
pos = 0xf;
|
||||
}
|
||||
@ -1002,7 +1002,7 @@ bool PRS1DataChunk::ParseEventsF5V2(void)
|
||||
// Originally based on ParseSummaryF0V6, with changes observed in ASV sample data
|
||||
// based on size, slices 0-5 look similar, and it looks like F0V6 slides 8-B are equivalent to 6-9
|
||||
//
|
||||
// TODO: surely there will be a way to merge these loops and abstract the machine-specific
|
||||
// TODO: surely there will be a way to merge these loops and abstract the device-specific
|
||||
// encodings into another function or class, but that's probably worth pursuing only after
|
||||
// the details have been figured out.
|
||||
bool PRS1DataChunk::ParseSummaryF5V3(void)
|
||||
@ -1015,7 +1015,7 @@ bool PRS1DataChunk::ParseSummaryF5V3(void)
|
||||
int chunk_size = this->m_data.size();
|
||||
static const int minimum_sizes[] = { 1, 0x35, 9, 4, 2, 4, 0x1e, 2, 4, 9 };
|
||||
static const int ncodes = sizeof(minimum_sizes) / sizeof(int);
|
||||
// NOTE: The sizes contained in hblock can vary, even within a single machine, as can the length of hblock itself!
|
||||
// NOTE: The sizes contained in hblock can vary, even within a single device, as can the length of hblock itself!
|
||||
|
||||
// TODO: hardcoding this is ugly, think of a better approach
|
||||
if (chunk_size < minimum_sizes[0] + minimum_sizes[1] + minimum_sizes[2]) {
|
||||
@ -1059,7 +1059,7 @@ bool PRS1DataChunk::ParseSummaryF5V3(void)
|
||||
switch (code) {
|
||||
case 0: // Equipment On
|
||||
CHECK_VALUE(pos, 1); // Always first?
|
||||
//CHECK_VALUES(data[pos], 1, 7); // or 3, or 0? 3 when machine turned on via auto-on, 1 when turned on via button
|
||||
//CHECK_VALUES(data[pos], 1, 7); // or 3, or 0? 3 when device turned on via auto-on, 1 when turned on via button
|
||||
CHECK_VALUE(size, 1);
|
||||
break;
|
||||
case 1: // Settings
|
||||
|
||||
@ -513,7 +513,7 @@ const QVector<PRS1ParsedEventType> ParsedEventsF3V3 = {
|
||||
// 1061, 1061T, 1160P series
|
||||
bool PRS1DataChunk::ParseEventsF3V03(void)
|
||||
{
|
||||
// NOTE: Older ventilators (BiPAP S/T and AVAPS) machines don't use timestamped events like everything else.
|
||||
// NOTE: Older ventilators (BiPAP S/T and AVAPS) devices don't use timestamped events like everything else.
|
||||
// Instead, they use a fixed interval format like waveforms do (see PRS1_HTYPE_INTERVAL).
|
||||
|
||||
if (this->family != 3 || (this->familyVersion != 0 && this->familyVersion != 3)) {
|
||||
@ -605,7 +605,7 @@ bool PRS1DataChunk::ParseEventsF3V03(void)
|
||||
|
||||
// Originally based on ParseSummaryF5V3, with changes observed in ventilator sample data
|
||||
//
|
||||
// TODO: surely there will be a way to merge ParseSummary (FV3) loops and abstract the machine-specific
|
||||
// TODO: surely there will be a way to merge ParseSummary (FV3) loops and abstract the device-specific
|
||||
// encodings into another function or class, but that's probably worth pursuing only after
|
||||
// the details have been figured out.
|
||||
bool PRS1DataChunk::ParseSummaryF3V6(void)
|
||||
@ -618,7 +618,7 @@ bool PRS1DataChunk::ParseSummaryF3V6(void)
|
||||
int chunk_size = this->m_data.size();
|
||||
static const int minimum_sizes[] = { 1, 0x25, 9, 7, 4, 2, 1, 2, 2, 1, 0x18, 2, 4 }; // F5V3 = { 1, 0x38, 4, 2, 4, 0x1e, 2, 4, 9 };
|
||||
static const int ncodes = sizeof(minimum_sizes) / sizeof(int);
|
||||
// NOTE: The sizes contained in hblock can vary, even within a single machine, as can the length of hblock itself!
|
||||
// NOTE: The sizes contained in hblock can vary, even within a single device, as can the length of hblock itself!
|
||||
|
||||
// TODO: hardcoding this is ugly, think of a better approach
|
||||
if (chunk_size < minimum_sizes[0] + minimum_sizes[1] + minimum_sizes[2]) {
|
||||
|
||||
@ -19,7 +19,7 @@ bool PRS1DataChunk::ParseComplianceF0V23(void)
|
||||
qWarning() << "ParseComplianceF0V23 called with family" << this->family << "familyVersion" << this->familyVersion;
|
||||
return false;
|
||||
}
|
||||
// All sample machines with FamilyVersion 3 in the properties.txt file have familyVersion 2 in their .001/.002/.005 files!
|
||||
// All sample devices with FamilyVersion 3 in the properties.txt file have familyVersion 2 in their .001/.002/.005 files!
|
||||
// We should flag an actual familyVersion 3 file if we ever encounter one!
|
||||
CHECK_VALUE(this->familyVersion, 2);
|
||||
|
||||
@ -104,7 +104,7 @@ bool PRS1DataChunk::ParseSummaryF0V23()
|
||||
qWarning() << "ParseSummaryF0V23 called with family" << this->family << "familyVersion" << this->familyVersion;
|
||||
return false;
|
||||
}
|
||||
// All sample machines with FamilyVersion 3 in the properties.txt file have familyVersion 2 in their .001/.002/.005 files!
|
||||
// All sample devices with FamilyVersion 3 in the properties.txt file have familyVersion 2 in their .001/.002/.005 files!
|
||||
// We should flag an actual familyVersion 3 file if we ever encounter one!
|
||||
CHECK_VALUE(this->familyVersion, 2);
|
||||
|
||||
@ -462,7 +462,7 @@ bool PRS1DataChunk::ParseEventsF0V23()
|
||||
qWarning() << "ParseEventsF0V23 called with family" << this->family << "familyVersion" << this->familyVersion;
|
||||
return false;
|
||||
}
|
||||
// All sample machines with FamilyVersion 3 in the properties.txt file have familyVersion 2 in their .001/.002/.005 files!
|
||||
// All sample devices with FamilyVersion 3 in the properties.txt file have familyVersion 2 in their .001/.002/.005 files!
|
||||
// We should flag an actual familyVersion 3 file if we ever encounter one!
|
||||
CHECK_VALUE(this->familyVersion, 2);
|
||||
|
||||
@ -746,7 +746,7 @@ bool PRS1DataChunk::ParseComplianceF0V4(void)
|
||||
// often clock adjustments without corresponding discontinuities in the waveform, and vice versa.
|
||||
// It's possible internal clock inaccuracy causes both independently.
|
||||
//
|
||||
// TODO: why do some machines have lots of these and others none? Maybe cellular modems make daily tweaks?
|
||||
// TODO: why do some devices have lots of these and others none? Maybe cellular modems make daily tweaks?
|
||||
if (false) {
|
||||
long value = data[pos] | data[pos+1]<<8 | data[pos+2]<<16 | data[pos+3]<<24;
|
||||
qDebug() << this->sessionid << "clock changing from" << ts(value * 1000L)
|
||||
@ -871,8 +871,8 @@ bool PRS1DataChunk::ParseSummaryF0V4(void)
|
||||
CHECK_VALUE(data[pos+0xc], 0);
|
||||
//CHECK_VALUE(data[pos+0xd], 0);
|
||||
CHECK_VALUE(data[pos+0xe], 0);
|
||||
//CHECK_VALUE(data[pos+0xf], 0); // CA count, probably 16-bit
|
||||
CHECK_VALUE(data[pos+0x10], 0);
|
||||
//CHECK_VALUE(data[pos+0xf], 0); // 16-bit CA count
|
||||
//CHECK_VALUE(data[pos+0x10], 0);
|
||||
//CHECK_VALUE(data[pos+0x11], 40); // 16-bit something: 0x88, 0x26, etc. ???
|
||||
//CHECK_VALUE(data[pos+0x12], 0);
|
||||
//CHECK_VALUE(data[pos+0x13], 0); // 16-bit minutes in LL
|
||||
@ -932,7 +932,7 @@ bool PRS1DataChunk::ParseSummaryF0V4(void)
|
||||
// often clock adjustments without corresponding discontinuities in the waveform, and vice versa.
|
||||
// It's possible internal clock inaccuracy causes both independently.
|
||||
//
|
||||
// TODO: why do some machines have lots of these and others none? Maybe cellular modems make daily tweaks?
|
||||
// TODO: why do some devices have lots of these and others none? Maybe cellular modems make daily tweaks?
|
||||
if (false) {
|
||||
long value = data[pos] | data[pos+1]<<8 | data[pos+2]<<16 | data[pos+3]<<24;
|
||||
qDebug() << this->sessionid << "clock changing from" << ts(value * 1000L)
|
||||
@ -1550,14 +1550,14 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
|
||||
int chunk_size = this->m_data.size();
|
||||
static const int minimum_sizes[] = { 1, 0x29, 9, 4, 2, 4, 1, 4, 0x1b, 2, 4, 0x0b, 1, 2, 6 };
|
||||
static const int ncodes = sizeof(minimum_sizes) / sizeof(int);
|
||||
// NOTE: The sizes contained in hblock can vary, even within a single machine, as can the length of hblock itself!
|
||||
// NOTE: The sizes contained in hblock can vary, even within a single device, as can the length of hblock itself!
|
||||
|
||||
// TODO: hardcoding this is ugly, think of a better approach
|
||||
if (chunk_size < minimum_sizes[0] + minimum_sizes[1] + minimum_sizes[2]) {
|
||||
qWarning() << this->sessionid << "summary data too short:" << chunk_size;
|
||||
return false;
|
||||
}
|
||||
if (chunk_size < 58) UNEXPECTED_VALUE(chunk_size, ">= 58");
|
||||
if (chunk_size < 55) UNEXPECTED_VALUE(chunk_size, ">= 55");
|
||||
|
||||
bool ok = true;
|
||||
int pos = 0;
|
||||
@ -1611,7 +1611,7 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
|
||||
this->AddEvent(new PRS1ParsedSliceEvent(tt, MaskOff));
|
||||
break;
|
||||
case 8: // vs. 7 in compliance, always follows mask off (except when there's a 5, see below), also longer
|
||||
// Maybe statistics of some kind, given the pressure stats that seem to appear before it on AutoCPAP machines?
|
||||
// Maybe statistics of some kind, given the pressure stats that seem to appear before it on AutoCPAP devices?
|
||||
//CHECK_VALUES(data[pos], 0x02, 0x01); // probably 16-bit value
|
||||
CHECK_VALUE(data[pos+1], 0x00);
|
||||
//CHECK_VALUES(data[pos+2], 0x0d, 0x0a); // probably 16-bit value, maybe OA count?
|
||||
@ -1739,7 +1739,7 @@ bool PRS1DataChunk::ParseSummaryF0V6(void)
|
||||
// The below is based on a combination of the old mainblock parsing for fileVersion == 3
|
||||
// in ParseSummary() and the switch statements of ParseSummaryF0V6.
|
||||
//
|
||||
// Both compliance and summary files (at least for 200X and 400X machines) seem to have
|
||||
// Both compliance and summary files (at least for 200X and 400X devices) seem to have
|
||||
// the same length for this slice, so maybe the settings are the same? At least 0x0a
|
||||
// looks like a pressure in compliance files.
|
||||
bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
|
||||
@ -1946,7 +1946,7 @@ bool PRS1DataChunk::ParseSettingsF0V6(const unsigned char* data, int size)
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case 0x90: // C-Flex+ or A-Flex, depending on machine mode
|
||||
case 0x90: // C-Flex+ or A-Flex, depending on device mode
|
||||
switch (cpapmode) {
|
||||
case PRS1_MODE_CPAP:
|
||||
case PRS1_MODE_CPAPCHECK:
|
||||
@ -2130,7 +2130,7 @@ const QVector<PRS1ParsedEventType> ParsedEventsF0V6 = {
|
||||
PRS1SnoresAtPressureEvent::TYPE,
|
||||
};
|
||||
|
||||
// DreamStation family 0 CPAP/APAP machines (400X-700X, 400G-502G)
|
||||
// DreamStation family 0 CPAP/APAP devices (400X-700X, 400G-502G)
|
||||
// Originally derived from F5V3 parsing + (incomplete) F0V234 parsing + sample data
|
||||
bool PRS1DataChunk::ParseEventsF0V6()
|
||||
{
|
||||
|
||||
@ -16,7 +16,8 @@
|
||||
#include "SleepLib/profiles.h"
|
||||
#include "SleepLib/loader_plugins/edfparser.h"
|
||||
|
||||
enum EDFType { EDF_UNKNOWN, EDF_BRP, EDF_PLD, EDF_SAD, EDF_EVE, EDF_CSL, EDF_AEV };
|
||||
// moved to edfparser.h
|
||||
// enum EDFType { EDF_UNKNOWN, EDF_BRP, EDF_PLD, EDF_SAD, EDF_EVE, EDF_CSL, EDF_AEV };
|
||||
|
||||
EDFType lookupEDFType(const QString & filename);
|
||||
|
||||
|
||||
@ -132,7 +132,7 @@ void ResmedLoader::initChannels()
|
||||
// RMS9_Temp, RMS9_TempEnable;
|
||||
|
||||
channel.add(GRP_CPAP, chan = new Channel(RMS9_SmartStart = 0xe204, SETTING, MT_CPAP, SESSION,
|
||||
"RMS9_SmartStart", QObject::tr("SmartStart"), QObject::tr("Machine auto starts by breathing"), QObject::tr("Smart Start"), "", LOOKUP, Qt::black));
|
||||
"RMS9_SmartStart", QObject::tr("SmartStart"), QObject::tr("Device auto starts by breathing"), QObject::tr("Smart Start"), "", LOOKUP, Qt::black));
|
||||
|
||||
chan->addOption(0, STR_TR_Off);
|
||||
chan->addOption(1, STR_TR_On);
|
||||
@ -207,7 +207,7 @@ void ResmedLoader::initChannels()
|
||||
chan->addOption(1, QObject::tr("Soft"));
|
||||
|
||||
channel.add(GRP_CPAP, chan = new Channel(RMAS11_SmartStop = 0xe20F, SETTING, MT_CPAP, SESSION,
|
||||
"RMAS11_SmartStop", QObject::tr("SmartStop"), QObject::tr("Machine auto stops by breathing"), QObject::tr("Smart Stop"), "", LOOKUP, Qt::black));
|
||||
"RMAS11_SmartStop", QObject::tr("SmartStop"), QObject::tr("Device auto stops by breathing"), QObject::tr("Smart Stop"), "", LOOKUP, Qt::black));
|
||||
|
||||
chan->addOption(0, STR_TR_Off);
|
||||
chan->addOption(1, STR_TR_On);
|
||||
@ -336,7 +336,7 @@ int ResmedLoader::Open(const QString & dirpath)
|
||||
{
|
||||
qDebug() << "Starting ResmedLoader::Open( with " << dirpath << ")";
|
||||
QString datalogPath;
|
||||
QHash<QString, QString> idmap; // Temporary machine ID properties hash
|
||||
QHash<QString, QString> idmap; // Temporary device ID properties hash
|
||||
|
||||
QString importPath(dirpath);
|
||||
importPath = importPath.replace("\\", "/");
|
||||
@ -387,7 +387,7 @@ int ResmedLoader::Open(const QString & dirpath)
|
||||
|
||||
bool compress_backups = p_profile->session->compressBackupData();
|
||||
|
||||
// Early check for STR.edf file, so we can early exit before creating faulty machine record.
|
||||
// Early check for STR.edf file, so we can early exit before creating faulty device record.
|
||||
// str.edf is the first (primary) file to check, str.edf.gz is the secondary
|
||||
QString pripath = importPath + "STR.edf"; // STR.edf file
|
||||
QString secpath = pripath + STR_ext_gz; // STR.edf.gz file
|
||||
@ -415,16 +415,16 @@ int ResmedLoader::Open(const QString & dirpath)
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Create machine object (unless it's already registered)
|
||||
// Create device object (unless it's already registered)
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
QDate firstImportDay = QDate().fromString("2010-01-01", "yyyy-MM-dd"); // Before Series 8 machines (I think)
|
||||
QDate firstImportDay = QDate().fromString("2010-01-01", "yyyy-MM-dd"); // Before Series 8 devices (I think)
|
||||
|
||||
Machine *mach = p_profile->lookupMachine(info.serial, info.loadername);
|
||||
if ( mach ) { // we have seen this machine
|
||||
if ( mach ) { // we have seen this device
|
||||
qDebug() << "We have seen this machime";
|
||||
mach->setInfo( info ); // update info
|
||||
QDate lastDate = mach->LastDay(); // use the last day for this machine
|
||||
QDate lastDate = mach->LastDay(); // use the last day for this device
|
||||
firstImportDay = lastDate; // re-import the last day, to pick up partial days
|
||||
QDate purgeDate = mach->purgeDate();
|
||||
if (purgeDate.isValid()) {
|
||||
@ -433,15 +433,15 @@ int ResmedLoader::Open(const QString & dirpath)
|
||||
// firstImportDay = lastDate.addDays(-1); // start the day before, to pick up partial days
|
||||
// firstImportDay = lastDate.addDays(1); // start the day after until we figure out the purge
|
||||
} else { // Starting from new beginnings - new or purged
|
||||
qDebug() << "New machine or just purged";
|
||||
qDebug() << "New device or just purged";
|
||||
p_profile->forceResmedPrefs();
|
||||
int modelNum = info.modelnumber.toInt();
|
||||
if ( modelNum >= 39000 ) {
|
||||
if ( ! AS11TestedModels.contains(modelNum) ) {
|
||||
QMessageBox::information(QApplication::activeWindow(),
|
||||
QObject::tr("Machine Untested"),
|
||||
QObject::tr("Your ResMed CPAP machine (Model %1) has not been tested yet.").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 to make sure it works with OSCAR.")
|
||||
QObject::tr("Device Untested"),
|
||||
QObject::tr("Your ResMed CPAP device (Model %1) has not been tested yet.").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 to make sure it works with OSCAR.")
|
||||
,QMessageBox::Ok);
|
||||
}
|
||||
}
|
||||
@ -471,7 +471,7 @@ int ResmedLoader::Open(const QString & dirpath)
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Copy the idmap into machine objects properties, (overwriting any old values)
|
||||
// Copy the idmap into device objects properties, (overwriting any old values)
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
for (auto i=idmap.begin(), idend=idmap.end(); i != idend; i++) {
|
||||
mach->info.properties[i.key()] = i.value();
|
||||
@ -826,7 +826,7 @@ void ResmedLoader::checkSummaryDay( ResMedDay & resday, QDate date, Machine * ma
|
||||
qDebug() << "Starting checkSummary for" << date.toString();
|
||||
#endif
|
||||
if (day && day->hasMachine(mach)) {
|
||||
// Sessions found for this machine, check if only summary info
|
||||
// Sessions found for this device, check if only summary info
|
||||
#ifdef STR_DEBUG
|
||||
qDebug() << "Sessions already found for this date";
|
||||
#endif
|
||||
@ -869,7 +869,7 @@ void ResmedLoader::checkSummaryDay( ResMedDay & resday, QDate date, Machine * ma
|
||||
numPairs++;
|
||||
QList<Session *> sessions = day->getSessions(MT_CPAP, true);
|
||||
// If we have more sessions that we found in the str file,
|
||||
// or if the sessions are for a different machine,
|
||||
// or if the sessions are for a different device,
|
||||
// leave well enough alone and don't re-import the day
|
||||
if (sessions.length() >= numPairs || sessions[0]->machine() != mach) {
|
||||
#ifdef STR_DEBUG
|
||||
@ -931,7 +931,7 @@ int ResmedLoader::ScanFiles(Machine * mach, const QString & datalog_path, QDate
|
||||
|
||||
QDir dir(datalog_path);
|
||||
|
||||
// First list any EDF files in DATALOG folder - Series 9 machines
|
||||
// First list any EDF files in DATALOG folder - Series 9 devices
|
||||
QStringList filter;
|
||||
filter << "*.edf";
|
||||
dir.setNameFilters(filter);
|
||||
@ -1239,9 +1239,9 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
|
||||
}
|
||||
|
||||
// ResMed and their consistent naming and spacing... :/
|
||||
EDFSignal *maskon = str.lookupLabel("Mask On"); // Series 9 machines
|
||||
EDFSignal *maskon = str.lookupLabel("Mask On"); // Series 9 devices
|
||||
if (!maskon) {
|
||||
maskon = str.lookupLabel("MaskOn"); // Series 1x machines
|
||||
maskon = str.lookupLabel("MaskOn"); // Series 1x devices
|
||||
}
|
||||
EDFSignal *maskoff = str.lookupLabel("Mask Off");
|
||||
if (!maskoff) {
|
||||
@ -1691,7 +1691,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
|
||||
epr--;
|
||||
}
|
||||
int epr_on=0, clin_epr_on=0;
|
||||
if ((sig = str.lookupLabel("S.EPR.EPREnable"))) { // first check machines opinion
|
||||
if ((sig = str.lookupLabel("S.EPR.EPREnable"))) { // first check devices opinion
|
||||
a1x = true;
|
||||
epr_on = EventDataType(sig->dataArray[rec]) * sig->gain + sig->offset;
|
||||
if ( AS_eleven )
|
||||
@ -1847,7 +1847,7 @@ bool ResmedLoader::ProcessSTRfiles(Machine *mach, QMap<QDate, STRFile> & STRmap,
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// Parse Identification.tgt file (containing serial number and machine information)
|
||||
// Parse Identification.tgt file (containing serial number and device information)
|
||||
///////////////////////////////////////////////////////////////////////////////////
|
||||
// QHash<QString, QString> parseIdentLine( const QString line, MachineInfo * info); // forward
|
||||
// void scanProductObject( QJsonObject product, MachineInfo *info, QHash<QString, QString> *idmap); // forward
|
||||
@ -2471,7 +2471,7 @@ void ResDayTask::run()
|
||||
// sooo... at this point we have
|
||||
// resday record populated with correct STR.edf settings for this date
|
||||
// files list containing unsorted EDF files that match this day
|
||||
// guaranteed no sessions for this day for this machine.
|
||||
// guaranteed no sessions for this day for this device.
|
||||
|
||||
// Need to check overlapping files in session candidates
|
||||
|
||||
@ -2924,13 +2924,13 @@ bool ResmedLoader::LoadEVE(Session *sess, const QString & path)
|
||||
if (sess->checkInside(tt))
|
||||
UA->AddEvent(tt, anno->duration);
|
||||
} else if (matchSignal(CPAP_RERA, anno->text)) {
|
||||
// Not all machines have it, so only create it when necessary..
|
||||
// Not all devices have it, so only create it when necessary..
|
||||
if ( ! RE)
|
||||
RE = sess->AddEventList(CPAP_RERA, EVL_Event);
|
||||
if (sess->checkInside(tt))
|
||||
RE->AddEvent(tt, anno->duration);
|
||||
} else if (matchSignal(CPAP_ClearAirway, anno->text)) {
|
||||
// Not all machines have it, so only create it when necessary..
|
||||
// Not all devices have it, so only create it when necessary..
|
||||
if ( ! CA)
|
||||
CA = sess->AddEventList(CPAP_ClearAirway, EVL_Event);
|
||||
if (sess->checkInside(tt))
|
||||
@ -3380,7 +3380,7 @@ void ResmedLoader::ToTimeDelta(Session *sess, ResMedEDFInfo &edf, EDFSignal &es,
|
||||
startpos = 5; // Shave the first 10 seconds of pressure data
|
||||
tt += rate * startpos;
|
||||
}
|
||||
// Likewise for the values that the machine computes for us, but 20 seconds
|
||||
// Likewise for the values that the device computes for us, but 20 seconds
|
||||
if ((code == CPAP_MinuteVent) || (code == CPAP_RespRate) || (code == CPAP_TidalVolume)) {
|
||||
startpos = 10; // Shave the first 20 seconds of computed data
|
||||
tt += rate * startpos;
|
||||
@ -3565,7 +3565,7 @@ bool matchSignal(ChannelID ch, const QString & name)
|
||||
void setupResMedTranslationMap()
|
||||
{
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
// Translation lookup table for non-english machines
|
||||
// Translation lookup table for non-english devices
|
||||
// Also combine S9, AS10, and AS11 variants
|
||||
////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
@ -68,13 +68,13 @@ class ResmedLoader : public CPAPLoader
|
||||
ResmedLoader();
|
||||
virtual ~ResmedLoader();
|
||||
|
||||
//! \brief Register the ResmedLoader with the list of other machine loaders
|
||||
//! \brief Register the ResmedLoader with the list of other device loaders
|
||||
static void Register();
|
||||
|
||||
//! \brief Detect if the given path contains a valid Folder structure
|
||||
virtual bool Detect(const QString & path);
|
||||
|
||||
//! \brief Look up machine model information of ResMed file structure stored at path
|
||||
//! \brief Look up device model information of ResMed file structure stored at path
|
||||
virtual MachineInfo PeekInfo(const QString & path);
|
||||
|
||||
virtual void checkSummaryDay( ResMedDay & resday, QDate date, Machine * mach );
|
||||
@ -85,7 +85,7 @@ class ResmedLoader : public CPAPLoader
|
||||
//! \brief Returns the version number of this ResMed loader
|
||||
virtual int Version() { return resmed_data_version; }
|
||||
|
||||
//! \brief Returns the Machine class name of this loader. ("ResMed")
|
||||
//! \brief Returns the device class name of this loader. ("ResMed")
|
||||
virtual const QString &loaderName() { return resmed_class_name; }
|
||||
|
||||
virtual MachineInfo newInfo() {
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
#include "SleepLib/loader_plugins/edfparser.h"
|
||||
|
||||
//enum EDFType { EDF_UNKNOWN, EDF_BRP, EDF_PLD, EDF_SAD, EDF_EVE, EDF_CSL, EDF_AEV };
|
||||
enum EDFType { EDF_UNKNOWN, EDF_RT };
|
||||
//enum EDFType { EDF_UNKNOWN, EDF_RT }; // moved to edfparser.h
|
||||
|
||||
// EDFType lookupEDFType(const QString & filename);
|
||||
|
||||
|
||||
@ -88,7 +88,7 @@ QString getIconDir (QString givenpath) {
|
||||
}
|
||||
|
||||
/*
|
||||
* getSleepStyleMachines returns a list of all SleepStyle machine folders in the ICON directory
|
||||
* getSleepStyleMachines returns a list of all SleepStyle device folders in the ICON directory
|
||||
*/
|
||||
QStringList getSleepStyleMachines (QString iconPath) {
|
||||
QStringList ssMachines;
|
||||
@ -118,7 +118,7 @@ QStringList getSleepStyleMachines (QString iconPath) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Find out what machine model this is
|
||||
// Find out what device model this is
|
||||
QFile sumFile (flist.at(0).absoluteFilePath());
|
||||
|
||||
QString line;
|
||||
@ -149,7 +149,7 @@ bool SleepStyleLoader::Detect(const QString & givenpath)
|
||||
|
||||
QStringList machines = getSleepStyleMachines(iconPath);
|
||||
if (machines.length() <= 0)
|
||||
// Did not find any SleepStyle machine directories
|
||||
// Did not find any SleepStyle device directories
|
||||
return false;
|
||||
|
||||
return true;
|
||||
@ -189,7 +189,7 @@ int SleepStyleLoader::Open(const QString & path)
|
||||
|
||||
QStringList serialNumbers = getSleepStyleMachines(iconPath);
|
||||
if (serialNumbers.length() <= 0)
|
||||
// Did not find any SleepStyle machine directories
|
||||
// Did not find any SleepStyle device directories
|
||||
return false;
|
||||
|
||||
Machine *m;
|
||||
@ -211,7 +211,7 @@ int SleepStyleLoader::Open(const QString & path)
|
||||
p_profile->DelMachine(m);
|
||||
MachList.erase(MachList.find(info.serial));
|
||||
QMessageBox::warning(nullptr, tr("Import Error"),
|
||||
tr("This Machine Record cannot be imported in this profile.")+"\n\n"+tr("The Day records overlap with already existing content."),
|
||||
tr("This device Record cannot be imported in this profile.")+"\n\n"+tr("The Day records overlap with already existing content."),
|
||||
QMessageBox::Ok);
|
||||
delete m;
|
||||
}
|
||||
@ -642,7 +642,7 @@ bool SleepStyleLoader::OpenSummary(Machine *mach, const QString & filename)
|
||||
htxt >> version;
|
||||
htxt >> fname;
|
||||
htxt >> serial;
|
||||
htxt >> model; //TODO: Should become Series in machine info???
|
||||
htxt >> model; //TODO: Should become Series in device info???
|
||||
htxt >> type; // SPSAAN etc with 4th character being A (Auto) or C (CPAP)
|
||||
htxt >> unknownident; // Constant, but has different value when version number is different.
|
||||
|
||||
@ -840,7 +840,7 @@ bool SleepStyleLoader::OpenDetail(Machine *mach, const QString & filename)
|
||||
htxt >> version;
|
||||
htxt >> fname;
|
||||
htxt >> serial;
|
||||
htxt >> model; //TODO: Should become Series in machine info???
|
||||
htxt >> model; //TODO: Should become Series in device info???
|
||||
htxt >> type; // SPSAAN etc with 4th character being A (Auto) or C (CPAP)
|
||||
htxt >> unknownident; // Constant, but has different value when version number is different.
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ const int sleepstyle_data_version = 1;
|
||||
//********************************************************************************************
|
||||
|
||||
/*! \class SleepStyle
|
||||
\brief F&P SleepStyle customized machine object
|
||||
\brief F&P SleepStyle customized device object
|
||||
*/
|
||||
class SleepStyle: public CPAP
|
||||
{
|
||||
@ -70,10 +70,10 @@ class SleepStyleLoader : public CPAPLoader
|
||||
//! \brief Returns SleepLib database version of this F&P SleepStyle loader
|
||||
virtual int Version() { return sleepstyle_data_version; }
|
||||
|
||||
//! \brief Returns the machine class name of this CPAP machine, "SleepStyle"
|
||||
//! \brief Returns the device class name of this CPAP device, "SleepStyle"
|
||||
virtual const QString & loaderName() { return sleepstyle_class_name; }
|
||||
|
||||
// ! \brief Creates a machine object, indexed by serial number
|
||||
// ! \brief Creates a device object, indexed by serial number
|
||||
//Machine *CreateMachine(QString serial);
|
||||
|
||||
QString getSerialPath () {return serialPath;}
|
||||
|
||||
@ -37,7 +37,7 @@ static QSet<QString> s_unexpectedMessages;
|
||||
bool
|
||||
ViatomLoader::Detect(const QString & path)
|
||||
{
|
||||
// This is only used for CPAP machines, when detecting CPAP cards.
|
||||
// This is only used for CPAP devices, when detecting CPAP cards.
|
||||
qDebug() << "ViatomLoader::Detect(" << path << ")";
|
||||
return false;
|
||||
}
|
||||
@ -74,7 +74,7 @@ ViatomLoader::Open(const QStringList & paths)
|
||||
}
|
||||
|
||||
Machine* mach = m_mach;
|
||||
if (imported && mach == nullptr) qWarning() << "No machine record created?";
|
||||
if (imported && mach == nullptr) qWarning() << "No device record created?";
|
||||
if (mach) {
|
||||
qDebug() << "Imported" << imported << "sessions";
|
||||
mach->Save();
|
||||
@ -82,7 +82,7 @@ ViatomLoader::Open(const QStringList & paths)
|
||||
p_profile->StoreMachines();
|
||||
}
|
||||
if (mach && s_unexpectedMessages.count() > 0 && p_profile->session->warnOnUnexpectedData()) {
|
||||
// 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 = s_unexpectedMessages - mach->previouslySeenUnexpectedData();
|
||||
if (newMessages.count() > 0) {
|
||||
|
||||
@ -25,7 +25,7 @@ const int weinmann_data_version = 3;
|
||||
//********************************************************************************************
|
||||
|
||||
/*! \class Weinmann
|
||||
\brief Weinmann customized machine object
|
||||
\brief Weinmann customized device object
|
||||
*/
|
||||
class Weinmann: public CPAP
|
||||
{
|
||||
@ -101,13 +101,13 @@ class WeinmannLoader : public CPAPLoader
|
||||
//! \brief Returns SleepLib database version of this Weinmann loader
|
||||
virtual int Version() { return weinmann_data_version; }
|
||||
|
||||
//! \brief Returns the machine loader name of this class
|
||||
//! \brief Returns the device loader name of this class
|
||||
virtual const QString &loaderName() { return weinmann_class_name; }
|
||||
|
||||
int ParseIndex(QFile & wmdata);
|
||||
|
||||
|
||||
//! \brief Creates a machine object, indexed by serial number
|
||||
//! \brief Creates a device object, indexed by serial number
|
||||
// Machine *CreateMachine(QString serial);
|
||||
|
||||
//! \brief Registers this MachineLoader with the master list, so Weinmann data can load
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
@ -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
|
||||
{
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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;
|
||||
};
|
||||
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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
|
||||
//////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@ -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())) {
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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,
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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; }
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Update the string below to set OSCAR's version and release status.
|
||||
// See https://semver.org/spec/v2.0.0.html for details on format.
|
||||
|
||||
#define VERSION "1.3.5-alpha.0"
|
||||
#define VERSION "1.3.5-alpha.3"
|
||||
|
||||
@ -127,7 +127,7 @@ QString AboutDialog::getRelnotes()
|
||||
QString text = "<html>"
|
||||
"<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head>"
|
||||
"<body><span style=\" font-size:20pt;\">"+tr("Release Notes")+"</span><br/>"
|
||||
"<span style=\" font-size:14pt;\">"+tr("OSCAR %1").arg(getVersion())+"</span>"
|
||||
"<span style=\" font-size:14pt;\">"+QString("OSCAR %1").arg(getVersion())+"</span>"
|
||||
"<hr/>";
|
||||
if (getVersion().IsReleaseVersion() == false) {
|
||||
text += "<p><font color='red' size=+1><b>"+tr("Important:")+"</b></font> "
|
||||
|
||||
@ -1108,7 +1108,7 @@ QString Daily::getMachineSettings(Day * day) {
|
||||
Machine * cpap = day->machine(MT_CPAP);
|
||||
if (cpap && day->hasEnabledSessions(MT_CPAP)) {
|
||||
html="<table cellpadding=0 cellspacing=0 border=0 width=100%>";
|
||||
html+=QString("<tr><td colspan=5 align=center><b>%1</b></td></tr>").arg(tr("Machine Settings"));
|
||||
html+=QString("<tr><td colspan=5 align=center><b>%1</b></td></tr>").arg(tr("Device Settings"));
|
||||
|
||||
if (day->noSettings(cpap)) {
|
||||
html+="<tr><td colspan=5 align=center><i><font color='red'>"+tr("<b>Please Note:</b> All settings shown below are based on assumptions that nothing has changed since previous days.")+"</font></i></td></tr>\n";
|
||||
@ -1117,7 +1117,7 @@ QString Daily::getMachineSettings(Day * day) {
|
||||
}
|
||||
/*
|
||||
} else if ((day->settingExists(CPAP_BrokenSummary))) {
|
||||
html+="<tr><td colspan=5 align=center><i>"+tr("Machine Settings Unavailable")+"</i></td></tr></table><hr/>\n";
|
||||
html+="<tr><td colspan=5 align=center><i>"+tr("Device Settings Unavailable")+"</i></td></tr></table><hr/>\n";
|
||||
return html;
|
||||
}
|
||||
*/
|
||||
@ -1320,7 +1320,7 @@ QString Daily::getStatisticsInfo(Day * day)
|
||||
.arg(STR_TR_Min)
|
||||
.arg(midname)
|
||||
.arg(QString("%1%2").arg(percentile*100,0,'f',0).arg(STR_UNIT_Percentage))
|
||||
.arg(ST_max == ST_MAX?STR_TR_Max:tr("99.5%"));
|
||||
.arg(ST_max == ST_MAX?STR_TR_Max:QString("99.5%"));
|
||||
|
||||
ChannelID chans[]={
|
||||
CPAP_Pressure,CPAP_PressureSet,CPAP_EPAP,CPAP_EPAPSet,CPAP_IPAP,CPAP_IPAPSet,CPAP_PS,CPAP_PTB,
|
||||
@ -1705,7 +1705,7 @@ void Daily::Load(QDate date)
|
||||
.arg("#F88017").arg(COLOR_Text.name()).arg(ahiname).arg(schema::channel[ahichan].fullname()).arg(ahi,0,'f',2);
|
||||
} else {
|
||||
htmlLeftAHI+=QString("<td colspan=5 bgcolor='%1' align=center><font size=+3 color='yellow'><b>%2</b></font></td>\n")
|
||||
.arg("#F88017").arg(tr("This CPAP machine does NOT record detailed data"));
|
||||
.arg("#F88017").arg(tr("This CPAP device does NOT record detailed data"));
|
||||
}
|
||||
htmlLeftAHI+="</tr>\n";
|
||||
htmlLeftAHI+="</table>\n";
|
||||
@ -1732,7 +1732,7 @@ void Daily::Load(QDate date)
|
||||
QString data;
|
||||
float channelHours = hours;
|
||||
if (chan.machtype() != MT_CPAP) {
|
||||
// Use machine type hours (if available) rather than CPAP hours, since
|
||||
// Use device type hours (if available) rather than CPAP hours, since
|
||||
// might have Oximetry (for example) longer or shorter than CPAP
|
||||
channelHours = day->hours(chan.machtype());
|
||||
if (channelHours <= 0) {
|
||||
@ -1784,9 +1784,9 @@ void Daily::Load(QDate date)
|
||||
htmlLeftNoHours+="<tr><td colspan=5 align='center'><b><h2>"+tr("Impossibly short session")+"</h2></b></td></tr>";
|
||||
htmlLeftNoHours+="<tr><td colspan=5 align='center'><i>"+tr("Zero hours??")+"</i></td></tr>\n";
|
||||
}
|
||||
} else { // machine is a brick
|
||||
htmlLeftNoHours+="<tr><td colspan=5 align='center'><b><h2>"+tr("BRICK :(")+"</h2></b></td></tr>";
|
||||
htmlLeftNoHours+="<tr><td colspan=5 align='center'><i>"+tr("Sorry, this machine only provides compliance data.")+"</i></td></tr>\n";
|
||||
} else { // Device is a brick
|
||||
htmlLeftNoHours+="<tr><td colspan=5 align='center'><b><h2>"+tr("no data :(")+"</h2></b></td></tr>";
|
||||
htmlLeftNoHours+="<tr><td colspan=5 align='center'><i>"+tr("Sorry, this device only provides compliance data.")+"</i></td></tr>\n";
|
||||
htmlLeftNoHours+="<tr><td colspan=5 align='center'><i>"+tr("Complain to your Equipment Provider!")+"</i></td></tr>\n";
|
||||
}
|
||||
htmlLeftNoHours+="<tr><td colspan='5'> </td></tr>\n";
|
||||
|
||||
@ -279,7 +279,7 @@ private:
|
||||
\brief Create a new journal session for this date, if one doesn't exist.
|
||||
\param QDate date
|
||||
|
||||
Creates a new journal Machine record if necessary.
|
||||
Creates a new journal device record if necessary.
|
||||
*/
|
||||
Session * CreateJournalSession(QDate date);
|
||||
|
||||
|
||||
@ -1047,7 +1047,7 @@ QToolButton:pressed {
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true"> i </string>
|
||||
<string> i </string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@ -281,7 +281,7 @@ void MainWindow::closeEvent(QCloseEvent * event)
|
||||
static bool runonce = false;
|
||||
if (!runonce) {
|
||||
if (AppSetting->removeCardReminder()) {
|
||||
Notify(QObject::tr("Don't forget to place your datacard back in your CPAP machine"), QObject::tr("OSCAR Reminder"));
|
||||
Notify(QObject::tr("Don't forget to place your datacard back in your CPAP device"), QObject::tr("OSCAR Reminder"));
|
||||
QThread::msleep(1000);
|
||||
QApplication::processEvents();
|
||||
}
|
||||
@ -391,7 +391,7 @@ void MainWindow::PopulatePurgeMenu()
|
||||
addMachineToMenu(mach, ui->menu_Rebuild_CPAP_Data);
|
||||
}
|
||||
|
||||
// Add any imported machine (except the built-in journal) to the purge menu.
|
||||
// Add any imported device (except the built-in journal) to the purge menu.
|
||||
machines = p_profile->GetMachines();
|
||||
for (int i=0; i < machines.size(); ++i) {
|
||||
Machine *mach = machines.at(i);
|
||||
@ -484,13 +484,13 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
|
||||
|
||||
QList<Machine *> machines = p_profile->GetMachines(MT_CPAP);
|
||||
if (machines.isEmpty()) {
|
||||
qDebug() << "No machines in profile";
|
||||
qDebug() << "No devices in profile";
|
||||
} else {
|
||||
#ifdef LOCK_RESMED_SESSIONS
|
||||
for (QList<Machine *>::iterator it = machines.begin(); it != machines.end(); ++it) {
|
||||
QString mclass=(*it)->loaderName();
|
||||
if (mclass == STR_MACH_ResMed) {
|
||||
qDebug() << "ResMed machine found.. locking OSCAR preferences to suit it's summary system";
|
||||
qDebug() << "ResMed device found.. locking OSCAR preferences to suit it's summary system";
|
||||
|
||||
// Have to sacrifice these features to get access to summary data.
|
||||
p_profile->session->setCombineCloseSessions(0);
|
||||
@ -743,7 +743,7 @@ int MainWindow::importCPAP(ImportPath import, const QString &message)
|
||||
} else if (c == 0) {
|
||||
Notify(tr("Already up to date with CPAP data at\n\n%1").arg(import.path), tr("Up to date"));
|
||||
} else {
|
||||
Notify(tr("Couldn't find any valid Machine Data at\n\n%1").arg(import.path),tr("Import Problem"));
|
||||
Notify(tr("Couldn't find any valid Device Data at\n\n%1").arg(import.path),tr("Import Problem"));
|
||||
}
|
||||
disconnect(progdlg, SIGNAL(abortClicked()), import.loader, SLOT(abortImport()));
|
||||
disconnect(import.loader, SIGNAL(setProgressMax(int)), progdlg, SLOT(setProgressMax(int)));
|
||||
@ -797,7 +797,7 @@ void MainWindow::finishCPAPImport()
|
||||
|
||||
void MainWindow::importCPAPBackups()
|
||||
{
|
||||
// Get BackupPaths for all CPAP machines
|
||||
// Get BackupPaths for all CPAP devices
|
||||
QList<Machine *> machlist = p_profile->GetMachines(MT_CPAP);
|
||||
QList<ImportPath> paths;
|
||||
Q_FOREACH(Machine *m, machlist) {
|
||||
@ -959,7 +959,7 @@ QList<ImportPath> MainWindow::detectCPAPCards()
|
||||
}
|
||||
|
||||
Q_FOREACH(const QString &path, AutoScannerPaths) {
|
||||
// Scan through available machine loaders and test if this folder contains valid folder structure
|
||||
// Scan through available device loaders and test if this folder contains valid folder structure
|
||||
Q_FOREACH(MachineLoader * loader, loaders) {
|
||||
if (loader->Detect(path)) {
|
||||
detectedCards.append(ImportPath(path, loader));
|
||||
@ -1748,7 +1748,7 @@ void MainWindow::on_actionPurgeCurrentDayAll_triggered()
|
||||
this->purgeDay(MT_JOURNAL);
|
||||
}
|
||||
|
||||
// Purge data for a given machine type.
|
||||
// Purge data for a given device type.
|
||||
// Special handling: MT_JOURNAL == All data. MT_UNKNOWN == All except journal
|
||||
void MainWindow::purgeDay(MachineType type)
|
||||
{
|
||||
@ -1848,7 +1848,7 @@ void MainWindow::on_actionRebuildCPAP(QAction *action)
|
||||
|
||||
if (backups) {
|
||||
if (QMessageBox::question(this, STR_MessageBox_Question,
|
||||
tr("Are you sure you want to rebuild all CPAP data for the following machine:\n\n") +
|
||||
tr("Are you sure you want to rebuild all CPAP data for the following device:\n\n") +
|
||||
mach->brand() + " " + mach->model() + " " +
|
||||
mach->modelnumber() + " (" + mach->serial() + ")\n\n" +
|
||||
tr("Please note, that this could result in loss of data if OSCAR's backups have been disabled."),
|
||||
@ -1858,7 +1858,7 @@ void MainWindow::on_actionRebuildCPAP(QAction *action)
|
||||
} else {
|
||||
if (QMessageBox::question(this,
|
||||
STR_MessageBox_Warning,
|
||||
"<p><b>"+STR_MessageBox_Warning+": </b>"+tr("For some reason, OSCAR does not have any backups for the following machine:")+ "</p>" +
|
||||
"<p><b>"+STR_MessageBox_Warning+": </b>"+tr("For some reason, OSCAR does not have any backups for the following device:")+ "</p>" +
|
||||
"<p>"+mach->brand() + " " + mach->model() + " " + mach->modelnumber() + " (" + mach->serial() + ")</p>"+
|
||||
"<p>"+tr("Provided you have made <i>your <b>own</b> backups for ALL of your CPAP data</i>, you can still complete this operation, but you will have to restore from your backups manually.")+"</p>" +
|
||||
"<p><b>"+tr("Are you really sure you want to do this?")+"</b></p>",
|
||||
@ -1870,14 +1870,14 @@ void MainWindow::on_actionRebuildCPAP(QAction *action)
|
||||
QString path = mach->getBackupPath();
|
||||
MachineLoader *loader = lookupLoader(mach);
|
||||
|
||||
purgeMachine(mach); // purge destroys machine record
|
||||
purgeMachine(mach); // purge destroys device record
|
||||
|
||||
if (backups) {
|
||||
importCPAP(ImportPath(path, loader), tr("Please wait, importing from backup folder(s)..."));
|
||||
} else {
|
||||
if (QMessageBox::information(this, STR_MessageBox_Warning,
|
||||
tr("Because there are no internal backups to rebuild from, you will have to restore from your own.")+"\n\n"+
|
||||
tr("Would you like to import from your own backups now? (you will have no data visible for this machine until you do)"),
|
||||
tr("Would you like to import from your own backups now? (you will have no data visible for this device until you do)"),
|
||||
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {
|
||||
on_action_Import_Data_triggered();
|
||||
} else {
|
||||
@ -1928,14 +1928,14 @@ void MainWindow::on_actionPurgeMachine(QAction *action)
|
||||
if (backups) {
|
||||
backupnotice = "<p>" + tr("Note as a precaution, the backup folder will be left in place.") + "</p>";
|
||||
} else {
|
||||
backupnotice = "<p>" + tr("OSCAR does not have any backups for this machine!") + "</p>" +
|
||||
"<p>" + tr("Unless you have made <i>your <b>own</b> backups for ALL of your data for this machine</i>, "
|
||||
"<font size=+2>you will lose this machine's data <b>permanently</b>!</font>") + "</p>";
|
||||
backupnotice = "<p>" + tr("OSCAR does not have any backups for this device!") + "</p>" +
|
||||
"<p>" + tr("Unless you have made <i>your <b>own</b> backups for ALL of your data for this device</i>, "
|
||||
"<font size=+2>you will lose this device's data <b>permanently</b>!</font>") + "</p>";
|
||||
}
|
||||
|
||||
if (QMessageBox::question(this, STR_MessageBox_Warning,
|
||||
"<p><b>"+STR_MessageBox_Warning+":</b> " +
|
||||
tr("You are about to <font size=+2>obliterate</font> OSCAR's machine database for the following machine:</p>") +
|
||||
tr("You are about to <font size=+2>obliterate</font> OSCAR's device database for the following device:</p>") +
|
||||
"<p><font size=+2>" + machname + "</font></p>" +
|
||||
backupnotice+
|
||||
"<p>"+tr("Are you <b>absolutely sure</b> you want to proceed?")+"</p>",
|
||||
@ -1958,7 +1958,7 @@ void MainWindow::purgeMachine(Machine * mach)
|
||||
QDir dir;
|
||||
QString path = mach->getDataPath();
|
||||
path.chop(1);
|
||||
qDebug() << "path to machine" << path;
|
||||
qDebug() << "path to device" << path;
|
||||
|
||||
p_profile->DelMachine(mach);
|
||||
delete mach;
|
||||
@ -2496,7 +2496,7 @@ void MainWindow::on_actionPurgeCurrentDaysOximetry_triggered()
|
||||
delete sess;
|
||||
}
|
||||
|
||||
// We have to update the summary cache for the affected machine(s),
|
||||
// We have to update the summary cache for the affected device(s),
|
||||
// otherwise OSCAR will still think this day has oximetry data at next launch.
|
||||
for (auto & mach : machines) {
|
||||
mach->SaveSummaryCache();
|
||||
|
||||
@ -41,7 +41,7 @@ class MainWindow;
|
||||
|
||||
Open Source CPAP Analysis Reporter (OSCAR) is a program derived from the SleepyHead program written by Mark Watkins.
|
||||
|
||||
SleepyHead was a Cross-Platform Open-Source software for reviewing data from %CPAP machines, which are used in the treatment of Sleep Disorders.
|
||||
SleepyHead was a Cross-Platform Open-Source software for reviewing data from %CPAP devices, which are used in the treatment of Sleep Disorders.
|
||||
|
||||
SleepyHead was created by <a href="http://jedimark64.blogspot.com">Mark Watkins</a> (JediMark), an Australian software developer.
|
||||
|
||||
@ -60,7 +60,7 @@ class MainWindow;
|
||||
\section structure Program Structure
|
||||
OSCAR is written in C++ using Qt Toolkit library, and comprises of 3 main components
|
||||
\list
|
||||
\li The SleepLib Database, a specialized database for working with multiple sources of Sleep machine data.
|
||||
\li The SleepLib Database, a specialized database for working with multiple sources of Sleep device data.
|
||||
\li A custom designed, high performance and interactive OpenGL Graphing Library.
|
||||
\li and the main Application user interface.
|
||||
\endlist
|
||||
@ -408,7 +408,7 @@ private:
|
||||
|
||||
void PopulatePurgeMenu();
|
||||
|
||||
//! \brief Destroy ALL the CPAP data for the selected machine
|
||||
//! \brief Destroy ALL the CPAP data for the selected device
|
||||
void purgeMachine(Machine *);
|
||||
|
||||
int warnidx;
|
||||
|
||||
@ -2492,7 +2492,7 @@ p, li { white-space: pre-wrap; }
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuPurge_CPAP_Data">
|
||||
<property name="title">
|
||||
<string>Purge ALL Machine Data</string>
|
||||
<string>Purge ALL Device Data</string>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuPurge_Current_Selected_Day">
|
||||
|
||||
@ -110,7 +110,7 @@ QString NewProfile::getIntroHTML()
|
||||
"<body>"
|
||||
"<div align=center><h1>" + tr("Welcome to the Open Source CPAP Analysis Reporter") + "</h1></div>"
|
||||
|
||||
"<p>" + tr("This software is being designed to assist you in reviewing the data produced by your CPAP machines and related equipment.")
|
||||
"<p>" + tr("This software is being designed to assist you in reviewing the data produced by your CPAP Devices and related equipment.")
|
||||
+ "</p>"
|
||||
|
||||
"<p>" + tr("OSCAR has been released freely under the <a href='qrc:/COPYING'>GNU Public License v3</a>, and comes with no warranty, and without ANY claims to fitness for any purpose.")
|
||||
|
||||
@ -7,15 +7,30 @@
|
||||
* License. See the file COPYING in the main directory of the source code
|
||||
* for more details. */
|
||||
|
||||
#define xDEBUG_FUNCTIONS
|
||||
#ifdef DEBUG_FUNCTIONS
|
||||
#include <QRegularExpression>
|
||||
#define DEBUGQ qDebug()
|
||||
#define DEBUGL qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__
|
||||
#define DEBUGF qDebug()<<QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__
|
||||
#define DEBUGTF qDebug()<<QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz") << QString(basename( __FILE__)).remove(QRegularExpression("\\..*$")) << __LINE__ << __func__
|
||||
#define DEBUGT qDebug()<<QDateTime::currentDateTime().time().toString("hh:mm:ss.zzz")
|
||||
|
||||
#define O( XX ) " " #XX ":" << XX
|
||||
#define OO( XX , YY ) " " #XX ":" << YY
|
||||
#define NAME( id) schema::channel[ id ].label()
|
||||
#define DATE( XX ) QDateTime::fromMSecsSinceEpoch(XX).toString("dd MMM yyyy")
|
||||
#define DATETIME( XX ) QDateTime::fromMSecsSinceEpoch(XX).toString("dd MMM yyyy hh:mm:ss.zzz")
|
||||
#endif
|
||||
|
||||
|
||||
#include <QCalendarWidget>
|
||||
#include <QTextCharFormat>
|
||||
//#include <QSystemLocale>
|
||||
#include <QDebug>
|
||||
#include <QDateTimeEdit>
|
||||
#include <QCalendarWidget>
|
||||
#include <QFileDialog>
|
||||
#include <QMessageBox>
|
||||
//#include <QProgressBar>
|
||||
|
||||
#include "SleepLib/profiles.h"
|
||||
#include "overview.h"
|
||||
@ -30,11 +45,27 @@
|
||||
#include "mainwindow.h"
|
||||
extern MainWindow *mainwin;
|
||||
|
||||
|
||||
qint64 convertDateToTimeRtn(const QDate &date,int hours,int min,int sec) {
|
||||
return QDateTime(date).addSecs(((hours*60+min)*60)+sec).toMSecsSinceEpoch();
|
||||
}
|
||||
qint64 convertDateToStartTime(const QDate &date) {
|
||||
return convertDateToTimeRtn(date,0,10,0);
|
||||
}
|
||||
qint64 convertDateToEndTime(const QDate &date) {
|
||||
return convertDateToTimeRtn(date,23,0,0);
|
||||
}
|
||||
QDate convertTimeToDate(qint64 time) {
|
||||
return QDateTime::fromMSecsSinceEpoch(time).date();
|
||||
}
|
||||
|
||||
Overview::Overview(QWidget *parent, gGraphView *shared) :
|
||||
QWidget(parent),
|
||||
ui(new Ui::Overview),
|
||||
m_shared(shared)
|
||||
{
|
||||
chartsToBeMonitored.clear();
|
||||
chartsEmpty.clear();;
|
||||
ui->setupUi(this);
|
||||
|
||||
// Set Date controls locale to 4 digit years
|
||||
@ -67,7 +98,6 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
|
||||
// Connect the signals to update which days have CPAP data when the month is changed
|
||||
connect(ui->dateStart->calendarWidget(), SIGNAL(currentPageChanged(int, int)), this, SLOT(dateStart_currentPageChanged(int, int)));
|
||||
connect(ui->dateEnd->calendarWidget(), SIGNAL(currentPageChanged(int, int)), this, SLOT(dateEnd_currentPageChanged(int, int)));
|
||||
|
||||
QVBoxLayout *framelayout = new QVBoxLayout;
|
||||
ui->graphArea->setLayout(framelayout);
|
||||
|
||||
@ -125,6 +155,7 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Rebuild contents
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
settingsLoaded=false;
|
||||
RebuildGraphs(false);
|
||||
|
||||
ui->rangeCombo->setCurrentIndex(p_profile->general->lastOverviewRange());
|
||||
@ -143,15 +174,18 @@ Overview::Overview(QWidget *parent, gGraphView *shared) :
|
||||
connect(GraphView, SIGNAL(updateCurrentTime(double)), this, SLOT(on_LineCursorUpdate(double)));
|
||||
connect(GraphView, SIGNAL(updateRange(double,double)), this, SLOT(on_RangeUpdate(double,double)));
|
||||
connect(GraphView, SIGNAL(GraphsChanged()), this, SLOT(updateGraphCombo()));
|
||||
connect(GraphView, SIGNAL(XBoundsChanged(qint64 ,qint64)), this, SLOT(on_XBoundsChanged(qint64 ,qint64)));
|
||||
}
|
||||
|
||||
Overview::~Overview()
|
||||
{
|
||||
disconnect(GraphView, SIGNAL(XBoundsChanged(qint64 ,qint64)), this, SLOT(on_XBoundsChanged(qint64 ,qint64)));
|
||||
disconnect(GraphView, SIGNAL(GraphsChanged()), this, SLOT(updateGraphCombo()));
|
||||
disconnect(GraphView, SIGNAL(updateRange(double,double)), this, SLOT(on_RangeUpdate(double,double)));
|
||||
disconnect(GraphView, SIGNAL(updateCurrentTime(double)), this, SLOT(on_LineCursorUpdate(double)));
|
||||
disconnect(ui->dateEnd->calendarWidget(), SIGNAL(currentPageChanged(int, int)), this, SLOT(dateEnd_currentPageChanged(int, int)));
|
||||
disconnect(ui->dateStart->calendarWidget(), SIGNAL(currentPageChanged(int, int)), this, SLOT(dateStart_currentPageChanged(int, int)));
|
||||
disconnectgSummaryCharts() ;
|
||||
|
||||
// Save graph orders and pin status, etc...
|
||||
GraphView->SaveSettings("Overview");//no trans
|
||||
@ -166,18 +200,63 @@ void Overview::ResetFont()
|
||||
dateLabel->setFont(font);
|
||||
}
|
||||
|
||||
|
||||
void Overview::connectgSummaryCharts()
|
||||
{
|
||||
for (auto it = chartsToBeMonitored.begin(); it != chartsToBeMonitored.end(); ++it) {
|
||||
gSummaryChart* sc =it.key();
|
||||
connect(sc, SIGNAL(summaryChartEmpty(gSummaryChart*,qint64,qint64,bool)), this, SLOT(on_summaryChartEmpty(gSummaryChart*,qint64,qint64,bool)));
|
||||
}
|
||||
}
|
||||
|
||||
void Overview::disconnectgSummaryCharts()
|
||||
{
|
||||
for (auto it = chartsToBeMonitored.begin(); it != chartsToBeMonitored.end(); ++it) {
|
||||
gSummaryChart* sc =it.key();
|
||||
disconnect(sc, SIGNAL(summaryChartEmpty(gSummaryChart*,qint64,qint64,bool)), this, SLOT(on_summaryChartEmpty(gSummaryChart*,qint64,qint64,bool)));
|
||||
}
|
||||
chartsToBeMonitored.clear();
|
||||
chartsEmpty.clear();;
|
||||
}
|
||||
|
||||
void Overview::on_summaryChartEmpty(gSummaryChart*sc,qint64 firstI,qint64 lastI,bool empty)
|
||||
{
|
||||
|
||||
auto it = chartsToBeMonitored.find(sc);
|
||||
if (it==chartsToBeMonitored.end()) {
|
||||
return;
|
||||
}
|
||||
gGraph* graph=it.value();
|
||||
if (empty) {
|
||||
// on next range change allow empty flag to be recalculated
|
||||
chartsEmpty.insert(sc,graph);
|
||||
//DEBUGF << graph->name() << "Chart is Empty" << "Range" << convertTimeToDate(firstI) << convertTimeToDate(lastI);
|
||||
} else {
|
||||
// The chart has some entry with data.
|
||||
chartsEmpty.remove(sc);
|
||||
updateGraphCombo();
|
||||
//DEBUGF << graph->name() << "Chart is enabled with range:" << convertTimeToDate(firstI) << "==>" << convertTimeToDate(lastI) ;
|
||||
}
|
||||
Q_UNUSED(firstI);
|
||||
Q_UNUSED(lastI);
|
||||
};
|
||||
|
||||
|
||||
// Create all the graphs for the Overview page
|
||||
void Overview::CreateAllGraphs() {
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Add all the graphs
|
||||
// Process is to createGraph() to make the graph object, then add a layer
|
||||
// that provides the contents for that graph.
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
if (chartsToBeMonitored.size()>0) {
|
||||
disconnectgSummaryCharts();
|
||||
}
|
||||
chartsEmpty.clear();;
|
||||
chartsToBeMonitored.clear();;
|
||||
|
||||
// Add graphs that are always included
|
||||
ChannelID ahicode = p_profile->general->calculateRDI() ? CPAP_RDI : CPAP_AHI;
|
||||
|
||||
if (ahicode == CPAP_RDI) {
|
||||
AHI = createGraph("AHIBreakdown", STR_TR_RDI, tr("Respiratory\nDisturbance\nIndex"));
|
||||
} else {
|
||||
@ -186,9 +265,11 @@ void Overview::CreateAllGraphs() {
|
||||
|
||||
ahi = new gAHIChart();
|
||||
AHI->AddLayer(ahi);
|
||||
//chartsToBeMonitored.insert(ahi,AHI);
|
||||
|
||||
UC = createGraph(STR_GRAPH_Usage, tr("Usage"), tr("Usage\n(hours)"));
|
||||
UC->AddLayer(uc = new gUsageChart());
|
||||
//chartsToBeMonitored.insert(uc,UC);
|
||||
|
||||
STG = createGraph("New Session", tr("Session Times"), tr("Session Times"), YT_Time);
|
||||
stg = new gSessionTimesChart();
|
||||
@ -197,10 +278,12 @@ void Overview::CreateAllGraphs() {
|
||||
PR = createGraph("Pressure Settings", STR_TR_Pressure, STR_TR_Pressure + "\n(" + STR_UNIT_CMH2O + ")");
|
||||
pres = new gPressureChart();
|
||||
PR->AddLayer(pres);
|
||||
//chartsToBeMonitored.insert(pres,PR);
|
||||
|
||||
TTIA = createGraph("TTIA", tr("Total Time in Apnea"), tr("Total Time in Apnea\n(Minutes)"));
|
||||
ttia = new gTTIAChart();
|
||||
TTIA->AddLayer(ttia);
|
||||
//chartsToBeMonitored.insert(ttia,TTIA);
|
||||
|
||||
// Add graphs for all channels that have been marked in Preferences Dialog as wanting a graph
|
||||
QHash<ChannelID, schema::Channel *>::iterator chit;
|
||||
@ -212,43 +295,59 @@ void Overview::CreateAllGraphs() {
|
||||
ChannelID code = chan->id();
|
||||
QString name = chan->fullname();
|
||||
if (name.length() > 16) name = chan->label();
|
||||
// qDebug() << "Channel" << name << "type" << chan->type() << "machine type" << chan->machtype();
|
||||
gGraph *G = createGraph(chan->code(), name, chan->description());
|
||||
gSummaryChart * sc = nullptr;
|
||||
if ((chan->type() == schema::FLAG) || (chan->type() == schema::MINOR_FLAG)) {
|
||||
gSummaryChart * sc = new gSummaryChart(chan->code(), chan->machtype()); // gts was MT_CPAP
|
||||
sc = new gSummaryChart(chan->code(), chan->machtype()); // gts was MT_CPAP
|
||||
sc->addCalc(code, ST_CPH, schema::channel[code].defaultColor());
|
||||
G->AddLayer(sc);
|
||||
chartsToBeMonitored.insert(sc,G);
|
||||
} else if (chan->type() == schema::SPAN) {
|
||||
gSummaryChart * sc = new gSummaryChart(chan->code(), MT_CPAP);
|
||||
sc = new gSummaryChart(chan->code(), MT_CPAP);
|
||||
sc->addCalc(code, ST_SPH, schema::channel[code].defaultColor());
|
||||
G->AddLayer(sc);
|
||||
chartsToBeMonitored.insert(sc,G);
|
||||
} else if (chan->type() == schema::WAVEFORM) {
|
||||
G->AddLayer(new gSummaryChart(code, chan->machtype()));
|
||||
sc= new gSummaryChart(code, chan->machtype());
|
||||
G->AddLayer(sc);
|
||||
chartsToBeMonitored.insert(sc,G);
|
||||
} else if (chan->type() == schema::UNKNOWN) {
|
||||
gSummaryChart * sc = new gSummaryChart(chan->code(), MT_CPAP);
|
||||
sc = new gSummaryChart(chan->code(), MT_CPAP);
|
||||
sc->addCalc(code, ST_CPH, schema::channel[code].defaultColor());
|
||||
G->AddLayer(sc);
|
||||
chartsToBeMonitored.insert(sc,G);
|
||||
}
|
||||
if (sc== nullptr) {
|
||||
//DEBUGF << "Channel" << name << "type" << chan->type() << "machine type" << chan->machtype() << "IGNORED";
|
||||
} else {
|
||||
sc ->reCalculate();
|
||||
//DEBUGF << "Channel" << name << "type" << chan->type() << "machine type" << chan->machtype() << OO(Empty,sc->isEmpty());
|
||||
}
|
||||
} // if showInOverview()
|
||||
} // for chit
|
||||
|
||||
// Note The following don not use gSummaryChart. They use SummaryChart instead. and can not be monitored.
|
||||
WEIGHT = createGraph(STR_GRAPH_Weight, STR_TR_Weight, STR_TR_Weight, YT_Weight);
|
||||
weight = new SummaryChart("Weight", GT_LINE);
|
||||
weight->setMachineType(MT_JOURNAL);
|
||||
weight->addSlice(Journal_Weight, QColor("black"), ST_SETAVG);
|
||||
WEIGHT->AddLayer(weight);
|
||||
|
||||
BMI = createGraph(STR_GRAPH_BMI, STR_TR_BMI, tr("Body\nMass\nIndex"));
|
||||
bmi = new SummaryChart("BMI", GT_LINE);
|
||||
bmi->setMachineType(MT_JOURNAL);
|
||||
bmi->addSlice(Journal_BMI, QColor("black"), ST_SETAVG);
|
||||
BMI->AddLayer(bmi);
|
||||
|
||||
ZOMBIE = createGraph(STR_GRAPH_Zombie, STR_TR_Zombie, tr("How you felt\n(0-10)"));
|
||||
zombie = new SummaryChart("Zombie", GT_LINE);
|
||||
zombie->setMachineType(MT_JOURNAL);
|
||||
zombie->addSlice(Journal_ZombieMeter, QColor("black"), ST_SETAVG);
|
||||
ZOMBIE->AddLayer(zombie);
|
||||
|
||||
connectgSummaryCharts();
|
||||
}
|
||||
|
||||
|
||||
// Recalculates Overview chart info
|
||||
void Overview::RebuildGraphs(bool reset)
|
||||
{
|
||||
@ -256,15 +355,20 @@ void Overview::RebuildGraphs(bool reset)
|
||||
if (reset) {
|
||||
GraphView->GetXBounds(minx, maxx);
|
||||
}
|
||||
|
||||
if (settingsLoaded) GraphView->SaveSettings("Overview");
|
||||
settingsLoaded=false;
|
||||
minRangeStartDate=p_profile->LastDay(MT_CPAP);
|
||||
maxRangeEndDate=minRangeStartDate.addDays(-1); // force a range change;
|
||||
disconnectgSummaryCharts() ;
|
||||
GraphView->trashGraphs(true); // Remove all existing graphs
|
||||
|
||||
CreateAllGraphs();
|
||||
GraphView->LoadSettings("Overview");
|
||||
settingsLoaded = true;
|
||||
|
||||
if (reset) {
|
||||
GraphView->resetLayout();
|
||||
GraphView->setDay(nullptr);
|
||||
GraphView->SetXBounds(minx, maxx, 0, false);
|
||||
SetXBounds(minx, maxx, 0, false);
|
||||
GraphView->resetLayout();
|
||||
updateGraphCombo();
|
||||
}
|
||||
@ -374,35 +478,12 @@ void Overview::updateGraphCombo()
|
||||
updateCube();
|
||||
}
|
||||
|
||||
#if 0
|
||||
void Overview::ResetGraphs()
|
||||
{
|
||||
QDate start = ui->dateStart->date();
|
||||
QDate end = ui->dateEnd->date();
|
||||
GraphView->setDay(nullptr);
|
||||
updateCube();
|
||||
|
||||
if (start.isValid() && end.isValid()) {
|
||||
setRange(start, end);
|
||||
}
|
||||
}
|
||||
|
||||
void Overview::ResetGraph(QString name)
|
||||
{
|
||||
gGraph *g = GraphView->findGraph(name);
|
||||
|
||||
if (!g) { return; }
|
||||
|
||||
g->setDay(nullptr);
|
||||
GraphView->redraw();
|
||||
}
|
||||
#endif
|
||||
|
||||
void Overview::RedrawGraphs()
|
||||
{
|
||||
GraphView->redraw();
|
||||
}
|
||||
|
||||
// Updates calendar format and profile data.
|
||||
void Overview::UpdateCalendarDay(QDateEdit *dateedit, QDate date)
|
||||
{
|
||||
QCalendarWidget *calendar = dateedit->calendarWidget();
|
||||
@ -433,6 +514,71 @@ void Overview::UpdateCalendarDay(QDateEdit *dateedit, QDate date)
|
||||
|
||||
calendar->setHorizontalHeaderFormat(QCalendarWidget::ShortDayNames);
|
||||
}
|
||||
|
||||
void Overview::SetXBounds(qint64 start, qint64 end, short group , bool refresh )
|
||||
{
|
||||
GraphView->SetXBounds( start , end ,group,refresh);
|
||||
}
|
||||
|
||||
void Overview::on_XBoundsChanged(qint64 start,qint64 end)
|
||||
{
|
||||
displayStartDate = convertTimeToDate(start);
|
||||
displayEndDate = convertTimeToDate(end);
|
||||
|
||||
bool largerRange=false;
|
||||
if (displayStartDate>maxRangeEndDate || minRangeStartDate>displayEndDate) {
|
||||
// have non-overlaping ranges
|
||||
// Only occurs when custom mode is switched to/from a latest mode. custom mode to/from last week.
|
||||
// All other displays expand the existing range.
|
||||
// reset all empty flags to not empty
|
||||
if (displayStartDate>maxRangeEndDate) {
|
||||
//DEBUGF << "Two ranges" O(displayStartDate) <<">" << O(maxRangeEndDate);
|
||||
}
|
||||
if (minRangeStartDate>displayEndDate) {
|
||||
//DEBUGF << "Two ranges" O(minRangeStartDate) <<">" << O(displayEndDate);
|
||||
}
|
||||
largerRange=true;
|
||||
chartsEmpty = QHash<gSummaryChart*, gGraph*>( chartsToBeMonitored );
|
||||
minRangeStartDate = displayStartDate;
|
||||
maxRangeEndDate = displayEndDate;
|
||||
} else {
|
||||
// new range overlaps with old range
|
||||
if (displayStartDate<minRangeStartDate) {
|
||||
//DEBUGF << "Start lower" <<O(minRangeStartDate)<< ">" <<O(displayStartDate);
|
||||
largerRange=true;
|
||||
minRangeStartDate = displayStartDate;
|
||||
}
|
||||
if (displayEndDate>maxRangeEndDate) {
|
||||
//DEBUGF << "End Higher" <<O(maxRangeEndDate)<< "<" <<O(displayEndDate);
|
||||
largerRange=true;
|
||||
maxRangeEndDate = displayEndDate;
|
||||
}
|
||||
}
|
||||
if (!largerRange) {
|
||||
if (displayStartDate<minRangeStartDate ) {
|
||||
//DEBUGF << "ERROR" <<O(minRangeStartDate)<< "==" <<O(displayStartDate);
|
||||
}
|
||||
if (displayEndDate>maxRangeEndDate) {
|
||||
//DEBUGF << "ERROR" <<O(maxRangeEndDate)<< "==" <<O(displayEndDate);
|
||||
}
|
||||
}
|
||||
|
||||
if (largerRange) {
|
||||
for (auto it= chartsEmpty.begin();it!=chartsEmpty.end();it++) {
|
||||
gSummaryChart* sc = it.key();
|
||||
bool empty=sc->isEmpty();
|
||||
if (empty) {
|
||||
sc ->reCalculate();
|
||||
GraphView->updateScale();
|
||||
GraphView->redraw();
|
||||
GraphView->timedRedraw(150);
|
||||
}
|
||||
}
|
||||
chartsEmpty.clear();
|
||||
updateGraphCombo();
|
||||
}
|
||||
}
|
||||
|
||||
void Overview::dateStart_currentPageChanged(int year, int month)
|
||||
{
|
||||
QDate d(year, month, 1);
|
||||
@ -443,6 +589,7 @@ void Overview::dateStart_currentPageChanged(int year, int month)
|
||||
UpdateCalendarDay(ui->dateStart, d);
|
||||
}
|
||||
}
|
||||
|
||||
void Overview::dateEnd_currentPageChanged(int year, int month)
|
||||
{
|
||||
QDate d(year, month, 1);
|
||||
@ -459,7 +606,7 @@ void Overview::on_dateEnd_dateChanged(const QDate &date)
|
||||
{
|
||||
qint64 d1 = qint64(QDateTime(ui->dateStart->date(), QTime(0, 10, 0)/*, Qt::UTC*/).toTime_t()) * 1000L;
|
||||
qint64 d2 = qint64(QDateTime(date, QTime(23, 0, 0)/*, Qt::UTC*/).toTime_t()) * 1000L;
|
||||
GraphView->SetXBounds(d1, d2);
|
||||
SetXBounds(d1, d2);
|
||||
ui->dateStart->setMaximumDate(date);
|
||||
if (customMode) {
|
||||
p_profile->general->setCustomOverviewRangeEnd(date);
|
||||
@ -470,12 +617,11 @@ void Overview::on_dateStart_dateChanged(const QDate &date)
|
||||
{
|
||||
qint64 d1 = qint64(QDateTime(date, QTime(0, 10, 0)/*, Qt::UTC*/).toTime_t()) * 1000L;
|
||||
qint64 d2 = qint64(QDateTime(ui->dateEnd->date(), QTime(23, 0, 0)/*, Qt::UTC*/).toTime_t()) * 1000L;
|
||||
GraphView->SetXBounds(d1, d2);
|
||||
SetXBounds(d1, d2);
|
||||
ui->dateEnd->setMinimumDate(date);
|
||||
if (customMode) {
|
||||
p_profile->general->setCustomOverviewRangeStart(date);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Zoom to 100% button clicked or called back from 100% zoom in popup menu
|
||||
@ -483,7 +629,7 @@ void Overview::on_zoomButton_clicked()
|
||||
{
|
||||
qint64 d1 = qint64(QDateTime(ui->dateStart->date(), QTime(0, 10, 0)/*, Qt::UTC*/).toTime_t()) * 1000L; // GTS why UTC?
|
||||
qint64 d2 = qint64(QDateTime(ui->dateEnd->date(), QTime(23, 0, 0)/*, Qt::UTC*/).toTime_t()) * 1000L; // Interesting: start date set to 10 min after midnight, ending at 11 pm
|
||||
GraphView->SetXBounds(d1, d2);
|
||||
SetXBounds(d1, d2);
|
||||
}
|
||||
|
||||
void Overview::ResetGraphLayout()
|
||||
@ -501,8 +647,14 @@ void Overview::ResetGraphOrder(int type)
|
||||
// Process new range selection from combo button
|
||||
void Overview::on_rangeCombo_activated(int index)
|
||||
{
|
||||
// Block signal so that graphs are not updated for these.
|
||||
ui->dateEnd->blockSignals(true);
|
||||
ui->dateStart->blockSignals(true);
|
||||
ui->dateStart->setMinimumDate(p_profile->FirstDay()); // first and last dates for ANY machine type
|
||||
ui->dateEnd->setMaximumDate(p_profile->LastDay());
|
||||
// these signals will be reenabled in setRange.
|
||||
//ui->dateEnd->blockSignals(false);
|
||||
//ui->dateStart->blockSignals(false);
|
||||
|
||||
// Exclude Journal in calculating the last day
|
||||
QDate end = p_profile->LastDay(MT_CPAP);
|
||||
@ -592,21 +744,27 @@ void Overview::on_rangeCombo_activated(int index)
|
||||
delete progress;
|
||||
|
||||
// first and last dates for ANY machine type
|
||||
//uiStartDate=start;
|
||||
//uiEndDate=end;
|
||||
setRange(start, end);
|
||||
}
|
||||
|
||||
// Saves dates in UI, clicks zoom button, and updates combo box
|
||||
void Overview::setRange(QDate start, QDate end)
|
||||
// 1. Updates the dates in the start / end date boxs
|
||||
// 2. optionally also changes display range for graphs.
|
||||
void Overview::setRange(QDate& start, QDate& end, bool updateGraphs/*zoom*/)
|
||||
{
|
||||
ui->dateEnd->blockSignals(true);
|
||||
ui->dateStart->blockSignals(true);
|
||||
|
||||
ui->dateStart->setMaximumDate(end);
|
||||
ui->dateEnd->setMinimumDate(start);
|
||||
ui->dateStart->setDate(start);
|
||||
ui->dateEnd->setDate(end);
|
||||
|
||||
ui->dateEnd->blockSignals(false);
|
||||
ui->dateStart->blockSignals(false);
|
||||
this->on_zoomButton_clicked(); // Click on zoom-out to 100% button
|
||||
if (updateGraphs) this->on_zoomButton_clicked(); // Click on zoom-out to 100% button
|
||||
updateGraphCombo();
|
||||
}
|
||||
|
||||
@ -631,7 +789,7 @@ void Overview::on_graphCombo_activated(int index)
|
||||
|
||||
g = GraphView->findGraphTitle(s);
|
||||
g->setVisible(b);
|
||||
}
|
||||
}
|
||||
ui->graphCombo->setCurrentIndex(0);
|
||||
updateCube();
|
||||
setGraphText();
|
||||
|
||||
@ -65,7 +65,7 @@ class Overview : public QWidget
|
||||
void RedrawGraphs();
|
||||
|
||||
//! \brief Sets the currently selected date range of the overview display
|
||||
void setRange(QDate start, QDate end);
|
||||
void setRange(QDate& start, QDate& end,bool updateGraphs=true);
|
||||
|
||||
/*! \brief Create an overview graph, adding it to the overview gGraphView object
|
||||
\param QString name The title of the graph
|
||||
@ -78,11 +78,6 @@ class Overview : public QWidget
|
||||
|
||||
gSummaryChart * stg, *uc, *ahi, * pres, *lk, *npb, *rr, *mv, *tv, *nll, *sn, *ttia;
|
||||
|
||||
//! \brief List of SummaryCharts shown on the overview page
|
||||
QVector<SummaryChart *> OverviewCharts;
|
||||
|
||||
//void ResetGraph(QString name);
|
||||
|
||||
void RebuildGraphs(bool reset = true);
|
||||
|
||||
public slots:
|
||||
@ -93,6 +88,8 @@ class Overview : public QWidget
|
||||
|
||||
private slots:
|
||||
void updateGraphCombo();
|
||||
void on_XBoundsChanged(qint64 ,qint64);
|
||||
void on_summaryChartEmpty(gSummaryChart*,qint64,qint64,bool);
|
||||
|
||||
//! \brief Resets the graph view because the Start date has been changed
|
||||
void on_dateStart_dateChanged(const QDate &date);
|
||||
@ -120,6 +117,7 @@ class Overview : public QWidget
|
||||
|
||||
private:
|
||||
void CreateAllGraphs();
|
||||
void timedUpdateOverview(int ms=0);
|
||||
|
||||
Ui::Overview *ui;
|
||||
gGraphView *GraphView;
|
||||
@ -139,6 +137,25 @@ class Overview : public QWidget
|
||||
|
||||
Day *day; // dummy in this case
|
||||
|
||||
|
||||
bool checkRangeChanged(QDate& first, QDate& last);
|
||||
void connectgSummaryCharts() ;
|
||||
void disconnectgSummaryCharts() ;
|
||||
void SetXBounds(qint64 minx, qint64 maxx, short group = 0, bool refresh = true);
|
||||
|
||||
// Start and of dates of the current graph display
|
||||
QDate displayStartDate;
|
||||
QDate displayEndDate;
|
||||
|
||||
// min / max dates of the graph Range
|
||||
QDate minRangeStartDate;
|
||||
QDate maxRangeEndDate;
|
||||
|
||||
QHash<gSummaryChart*,gGraph*> chartsToBeMonitored;
|
||||
QHash<gSummaryChart*,gGraph* > chartsEmpty;
|
||||
|
||||
bool settingsLoaded ;
|
||||
|
||||
};
|
||||
|
||||
#endif // OVERVIEW_H
|
||||
|
||||
@ -1005,7 +1005,7 @@ void OximeterImport::on_saveButton_clicked()
|
||||
calcSPO2Drop(session);
|
||||
calcPulseChange(session);
|
||||
|
||||
qDebug() << "oximod - Setting up machine and session";
|
||||
qDebug() << "oximod - Setting up device and session";
|
||||
|
||||
mach->setModel(oximodule->getModel());
|
||||
mach->setBrand(oximodule->getVendor());
|
||||
@ -1040,9 +1040,9 @@ void OximeterImport::on_saveButton_clicked()
|
||||
|
||||
session->setOpened(true);
|
||||
|
||||
qDebug() << "oximod - Adding session to machine";
|
||||
qDebug() << "oximod - Adding session to device";
|
||||
mach->AddSession(session);
|
||||
qDebug() << "oximod - Saving machine";
|
||||
qDebug() << "oximod - Saving device";
|
||||
mach->Save();
|
||||
mach->SaveSummaryCache();
|
||||
p_profile->StoreMachines();
|
||||
|
||||
@ -345,7 +345,7 @@ border-radius: 0px;</string>
|
||||
<item>
|
||||
<widget class="QStackedWidget" name="stackedWidget">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>1</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="welcomePage">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
@ -599,17 +599,17 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
|
||||
</property>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>CMS50Fv3.7+/H/I, CMS50D+v4.6, Pulox PO-400/500</string>
|
||||
<string notr="true">CMS50D+/E/F, Pulox PO-200/300</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>CMS50D+/E/F, Pulox PO-200/300</string>
|
||||
<string notr="true">CMS50Fv3.7+/H/I, CMS50D+v4.6, Pulox PO-400/500</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>ChoiceMMed MD300W1</string>
|
||||
<string notr="true">ChoiceMMed MD300W1</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
@ -1470,7 +1470,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>I started this oximeter recording at (or near) the same time as a session on my CPAP machine.</string>
|
||||
<string>I started this oximeter recording at (or near) the same time as a session on my CPAP device.</string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
|
||||
@ -63,15 +63,15 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (QMessageBox::question(this, tr("No CPAP machines detected"),
|
||||
tr("Will you be using a ResMed brand machine?"),
|
||||
if (QMessageBox::question(this, tr("No CPAP devices detected"),
|
||||
tr("Will you be using a ResMed brand device?"),
|
||||
QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes )
|
||||
haveResMed = true;
|
||||
}
|
||||
|
||||
#ifdef LOCK_RESMED_SESSIONS
|
||||
// Remove access to session splitting options and show ResMed users a notice instead
|
||||
ui->ResMedWarning->setText(tr("<p><b>Please Note:</b> OSCAR's advanced session splitting capabilities are not possible with <b>ResMed</b> machines due to a limitation in the way their settings and summary data is stored, and therefore they have been disabled for this profile.</p><p>On ResMed machines, days will <b>split at noon</b> like in ResMed's commercial software.</p>"));
|
||||
ui->ResMedWarning->setText(tr("<p><b>Please Note:</b> OSCAR's advanced session splitting capabilities are not possible with <b>ResMed</b> devices due to a limitation in the way their settings and summary data is stored, and therefore they have been disabled for this profile.</p><p>On ResMed devices, days will <b>split at noon</b> like in ResMed's commercial software.</p>"));
|
||||
ui->ResMedWarning->setVisible(haveResMed);
|
||||
|
||||
if (haveResMed) {
|
||||
@ -1162,7 +1162,7 @@ void PreferencesDialog::on_createSDBackups_toggled(bool checked)
|
||||
|
||||
if (haveS9 && QMessageBox::question(this,
|
||||
tr("This may not be a good idea"),
|
||||
tr("ResMed S9 machines routinely delete certain data from your SD card older than 7 and 30 days (depending on resolution).") +
|
||||
tr("ResMed S9 devices routinely delete certain data from your SD card older than 7 and 30 days (depending on resolution).") +
|
||||
tr(" If you ever need to reimport this data again (whether in OSCAR or ResScan) this data won't come back.") +
|
||||
tr(" If you need to conserve disk space, please remember to carry out manual backups.") +
|
||||
tr(" Are you sure you want to disable these backups?"),
|
||||
|
||||
@ -269,12 +269,7 @@
|
||||
<item>
|
||||
<widget class="QSlider" name="IgnoreSlider">
|
||||
<property name="toolTip">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Sessions shorter in duration than this will not be displayed<span style=" font-style:italic;">.</span></p>
|
||||
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-style:italic;"></p></body></html></string>
|
||||
<string><html><head/><body><p><span style=" font-family:'Cantarell'; font-size:11pt;">Sessions shorter in duration than this will not be displayed</span><span style=" font-family:'Cantarell'; font-size:11pt; font-style:italic;">.</span></p><p><br/></p></body></html></string>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>90</number>
|
||||
@ -477,9 +472,9 @@ If you've got a new computer with a small solid state disk, this is a good optio
|
||||
<item row="2" column="0">
|
||||
<widget class="QCheckBox" name="createSDBackups">
|
||||
<property name="toolTip">
|
||||
<string>This maintains a backup of SD-card data for ResMed machines,
|
||||
<string>This maintains a backup of SD-card data for ResMed devices,
|
||||
|
||||
ResMed S9 series machines delete high resolution data older than 7 days,
|
||||
ResMed S9 series devices delete high resolution data older than 7 days,
|
||||
and graph data older than 30 days..
|
||||
|
||||
OSCAR can keep a copy of this data if you ever need to reinstall.
|
||||
@ -637,10 +632,10 @@ OSCAR can keep a copy of this data if you ever need to reinstall.
|
||||
<item row="1" column="1">
|
||||
<widget class="QCheckBox" name="warnOnUntestedMachine">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Provide an alert when importing data from any machine model that has not yet been tested by OSCAR developers.</p></body></html></string>
|
||||
<string><html><head/><body><p>Provide an alert when importing data from any device model that has not yet been tested by OSCAR developers.</p></body></html></string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Warn when importing data from an untested machine</string>
|
||||
<string>Warn when importing data from an untested device</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -805,7 +800,7 @@ OSCAR can keep a copy of this data if you ever need to reinstall.
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>This calculation requires Total Leaks data to be provided by the CPAP machine. (Eg, PRS1, but not ResMed, which has these already)
|
||||
<string>This calculation requires Total Leaks data to be provided by the CPAP device. (Eg, PRS1, but not ResMed, which has these already)
|
||||
|
||||
The Unintentional Leak calculations used here are linear, they don't model the mask vent curve.
|
||||
|
||||
@ -970,7 +965,7 @@ If you use a few different masks, pick average values instead. It should still b
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Enable/disable experimental event flagging enhancements.
|
||||
It allows detecting borderline events, and some the machine missed.
|
||||
It allows detecting borderline events, and some the device missed.
|
||||
This option must be enabled before import, otherwise a purge is required.</string>
|
||||
</property>
|
||||
<property name="title">
|
||||
@ -1021,10 +1016,10 @@ This option must be enabled before import, otherwise a purge is required.</strin
|
||||
<item row="6" column="0" colspan="4">
|
||||
<widget class="QCheckBox" name="resyncMachineDetectedEvents">
|
||||
<property name="toolTip">
|
||||
<string>This experimental option attempts to use OSCAR's event flagging system to improve machine detected event positioning.</string>
|
||||
<string>This experimental option attempts to use OSCAR's event flagging system to improve device detected event positioning.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Resync Machine Detected Events (Experimental)</string>
|
||||
<string>Resync Device Detected Events (Experimental)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -1078,11 +1073,7 @@ This option must be enabled before import, otherwise a purge is required.</strin
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:italic;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Custom flagging is an experimental method of detecting events missed by the machine. They are <span style=" text-decoration: underline;">not</span> included in AHI.</p></body></html></string>
|
||||
<string><html><head/><body><p><span style=" font-family:'Sans'; font-size:10pt;">Custom flagging is an experimental method of detecting events missed by the device. They are </span><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline;">not</span><span style=" font-family:'Sans'; font-size:10pt;"> included in AHI.</span></p></body></html></string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
@ -1148,7 +1139,7 @@ A value of 20% works well for detecting apneas. </string>
|
||||
<item row="4" column="0" colspan="4">
|
||||
<widget class="QCheckBox" name="userEventDuplicates">
|
||||
<property name="text">
|
||||
<string>Allow duplicates near machine events.</string>
|
||||
<string>Allow duplicates near device events.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -1196,7 +1187,7 @@ A value of 20% works well for detecting apneas. </string>
|
||||
<item row="3" column="0">
|
||||
<widget class="QCheckBox" name="showUnknownFlags">
|
||||
<property name="toolTip">
|
||||
<string>Show flags for machine detected events that haven't been identified yet.</string>
|
||||
<string>Show flags for device detected events that haven't been identified yet.</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Enable Unknown Events Channels</string>
|
||||
@ -1492,7 +1483,7 @@ as this is the only value available on summary-only days.</string>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string><html><head/><body><p><span style=" font-weight:600;">Note: </span>Due to summary design limitations, ResMed machines do not support changing these settings.</p></body></html></string>
|
||||
<string><html><head/><body><p><span style=" font-weight:600;">Note: </span>Due to summary design limitations, ResMed devices do not support changing these settings.</p></body></html></string>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
@ -1789,15 +1780,15 @@ as this is the only value available on summary-only days.</string>
|
||||
<html><head><meta name="qrichtext" content="1" /><meta charset="utf-8" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt; font-weight:600;">Syncing Oximetry and CPAP Data</span></p>
|
||||
<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"><br /></p>
|
||||
<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">CMS50 data imported from SpO2Review (from .spoR files) or the serial import method do </span><span style=" font-family:'Sans'; font-size:10pt; font-weight:600; text-decoration: underline;">not</span><span style=" font-family:'Sans'; font-size:10pt;"> have the correct timestamp needed to sync.</span></p>
|
||||
<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"><br /></p>
|
||||
<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">Live view mode (using a serial cable) is one way to acheive an accurate sync on CMS50 oximeters, but does not counter for CPAP clock drift.</span></p>
|
||||
<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"><br /></p>
|
||||
<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">If you start your Oximeters recording mode at </span><span style=" font-family:'Sans'; font-size:10pt; font-style:italic;">exactly </span><span style=" font-family:'Sans'; font-size:10pt;">the same time you start your CPAP machine, you can now also achieve sync. </span></p>
|
||||
<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"><br /></p>
|
||||
<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">The serial import process takes the starting time from last nights first CPAP session. (Remember to import your CPAP data first!)</span></p></body></html></string>
|
||||
<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt; font-weight:600;">Syncing Oximetry and CPAP Data</span></p>
|
||||
<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
|
||||
<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">CMS50 data imported from SpO2Review (from .spoR files) or the serial import method do </span><span style=" font-family:'Sans'; font-size:10pt; font-weight:600; text-decoration: underline;">not</span><span style=" font-family:'Sans'; font-size:10pt;"> have the correct timestamp needed to sync.</span></p>
|
||||
<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
|
||||
<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">Live view mode (using a serial cable) is one way to acheive an accurate sync on CMS50 oximeters, but does not counter for CPAP clock drift.</span></p>
|
||||
<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
|
||||
<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">If you start your Oximeters recording mode at </span><span style=" font-family:'Sans'; font-size:10pt; font-style:italic;">exactly </span><span style=" font-family:'Sans'; font-size:10pt;">the same time you start your CPAP device, you can now also achieve sync. </span></p>
|
||||
<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
|
||||
<p align="justify" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">The serial import process takes the starting time from last nights first CPAP session. (Remember to import your CPAP data first!)</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
@ -2497,10 +2488,10 @@ Mainly affects the importer.</string>
|
||||
<number>30000</number>
|
||||
</property>
|
||||
<property name="singleStep">
|
||||
<number>100</number>
|
||||
<number>1000</number>
|
||||
</property>
|
||||
<property name="pageStep">
|
||||
<number>500</number>
|
||||
<number>5000</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>5000</number>
|
||||
@ -2738,7 +2729,7 @@ Try it and see if you like it.</string>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="includeSerial">
|
||||
<property name="toolTip">
|
||||
<string>Whether to include machine serial number on machine settings changes report</string>
|
||||
<string>Whether to include device serial number on device settings changes report</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Include Serial Number</string>
|
||||
|
||||
@ -125,7 +125,7 @@ void ProfileSelector::updateProfileList()
|
||||
|
||||
Machine * mach = prof->GetMachine(MT_CPAP); // only interested in last cpap machine...
|
||||
if (!mach) {
|
||||
qDebug() << "Couldn't find machine info for" << name;
|
||||
qDebug() << "Couldn't find device info for" << name;
|
||||
}
|
||||
|
||||
model->insertRows(row, 1, QModelIndex());
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
</property>
|
||||
<property name="url" stdset="0">
|
||||
<url>
|
||||
<string>about:blank</string>
|
||||
<string notr="true">about:blank</string>
|
||||
</url>
|
||||
</property>
|
||||
</widget>
|
||||
|
||||
@ -30,8 +30,8 @@ extern MainWindow *mainwin;
|
||||
QString htmlReportHeader = ""; // Page header
|
||||
QString htmlReportHeaderPrint = ""; // Page header
|
||||
QString htmlUsage = ""; // CPAP and Oximetry
|
||||
QString htmlMachineSettings = ""; // Machine (formerly Rx) changes
|
||||
QString htmlMachines = ""; // Machines used in this profile
|
||||
QString htmlMachineSettings = ""; // Device (formerly Rx) changes
|
||||
QString htmlMachines = ""; // Devices used in this profile
|
||||
QString htmlReportFooter = ""; // Page footer
|
||||
|
||||
QString resizeHTMLPixmap(QPixmap &pixmap, int width, int height) {
|
||||
@ -529,7 +529,7 @@ void Statistics::updateRXChanges()
|
||||
// Statistics constructor is responsible for creating list of rows that will on the Statistics page
|
||||
// and skeletons of column 1 text that correspond to each calculation type.
|
||||
// Actual column 1 text is combination of skeleton for the row's calculation time and the text of the row.
|
||||
// Also creates "machine" names for machine types.
|
||||
// Also creates "device" names for device types.
|
||||
Statistics::Statistics(QObject *parent) :
|
||||
QObject(parent)
|
||||
{
|
||||
@ -803,7 +803,7 @@ EventDataType calcSA(QDate start, QDate end)
|
||||
return val;
|
||||
}
|
||||
|
||||
// Structure for recording Prescription Changes (now called Machine Settings Changes)
|
||||
// Structure for recording Prescription Changes (now called Device Settings Changes)
|
||||
struct RXChange {
|
||||
RXChange() { highlight = 0; machine = nullptr; }
|
||||
RXChange(const RXChange ©) {
|
||||
@ -888,7 +888,7 @@ const QString heading_color="#ffffff";
|
||||
const QString subheading_color="#e0e0e0";
|
||||
//const int rxthresh = 5;
|
||||
|
||||
// Sort machines by first day of use
|
||||
// Sort devices by first day of use
|
||||
bool machineCompareFirstDay(Machine* left, Machine *right) {
|
||||
return left->FirstDay() > right->FirstDay();
|
||||
}
|
||||
@ -914,7 +914,7 @@ QString Statistics::GenerateMachineList()
|
||||
html += QString("<table class=curved style='page-break-before:auto' "+table_width+">");
|
||||
|
||||
html += "<thead>";
|
||||
html += "<tr bgcolor='"+heading_color+"'><th colspan=7 align=center><font size='+2'>" + tr("Machine Information") + "</font></th></tr>";
|
||||
html += "<tr bgcolor='"+heading_color+"'><th colspan=7 align=center><font size='+2'>" + tr("Device Information") + "</font></th></tr>";
|
||||
|
||||
html += QString("<tr><td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td><td><b>%5</b></td></tr>")
|
||||
.arg(STR_TR_Brand)
|
||||
@ -931,7 +931,7 @@ QString Statistics::GenerateMachineList()
|
||||
m = mach.at(i);
|
||||
|
||||
if (m->type() == MT_JOURNAL) { continue; }
|
||||
//qDebug() << "Machine" << m->brand() << "series" << m->series() << "model" << m->model() << "model number" << m->modelnumber();
|
||||
//qDebug() << "Device" << m->brand() << "series" << m->series() << "model" << m->model() << "model number" << m->modelnumber();
|
||||
QDate d1 = m->FirstDay();
|
||||
QDate d2 = m->LastDay();
|
||||
QString mn = m->modelnumber();
|
||||
@ -952,7 +952,7 @@ QString Statistics::GenerateMachineList()
|
||||
}
|
||||
QString Statistics::GenerateRXChanges()
|
||||
{
|
||||
// Generate list only if there are CPAP machines
|
||||
// Generate list only if there are CPAP devices
|
||||
QList<Machine *> cpap_machines = p_profile->GetMachines(MT_CPAP);
|
||||
if (cpap_machines.isEmpty())
|
||||
return "";
|
||||
@ -973,7 +973,7 @@ QString Statistics::GenerateRXChanges()
|
||||
QString html = "<div align=center><br>";
|
||||
html += QString("<table class=curved style='page-break-before:always' " + table_width+">");
|
||||
html += "<thead>";
|
||||
html += "<tr bgcolor='"+heading_color+"'><th colspan=9 align=center><font size='+2'>" + tr("Changes to Machine Settings") + "</font></th></tr>";
|
||||
html += "<tr bgcolor='"+heading_color+"'><th colspan=9 align=center><font size='+2'>" + tr("Changes to Device Settings") + "</font></th></tr>";
|
||||
|
||||
// QString extratxt;
|
||||
|
||||
@ -1083,7 +1083,7 @@ QString Statistics::GenerateCPAPUsage()
|
||||
mach.append(cpap_machines);
|
||||
mach.append(oximeters);
|
||||
|
||||
// Go through all CPAP and Oximeter machines and see if any data is present
|
||||
// Go through all CPAP and Oximeter devices and see if any data is present
|
||||
bool havedata = false;
|
||||
for (int i=0; i < mach.size(); ++i) {
|
||||
int daysize = mach[i]->day.size();
|
||||
@ -1378,7 +1378,7 @@ QString Statistics::UpdateRecordsBox()
|
||||
"a:link,a:visited { color: inherit; text-decoration: none; }" //font-weight: normal;
|
||||
"a:hover { background-color: inherit; color: white; text-decoration:none; font-weight: bold; }"
|
||||
"</style>"
|
||||
"<title>Machine Statistics Panel</title>"
|
||||
"<title>Device Statistics Panel</title>"
|
||||
"</head><body>";
|
||||
|
||||
Machine * cpap = p_profile->GetMachine(MT_CPAP);
|
||||
|
||||
@ -83,7 +83,7 @@ struct StatisticsRow {
|
||||
return SC_UNDEFINED;
|
||||
}
|
||||
|
||||
//! \brief Look up machine type
|
||||
//! \brief Look up device type
|
||||
MachineType lookupType(QString type)
|
||||
{
|
||||
if (type.compare("cpap", Qt::CaseInsensitive)==0) {
|
||||
@ -104,7 +104,7 @@ struct StatisticsRow {
|
||||
QString value(QDate start, QDate end);
|
||||
};
|
||||
|
||||
//! \class Prescription (Machine) setting
|
||||
//! \class Prescription (device) setting
|
||||
class RXItem {
|
||||
public:
|
||||
RXItem() {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user