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

First series in my translation-cleanup. More to come...

Browse Source
This commit is contained in:
ArieKlerk 2022-02-27 15:18:39 +01:00
parent 3e069fa4de
commit 1be14922c0
18 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oscar/aboutdialog.cpp
View File

@ -127,7 +127,7 @@ QString AboutDialog::getRelnotes()
QString text = "<html>" QString text = "<html>"
"<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head>" "<head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head>"
"<body><span style=\" font-size:20pt;\">"+tr("Release Notes")+"</span><br/>" "<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/>"; "<hr/>";
if (getVersion().IsReleaseVersion() == false) { if (getVersion().IsReleaseVersion() == false) {
text += "<p><font color='red' size=+1><b>"+tr("Important:")+"</b></font> " text += "<p><font color='red' size=+1><b>"+tr("Important:")+"</b></font> "

16
oscar/daily.cpp
View File

@ -1108,7 +1108,7 @@ QString Daily::getMachineSettings(Day * day) {
Machine * cpap = day->machine(MT_CPAP); Machine * cpap = day->machine(MT_CPAP);
if (cpap && day->hasEnabledSessions(MT_CPAP)) { if (cpap && day->hasEnabledSessions(MT_CPAP)) {
html="<table cellpadding=0 cellspacing=0 border=0 width=100%>"; 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)) { 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"; 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))) { } 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; return html;
} }
*/ */
@ -1320,7 +1320,7 @@ QString Daily::getStatisticsInfo(Day * day)
.arg(STR_TR_Min) .arg(STR_TR_Min)
.arg(midname) .arg(midname)
.arg(QString("%1%2").arg(percentile*100,0,'f',0).arg(STR_UNIT_Percentage)) .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[]={ ChannelID chans[]={
CPAP_Pressure,CPAP_PressureSet,CPAP_EPAP,CPAP_EPAPSet,CPAP_IPAP,CPAP_IPAPSet,CPAP_PS,CPAP_PTB, 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); .arg("#F88017").arg(COLOR_Text.name()).arg(ahiname).arg(schema::channel[ahichan].fullname()).arg(ahi,0,'f',2);
} else { } else {
htmlLeftAHI+=QString("<td colspan=5 bgcolor='%1' align=center><font size=+3 color='yellow'><b>%2</b></font></td>\n") 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+="</tr>\n";
htmlLeftAHI+="</table>\n"; htmlLeftAHI+="</table>\n";
@ -1732,7 +1732,7 @@ void Daily::Load(QDate date)
QString data; QString data;
float channelHours = hours; float channelHours = hours;
if (chan.machtype() != MT_CPAP) { 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 // might have Oximetry (for example) longer or shorter than CPAP
channelHours = day->hours(chan.machtype()); channelHours = day->hours(chan.machtype());
if (channelHours <= 0) { 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'><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"; htmlLeftNoHours+="<tr><td colspan=5 align='center'><i>"+tr("Zero hours??")+"</i></td></tr>\n";
} }
} else { // machine is a brick } else { // Device 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'><b><h2>"+tr("no data :(")+"</h2></b></td></tr>";
htmlLeftNoHours+="<tr><td colspan=5 align='center'><i>"+tr("Sorry, this machine only provides compliance data.")+"</i></td></tr>\n"; 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 align='center'><i>"+tr("Complain to your Equipment Provider!")+"</i></td></tr>\n";
} }
htmlLeftNoHours+="<tr><td colspan='5'>&nbsp;</td></tr>\n"; htmlLeftNoHours+="<tr><td colspan='5'>&nbsp;</td></tr>\n";

2
oscar/daily.h
View File

@ -279,7 +279,7 @@ private:
\brief Create a new journal session for this date, if one doesn't exist. \brief Create a new journal session for this date, if one doesn't exist.
\param QDate date \param QDate date
Creates a new journal Machine record if necessary. Creates a new journal device record if necessary.
*/ */
Session * CreateJournalSession(QDate date); Session * CreateJournalSession(QDate date);

2
oscar/daily.ui
View File

@ -1047,7 +1047,7 @@ QToolButton:pressed {
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string notr="true"> i </string> <string> i </string>
</property> </property>
</widget> </widget>
</item> </item>

36
oscar/mainwindow.cpp
View File

@ -281,7 +281,7 @@ void MainWindow::closeEvent(QCloseEvent * event)
static bool runonce = false; static bool runonce = false;
if (!runonce) { if (!runonce) {
if (AppSetting->removeCardReminder()) { 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); QThread::msleep(1000);
QApplication::processEvents(); QApplication::processEvents();
} }
@ -391,7 +391,7 @@ void MainWindow::PopulatePurgeMenu()
addMachineToMenu(mach, ui->menu_Rebuild_CPAP_Data); 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(); machines = p_profile->GetMachines();
for (int i=0; i < machines.size(); ++i) { for (int i=0; i < machines.size(); ++i) {
Machine *mach = machines.at(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); QList<Machine *> machines = p_profile->GetMachines(MT_CPAP);
if (machines.isEmpty()) { if (machines.isEmpty()) {
qDebug() << "No machines in profile"; qDebug() << "No devices in profile";
} else { } else {
#ifdef LOCK_RESMED_SESSIONS #ifdef LOCK_RESMED_SESSIONS
for (QList<Machine *>::iterator it = machines.begin(); it != machines.end(); ++it) { for (QList<Machine *>::iterator it = machines.begin(); it != machines.end(); ++it) {
QString mclass=(*it)->loaderName(); QString mclass=(*it)->loaderName();
if (mclass == STR_MACH_ResMed) { 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. // Have to sacrifice these features to get access to summary data.
p_profile->session->setCombineCloseSessions(0); p_profile->session->setCombineCloseSessions(0);
@ -743,7 +743,7 @@ int MainWindow::importCPAP(ImportPath import, const QString &message)
} else if (c == 0) { } else if (c == 0) {
Notify(tr("Already up to date with CPAP data at\n\n%1").arg(import.path), tr("Up to date")); Notify(tr("Already up to date with CPAP data at\n\n%1").arg(import.path), tr("Up to date"));
} else { } 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(progdlg, SIGNAL(abortClicked()), import.loader, SLOT(abortImport()));
disconnect(import.loader, SIGNAL(setProgressMax(int)), progdlg, SLOT(setProgressMax(int))); disconnect(import.loader, SIGNAL(setProgressMax(int)), progdlg, SLOT(setProgressMax(int)));
@ -797,7 +797,7 @@ void MainWindow::finishCPAPImport()
void MainWindow::importCPAPBackups() void MainWindow::importCPAPBackups()
{ {
// Get BackupPaths for all CPAP machines // Get BackupPaths for all CPAP devices
QList<Machine *> machlist = p_profile->GetMachines(MT_CPAP); QList<Machine *> machlist = p_profile->GetMachines(MT_CPAP);
QList<ImportPath> paths; QList<ImportPath> paths;
Q_FOREACH(Machine *m, machlist) { Q_FOREACH(Machine *m, machlist) {
@ -959,7 +959,7 @@ QList<ImportPath> MainWindow::detectCPAPCards()
} }
Q_FOREACH(const QString &path, AutoScannerPaths) { 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) { Q_FOREACH(MachineLoader * loader, loaders) {
if (loader->Detect(path)) { if (loader->Detect(path)) {
detectedCards.append(ImportPath(path, loader)); detectedCards.append(ImportPath(path, loader));
@ -1748,7 +1748,7 @@ void MainWindow::on_actionPurgeCurrentDayAll_triggered()
this->purgeDay(MT_JOURNAL); 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 // Special handling: MT_JOURNAL == All data. MT_UNKNOWN == All except journal
void MainWindow::purgeDay(MachineType type) void MainWindow::purgeDay(MachineType type)
{ {
@ -1848,7 +1848,7 @@ void MainWindow::on_actionRebuildCPAP(QAction *action)
if (backups) { if (backups) {
if (QMessageBox::question(this, STR_MessageBox_Question, 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->brand() + " " + mach->model() + " " +
mach->modelnumber() + " (" + mach->serial() + ")\n\n" + mach->modelnumber() + " (" + mach->serial() + ")\n\n" +
tr("Please note, that this could result in loss of data if OSCAR's backups have been disabled."), 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 { } else {
if (QMessageBox::question(this, if (QMessageBox::question(this,
STR_MessageBox_Warning, 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>"+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>"+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>", "<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(); QString path = mach->getBackupPath();
MachineLoader *loader = lookupLoader(mach); MachineLoader *loader = lookupLoader(mach);
purgeMachine(mach); // purge destroys machine record purgeMachine(mach); // purge destroys device record
if (backups) { if (backups) {
importCPAP(ImportPath(path, loader), tr("Please wait, importing from backup folder(s)...")); importCPAP(ImportPath(path, loader), tr("Please wait, importing from backup folder(s)..."));
} else { } else {
if (QMessageBox::information(this, STR_MessageBox_Warning, 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("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) { QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) {
on_action_Import_Data_triggered(); on_action_Import_Data_triggered();
} else { } else {
@ -1928,14 +1928,14 @@ void MainWindow::on_actionPurgeMachine(QAction *action)
if (backups) { if (backups) {
backupnotice = "<p>" + tr("Note as a precaution, the backup folder will be left in place.") + "</p>"; backupnotice = "<p>" + tr("Note as a precaution, the backup folder will be left in place.") + "</p>";
} else { } else {
backupnotice = "<p>" + tr("OSCAR does not have any backups for this machine!") + "</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 machine</i>, " "<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 machine's data <b>permanently</b>!</font>") + "</p>"; "<font size=+2>you will lose this device's data <b>permanently</b>!</font>") + "</p>";
} }
if (QMessageBox::question(this, STR_MessageBox_Warning, if (QMessageBox::question(this, STR_MessageBox_Warning,
"<p><b>"+STR_MessageBox_Warning+":</b> " + "<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>" + "<p><font size=+2>" + machname + "</font></p>" +
backupnotice+ backupnotice+
"<p>"+tr("Are you <b>absolutely sure</b> you want to proceed?")+"</p>", "<p>"+tr("Are you <b>absolutely sure</b> you want to proceed?")+"</p>",
@ -1958,7 +1958,7 @@ void MainWindow::purgeMachine(Machine * mach)
QDir dir; QDir dir;
QString path = mach->getDataPath(); QString path = mach->getDataPath();
path.chop(1); path.chop(1);
qDebug() << "path to machine" << path; qDebug() << "path to device" << path;
p_profile->DelMachine(mach); p_profile->DelMachine(mach);
delete mach; delete mach;
@ -2496,7 +2496,7 @@ void MainWindow::on_actionPurgeCurrentDaysOximetry_triggered()
delete sess; 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. // otherwise OSCAR will still think this day has oximetry data at next launch.
for (auto & mach : machines) { for (auto & mach : machines) {
mach->SaveSummaryCache(); mach->SaveSummaryCache();

6
oscar/mainwindow.h
View File

@ -41,7 +41,7 @@ class MainWindow;
Open Source CPAP Analysis Reporter (OSCAR) is a program derived from the SleepyHead program written by Mark Watkins. 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. 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 \section structure Program Structure
OSCAR is written in C++ using Qt Toolkit library, and comprises of 3 main components OSCAR is written in C++ using Qt Toolkit library, and comprises of 3 main components
\list \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 A custom designed, high performance and interactive OpenGL Graphing Library.
\li and the main Application user interface. \li and the main Application user interface.
\endlist \endlist
@ -408,7 +408,7 @@ private:
void PopulatePurgeMenu(); 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 *); void purgeMachine(Machine *);
int warnidx; int warnidx;

2
oscar/mainwindow.ui
View File

@ -2492,7 +2492,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
<widget class="QMenu" name="menuPurge_CPAP_Data"> <widget class="QMenu" name="menuPurge_CPAP_Data">
<property name="title"> <property name="title">
<string>Purge ALL Machine Data</string> <string>Purge ALL Device Data</string>
</property> </property>
</widget> </widget>
<widget class="QMenu" name="menuPurge_Current_Selected_Day"> <widget class="QMenu" name="menuPurge_Current_Selected_Day">

2
oscar/newprofile.cpp
View File

@ -110,7 +110,7 @@ QString NewProfile::getIntroHTML()
"<body>" "<body>"
"<div align=center><h1>" + tr("Welcome to the Open Source CPAP Analysis Reporter") + "</h1></div>" "<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>"
"<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.") "<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.")

6
oscar/overview.cpp
View File

@ -212,7 +212,7 @@ void Overview::CreateAllGraphs() {
ChannelID code = chan->id(); ChannelID code = chan->id();
QString name = chan->fullname(); QString name = chan->fullname();
if (name.length() > 16) name = chan->label(); if (name.length() > 16) name = chan->label();
// qDebug() << "Channel" << name << "type" << chan->type() << "machine type" << chan->machtype(); // qDebug() << "Channel" << name << "type" << chan->type() << "device type" << chan->machtype();
gGraph *G = createGraph(chan->code(), name, chan->description()); gGraph *G = createGraph(chan->code(), name, chan->description());
if ((chan->type() == schema::FLAG) || (chan->type() == schema::MINOR_FLAG)) { if ((chan->type() == schema::FLAG) || (chan->type() == schema::MINOR_FLAG)) {
gSummaryChart * sc = new gSummaryChart(chan->code(), chan->machtype()); // gts was MT_CPAP gSummaryChart * sc = new gSummaryChart(chan->code(), chan->machtype()); // gts was MT_CPAP
@ -501,7 +501,7 @@ void Overview::ResetGraphOrder(int type)
// Process new range selection from combo button // Process new range selection from combo button
void Overview::on_rangeCombo_activated(int index) void Overview::on_rangeCombo_activated(int index)
{ {
ui->dateStart->setMinimumDate(p_profile->FirstDay()); // first and last dates for ANY machine type ui->dateStart->setMinimumDate(p_profile->FirstDay()); // first and last dates for ANY device type
ui->dateEnd->setMaximumDate(p_profile->LastDay()); ui->dateEnd->setMaximumDate(p_profile->LastDay());
// Exclude Journal in calculating the last day // Exclude Journal in calculating the last day
@ -591,7 +591,7 @@ void Overview::on_rangeCombo_activated(int index)
progress->close(); progress->close();
delete progress; delete progress;
// first and last dates for ANY machine type // first and last dates for ANY device type
setRange(start, end); setRange(start, end);
} }

6
oscar/oximeterimport.cpp
View File

@ -1005,7 +1005,7 @@ void OximeterImport::on_saveButton_clicked()
calcSPO2Drop(session); calcSPO2Drop(session);
calcPulseChange(session); calcPulseChange(session);
qDebug() << "oximod - Setting up machine and session"; qDebug() << "oximod - Setting up device and session";
mach->setModel(oximodule->getModel()); mach->setModel(oximodule->getModel());
mach->setBrand(oximodule->getVendor()); mach->setBrand(oximodule->getVendor());
@ -1040,9 +1040,9 @@ void OximeterImport::on_saveButton_clicked()
session->setOpened(true); session->setOpened(true);
qDebug() << "oximod - Adding session to machine"; qDebug() << "oximod - Adding session to device";
mach->AddSession(session); mach->AddSession(session);
qDebug() << "oximod - Saving machine"; qDebug() << "oximod - Saving device";
mach->Save(); mach->Save();
mach->SaveSummaryCache(); mach->SaveSummaryCache();
p_profile->StoreMachines(); p_profile->StoreMachines();

10
oscar/oximeterimport.ui
View File

@ -345,7 +345,7 @@ border-radius: 0px;</string>
<item> <item>
<widget class="QStackedWidget" name="stackedWidget"> <widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="welcomePage"> <widget class="QWidget" name="welcomePage">
<layout class="QVBoxLayout" name="verticalLayout"> <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> </property>
<item> <item>
<property name="text"> <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> </property>
</item> </item>
<item> <item>
<property name="text"> <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> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>ChoiceMMed MD300W1</string> <string notr="true">ChoiceMMed MD300W1</string>
</property> </property>
</item> </item>
</widget> </widget>
@ -1470,7 +1470,7 @@ background: qlineargradient( x1:0 y1:0, x2:1 y2:0, stop:0 white, stop:1 #cccccc)
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <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>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

8
oscar/preferencesdialog.cpp
View File

@ -63,15 +63,15 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Profile *_profile) :
} }
} }
} else { } else {
if (QMessageBox::question(this, tr("No CPAP machines detected"), if (QMessageBox::question(this, tr("No CPAP devices detected"),
tr("Will you be using a ResMed brand machine?"), tr("Will you be using a ResMed brand device?"),
QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes ) QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes )
haveResMed = true; haveResMed = true;
} }
#ifdef LOCK_RESMED_SESSIONS #ifdef LOCK_RESMED_SESSIONS
// Remove access to session splitting options and show ResMed users a notice instead // 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); ui->ResMedWarning->setVisible(haveResMed);
if (haveResMed) { if (haveResMed) {
@ -1162,7 +1162,7 @@ void PreferencesDialog::on_createSDBackups_toggled(bool checked)
if (haveS9 && QMessageBox::question(this, if (haveS9 && QMessageBox::question(this,
tr("This may not be a good idea"), 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 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(" If you need to conserve disk space, please remember to carry out manual backups.") +
tr(" Are you sure you want to disable these backups?"), tr(" Are you sure you want to disable these backups?"),

34
oscar/preferencesdialog.ui
View File

@ -63,7 +63,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>6</number>
</property> </property>
<widget class="QWidget" name="importTab"> <widget class="QWidget" name="importTab">
<attribute name="title"> <attribute name="title">
@ -477,9 +477,9 @@ If you've got a new computer with a small solid state disk, this is a good optio
<item row="2" column="0"> <item row="2" column="0">
<widget class="QCheckBox" name="createSDBackups"> <widget class="QCheckBox" name="createSDBackups">
<property name="toolTip"> <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.. and graph data older than 30 days..
OSCAR can keep a copy of this data if you ever need to reinstall. OSCAR can keep a copy of this data if you ever need to reinstall.
@ -637,10 +637,10 @@ OSCAR can keep a copy of this data if you ever need to reinstall.
<item row="1" column="1"> <item row="1" column="1">
<widget class="QCheckBox" name="warnOnUntestedMachine"> <widget class="QCheckBox" name="warnOnUntestedMachine">
<property name="toolTip"> <property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Provide an alert when importing data from any machine model that has not yet been tested by OSCAR developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Provide an alert when importing data from any device model that has not yet been tested by OSCAR developers.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="text"> <property name="text">
<string>Warn when importing data from an untested machine</string> <string>Warn when importing data from an untested device</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -805,7 +805,7 @@ OSCAR can keep a copy of this data if you ever need to reinstall.
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip"> <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. The Unintentional Leak calculations used here are linear, they don't model the mask vent curve.
@ -970,7 +970,7 @@ If you use a few different masks, pick average values instead. It should still b
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Enable/disable experimental event flagging enhancements. <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> This option must be enabled before import, otherwise a purge is required.</string>
</property> </property>
<property name="title"> <property name="title">
@ -1021,10 +1021,10 @@ This option must be enabled before import, otherwise a purge is required.</strin
<item row="6" column="0" colspan="4"> <item row="6" column="0" colspan="4">
<widget class="QCheckBox" name="resyncMachineDetectedEvents"> <widget class="QCheckBox" name="resyncMachineDetectedEvents">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Resync Machine Detected Events (Experimental)</string> <string>Resync Device Detected Events (Experimental)</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1082,7 +1082,7 @@ This option must be enabled before import, otherwise a purge is required.</strin
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:italic;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:italic;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Custom flagging is an experimental method of detecting events missed by the machine. They are &lt;span style=&quot; text-decoration: underline;&quot;&gt;not&lt;/span&gt; included in AHI.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Custom flagging is an experimental method of detecting events missed by the device. They are &lt;span style=&quot; text-decoration: underline;&quot;&gt;not&lt;/span&gt; included in AHI.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@ -1148,7 +1148,7 @@ A value of 20% works well for detecting apneas. </string>
<item row="4" column="0" colspan="4"> <item row="4" column="0" colspan="4">
<widget class="QCheckBox" name="userEventDuplicates"> <widget class="QCheckBox" name="userEventDuplicates">
<property name="text"> <property name="text">
<string>Allow duplicates near machine events.</string> <string>Allow duplicates near device events.</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -1196,7 +1196,7 @@ A value of 20% works well for detecting apneas. </string>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QCheckBox" name="showUnknownFlags"> <widget class="QCheckBox" name="showUnknownFlags">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Enable Unknown Events Channels</string> <string>Enable Unknown Events Channels</string>
@ -1492,7 +1492,7 @@ as this is the only value available on summary-only days.</string>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note: &lt;/span&gt;Due to summary design limitations, ResMed machines do not support changing these settings.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Note: &lt;/span&gt;Due to summary design limitations, ResMed devices do not support changing these settings.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
@ -1795,7 +1795,7 @@ p, li { white-space: pre-wrap; }
&lt;p align=&quot;justify&quot; style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;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.&lt;/span&gt;&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;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.&lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;If you start your Oximeters recording mode at &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-style:italic;&quot;&gt;exactly &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;the same time you start your CPAP machine, you can now also achieve sync. &lt;/span&gt;&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;If you start your Oximeters recording mode at &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt; font-style:italic;&quot;&gt;exactly &lt;/span&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;the same time you start your CPAP device, you can now also achieve sync. &lt;/span&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt; &lt;p align=&quot;justify&quot; style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;The serial import process takes the starting time from last nights first CPAP session. (Remember to import your CPAP data first!)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p align=&quot;justify&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Sans'; font-size:10pt;&quot;&gt;The serial import process takes the starting time from last nights first CPAP session. (Remember to import your CPAP data first!)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
@ -2497,10 +2497,10 @@ Mainly affects the importer.</string>
<number>30000</number> <number>30000</number>
</property> </property>
<property name="singleStep"> <property name="singleStep">
<number>100</number> <number>1000</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>500</number> <number>5000</number>
</property> </property>
<property name="value"> <property name="value">
<number>5000</number> <number>5000</number>
@ -2738,7 +2738,7 @@ Try it and see if you like it.</string>
<item> <item>
<widget class="QCheckBox" name="includeSerial"> <widget class="QCheckBox" name="includeSerial">
<property name="toolTip"> <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>
<property name="text"> <property name="text">
<string>Include Serial Number</string> <string>Include Serial Number</string>

2
oscar/profileselector.cpp
View File

@ -125,7 +125,7 @@ void ProfileSelector::updateProfileList()
Machine * mach = prof->GetMachine(MT_CPAP); // only interested in last cpap machine... Machine * mach = prof->GetMachine(MT_CPAP); // only interested in last cpap machine...
if (!mach) { if (!mach) {
qDebug() << "Couldn't find machine info for" << name; qDebug() << "Couldn't find device info for" << name;
} }
model->insertRows(row, 1, QModelIndex()); model->insertRows(row, 1, QModelIndex());

22
oscar/statistics.cpp
View File

@ -30,8 +30,8 @@ extern MainWindow *mainwin;
QString htmlReportHeader = ""; // Page header QString htmlReportHeader = ""; // Page header
QString htmlReportHeaderPrint = ""; // Page header QString htmlReportHeaderPrint = ""; // Page header
QString htmlUsage = ""; // CPAP and Oximetry QString htmlUsage = ""; // CPAP and Oximetry
QString htmlMachineSettings = ""; // Machine (formerly Rx) changes QString htmlMachineSettings = ""; // Device (formerly Rx) changes
QString htmlMachines = ""; // Machines used in this profile QString htmlMachines = ""; // Devices used in this profile
QString htmlReportFooter = ""; // Page footer QString htmlReportFooter = ""; // Page footer
QString resizeHTMLPixmap(QPixmap &pixmap, int width, int height) { 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 // 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. // 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. // 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) : Statistics::Statistics(QObject *parent) :
QObject(parent) QObject(parent)
{ {
@ -803,7 +803,7 @@ EventDataType calcSA(QDate start, QDate end)
return val; return val;
} }
// Structure for recording Prescription Changes (now called Machine Settings Changes) // Structure for recording Prescription Changes (now called Device Settings Changes)
struct RXChange { struct RXChange {
RXChange() { highlight = 0; machine = nullptr; } RXChange() { highlight = 0; machine = nullptr; }
RXChange(const RXChange &copy) { RXChange(const RXChange &copy) {
@ -888,7 +888,7 @@ const QString heading_color="#ffffff";
const QString subheading_color="#e0e0e0"; const QString subheading_color="#e0e0e0";
//const int rxthresh = 5; //const int rxthresh = 5;
// Sort machines by first day of use // Sort devices by first day of use
bool machineCompareFirstDay(Machine* left, Machine *right) { bool machineCompareFirstDay(Machine* left, Machine *right) {
return left->FirstDay() > right->FirstDay(); 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 += QString("<table class=curved style='page-break-before:auto' "+table_width+">");
html += "<thead>"; 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>") 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) .arg(STR_TR_Brand)
@ -931,7 +931,7 @@ QString Statistics::GenerateMachineList()
m = mach.at(i); m = mach.at(i);
if (m->type() == MT_JOURNAL) { continue; } 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 d1 = m->FirstDay();
QDate d2 = m->LastDay(); QDate d2 = m->LastDay();
QString mn = m->modelnumber(); QString mn = m->modelnumber();
@ -952,7 +952,7 @@ QString Statistics::GenerateMachineList()
} }
QString Statistics::GenerateRXChanges() 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); QList<Machine *> cpap_machines = p_profile->GetMachines(MT_CPAP);
if (cpap_machines.isEmpty()) if (cpap_machines.isEmpty())
return ""; return "";
@ -973,7 +973,7 @@ QString Statistics::GenerateRXChanges()
QString html = "<div align=center><br>"; QString html = "<div align=center><br>";
html += QString("<table class=curved style='page-break-before:always' " + table_width+">"); html += QString("<table class=curved style='page-break-before:always' " + table_width+">");
html += "<thead>"; 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; // QString extratxt;
@ -1083,7 +1083,7 @@ QString Statistics::GenerateCPAPUsage()
mach.append(cpap_machines); mach.append(cpap_machines);
mach.append(oximeters); 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; bool havedata = false;
for (int i=0; i < mach.size(); ++i) { for (int i=0; i < mach.size(); ++i) {
int daysize = mach[i]->day.size(); 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:link,a:visited { color: inherit; text-decoration: none; }" //font-weight: normal;
"a:hover { background-color: inherit; color: white; text-decoration:none; font-weight: bold; }" "a:hover { background-color: inherit; color: white; text-decoration:none; font-weight: bold; }"
"</style>" "</style>"
"<title>Machine Statistics Panel</title>" "<title>Device Statistics Panel</title>"
"</head><body>"; "</head><body>";
Machine * cpap = p_profile->GetMachine(MT_CPAP); Machine * cpap = p_profile->GetMachine(MT_CPAP);

4
oscar/statistics.h
View File

@ -83,7 +83,7 @@ struct StatisticsRow {
return SC_UNDEFINED; return SC_UNDEFINED;
} }
//! \brief Look up machine type //! \brief Look up device type
MachineType lookupType(QString type) MachineType lookupType(QString type)
{ {
if (type.compare("cpap", Qt::CaseInsensitive)==0) { if (type.compare("cpap", Qt::CaseInsensitive)==0) {
@ -104,7 +104,7 @@ struct StatisticsRow {
QString value(QDate start, QDate end); QString value(QDate start, QDate end);
}; };
//! \class Prescription (Machine) setting //! \class Prescription (device) setting
class RXItem { class RXItem {
public: public:
RXItem() { RXItem() {

12
oscar/welcome.cpp
View File

@ -54,7 +54,7 @@ void Welcome::refreshPage()
ui->S9Warning->setVisible(showCardWarning); ui->S9Warning->setVisible(showCardWarning);
if (!b) { if (!b) {
qDebug() << "No machines in Profile"; qDebug() << "No devices in Profile";
// sleep(3); // sleep(3);
ui->cpapIcon->setPixmap(pixmap); ui->cpapIcon->setPixmap(pixmap);
} }
@ -159,7 +159,7 @@ QString Welcome::GenerateCPAPHTML()
if (!havecpapdata && !haveoximeterdata) { if (!havecpapdata && !haveoximeterdata) {
html += "<p>" + tr("It would be a good idea to check File->Preferences first,") + "<br />" + html += "<p>" + tr("It would be a good idea to check File->Preferences first,") + "<br />" +
tr("as there are some options that affect import.")+"</p>" + tr("as there are some options that affect import.")+"</p>" +
"<p>" + tr("Note that some preferences are forced when a ResMed machine is detected") + "</p>" + "<p>" + tr("Note that some preferences are forced when a ResMed device is detected") + "</p>" +
"<p>" + tr("First import can take a few minutes.") + "</p>"; "<p>" + tr("First import can take a few minutes.") + "</p>";
} else { } else {
QDate date = p_profile->LastDay(MT_CPAP); QDate date = p_profile->LastDay(MT_CPAP);
@ -192,7 +192,7 @@ QString Welcome::GenerateCPAPHTML()
QString timestr = tr("%1 hours, %2 minutes and %3 seconds").arg(hour).arg(minutes).arg(seconds); QString timestr = tr("%1 hours, %2 minutes and %3 seconds").arg(hour).arg(minutes).arg(seconds);
const EventDataType compliance_min = p_profile->cpap->m_complianceHours; // 4.0; const EventDataType compliance_min = p_profile->cpap->m_complianceHours; // 4.0;
if (hours > compliance_min) html += tr("Your machine was on for %1.").arg(timestr)+"<br/>"; if (hours > compliance_min) html += tr("Your device was on for %1.").arg(timestr)+"<br/>";
else html += tr("<font color = red>You only had the mask on for %1.</font>").arg(timestr)+"<br/>"; else html += tr("<font color = red>You only had the mask on for %1.</font>").arg(timestr)+"<br/>";
@ -254,7 +254,7 @@ QString Welcome::GenerateCPAPHTML()
pressSettingChanID = CPAP_Pressure; // DreamStation ventilators report EPAP/IPAP data, but the setting is Pressure pressSettingChanID = CPAP_Pressure; // DreamStation ventilators report EPAP/IPAP data, but the setting is Pressure
EventDataType pressure = day->settings_max(pressSettingChanID); EventDataType pressure = day->settings_max(pressSettingChanID);
qDebug() << pressSettingChanID << pressure; qDebug() << pressSettingChanID << pressure;
html += tr("Your CPAP machine used a constant %1 %2 of air") html += tr("Your CPAP device used a constant %1 %2 of air")
.arg(pressure) .arg(pressure)
.arg(schema::channel[pressChanID].units()); .arg(schema::channel[pressChanID].units());
} else if (cpapmode == MODE_APAP) { } else if (cpapmode == MODE_APAP) {
@ -267,14 +267,14 @@ QString Welcome::GenerateCPAPHTML()
// pressSettingChanID = CPAP_IPAP; // pressSettingChanID = CPAP_IPAP;
// EventDataType ipap = day->settings_max(pressSettingChanID); // EventDataType ipap = day->settings_max(pressSettingChanID);
// EventDataType epap = day->settings_min(CPAP_EPAP); // EventDataType epap = day->settings_min(CPAP_EPAP);
html += tr("Your machine used a constant %1-%2 %3 of air.") html += tr("Your device used a constant %1-%2 %3 of air.")
.arg(day->validPressure(day->settings_min(CPAP_EPAP))) .arg(day->validPressure(day->settings_min(CPAP_EPAP)))
.arg(day->validPressure(day->settings_max(CPAP_IPAP))) .arg(day->validPressure(day->settings_max(CPAP_IPAP)))
.arg(schema::channel[CPAP_IPAP].units()); .arg(schema::channel[CPAP_IPAP].units());
} else if (cpapmode == MODE_BILEVEL_AUTO_FIXED_PS) { } else if (cpapmode == MODE_BILEVEL_AUTO_FIXED_PS) {
EventDataType ipap = day->percentile(pressChanID, perc/100.0); EventDataType ipap = day->percentile(pressChanID, perc/100.0);
EventDataType epap = day->percentile(epapDataChanID, perc/100.0); EventDataType epap = day->percentile(epapDataChanID, perc/100.0);
html += tr("Your machine was under %1-%2 %3 for %4% of the time.") html += tr("Your device was under %1-%2 %3 for %4% of the time.")
.arg(epap) .arg(epap)
.arg(ipap) .arg(ipap)
.arg(schema::channel[pressChanID].units()) .arg(schema::channel[pressChanID].units())

2
oscar/welcome.ui
View File

@ -577,7 +577,7 @@ p, li { white-space: pre-wrap; }
<item> <item>
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>&lt;span style=&quot; font-weight:600;&quot;&gt;Warning: &lt;/span&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;ResMed S9 SDCards need to be locked &lt;/span&gt;&lt;span style=&quot; font-weight:600; color:#ff0000;&quot;&gt;before inserting into your computer.&amp;nbsp;&amp;nbsp;&amp;nbsp;&lt;/span&gt;&lt;span style=&quot; color:#000000;&quot;&gt;&lt;br&gt;Some operating systems write index files to the card without asking, which can render your card unreadable by your cpap machine.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> <string>&lt;span style=&quot; font-weight:600;&quot;&gt;Warning: &lt;/span&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;ResMed S9 SDCards need to be locked &lt;/span&gt;&lt;span style=&quot; font-weight:600; color:#ff0000;&quot;&gt;before inserting into your computer.&amp;nbsp;&amp;nbsp;&amp;nbsp;&lt;/span&gt;&lt;span style=&quot; color:#000000;&quot;&gt;&lt;br&gt;Some operating systems write index files to the card without asking, which can render your card unreadable by your cpap device.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>false</bool> <bool>false</bool>