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

Merge branch 'master' into loudSnorerChanges

Browse Source
This commit is contained in:
LoudSnorer 2023-06-14 13:47:48 -04:00
commit 41ef9ffb6a
4 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oscar/SleepLib/profiles.h
View File

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

18
oscar/mainwindow.cpp
View File

@ -561,8 +561,15 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
// Should really create welcome and statistics here, but they need redoing later anyway to kill off webkit
ui->tabWidget->setCurrentIndex(AppSetting->openTabAtStart());
ui->statStartDate->setDate(p_profile->FirstDay());
ui->statEndDate->setDate(p_profile->LastDay());
QDate first = p_profile->FirstDay();
QDate last = p_profile->LastDay();
ui->statStartDate->setDate(first);
ui->statEndDate->setDate(last);
p_profile->general->setStatReportRangeStart(first);
p_profile->general->setStatReportRangeEnd(last);
p_profile->general->setStatReportDate(last);
p_profile->general->setStatReportMode(STAT_MODE_STANDARD);
set_reportModeStandard_mode();
GenerateStatistics();
PopulatePurgeMenu();
@ -583,7 +590,6 @@ bool MainWindow::OpenProfile(QString profileName, bool skippassword)
ui->tabWidget->setTabEnabled(3, !noMachines); // overview, STR_TR_Overview);
ui->tabWidget->setTabEnabled(4, !noMachines); // statistics, STR_TR_Statistics);
set_reportModeStandard_mode() ;
progress->close();
delete progress;
@ -2442,7 +2448,7 @@ void MainWindow::set_reportModeStandard_mode()
ui->statStartDate->setVisible(false);
ui->statEnableEndDisplay->setVisible(true);
if (p_profile) {
ui->statEndDate->setDate(p_profile->general->statReportStart());
ui->statEndDate->setDate(p_profile->general->statReportDate());
}
}
break;
@ -2453,7 +2459,7 @@ void MainWindow::set_reportModeStandard_mode()
ui->statEnableEndDisplay->setVisible(true);
if (p_profile) {
ui->statEndDate->setDate(p_profile->general->statReportStart());
ui->statEndDate->setDate(p_profile->general->statReportDate());
}
break;
case STAT_MODE_RANGE:
@ -2503,7 +2509,7 @@ void MainWindow::on_statEndDate_dateChanged(const QDate &date)
if (p_profile->general->statReportMode() == STAT_MODE_RANGE ) {
p_profile->general->setStatReportRangeEnd(date);
} else {
p_profile->general->setStatReportStart(date);
p_profile->general->setStatReportDate(date);
};
GenerateStatistics();
}

17
oscar/mainwindow.ui
View File

@ -564,6 +564,9 @@
</item>
<item>
<widget class="QRadioButton" name="reportModeStandard">
<property name="toolTip">
<string>Show Standard Report</string>
</property>
<property name="text">
<string>Standard</string>
</property>
@ -574,6 +577,9 @@
</item>
<item>
<widget class="QRadioButton" name="reportModeMonthly">
<property name="toolTip">
<string>Show Monthly Report</string>
</property>
<property name="text">
<string>Monthly</string>
</property>
@ -581,6 +587,9 @@
</item>
<item>
<widget class="QRadioButton" name="reportModeRange">
<property name="toolTip">
<string>Show Range Report</string>
</property>
<property name="text">
<string>Date Range</string>
</property>
@ -607,13 +616,9 @@
</item>
<item>
<widget class="QLabel" name="statEnableEndDisplay">
<property name="text">
<string>Report Date</string>
<property name="toolTip">
<string>Select Report Date</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="statEnableEndDisplay">
<property name="text">
<string>Report Date</string>
</property>

28
oscar/statistics.cpp
View File

@ -169,8 +169,8 @@ void Statistics::updateDisabledInfo()
{
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();
if (lastcpap > p_profile->general->statReportDate() ) {
lastcpap = p_profile->general->statReportDate();
}
disabledInfo.update( lastcpap, firstcpap );
}
@ -1057,8 +1057,8 @@ QString Statistics::GenerateMachineList()
//qDebug() << "Device" << m->brand() << "series" << m->series() << "model" << m->model() << "model number" << m->modelnumber();
QDate d1 = m->FirstDay();
QDate d2 = m->LastDay();
if (d2 > p_profile->general->statReportStart() ) {
d2 = p_profile->general->statReportStart();
if (d2 > p_profile->general->statReportDate() ) {
d2 = p_profile->general->statReportDate();
}
QString mn = m->modelnumber();
html += QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td></tr>")
@ -1134,9 +1134,9 @@ QString Statistics::GenerateRXChanges()
while (it.hasPrevious()) {
it.previous();
const RXItem & rx = it.value();
if (rx.start > p_profile->general->statReportStart() ) continue;
if (rx.start > p_profile->general->statReportDate() ) continue;
QDate rxend=rx.end;
if (rxend > p_profile->general->statReportStart() ) rxend = p_profile->general->statReportStart();
if (rxend > p_profile->general->statReportDate() ) rxend = p_profile->general->statReportDate();
QString color;
@ -1232,8 +1232,8 @@ QString Statistics::GenerateCPAPUsage()
// Find first and last days with valid CPAP data
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();
if (lastcpap > p_profile->general->statReportDate() ) {
lastcpap = p_profile->general->statReportDate();
}
QString ahitxt = getRDIorAHIText();
@ -1276,8 +1276,8 @@ QString Statistics::GenerateCPAPUsage()
if (row.calc == SC_HEADING) { // All sections begin with a heading
last = p_profile->LastGoodDay(row.type);
first = p_profile->FirstGoodDay(row.type);
if (last > p_profile->general->statReportStart() ) {
last = p_profile->general->statReportStart();
if (last > p_profile->general->statReportDate() ) {
last = p_profile->general->statReportDate();
}
// Clear the periods (columns)
@ -1351,8 +1351,8 @@ QString Statistics::GenerateCPAPUsage()
} else if (row.calc == SC_DAYS) {
QDate first=p_profile->FirstGoodDay(row.type);
QDate last=p_profile->LastGoodDay(row.type);
if (last > p_profile->general->statReportStart() ) {
last = p_profile->general->statReportStart();
if (last > p_profile->general->statReportDate() ) {
last = p_profile->general->statReportDate();
}
QString & machine = machinenames[row.type];
int value=p_profile->countDays(row.type, first, last);
@ -1530,8 +1530,8 @@ QString Statistics::UpdateRecordsBox()
if (cpap) {
QDate first = p_profile->FirstGoodDay(MT_CPAP);
QDate last = p_profile->LastGoodDay(MT_CPAP);
if (last > p_profile->general->statReportStart() ) {
last = p_profile->general->statReportStart();
if (last > p_profile->general->statReportDate() ) {
last = p_profile->general->statReportDate();
}
/////////////////////////////////////////////////////////////////////////////////////