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

Merge branch 'master' into tidy-edf-parser

Browse Source
This commit is contained in:
Phil Olynyk 2019-07-24 17:18:03 -04:00
commit 93b363465f
9 changed files with 9111 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8926
Translations/Romanian.ro.ts Normal file
View File

File diff suppressed because it is too large Load Diff

4
oscar/SleepLib/appsettings.h
View File

@ -74,7 +74,7 @@ public:
m_multithreading = false; // too dangerous to allow
m_showPerformance = initPref(STR_US_ShowPerformance, false).toBool();
m_showDebug = initPref(STR_US_ShowDebug, false).toBool();
initPref(STR_AS_CalendarVisible, true);
initPref(STR_AS_CalendarVisible, false);
m_scrollDampening = initPref(STR_US_ScrollDampening, (int)50).toInt();
m_tooltipTimeout = initPref(STR_US_TooltipTimeout, (int)2500).toInt();
m_graphHeight=initPref(STR_AS_GraphHeight, 180).toInt();
@ -92,7 +92,7 @@ public:
m_olm = (OverviewLinechartModes)initPref(STR_AS_OverviewLinechartMode, (int)OLC_Bartop).toInt();
m_lineThickness=initPref(STR_AS_LineThickness, 1.0).toFloat();
m_lineCursorMode = initPref(STR_AS_LineCursorMode, true).toBool();
initPref(STR_AS_RightSidebarVisible, true);
initPref(STR_AS_RightSidebarVisible, false);
initPref(STR_CS_UserEventPieChart, false);
initPref(STR_US_ShowSerialNumbers, false);
initPref(STR_US_OpenTabAtStart, 1);

207
oscar/daily.cpp
View File

