diff --git a/SleepLib/profiles.cpp b/SleepLib/profiles.cpp index bda97abf..a81716c0 100644 --- a/SleepLib/profiles.cpp +++ b/SleepLib/profiles.cpp @@ -615,3 +615,131 @@ const char * US_STR_SkipEmptyDays="SkipEmptyDays"; const char * US_STR_RebuildCache="RebuildCache"; const char * US_STR_ShowDebug="ShowDebug"; const char * US_STR_LinkGroups="LinkGroups"; + +EventDataType Profile::calcCount(ChannelID code, MachineType mt, QDate start, QDate end) +{ + if (!start.isValid()) start=LastDay(mt); + if (!end.isValid()) end=LastDay(mt); + QDate date=start; + + double val=0; + do { + Day * day=GetDay(date,mt); + if (day) { + val+=day->count(code); + } + date=date.addDays(1); + } while (datesum(code); + } + date=date.addDays(1); + } while (datehours(); + } + date=date.addDays(1); + } while (datesum(code); + cnt++; + } + date=date.addDays(1); + } while (datehours(); + tmp=day->wavg(code); + val+=tmp*tmph; + hours+=tmph; + } + date=date.addDays(1); + } while (date=m_first); + return m_first; +} diff --git a/SleepLib/profiles.h b/SleepLib/profiles.h index 66cc59c2..767fbd25 100644 --- a/SleepLib/profiles.h +++ b/SleepLib/profiles.h @@ -96,12 +96,19 @@ public: //! \brief Returns true if this profile stores this variable identified by key bool contains(QString key) { return p_preferences.contains(key); } + EventDataType calcCount(ChannelID code, MachineType mt=MT_CPAP, QDate start=QDate(), QDate end=QDate()); + double calcSum(ChannelID code, MachineType mt=MT_CPAP, QDate start=QDate(), QDate end=QDate()); + EventDataType calcHours(MachineType mt=MT_CPAP, QDate start=QDate(), QDate end=QDate()); + EventDataType calcAvg(ChannelID code, MachineType mt=MT_CPAP, QDate start=QDate(), QDate end=QDate()); + EventDataType calcWavg(ChannelID code, MachineType mt=MT_CPAP, QDate start=QDate(), QDate end=QDate()); + EventDataType calcPercentile(ChannelID code, EventDataType percent, MachineType mt=MT_CPAP, QDate start=QDate(), QDate end=QDate()); + virtual void ExtraLoad(QDomElement & root); virtual QDomElement ExtraSave(QDomDocument & doc); QMap > daylist; - const QDate & FirstDay() { return m_first; } - const QDate & LastDay() { return m_last; } + QDate FirstDay(MachineType mt=MT_UNKNOWN); + QDate LastDay(MachineType mt=MT_UNKNOWN); QString dataFolder() { return (*this).Get("{DataFolder}"); } @@ -351,6 +358,7 @@ public: void setProfile(Profile *p) { m_profile=p; } + //Getters double complianceHours() { return (*m_profile)[CS_STR_ComplianceHours].toDouble(); } bool showComplianceInfo() { return (*m_profile)[CS_STR_ShowCompliance].toBool(); } int leakMode() { return (*m_profile)[CS_STR_ShowLeaksMode].toInt(); } @@ -364,6 +372,7 @@ public: const QString notes() { return (*m_profile)[CS_STR_Notes].toString(); } QDate dateDiagnosed() { return (*m_profile)[CS_STR_DateDiagnosed].toDate(); } + //Setters void setMode(CPAPMode mode) { (*m_profile)[CS_STR_PrescribedMode]=(int)mode; } void setMinPressure(double pressure) { (*m_profile)[CS_STR_PrescribedMinPressure]=pressure; } void setMaxPressure(double pressure) { (*m_profile)[CS_STR_PrescribedMaxPressure]=pressure; } diff --git a/mainwindow.cpp b/mainwindow.cpp index 64ba7b77..33396f42 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -209,6 +209,8 @@ void MainWindow::Startup() if (overview) overview->ReloadGraphs(); qprogress->hide(); qstatus->setText(""); + on_homeButton_clicked(); + } void MainWindow::on_action_Import_Data_triggered() @@ -342,11 +344,115 @@ void MainWindow::on_action_Fullscreen_triggered() this->showNormal(); } +QString htmlHeader() +{ + return QString("" +"" +"" +"" +"" +"

SleepyHead v"+VersionString+" "+ReleaseStatus+"

" +"

This page is being redesigned to be more useful... Please send me your ideas on what you'd like to see here :)

" +"

The plan is to get the content happening first, then make the layout pretty...

