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

statistics: allow user to select report date.

Browse Source
This commit is contained in:
LoudSnorer 2023-06-13 12:32:51 -04:00
parent 6f2100d3cb
commit b678b137e5
6 changed files with 285 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oscar/SleepLib/profiles.h
View File

@ -368,6 +368,7 @@ const QString STR_US_PrefCalcPercentile = "PrefCalcPercentile";
const QString STR_US_PrefCalcMax = "PrefCalcMax"; const QString STR_US_PrefCalcMax = "PrefCalcMax";
const QString STR_US_ShowUnknownFlags = "ShowUnknownFlags"; const QString STR_US_ShowUnknownFlags = "ShowUnknownFlags";
const QString STR_US_StatReportMode = "StatReportMode"; const QString STR_US_StatReportMode = "StatReportMode";
const QString STR_US_StatReportStart = "StatReportStart";
const QString STR_US_StatReportRangeStart = "StatReportRangeStart"; const QString STR_US_StatReportRangeStart = "StatReportRangeStart";
const QString STR_US_StatReportRangeEnd = "StatReportRangeEnd"; const QString STR_US_StatReportRangeEnd = "StatReportRangeEnd";
const QString STR_US_LastOverviewRange = "LastOverviewRange"; const QString STR_US_LastOverviewRange = "LastOverviewRange";
@ -760,6 +761,7 @@ class UserSettings : public PrefSettings
m_prefCalcPercentile = initPref(STR_US_PrefCalcPercentile, (double)95.0).toDouble(); m_prefCalcPercentile = initPref(STR_US_PrefCalcPercentile, (double)95.0).toDouble();
m_prefCalcMax = initPref(STR_US_PrefCalcMax, (int)0).toInt(); m_prefCalcMax = initPref(STR_US_PrefCalcMax, (int)0).toInt();
initPref(STR_US_StatReportMode, 0); initPref(STR_US_StatReportMode, 0);
initPref(STR_US_StatReportStart, QDate(1,1,2000));
initPref(STR_US_StatReportRangeStart, QDate(1,1,2000)); initPref(STR_US_StatReportRangeStart, QDate(1,1,2000));
initPref(STR_US_StatReportRangeEnd, QDate(1,1,2000)); initPref(STR_US_StatReportRangeEnd, QDate(1,1,2000));
m_showUnownFlags = initPref(STR_US_ShowUnknownFlags, false).toBool(); m_showUnownFlags = initPref(STR_US_ShowUnknownFlags, false).toBool();
@ -775,6 +777,7 @@ class UserSettings : public PrefSettings
inline double prefCalcPercentile() const { return m_prefCalcPercentile; } inline double prefCalcPercentile() const { return m_prefCalcPercentile; }
inline int prefCalcMax() const { return m_prefCalcMax; } inline int prefCalcMax() const { return m_prefCalcMax; }
int statReportMode() const { return getPref(STR_US_StatReportMode).toInt(); } int statReportMode() const { return getPref(STR_US_StatReportMode).toInt(); }
QDate statReportStart() const { return getPref(STR_US_StatReportStart).toDate(); }
QDate statReportRangeStart() const { return getPref(STR_US_StatReportRangeStart).toDate(); } QDate statReportRangeStart() const { return getPref(STR_US_StatReportRangeStart).toDate(); }
QDate statReportRangeEnd() const { return getPref(STR_US_StatReportRangeEnd).toDate(); } QDate statReportRangeEnd() const { return getPref(STR_US_StatReportRangeEnd).toDate(); }
inline bool showUnknownFlags() const { return m_showUnownFlags; } inline bool showUnknownFlags() const { return m_showUnownFlags; }
@ -791,6 +794,7 @@ class UserSettings : public PrefSettings
void setPrefCalcPercentile(double p) { setPref(STR_US_PrefCalcPercentile, m_prefCalcPercentile=p); } void setPrefCalcPercentile(double p) { setPref(STR_US_PrefCalcPercentile, m_prefCalcPercentile=p); }
void setPrefCalcMax(int i) { setPref(STR_US_PrefCalcMax, m_prefCalcMax=i); } void setPrefCalcMax(int i) { setPref(STR_US_PrefCalcMax, m_prefCalcMax=i); }
void setStatReportMode(int i) { setPref(STR_US_StatReportMode, i); } void setStatReportMode(int i) { setPref(STR_US_StatReportMode, i); }
void setStatReportStart(QDate i) { setPref(STR_US_StatReportStart, i); }
void setStatReportRangeStart(QDate i) { setPref (STR_US_StatReportRangeStart, i); } void setStatReportRangeStart(QDate i) { setPref (STR_US_StatReportRangeStart, i); }
void setStatReportRangeEnd(QDate i) { setPref (STR_US_StatReportRangeEnd, i); } void setStatReportRangeEnd(QDate i) { setPref (STR_US_StatReportRangeEnd, i); }
void setShowUnknownFlags(bool b) { setPref(STR_US_ShowUnknownFlags, m_showUnownFlags=b); } void setShowUnknownFlags(bool b) { setPref(STR_US_ShowUnknownFlags, m_showUnownFlags=b); }