@ -42,6 +42,20 @@
extern MainWindow * mainwin;
QString htmlLeftHeader;
QString htmlLeftAHI;
QString htmlLeftMachineInfo;
QString htmlLeftSleepTime;
QString htmlLeftIndices;
QString htmlLeftPieChart = "";
QString htmlLeftNoHours = "";
QString htmlLeftStatistics;
QString htmlLeftOximeter;
QString htmlLeftMachineSettings;
QString htmlLeftSessionInfo;
QString htmlLeftFooter;
// This was Sean Stangl's idea.. but I couldn't apply that patch.
inline QString channelInfo(ChannelID code) {
return schema::channel[code].fullname()+"\n"+schema::channel[code].description()+"\n("+schema::channel[code].units()+")";
@ -579,12 +593,18 @@ void Daily::hideSpaceHogs()
if (AppSetting->calendarVisible()) {
ui->calendarFrame->setVisible(false);
}
if (AppSetting->showPieChart()) {
webView->setHtml(getLeftSidebar(false));
}
}
void Daily::showSpaceHogs()
{
if (AppSetting->calendarVisible()) {
ui->calendarFrame->setVisible(true);
}
if (AppSetting->showPieChart()) {
webView->setHtml(getLeftSidebar(true));
}
}
void Daily::on_calendar_currentPageChanged(int year, int month)
@ -1307,6 +1327,63 @@ QString Daily::getSleepTime(Day * day)
return html;
}
QString Daily::getPieChart (float values, Day * day) {
qDebug() << "Daily:getPieChart, values" << values;
QString html = "<table cellspacing=0 cellpadding=0 border=0 width='100%'>";
if (values > 0) {
// html += "<tr><td align=center>&nbsp;</td></tr>";
html += QString("<tr><td align=center><b>%1</b></td></tr>").arg(tr("Event Breakdown"));
eventBreakdownPie()->setShowTitle(false);
int w=155;
int h=155;
QPixmap pixmap=eventBreakdownPie()->renderPixmap(w,h,false);
if (!pixmap.isNull()) {
QByteArray byteArray;
QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
buffer.open(QIODevice::WriteOnly);
pixmap.save(&buffer, "PNG");
html += "<tr><td align=center><img src=\"data:image/png;base64," + byteArray.toBase64() + "\"></td></tr>\n";
} else {
html += "<tr><td align=center>"+tr("Unable to display Pie Chart on this system")+"</td></tr>\n";
}
} else if ( day->channelHasData(CPAP_Obstructive)
|| day->channelHasData(CPAP_Hypopnea)
|| day->channelHasData(CPAP_ClearAirway)
|| day->channelHasData(CPAP_RERA)
|| day->channelHasData(CPAP_Apnea)
|| day->channelHasData(CPAP_FlowLimit)
|| day->channelHasData(CPAP_SensAwake)
) {
html += "<tr><td align=center><img src=\"qrc:/docs/0.0.gif\"></td></tr>\n";
}
html+="</table>\n";
html+="<hr/>\n";
return html;
}
// honorPieChart true - show pie chart if it is enabled. False, do not show pie chart
QString Daily::getLeftSidebar (bool honorPieChart) {
QString html = htmlLeftHeader
+ htmlLeftAHI
+ htmlLeftMachineInfo
+ htmlLeftSleepTime
+ htmlLeftIndices;
// Include pie chart if wanted and enabled.
if (honorPieChart && AppSetting->showPieChart())
html += htmlLeftPieChart;
html += htmlLeftNoHours
+ htmlLeftStatistics
+ htmlLeftOximeter
+ htmlLeftMachineSettings
+ htmlLeftSessionInfo
+ htmlLeftFooter;
return html;
}
QVariant MyTextBrowser::loadResource(int type, const QUrl &url)
{
if (type == QTextDocument::ImageResource && url.scheme().compare(QLatin1String("data"), Qt::CaseInsensitive) == 0) {
@ -1355,7 +1432,19 @@ void Daily::Load(QDate date)
lastcpapday=day;
QString html="<html>"
// Clear the components of the left sidebar prior to recreating them
htmlLeftAHI.clear();
htmlLeftMachineInfo.clear();
htmlLeftSleepTime.clear();
htmlLeftIndices.clear();
htmlLeftPieChart.clear();
htmlLeftNoHours.clear();
htmlLeftStatistics.clear();
htmlLeftOximeter.clear();
htmlLeftMachineSettings.clear();
htmlLeftSessionInfo.clear();
htmlLeftHeader = "<html><head>"
"</head>"
"<body leftmargin=0 rightmargin=0 topmargin=0 marginwidth=0 marginheight=0>";
@ -1420,8 +1509,8 @@ void Daily::Load(QDate date)
ahi/=hours;
if (hours>0) {
html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
html+="<tr>";
htmlLeftAHI="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
htmlLeftAHI+="<tr>";
if (!isBrick) {
ChannelID ahichan=CPAP_AHI;
QString ahiname=STR_TR_AHI;
@ -1429,19 +1518,20 @@ void Daily::Load(QDate date)
ahichan=CPAP_RDI;
ahiname=STR_TR_RDI;
}
html+=QString("<td colspan=4 bgcolor='%1' align=center><p title='%4'><font size=+4 color='%2'><b>%3</b></font></p> &nbsp; <font size=+4 color='%2'><b>%5</b></font></td>\n")
htmlLeftAHI+=QString("<td colspan=4 bgcolor='%1' align=center><p title='%4'><font size=+4 color='%2'><b>%3</b></font></p> &nbsp; <font size=+4 color='%2'><b>%5</b></font></td>\n")
.arg("#F88017").arg(COLOR_Text.name()).arg(ahiname).arg(schema::channel[ahichan].fullname()).arg(ahi,0,'f',2);
} else {
html+=QString("<td colspan=5 bgcolor='%1' align=center><font size=+4 color='yellow'>%2</font></td>\n")
htmlLeftAHI+=QString("<td colspan=5 bgcolor='%1' align=center><font size=+4 color='yellow'>%2</font></td>\n")
.arg("#F88017").arg(tr("BRICK! :("));
}
html+="</tr>\n";
html+="</table>\n";
html+=getCPAPInformation(day);
html+=getSleepTime(day);
htmlLeftAHI+="</tr>\n";
htmlLeftAHI+="</table>\n";
html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
htmlLeftMachineInfo = getCPAPInformation(day);
htmlLeftSleepTime = getSleepTime(day);
htmlLeftIndices = "<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
quint32 zchans = schema::SPAN | schema::FLAG;
bool show_minors = true;
@ -1469,97 +1559,66 @@ void Daily::Load(QDate date)
// than the duration of timed breaths per hour.
values[code] = val;
QColor altcolor = (brightness(chan.defaultColor()) < 0.3) ? Qt::white : Qt::black; // pick a contrasting color
html+=QString("<tr><td align='left' bgcolor='%1'><b><font color='%2'><a href='event=%5' style='text-decoration:none;color:%2'>%3</a></font></b></td><td width=20% bgcolor='%1'><b><font color='%2'>%4</font></b></td></tr>\n")
htmlLeftIndices+=QString("<tr><td align='left' bgcolor='%1'><b><font color='%2'><a href='event=%5' style='text-decoration:none;color:%2'>%3</a></font></b></td><td width=20% bgcolor='%1'><b><font color='%2'>%4</font></b></td></tr>")
.arg(chan.defaultColor().name()).arg(altcolor.name()).arg(chan.fullname()).arg(data).arg(code);
}
html+="</table>";
htmlLeftIndices+="</table><hr/>";
html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
// Show Event Breakdown pie chart
if ((hours > 0) && AppSetting->showPieChart()) { // AHI Pie Chart
if ((values[CPAP_Obstructive] + values[CPAP_Hypopnea] + values[CPAP_ClearAirway] + values[CPAP_Apnea] + values[CPAP_RERA] + values[CPAP_FlowLimit] + values[CPAP_SensAwake])>0) {
html+="<tr><td align=center>&nbsp;</td></tr>";
html+=QString("<tr><td align=center><b>%1</b></td></tr>").arg(tr("Event Breakdown"));
eventBreakdownPie()->setShowTitle(false);
htmlLeftPieChart = getPieChart((values[CPAP_Obstructive] + values[CPAP_Hypopnea] +
values[CPAP_ClearAirway] + values[CPAP_Apnea] + values[CPAP_RERA] +
values[CPAP_FlowLimit] + values[CPAP_SensAwake]), day);
int w=155;
int h=155;
QPixmap pixmap=eventBreakdownPie()->renderPixmap(w,h,false);
if (!pixmap.isNull()) {
QByteArray byteArray;
QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
buffer.open(QIODevice::WriteOnly);
pixmap.save(&buffer, "PNG");
html += "<tr><td align=center><img src=\"data:image/png;base64," + byteArray.toBase64() + "\"></td></tr>\n";
} else {
html += "<tr><td align=center>"+tr("Unable to display Pie Chart on this system")+"</td></tr>\n";
}
} else if (day->channelHasData(CPAP_Obstructive)
|| day->channelHasData(CPAP_Hypopnea)
|| day->channelHasData(CPAP_ClearAirway)
|| day->channelHasData(CPAP_RERA)
|| day->channelHasData(CPAP_Apnea)
|| day->channelHasData(CPAP_FlowLimit)
|| day->channelHasData(CPAP_SensAwake)
) {
html += "<tr><td align=center><img src=\"qrc:/docs/0.0.gif\"></td></tr>\n";
}
}
html+="</table>\n";
html+="<hr/>\n";
} else {
html+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
} else { // No hours
htmlLeftNoHours+="<table cellspacing=0 cellpadding=0 border=0 width='100%'>\n";
if (!isBrick) {
html+="<tr><td colspan='5'>&nbsp;</td></tr>\n";
htmlLeftNoHours+="<tr><td colspan='5'>&nbsp;</td></tr>\n";
if (day->size()>0) {
html+="<tr><td colspan=5 align='center'><font size='+3'>"+tr("Sessions all off!")+"</font></td></tr>";
html+="<tr><td colspan=5 align='center><img src='qrc:/icons/logo-md.png'></td></tr>";
html+="<tr bgcolor='#89abcd'><td colspan=5 align='center'><i><font color=white size=+1>"+tr("Sessions exist for this day but are switched off.")+"</font></i></td></tr>\n";
htmlLeftNoHours+="<tr><td colspan=5 align='center'><font size='+3'>"+tr("Sessions all off!")+"</font></td></tr>";
htmlLeftNoHours+="<tr><td colspan=5 align='center><img src='qrc:/icons/logo-md.png'></td></tr>";
htmlLeftNoHours+="<tr bgcolor='#89abcd'><td colspan=5 align='center'><i><font color=white size=+1>"+tr("Sessions exist for this day but are switched off.")+"</font></i></td></tr>\n";
GraphView->setEmptyText(STR_Empty_NoSessions);
} else {
html+="<tr><td colspan=5 align='center'><b><h2>"+tr("Impossibly short session")+"</h2></b></td></tr>";
html+="<tr><td colspan=5 align='center'><i>"+tr("Zero hours??")+"</i></td></tr>\n";
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
html+="<tr><td colspan=5 align='center'><b><h2>"+tr("BRICK :(")+"</h2></b></td></tr>";
html+="<tr><td colspan=5 align='center'><i>"+tr("Sorry, this machine only provides compliance data.")+"</i></td></tr>\n";
html+="<tr><td colspan=5 align='center'><i>"+tr("Complain to your Equipment Provider!")+"</i></td></tr>\n";
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";
htmlLeftNoHours+="<tr><td colspan=5 align='center'><i>"+tr("Complain to your Equipment Provider!")+"</i></td></tr>\n";
}
html+="<tr><td colspan='5'>&nbsp;</td></tr>\n";
html+="</table>\n";
htmlLeftNoHours+="<tr><td colspan='5'>&nbsp;</td></tr>\n";
htmlLeftNoHours+="</table>\n";
}
} // if (!CPAP)
else html+=getSleepTime(day);
else htmlLeftSleepTime = getSleepTime(day);
if ((cpap && !isBrick && (day->hours()>0)) || oxi || posit) {
html+=getStatisticsInfo(day);
htmlLeftStatistics = getStatisticsInfo(day);
} else {
if (cpap && day->hours(MT_CPAP)<0.0000001) {
} else if (!isBrick) {
html+="<table cellspacing=0 cellpadding=0 border=0 height=100% width=100%>";
html+="<tr height=25%><td align=center></td></tr>";
html+="<tr><td align=center><font size='+3'>"+tr("\"Nothing's here!\"")+"</font></td></tr>";
html+="<tr><td align=center><img src='qrc:/icons/logo-md.png'></td></tr>";
html+="<tr height=5px><td align=center></td></tr>";
html+="<tr bgcolor='#89abcd'><td align=center><i><font size=+1 color=white>"+tr("No data is available for this day.")+"</font></i></td></tr>";
html+="<tr height=25%><td align=center></td></tr>";
html+="</table>\n";
htmlLeftStatistics ="<table cellspacing=0 cellpadding=0 border=0 height=100% width=100%>";
htmlLeftStatistics+="<tr height=25%><td align=center></td></tr>";
htmlLeftStatistics+="<tr><td align=center><font size='+3'>"+tr("\"Nothing's here!\"")+"</font></td></tr>";
htmlLeftStatistics+="<tr><td align=center><img src='qrc:/icons/logo-md.png'></td></tr>";
htmlLeftStatistics+="<tr height=5px><td align=center></td></tr>";
htmlLeftStatistics+="<tr bgcolor='#89abcd'><td align=center><i><font size=+1 color=white>"+tr("No data is available for this day.")+"</font></i></td></tr>";
htmlLeftStatistics+="<tr height=25%><td align=center></td></tr>";
htmlLeftStatistics+="</table>\n";
}
}
if (day) {
html+=getOximeterInformation(day);
html+=getMachineSettings(day);
html+=getSessionInformation(day);
htmlLeftOximeter = getOximeterInformation(day);
htmlLeftMachineSettings = getMachineSettings(day);
htmlLeftSessionInfo= getSessionInformation(day);
}
html+="</body></html>";
htmlLeftFooter ="</body></html>";
QColor cols[]={
COLOR_Gold,
@ -1592,7 +1651,7 @@ void Daily::Load(QDate date)
}
#endif
webView->setHtml(html);
webView->setHtml(getLeftSidebar(true));
ui->JournalNotes->clear();