"); +} +QString htmlFooter() +{ + return QString(""); +} + void MainWindow::on_homeButton_clicked() { - QString file="qrc:/docs/index.html"; - QUrl url(file); - ui->webView->setUrl(url); + QString html=htmlHeader(); + + QDate lastcpap=p_profile->LastDay(MT_CPAP); + QDate firstcpap=p_profile->FirstDay(MT_CPAP); + QDate cpapweek=lastcpap.addDays(-7); + QDate cpapmonth=lastcpap.addDays(-30); + QDate cpap6month=lastcpap.addMonths(-6); + QDate cpapyear=lastcpap.addYears(-12); + if (cpapweekSummary Information as of %1").arg(lastcpap.toString(Qt::SystemLocaleLongDate)); + html+=QString("" + "") + .arg(tr("Details")).arg(tr("Most Recent")).arg(tr("Last 7 Days")).arg(tr("Last 30 Days")).arg(tr("Last 6 months")).arg(tr("Last Year")); + + html+=QString("") + .arg(tr("AHI")) + .arg((p_profile->calcCount(CPAP_Obstructive) + +p_profile->calcCount(CPAP_Hypopnea) + +p_profile->calcCount(CPAP_ClearAirway) + +p_profile->calcCount(CPAP_Apnea)) + /p_profile->calcHours(),0,'f',2) + .arg((p_profile->calcCount(CPAP_Obstructive,MT_CPAP,cpapweek,lastcpap) + +p_profile->calcCount(CPAP_Hypopnea,MT_CPAP,cpapweek,lastcpap) + +p_profile->calcCount(CPAP_ClearAirway,MT_CPAP,cpapweek,lastcpap) + +p_profile->calcCount(CPAP_Apnea,MT_CPAP,cpapweek,lastcpap)) + /p_profile->calcHours(MT_CPAP,cpapweek,lastcpap),0,'f',2) + .arg((p_profile->calcCount(CPAP_Obstructive,MT_CPAP,cpapmonth,lastcpap) + +p_profile->calcCount(CPAP_Hypopnea,MT_CPAP,cpapmonth,lastcpap) + +p_profile->calcCount(CPAP_ClearAirway,MT_CPAP,cpapmonth,lastcpap) + +p_profile->calcCount(CPAP_Apnea,MT_CPAP,cpapmonth,lastcpap)) + /p_profile->calcHours(MT_CPAP,cpapmonth,lastcpap),0,'f',2) + .arg((p_profile->calcCount(CPAP_Obstructive,MT_CPAP,cpap6month,lastcpap) + +p_profile->calcCount(CPAP_Hypopnea,MT_CPAP,cpap6month,lastcpap) + +p_profile->calcCount(CPAP_ClearAirway,MT_CPAP,cpap6month,lastcpap) + +p_profile->calcCount(CPAP_Apnea,MT_CPAP,cpap6month,lastcpap)) + /p_profile->calcHours(MT_CPAP,cpap6month,lastcpap),0,'f',2) + .arg((p_profile->calcCount(CPAP_Obstructive,MT_CPAP,cpapyear,lastcpap) + +p_profile->calcCount(CPAP_Hypopnea,MT_CPAP,cpapyear,lastcpap) + +p_profile->calcCount(CPAP_ClearAirway,MT_CPAP,cpapyear,lastcpap) + +p_profile->calcCount(CPAP_Apnea,MT_CPAP,cpapyear,lastcpap)) + /p_profile->calcHours(MT_CPAP,cpapyear,lastcpap),0,'f',2); + html+=""; + + html+=QString("") + .arg(tr("Usage (Average)")) + .arg(p_profile->calcHours(MT_CPAP),0,'f',2) + .arg(p_profile->calcHours(MT_CPAP,cpapweek,lastcpap)/float(cpapweekdays),0,'f',2) + .arg(p_profile->calcHours(MT_CPAP,cpapmonth,lastcpap)/float(cpapmonthdays),0,'f',2) + .arg(p_profile->calcHours(MT_CPAP,cpap6month,lastcpap)/float(cpap6monthdays),0,'f',2) + .arg(p_profile->calcHours(MT_CPAP,cpapyear,lastcpap)/float(cpapyeardays),0,'f',2); + + html+=QString("") + .arg(tr("Average Pressure")) + .arg(p_profile->calcWavg(CPAP_Pressure,MT_CPAP)) + .arg(p_profile->calcWavg(CPAP_Pressure,MT_CPAP,cpapweek,lastcpap),0,'f',3) + .arg(p_profile->calcWavg(CPAP_Pressure,MT_CPAP,cpapmonth,lastcpap),0,'f',3) + .arg(p_profile->calcWavg(CPAP_Pressure,MT_CPAP,cpap6month,lastcpap),0,'f',3) + .arg(p_profile->calcWavg(CPAP_Pressure,MT_CPAP,cpapyear,lastcpap),0,'f',3); + html+=""; + + + html+=QString("") + .arg(tr("Average Leaks")) + .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP)) + .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP,cpapweek,lastcpap),0,'f',3) + .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP,cpapmonth,lastcpap),0,'f',3) + .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP,cpap6month,lastcpap),0,'f',3) + .arg(p_profile->calcWavg(CPAP_Leak,MT_CPAP,cpapyear,lastcpap),0,'f',3); + html+=""; + + + html+="
%1%2%3%4%5%6
%1%2%3%4%5%6
Note, these are different to overview calcs.. Overview shows a simple average AHI, this shows combined counts divide by combined hours
%1%2%3%4%5%6
%1%2%3%4%5%6
TODO: 90% pressure.. Any point showing if this is all CPAP?
%1%2%3%4%5%6
What about median leak values? 90% Leaks?
"; + html+=htmlFooter(); + ui->webView->setHtml(html); +// QString file="qrc:/docs/index.html"; +// QUrl url(file); +// ui->webView->setUrl(url); } void MainWindow::on_backButton_clicked()