diff --git a/daily.cpp b/daily.cpp index 4ac9f024..938da7ef 100644 --- a/daily.cpp +++ b/daily.cpp @@ -1120,7 +1120,8 @@ void Daily::Unload(QDate date) } } if (journal->IsChanged()) { - mainwin->getOverview()->ReloadGraphs(); + + mainwin->getOverview()->ResetGraphs(); } Machine *jm=PROFILE.GetMachine(MT_JOURNAL); if (jm) jm->SaveSession(journal); diff --git a/mainwindow.cpp b/mainwindow.cpp index d41f330b..bf5388ad 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -140,7 +140,12 @@ MainWindow::MainWindow(QWidget *parent) : systray=NULL; systraymenu=NULL; } + ui->toolBox->setCurrentIndex(0); daily->graphView()->redraw(); + + ui->recordsBox->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); + //connect(ui->recordsBox,SIGNAL(linkClicked(QUrl)),this,SLOT(Link_clicked(QUrl))); + } extern MainWindow *mainwin; MainWindow::~MainWindow() @@ -712,6 +717,8 @@ void MainWindow::on_summaryButton_clicked() html+=""; html+=""; + QDate bestAHIdate, worstAHIdate; + EventDataType bestAHI=999.0, worstAHI=0; if (cpapdays>0) { QDate first,last=lastcpap; CPAPMode mode,cmode=MODE_UNKNOWN; @@ -723,8 +730,21 @@ void MainWindow::on_summaryButton_clicked() QVector rxchange; do { day=PROFILE.GetDay(date,MT_CPAP); + lastchanged=false; if (day) { + EventDataType ahi=day->count(CPAP_Obstructive)+day->count(CPAP_Hypopnea)+day->count(CPAP_Apnea)+day->count(CPAP_ClearAirway); + if (PROFILE.general->calculateRDI()) ahi+=day->count(CPAP_RERA); + ahi/=day->hours(); + if (ahi > worstAHI) { + worstAHI=ahi; + worstAHIdate=date; + } + if (ahi < bestAHI) { + bestAHI=ahi; + bestAHIdate=date; + } + mode=(CPAPMode)round(day->settings_wavg(CPAP_Mode)); min=day->settings_min(CPAP_PressureMin); if (mode==MODE_CPAP) { @@ -797,7 +817,92 @@ void MainWindow::on_summaryButton_clicked() RXsort=RX_ahi; qSort(tmpRX.begin(),tmpRX.end(),RXSort); tmpRX[0]->highlight=4; // worst - tmpRX[tmpRX.size()-1]->highlight=1; //best + int ls=tmpRX.size()-1; + tmpRX[ls]->highlight=1; //best + + QString recbox=""; + recbox+=""; + recbox+=QString("").arg(bestAHIdate.toString(Qt::ISODate)).arg("Best AHI").arg(bestAHI,0,'f',2); + recbox+=QString("").arg(bestAHIdate.toString(Qt::SystemLocaleShortDate)); + recbox+=QString(""); + recbox+=QString("").arg(worstAHIdate.toString(Qt::ISODate)).arg("Worst AHI").arg(worstAHI,0,'f',2); + recbox+=QString("").arg(worstAHIdate.toString(Qt::SystemLocaleShortDate)); + recbox+=QString(""); + QString minstr,maxstr,modestr; + + + { + CPAPMode mode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,tmpRX[ls]->first,tmpRX[ls]->first); + + if (mode") + .arg(tmpRX[ls]->first.toString(Qt::ISODate)) + .arg(tmpRX[ls]->last.toString(Qt::ISODate)) + .arg(tr("Best RX Setting")); + recbox+=QString("").arg(tr("AHI")).arg(tmpRX[ls]->ahi,0,'f',2); + recbox+=QString("").arg(tr("Mode")).arg(modestr); + recbox+=QString(""; + + recbox+=QString("").arg(tr("Start")).arg(tmpRX[ls]->first.toString(Qt::SystemLocaleShortDate)); + recbox+=QString("").arg(tr("End")).arg(tmpRX[ls]->last.toString(Qt::SystemLocaleShortDate)); + recbox+=QString(""); + + mode=(CPAPMode)(int)PROFILE.calcSettingsMax(CPAP_Mode,MT_CPAP,tmpRX[0]->first,tmpRX[0]->first); + if (mode") + .arg(tmpRX[0]->first.toString(Qt::ISODate)) + .arg(tmpRX[0]->last.toString(Qt::ISODate)) + .arg(tr("Worst RX Setting")); + recbox+=QString("").arg(tr("AHI")).arg(tmpRX[0]->ahi,0,'f',2); + recbox+=QString("").arg(tr("Mode")).arg(modestr); + recbox+=QString(""; + + recbox+=QString("").arg(tr("Start")).arg(tmpRX[0]->first.toString(Qt::SystemLocaleShortDate)); + recbox+=QString("").arg(tr("End")).arg(tmpRX[0]->last.toString(Qt::SystemLocaleShortDate)); + } + recbox+=QString("
%2%3
%1
 
%2%3
%1
 
%3
%1: %2
%1: %2
%1: %2").arg(minstr).arg(tmpRX[ls]->min,0,'f',1); + if (!maxstr.isEmpty()) recbox+=QString(" %1: %2").arg(maxstr).arg(tmpRX[ls]->max,0,'f',1); + recbox+="
%1: %2
%1: %2
 
%3
%1: %2
%1: %2
%1: %2").arg(minstr).arg(tmpRX[0]->min,0,'f',1); + if (!maxstr.isEmpty()) recbox+=QString(" %1: %2").arg(maxstr).arg(tmpRX[0]->max,0,'f',1); + recbox+="
%1: %2
%1: %2
"); + recbox+=""; + ui->recordsBox->setHtml(recbox); + +// ui->recordsBox->append("Best RX Setting"); +// ui->recordsBox->append("Start: "+tmpRX[ls]->first.toString(Qt::SystemLocaleShortDate)+"
End: "+tmpRX[ls]->last.toString(Qt::SystemLocaleShortDate)+"\n\n"); +// ui->recordsBox->append("Worst RX Setting"); +// ui->recordsBox->append("Start: "+tmpRX[0]->first.toString(Qt::SystemLocaleShortDate)+"
End: "+tmpRX[0]->last.toString(Qt::SystemLocaleShortDate)+"\n\n"); //show the second best and worst.. //if (tmpRX.size()>4) { @@ -1841,3 +1946,24 @@ void MainWindow::on_action_Sidebar_Toggle_toggled(bool visible) { ui->toolBox->setVisible(visible); } + +void MainWindow::on_recordsBox_linkClicked(const QUrl &linkurl) +{ + QString link=linkurl.toString().section("=",0,0).toLower(); + QString datestr=linkurl.toString().section("=",1).toLower(); + qDebug() << linkurl.toString() << link << datestr; + if (link=="daily") { + QDate date=QDate::fromString(datestr,Qt::ISODate); + daily->LoadDate(date); + ui->tabWidget->setCurrentWidget(daily); + } else if (link=="overview") { + QString date1=datestr.section(",",0,0); + QString date2=datestr.section(",",1); + + QDate d1=QDate::fromString(date1,Qt::ISODate); + QDate d2=QDate::fromString(date2,Qt::ISODate); + overview->setRange(d1,d2); + ui->tabWidget->setCurrentWidget(overview); + } + +} diff --git a/mainwindow.h b/mainwindow.h index 853de7c6..62e9bbee 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -248,6 +248,8 @@ private slots: void on_action_Sidebar_Toggle_toggled(bool arg1); + void on_recordsBox_linkClicked(const QUrl &arg1); + private: Ui::MainWindow *ui; diff --git a/mainwindow.ui b/mainwindow.ui index 2ac8239d..1706fdbe 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -271,13 +271,13 @@ - 140 + 160 0 - 140 + 160 16777215 @@ -385,7 +385,7 @@ 1 - 1 + 2 0 @@ -395,7 +395,7 @@ 0 0 - 123 + 143 513 @@ -691,7 +691,7 @@ 0 0 - 138 + 158 319 @@ -713,7 +713,7 @@ 0 - + @@ -774,28 +774,48 @@ 0 - - - true + + + + + + + + 170 + 170 + 255 + + + + + + + + + 170 + 170 + 255 + + + + + + + + + 0 + 31 + 237 + + + + + - - true - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Highest AHI</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="foo"><span style=" text-decoration: underline; color:#0000ff;">somedate</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Lowest AHI</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="foo"><span style=" text-decoration: underline; color:#0000ff;">somedate</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Most PB/CSR</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="foo"><span style=" text-decoration: underline; color:#0000ff;">somedate</span></a></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">etc..</p></body></html> - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse + + + about:blank + diff --git a/overview.cpp b/overview.cpp index dc5bcbd7..3d1cb3e6 100644 --- a/overview.cpp +++ b/overview.cpp @@ -283,13 +283,25 @@ gGraph * Overview::createGraph(QString name,QString units, YTickerType yttype) void Overview::ReloadGraphs() { - ui->dateStart->setDate(p_profile->FirstDay()); - ui->dateEnd->setDate(p_profile->LastDay()); GraphView->setDay(NULL); on_rangeCombo_activated(ui->rangeCombo->currentIndex()); } +void Overview::ResetGraphs() +{ + QDate start=ui->dateStart->date(); + QDate end=ui->dateEnd->date(); + //ui->dateStart->setDate(p_profile->FirstDay()); + //ui->dateEnd->setDate(p_profile->LastDay()); + GraphView->setDay(NULL); + if (start.isValid() && end.isValid()) { + setRange(start,end); + } + + //on_rangeCombo_activated(ui->rangeCombo->currentIndex()); +} + void Overview::RedrawGraphs() { GraphView->redraw(); @@ -369,10 +381,10 @@ void Overview::on_toolButton_clicked() GraphView->SetXBounds(d1,d2); } -void Overview::on_printButton_clicked() -{ - mainwin->PrintReport(GraphView,STR_TR_Overview); // Must be translated the same as PrintReport checks. -} +//void Overview::on_printButton_clicked() +//{ +// mainwin->PrintReport(GraphView,STR_TR_Overview); // Must be translated the same as PrintReport checks. +//} void Overview::ResetGraphLayout() { @@ -416,7 +428,6 @@ void Overview::on_rangeCombo_activated(int index) { QDate end=PROFILE.LastDay(); QDate start; - ui->dateEnd->setDate(end); if (index==0) { start=end.addDays(-6); } else if (index==1) { @@ -433,6 +444,15 @@ void Overview::on_rangeCombo_activated(int index) start=end.addYears(-1).addDays(1); } if (startdateEnd->blockSignals(true); + ui->dateStart->blockSignals(true); ui->dateStart->setDate(start); + ui->dateEnd->setDate(end); + ui->dateEnd->blockSignals(false); + ui->dateStart->blockSignals(false); this->on_toolButton_clicked(); } diff --git a/overview.h b/overview.h index 75f73c95..d6ae251a 100644 --- a/overview.h +++ b/overview.h @@ -41,12 +41,18 @@ public: //! \brief Recalculates Overview chart info void ReloadGraphs(); + //! \brief Recalculates Overview chart info, but keeps the date set + void ResetGraphs(); + //! \brief Reset graphs to uniform heights void ResetGraphLayout(); //! \brief Calls updateGL to redraw the overview charts void RedrawGraphs(); + //! \brief Sets the currently selected date range of the overview display + void setRange(QDate start, QDate end); + /*! \brief Create an overview graph, adding it to the overview gGraphView object \param QString name The title of the graph \param QString units The units of measurements to show in the popup */ @@ -59,8 +65,8 @@ public: QVector OverviewCharts; public slots: - //! \brief Print button down the bottom, does the same as File->Print - void on_printButton_clicked(); + // ! \brief Print button down the bottom, does the same as File->Print + //void on_printButton_clicked(); private slots: /* void on_drStart_dateChanged(const QDate &date); diff --git a/overview.ui b/overview.ui index a9d47634..f6e32714 100644 --- a/overview.ui +++ b/overview.ui @@ -6,8 +6,8 @@ 0 0 - 668 - 393 + 611 + 392 @@ -167,16 +167,6 @@ - - - - Send a Report to your Printer - - - &Print Overview - - -