4
oscar/daily.h
View File

@ -296,13 +296,17 @@ private:
void updateCube();
QString getLeftAHI (Day * day);
QString getSessionInformation(Day *);
QString getMachineSettings(Day *);
QString getStatisticsInfo(Day *);
QString getCPAPInformation(Day *);
QString getOximeterInformation(Day *);
QString getEventBreakdown(Day *);
QString getPieChart(float values, Day *);
QString getIndicesAndPie(Day *, float hours, bool isBrick);
QString getSleepTime(Day *);
QString getLeftSidebar (bool honorPieChart);
QHash<QString, gGraph *> graphlist;

45
oscar/docs/release_notes.html
View File

@ -7,16 +7,45 @@ Which was written and copyright 2011-2018 &copy; Mark Watkins
</p>
<p>
<b>Changes and fixes in OSCAR v1.0.2-beta-1</b>
<b>Changes and fixes in OSCAR v1.1.0-testing-1</b>
<br/><b>NOTE: Translations have NOT yet been updated for these changes</b>
<ul>
<li>Portions of OSCAR are &copy; 2019 by The OSCAR Team</li>
<li>Offer migration to non-default directory on first use</li>
<li>Add "Use Legacy Graphics.reg" to ask OSCAR to use simpler graphics for older systems</li>
<li>Change Preferences measurement units choice to Metric or English</li>
<li>Improve display of cmH2O numbers</li>
<li>Re-organize build instructions and other cleanup</li>
<li>Show graphics engine in title bar correctly</li>
<li>Adjust size of Preferences dialog to fit smaller screens</li>
<li>[new] Offer migration if non-default directory is selected on first use</li>
<li>[new] Press SHIFT key when starting OSCAR to use Software Graphics Engine</li>
<li>[new] Support for DreamStation BiPAP autoSV (900X) should now be complete</li>
<li>[new] Improved Dreamstation support</li>
<li>[new] Improve oximeter import for CM550D+</li>
<li>[new] Disable Dark Mode on Mac</li>
<li>[new] Show hours/day constituting compliance on Statistics page</li>
<li>[new] Better order of graphs on Daily page for newly created profiles</li>
<li>[new] Help/System Information shows info about OSCAR, OS, and data location</li>
<li>[new] Move pie chart option from Preferences dialog to View menu</li>
<li>[new] Hide pie chart when capturing screen</li>
<li>[new] --datadir option now allows fully qualified name on Windows</li>
<li>[fix] Fix some oximeter import issues</li>
<li>[fix] Use local time rather than UTC time in oximeter import</li>
<li>[fix] Improve screen capture on Mac</li>
<li>[fix] Fix crashes in CPAP data rebuild, purging of a machine</li>
<li>[fix] Prevent crash if taking screen shot before profile is opened</li>
<li>[fix] Increase mask vent ranges</li>
<li>[fix] Correct session bar if no sessions are present</li>
<li>[fix] Correct months shown on Statistics page monthly view</li>
<li>[fix] Compute compliance on Statistics page based on total days not days used</li>
<li>[fix] Paginate statistics report when printing</li>
<li>[fix] Fix "phantom date" (12/31/1969) on some ResMed imports</li>
<li>[fix] Default font substituted when a specified font is not valid</li>
<li>[fix] Change Preferences measurement units choice to Metric or English</li>
<li>[fix] Improve display of cmH2O numbers</li>
<li>[fix] Show graphics engine in title bar correctly</li>
<li>[fix] Adjust size of Preferences dialog to fit smaller screens</li>
<li>[fix] Label climate control as manual or auto correctly on ResMed import</li>
<li>[fix] Move less useful information from titlebar to Help/System Information</li>
<li>[fix] Change "Prescription Settings" to "Machine Settings" message</li>
<li>[fix] Improve icons, especially smaller ones</li>
<li>[fix] Correct Mac menu issues</li>
<li>[fix] Improve messages in debug pane</li>
<li>[fix] Re-organize build instructions and other cleanup</li>
</ul>
</p>

4
oscar/mainwindow.ui
View File

@ -3135,7 +3135,7 @@ p, li { white-space: pre-wrap; }
<bool>true</bool>
</property>
<property name="text">
<string>Toggle &amp;Line Cursor</string>
<string>Show &amp;Line Cursor</string>
</property>
<property name="shortcut">
<string notr="true">Ctrl+L</string>
@ -3221,7 +3221,7 @@ p, li { white-space: pre-wrap; }
<bool>false</bool>
</property>
<property name="text">
<string>Toggle &amp;Pie Chart</string>
<string>Show &amp;Pie Chart</string>
</property>
<property name="toolTip">
<string>Show Pie Chart on Daily page</string>

5
oscar/statistics.cpp
View File

@ -1068,14 +1068,15 @@ QString Statistics::GenerateCPAPUsage()
if (p_profile->general->statReportMode() == STAT_MODE_MONTHLY) {
int firstMonth = firstcpap.month();
int lastMonth = lastcpap.month();
if (lastMonth <= firstMonth && firstcpap.year() != lastcpap.year())
lastMonth += 12; // handle time extending to next year
int years = lastcpap.year() - firstcpap.year();
lastMonth += (12 * years); // handle time extending to next year
number_periods = lastMonth - firstMonth + 1;
if (number_periods < 1) {
qDebug() << "*** Begin" << firstcpap << "beginMonth" << firstMonth << "lastMonth" << lastMonth << "periods" << number_periods;
number_periods = 1;
}
qDebug() << "Number of months for stats (trim to 12 max)" << number_periods;
// But not more than one year
if (number_periods > 12) {
number_periods = 12;

1
oscar/translation.cpp
View File

@ -50,6 +50,7 @@ void initTranslations()
langNames["en_UK"] = "English (UK)";
langNames["nl"] = "Nederlands";
langNames["pt_BR"] = "Portugues (BR)";
langNames["ro"] = "Romanian";
langNames[DefaultLanguage]="English (US)";

6
oscar/version.h
View File

@ -13,9 +13,9 @@
#include "build_number.h"
const int major_version = 1; // incompatible API changes
const int minor_version = 0; // new features that don't break things
const int revision_number = 2; // bugfixes, revisions
const QString ReleaseStatus = "beta"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable
const int minor_version = 1; // new features that don't break things
const int revision_number = 0; // bugfixes, revisions
const QString ReleaseStatus = "testing"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable
const QString VersionString = QString("%1.%2.%3-%4-%5").arg(major_version).arg(minor_version).arg(revision_number).arg(ReleaseStatus).arg(build_number);
const QString ShortVersionString = QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number);