162
oscar/mainwindow.cpp
View File

@ -190,37 +190,6 @@ void MainWindow::SetupGUI()
ui->statEndDate->calendarWidget()->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader); ui->statEndDate->calendarWidget()->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
ui->statEndDate->calendarWidget()->setFirstDayOfWeek(dow); ui->statEndDate->calendarWidget()->setFirstDayOfWeek(dow);
ui->statEndDate->setVisible(false);
ui->statStartDate->setVisible(false);
// ui->reportModeRange->setVisible(false);
int srm = 0;
if (p_profile) {
srm = p_profile->general->statReportMode();
}
switch(srm) {
case 0:
ui->reportModeStandard->setChecked(true);
break;
case 1:
ui->reportModeMonthly->setChecked(true);
break;
case 2:
ui->reportModeRange->setChecked(true);
ui->statEndDate->setVisible(true);
ui->statStartDate->setVisible(true);
break;
default:
if (p_profile) {
p_profile->general->setStatReportMode(0);
}
break;
}
if (!AppSetting->showDebug()) {
ui->logText->hide();
}
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
//p_profile->appearance->setAntiAliasing(false); //p_profile->appearance->setAntiAliasing(false);
#endif #endif
@ -287,6 +256,12 @@ void MainWindow::SetupGUI()
ui->actionReport_a_Bug->setVisible(false); // remove this once we actually implement it ui->actionReport_a_Bug->setVisible(false); // remove this once we actually implement it
ui->actionExport_Review->setVisible(false); // remove this once we actually implement it ui->actionExport_Review->setVisible(false); // remove this once we actually implement it
set_reportModeStandard_mode() ;
if (!AppSetting->showDebug()) {
ui->logText->hide();
}
#ifndef helpless #ifndef helpless
help = new Help(this); help = new Help(this);
ui->tabWidget->addTab(help, tr("Help Browser")); ui->tabWidget->addTab(help, tr("Help Browser"));
@ -545,7 +520,6 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
p_profile->LoadMachineData(progress); p_profile->LoadMachineData(progress);
if (!p_profile->LastDay(MT_CPAP).isValid() ) { // quick test if new profile or not. if (!p_profile->LastDay(MT_CPAP).isValid() ) { // quick test if new profile or not.
// Override default value of clinicalMode if new profile. // Override default value of clinicalMode if new profile.
// Allows permissiveMode (not clinicalMode) to be the default value for existing profiles. // Allows permissiveMode (not clinicalMode) to be the default value for existing profiles.
@ -561,8 +535,6 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
QApplication::processEvents(); QApplication::processEvents();
ui->statStartDate->setDate(p_profile->FirstDay());
ui->statEndDate->setDate(p_profile->LastDay());
// Reload everything profile related // Reload everything profile related
if (daily) { if (daily) {
@ -588,6 +560,9 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
// Should really create welcome and statistics here, but they need redoing later anyway to kill off webkit // Should really create welcome and statistics here, but they need redoing later anyway to kill off webkit
ui->tabWidget->setCurrentIndex(AppSetting->openTabAtStart()); ui->tabWidget->setCurrentIndex(AppSetting->openTabAtStart());
ui->statStartDate->setDate(p_profile->FirstDay());
ui->statEndDate->setDate(p_profile->LastDay());
GenerateStatistics(); GenerateStatistics();
PopulatePurgeMenu(); PopulatePurgeMenu();
@ -608,34 +583,7 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
ui->tabWidget->setTabEnabled(3, !noMachines); // overview, STR_TR_Overview); ui->tabWidget->setTabEnabled(3, !noMachines); // overview, STR_TR_Overview);
ui->tabWidget->setTabEnabled(4, !noMachines); // statistics, STR_TR_Statistics); ui->tabWidget->setTabEnabled(4, !noMachines); // statistics, STR_TR_Statistics);
int srm = 0; set_reportModeStandard_mode() ;
if (p_profile) {
srm = p_profile->general->statReportMode();
}
switch (srm) {
case 0:
ui->reportModeStandard->setChecked(true);
ui->statEndDate->setVisible(false);
ui->statStartDate->setVisible(false);
break;
case 1:
ui->reportModeMonthly->setChecked(true);
ui->statEndDate->setVisible(false);
ui->statStartDate->setVisible(false);
break;
case 2:
ui->reportModeRange->setChecked(true);
ui->statEndDate->setVisible(true);
ui->statStartDate->setVisible(true);
break;
default:
if (p_profile) {
p_profile->general->setStatReportMode(0);
}
break;
}
progress->close(); progress->close();
delete progress; delete progress;
@ -2424,21 +2372,14 @@ void MainWindow::on_actionImport_Viatom_Data_triggered()
void MainWindow::GenerateStatistics() void MainWindow::GenerateStatistics()
{ {
QDate first = p_profile->FirstDay();
QDate last = p_profile->LastDay();
ui->statStartDate->setMinimumDate(first);
ui->statStartDate->setMaximumDate(last);
ui->statEndDate->setMinimumDate(first);
ui->statEndDate->setMaximumDate(last);
Statistics stats; Statistics stats;
QString htmlStats = stats.GenerateHTML(); QString htmlStats = stats.GenerateHTML();
QString htmlRecords = stats.UpdateRecordsBox(); QString htmlRecords = stats.UpdateRecordsBox();
bool brange = (p_profile->general->statReportMode() == 2); set_reportModeStandard_mode() ;
ui->statEndDate->setVisible(brange); if (!AppSetting->showDebug()) {
ui->statStartDate->setVisible(brange); ui->logText->hide();
}
updateFavourites(); updateFavourites();
@ -2479,22 +2420,70 @@ void MainWindow::on_statisticsButton_clicked()
} }
} }
void MainWindow::set_reportModeStandard_mode()
{
int mode = STAT_MODE_STANDARD;
if (p_profile) {
mode = p_profile->general->statReportMode();
QDate first = p_profile->FirstDay();
QDate last = p_profile->LastDay();
ui->statStartDate->setMinimumDate(first);
ui->statStartDate->setMaximumDate(last);
ui->statEndDate->setMinimumDate(first);
ui->statEndDate->setMaximumDate(last);
}
switch (mode) {
default:
case STAT_MODE_STANDARD:
{
ui->reportModeStandard->setChecked(true);
ui->statEndDate->setVisible(true);
ui->statStartDate->setVisible(false);
ui->statEnableEndDisplay->setVisible(true);
if (p_profile) {
ui->statEndDate->setDate(p_profile->general->statReportStart());
}
}
break;
case STAT_MODE_MONTHLY:
ui->statStartDate->setVisible(false);
ui->statEndDate->setVisible(true);
ui->reportModeMonthly->setChecked(true);
ui->statEnableEndDisplay->setVisible(true);
if (p_profile) {
ui->statEndDate->setDate(p_profile->general->statReportStart());
}
break;
case STAT_MODE_RANGE:
ui->reportModeRange->setChecked(true);
ui->statStartDate->setVisible(true);
ui->statEndDate->setVisible(true);
ui->statEnableEndDisplay->setVisible(false);
if (p_profile) {
ui->statStartDate->setDate( p_profile->general->statReportRangeStart());
ui->statEndDate->setDate( p_profile->general->statReportRangeEnd());
}
break;
}
return;
};
void MainWindow::on_reportModeMonthly_clicked() void MainWindow::on_reportModeMonthly_clicked()
{ {
ui->statStartDate->setVisible(false); if (p_profile->general->statReportMode() != STAT_MODE_MONTHLY) {
ui->statEndDate->setVisible(false); p_profile->general->setStatReportMode(STAT_MODE_MONTHLY);
if (p_profile->general->statReportMode() != 1) { set_reportModeStandard_mode();
p_profile->general->setStatReportMode(1);
GenerateStatistics(); GenerateStatistics();
} }
} }
void MainWindow::on_reportModeStandard_clicked() void MainWindow::on_reportModeStandard_clicked()
{ {
ui->statStartDate->setVisible(false); if (p_profile->general->statReportMode() != STAT_MODE_STANDARD) {
ui->statEndDate->setVisible(false); p_profile->general->setStatReportMode(STAT_MODE_STANDARD);
if (p_profile->general->statReportMode() != 0) { set_reportModeStandard_mode();
p_profile->general->setStatReportMode(0);
GenerateStatistics(); GenerateStatistics();
} }
} }
@ -2502,17 +2491,20 @@ void MainWindow::on_reportModeStandard_clicked()
void MainWindow::on_reportModeRange_clicked() void MainWindow::on_reportModeRange_clicked()
{ {
ui->statStartDate->setVisible(true); if (p_profile->general->statReportMode() != STAT_MODE_RANGE) {
ui->statEndDate->setVisible(true); p_profile->general->setStatReportMode(STAT_MODE_RANGE);
if (p_profile->general->statReportMode() != 2) { set_reportModeStandard_mode();
p_profile->general->setStatReportMode(2);
GenerateStatistics(); GenerateStatistics();
} }
} }
void MainWindow::on_statEndDate_dateChanged(const QDate &date) void MainWindow::on_statEndDate_dateChanged(const QDate &date)
{ {
if (p_profile->general->statReportMode() == STAT_MODE_RANGE ) {
p_profile->general->setStatReportRangeEnd(date); p_profile->general->setStatReportRangeEnd(date);
} else {
p_profile->general->setStatReportStart(date);
};
GenerateStatistics(); GenerateStatistics();
} }

2
oscar/mainwindow.h
View File

@ -318,6 +318,8 @@ class MainWindow : public QMainWindow
void on_reportModeStandard_clicked(); void on_reportModeStandard_clicked();
void set_reportModeStandard_mode();
void on_actionRebuildCPAP(QAction *action); void on_actionRebuildCPAP(QAction *action);
void on_actionPurgeMachine(QAction *action); void on_actionPurgeMachine(QAction *action);

151
oscar/mainwindow.ui
View File

@ -219,6 +219,15 @@
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="NoBrush">
<color alpha="128">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active> </active>
<inactive> <inactive>
<colorrole role="WindowText"> <colorrole role="WindowText">
@ -347,6 +356,15 @@
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="NoBrush">
<color alpha="128">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive> </inactive>
<disabled> <disabled>
<colorrole role="WindowText"> <colorrole role="WindowText">
@ -475,6 +493,15 @@
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="NoBrush">
<color alpha="128">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</disabled> </disabled>
</palette> </palette>
</property> </property>
@ -588,16 +615,57 @@
</item> </item>
<item> <item>
<widget class="QDateEdit" name="statStartDate"> <widget class="QDateEdit" name="statStartDate">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentSection">
<enum>QDateTimeEdit::MonthSection</enum>
</property>
<property name="displayFormat">
<string>Qt::SystemLocaleShortDate</string>
</property>
<property name="calendarPopup"> <property name="calendarPopup">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="statEnableEndDisplay">
<property name="text">
<string>Report Date</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="statEnableEndDisplay">
<property name="text">
<string>Report Date</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QDateEdit" name="statEndDate"> <widget class="QDateEdit" name="statEndDate">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentSection">
<enum>QDateTimeEdit::MonthSection</enum>
</property>
<property name="displayFormat">
<string>Qt::SystemLocaleShortDate</string>
</property>
<property name="calendarPopup"> <property name="calendarPopup">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="currentSectionIndex">
<number>1</number>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@ -605,6 +673,9 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
@ -776,8 +847,8 @@ QToolBox::tab:selected {
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>117</width> <width>123</width>
<height>703</height> <height>704</height>
</rect> </rect>
</property> </property>
<property name="palette"> <property name="palette">
@ -1234,8 +1305,8 @@ border: 2px solid #56789a; border-radius: 30px;
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>132</width> <width>137</width>
<height>684</height> <height>686</height>
</rect> </rect>
</property> </property>
<property name="palette"> <property name="palette">
@ -1504,6 +1575,15 @@ border: 2px solid #56789a; border-radius: 30px;
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="NoBrush">
<color alpha="128">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</active> </active>
<inactive> <inactive>
<colorrole role="WindowText"> <colorrole role="WindowText">
@ -1665,6 +1745,15 @@ border: 2px solid #56789a; border-radius: 30px;
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="NoBrush">
<color alpha="128">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</inactive> </inactive>
<disabled> <disabled>
<colorrole role="WindowText"> <colorrole role="WindowText">
@ -1826,6 +1915,15 @@ border: 2px solid #56789a; border-radius: 30px;
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="NoBrush">
<color alpha="128">
<red>0</red>
<green>0</green>
<blue>0</blue>
</color>
</brush>
</colorrole>
</disabled> </disabled>
</palette> </palette>
</property> </property>
@ -1928,6 +2026,15 @@ border: 2px solid #56789a; border-radius: 30px;
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</active> </active>
<inactive> <inactive>
<colorrole role="WindowText"> <colorrole role="WindowText">
@ -1993,6 +2100,15 @@ border: 2px solid #56789a; border-radius: 30px;
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</inactive> </inactive>
<disabled> <disabled>
<colorrole role="WindowText"> <colorrole role="WindowText">
@ -2058,6 +2174,15 @@ border: 2px solid #56789a; border-radius: 30px;
</color> </color>
</brush> </brush>
</colorrole> </colorrole>
<colorrole role="PlaceholderText">
<brush brushstyle="SolidPattern">
<color alpha="255">
<red>255</red>
<green>255</green>
<blue>255</blue>
</color>
</brush>
</colorrole>
</disabled> </disabled>
</palette> </palette>
</property> </property>
@ -2249,10 +2374,9 @@ border-radius: 10px;
</property> </property>
<property name="html"> <property name="html">
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;meta charset=&quot;utf-8&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; }
hr { height: 1px; border-width: 0; } &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p 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:'MS Shell Dlg 2'; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p 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:'MS Shell Dlg 2'; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="openLinks"> <property name="openLinks">
@ -2267,8 +2391,8 @@ hr { height: 1px; border-width: 0; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>132</width> <width>137</width>
<height>684</height> <height>686</height>
</rect> </rect>
</property> </property>
<property name="mouseTracking"> <property name="mouseTracking">
@ -2307,10 +2431,9 @@ hr { height: 1px; border-width: 0; }
</property> </property>
<property name="html"> <property name="html">
<string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string notr="true">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;meta charset=&quot;utf-8&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; }
hr { height: 1px; border-width: 0; } &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'.AppleSystemUIFont'; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p 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:'MS Shell Dlg 2'; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p 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:'MS Shell Dlg 2'; font-size:8.25pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
<property name="openLinks"> <property name="openLinks">
@ -2331,7 +2454,7 @@ hr { height: 1px; border-width: 0; }
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1023</width> <width>1023</width>
<height>24</height> <height>22</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -2340,8 +2463,6 @@ hr { height: 1px; border-width: 0; }
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<widget class="QMenu" name="menu_File"> <widget class="QMenu" name="menu_File">
<property name="title"> <property name="title">
<string>&amp;File</string> <string>&amp;File</string>

70
oscar/statistics.cpp
View File

@ -167,7 +167,12 @@ bool rxAHILessThan(const RXItem * rx1, const RXItem * rx2)
void Statistics::updateDisabledInfo() void Statistics::updateDisabledInfo()
{ {
disabledInfo.update( p_profile->LastDay(MT_CPAP), p_profile->FirstDay(MT_CPAP) ); QDate lastcpap = p_profile->LastGoodDay(MT_CPAP);
QDate firstcpap = p_profile->FirstGoodDay(MT_CPAP);
if (lastcpap > p_profile->general->statReportStart() ) {
lastcpap = p_profile->general->statReportStart();
}
disabledInfo.update( lastcpap, firstcpap );
} }
void DisabledInfo::update(QDate latestDate, QDate earliestDate) void DisabledInfo::update(QDate latestDate, QDate earliestDate)
@ -217,23 +222,6 @@ void DisabledInfo::update(QDate latestDate, QDate earliestDate)
// convect ms to minutes // convect ms to minutes
maxDurationOfaDisabledsession/=60000 ; maxDurationOfaDisabledsession/=60000 ;
totalDurationOfDisabledSessions/=60000 ; totalDurationOfDisabledSessions/=60000 ;
#if 0
DEBUGQ;
DEBUGQ;
DEBUGFW Q(p_profile->cpap->complianceHours()) ;
DEBUGFW Q( totalDays ) ;
DEBUGQ;
DEBUGFW Q( daysNoData ) ;
DEBUGFW Q( daysInCompliance ) ;
DEBUGFW Q( daysOutOfCompliance ) ;
DEBUGFW Q( numDaysDisabledSessionChangedCompliance ) ;
DEBUGQ;
DEBUGFW Q( numDisabledsessions ) ;
DEBUGFW Q( maxDurationOfaDisabledsession) O("minutes");
DEBUGFW Q( totalDurationOfDisabledSessions) O("minutes") ;
DEBUGFW Q( numDaysWithDisabledsessions ) ;
#endif
}; };
QString DisabledInfo::display(int type) QString DisabledInfo::display(int type)
@ -1069,6 +1057,9 @@ QString Statistics::GenerateMachineList()
//qDebug() << "Device" << 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();
if (d2 > p_profile->general->statReportStart() ) {
d2 = p_profile->general->statReportStart();
}
QString mn = m->modelnumber(); QString mn = m->modelnumber();
html += QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td></tr>") html += QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td></tr>")
.arg(m->brand()) .arg(m->brand())
@ -1143,6 +1134,9 @@ QString Statistics::GenerateRXChanges()
while (it.hasPrevious()) { while (it.hasPrevious()) {
it.previous(); it.previous();
const RXItem & rx = it.value(); const RXItem & rx = it.value();
if (rx.start > p_profile->general->statReportStart() ) continue;
QDate rxend=rx.end;
if (rxend > p_profile->general->statReportStart() ) rxend = p_profile->general->statReportStart();
QString color; QString color;
@ -1161,7 +1155,7 @@ QString Statistics::GenerateRXChanges()
html += QString("<tr %4 bgcolor='%1' onmouseover='ChangeColor(this, \"#dddddd\");' onmouseout='ChangeColor(this, \"%1\");' onclick='alert(\"overview=%2,%3\");'>") html += QString("<tr %4 bgcolor='%1' onmouseover='ChangeColor(this, \"#dddddd\");' onmouseout='ChangeColor(this, \"%1\");' onclick='alert(\"overview=%2,%3\");'>")
.arg(color) .arg(color)
.arg(rx.start.toString(Qt::ISODate)) .arg(rx.start.toString(Qt::ISODate))
.arg(rx.end.toString(Qt::ISODate)) .arg(rxend.toString(Qt::ISODate))
.arg(datarowclass); .arg(datarowclass);
double ahi = rdi ? (double(rx.rdi) / rx.hours) : (double(rx.ahi) /rx.hours); double ahi = rdi ? (double(rx.rdi) / rx.hours) : (double(rx.ahi) /rx.hours);
@ -1175,7 +1169,7 @@ QString Statistics::GenerateRXChanges()
.arg(rx.machine->serial()); .arg(rx.machine->serial());
html += QString("<td>%1</td>").arg(rx.start.toString(MedDateFormat))+ html += QString("<td>%1</td>").arg(rx.start.toString(MedDateFormat))+
QString("<td>%1</td>").arg(rx.end.toString(MedDateFormat))+ QString("<td>%1</td>").arg(rxend.toString(MedDateFormat))+
QString("<td>%1</td>").arg(rx.days)+ QString("<td>%1</td>").arg(rx.days)+
QString("<td>%1</td>").arg(ahi, 0, 'f', 2)+ QString("<td>%1</td>").arg(ahi, 0, 'f', 2)+
QString("<td>%1</td>").arg(fli, 0, 'f', 2)+ QString("<td>%1</td>").arg(fli, 0, 'f', 2)+
@ -1238,19 +1232,9 @@ QString Statistics::GenerateCPAPUsage()
// Find first and last days with valid CPAP data // Find first and last days with valid CPAP data
QDate lastcpap = p_profile->LastGoodDay(MT_CPAP); QDate lastcpap = p_profile->LastGoodDay(MT_CPAP);
QDate firstcpap = p_profile->FirstGoodDay(MT_CPAP); QDate firstcpap = p_profile->FirstGoodDay(MT_CPAP);
if (lastcpap > p_profile->general->statReportStart() ) {
// Get dates for standard report (last week, month, 6 months, year) lastcpap = p_profile->general->statReportStart();
QDate cpapweek = lastcpap.addDays(-6); }
QDate cpapmonth = lastcpap.addDays(-29);
QDate cpap6month = lastcpap.addMonths(-6);
QDate cpapyear = lastcpap.addMonths(-12);
// but not before the first available date of course
if (cpapweek < firstcpap) { cpapweek = firstcpap; }
if (cpapmonth < firstcpap) { cpapmonth = firstcpap; }
if (cpap6month < firstcpap) { cpap6month = firstcpap; }
if (cpapyear < firstcpap) { cpapyear = firstcpap; }
QString ahitxt = getRDIorAHIText(); QString ahitxt = getRDIorAHIText();
@ -1292,7 +1276,9 @@ QString Statistics::GenerateCPAPUsage()
if (row.calc == SC_HEADING) { // All sections begin with a heading if (row.calc == SC_HEADING) { // All sections begin with a heading
last = p_profile->LastGoodDay(row.type); last = p_profile->LastGoodDay(row.type);
first = p_profile->FirstGoodDay(row.type); first = p_profile->FirstGoodDay(row.type);
//last = p_profile->general->statReportStart(); if (last > p_profile->general->statReportStart() ) {
last = p_profile->general->statReportStart();
}
// Clear the periods (columns) // Clear the periods (columns)
periods.clear(); periods.clear();
@ -1365,6 +1351,9 @@ QString Statistics::GenerateCPAPUsage()
} else if (row.calc == SC_DAYS) { } else if (row.calc == SC_DAYS) {
QDate first=p_profile->FirstGoodDay(row.type); QDate first=p_profile->FirstGoodDay(row.type);
QDate last=p_profile->LastGoodDay(row.type); QDate last=p_profile->LastGoodDay(row.type);
if (last > p_profile->general->statReportStart() ) {
last = p_profile->general->statReportStart();
}
QString & machine = machinenames[row.type]; QString & machine = machinenames[row.type];
int value=p_profile->countDays(row.type, first, last); int value=p_profile->countDays(row.type, first, last);
@ -1541,6 +1530,9 @@ QString Statistics::UpdateRecordsBox()
if (cpap) { if (cpap) {
QDate first = p_profile->FirstGoodDay(MT_CPAP); QDate first = p_profile->FirstGoodDay(MT_CPAP);
QDate last = p_profile->LastGoodDay(MT_CPAP); QDate last = p_profile->LastGoodDay(MT_CPAP);
if (last > p_profile->general->statReportStart() ) {
last = p_profile->general->statReportStart();
}
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
/// Compliance and usage information /// Compliance and usage information
@ -1579,7 +1571,7 @@ QString Statistics::UpdateRecordsBox()
int baddays = 0; int baddays = 0;
for (QDate date = first; date <= last; date = date.addDays(1)) { for (QDate date = first; date <= last; date = date.addDays(1)) {
Day * day = p_profile->GetGoodDay(date, MT_CPAP); Day * day = p_profile->GetDay(date, MT_CPAP);
if (!day) continue; if (!day) continue;
float ahi = day->calcAHI(); float ahi = day->calcAHI();
@ -1624,7 +1616,7 @@ QString Statistics::UpdateRecordsBox()
ahilist.clear(); ahilist.clear();
for (QDate date = first; date <= last; date = date.addDays(1)) { for (QDate date = first; date <= last; date = date.addDays(1)) {
Day * day = p_profile->GetGoodDay(date, MT_CPAP); Day * day = p_profile->GetDay(date, MT_CPAP);
if (!day) continue; if (!day) continue;
float val = 0; float val = 0;
@ -1676,7 +1668,7 @@ QString Statistics::UpdateRecordsBox()
ahilist.clear(); ahilist.clear();
for (QDate date = first; date <= last; date = date.addDays(1)) { for (QDate date = first; date <= last; date = date.addDays(1)) {
Day * day = p_profile->GetGoodDay(date, MT_CPAP); Day * day = p_profile->GetDay(date, MT_CPAP);
if (!day) continue; if (!day) continue;
float leak = day->calcPON(CPAP_LargeLeak); float leak = day->calcPON(CPAP_LargeLeak);
@ -1714,7 +1706,7 @@ QString Statistics::UpdateRecordsBox()
if (p_profile->hasChannel(CPAP_CSR)) { if (p_profile->hasChannel(CPAP_CSR)) {
ahilist.clear(); ahilist.clear();
for (QDate date = first; date <= last; date = date.addDays(1)) { for (QDate date = first; date <= last; date = date.addDays(1)) {
Day * day = p_profile->GetGoodDay(date, MT_CPAP); Day * day = p_profile->GetDay(date, MT_CPAP);
if (!day) continue; if (!day) continue;
float leak = day->calcPON(CPAP_CSR); float leak = day->calcPON(CPAP_CSR);
@ -1744,7 +1736,7 @@ QString Statistics::UpdateRecordsBox()
if (p_profile->hasChannel(CPAP_PB)) { if (p_profile->hasChannel(CPAP_PB)) {
ahilist.clear(); ahilist.clear();
for (QDate date = first; date <= last; date = date.addDays(1)) { for (QDate date = first; date <= last; date = date.addDays(1)) {
Day * day = p_profile->GetGoodDay(date, MT_CPAP); Day * day = p_profile->GetDay(date, MT_CPAP);
if (!day) continue; if (!day) continue;
float leak = day->calcPON(CPAP_PB); float leak = day->calcPON(CPAP_PB);

2
oscar/statistics.h
View File

@ -38,6 +38,7 @@ private:
int numDaysDisabledSessionChangedCompliance ; int numDaysDisabledSessionChangedCompliance ;
double maxDurationOfaDisabledsession ; double maxDurationOfaDisabledsession ;
double totalDurationOfDisabledSessions ; double totalDurationOfDisabledSessions ;
public:
void clear () { void clear () {
totalDays = 0; totalDays = 0;
daysNoData = 0; daysNoData = 0;
@ -237,6 +238,7 @@ class Statistics : public QObject
QList<QDate> record_worst_ahi; QList<QDate> record_worst_ahi;
DisabledInfo disabledInfo; DisabledInfo disabledInfo;
signals: signals:
public slots: public slots: