diff --git a/Graphs/gGraphView.cpp b/Graphs/gGraphView.cpp index b6121509..88c7389c 100644 --- a/Graphs/gGraphView.cpp +++ b/Graphs/gGraphView.cpp @@ -2612,6 +2612,8 @@ void gGraphView::paintGL() redrawtimer->setInterval(15); redrawtimer->setSingleShot(true); redrawtimer->start(); + } else { + int i=5; } } } diff --git a/SleepLib/machine.cpp b/SleepLib/machine.cpp index 1e110c30..3c0ecf09 100644 --- a/SleepLib/machine.cpp +++ b/SleepLib/machine.cpp @@ -256,9 +256,12 @@ bool Machine::Load() int cnt=0; for (s=sessfiles.begin(); s!=sessfiles.end(); s++) { cnt++; - if ((cnt % 10)==0) + if ((cnt % 10)==0) { if (qprogress) qprogress->setValue((float(cnt)/float(size)*100.0)); + } + QApplication::processEvents(); + Session *sess=new Session(this,s.key()); if (sess->LoadSummary(s.value()[0])) { diff --git a/daily.cpp b/daily.cpp index 84b16994..c14a34b1 100644 --- a/daily.cpp +++ b/daily.cpp @@ -290,7 +290,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared) GraphView->LoadSettings("Daily"); - emptyToggleArea=new QLabel("No data available for this day",this); + emptyToggleArea=new QLabel(this); + emptyToggleArea->setText("This may take a while..."); ui->graphToggleArea->addWidget(emptyToggleArea,1,Qt::AlignCenter); emptyToggleArea->setVisible(false); for (int i=0;isize();i++) { @@ -299,13 +300,15 @@ Daily::Daily(QWidget *parent,gGraphView * shared) btn->setCheckable(true); btn->setChecked((*GraphView)[i]->visible()); btn->setToolTip(tr("Show/Hide %1").arg(title)); + btn->setVisible(false); GraphToggles[title]=btn; btn->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Minimum); ui->graphToggleArea->addWidget(btn); connect(btn,SIGNAL(toggled(bool)),this,SLOT(graphtogglebutton_toggled(bool))); } ui->graphToggleArea->addSpacerItem(new QSpacerItem(0,0,QSizePolicy::Expanding)); - + ui->graphVisibilityToggleArea->setVisible(false); + ui->splitter->setVisible(false); // TODO: Add preference to hide do this for Widget Haters.. //ui->calNavWidget->hide(); @@ -320,6 +323,8 @@ Daily::Daily(QWidget *parent,gGraphView * shared) ui->weightSpinBox->setDecimals(3); ui->weightSpinBox->setSuffix(STR_UNIT_KG); } + GraphView->setCubeImage(images["sheep"]); + GraphView->setEmptyText(tr("Loading Data...")); } Daily::~Daily() @@ -377,6 +382,7 @@ void Daily::Link_clicked(const QUrl &url) void Daily::ReloadGraphs() { + ui->splitter->setVisible(true); QDate d; if (previous_date.isValid()) { d=previous_date; @@ -661,12 +667,15 @@ void Daily::Load(QDate date) QString a; bool isBrick=false; + ui->graphVisibilityToggleArea->setVisible(true); + if (graphsAvailable>0) { GraphView->setCubeImage(images["sheep"]); GraphView->setEmptyText(tr("Graphs Switched Off")); } else { GraphView->setCubeImage(images["nodata"]); GraphView->setEmptyText(tr("No Data")); + emptyToggleArea->setText("No data available for this day"); } if (cpap) { @@ -804,9 +813,9 @@ void Daily::Load(QDate date) html+="\n"; html+="\n"; html+=""; - html+=QString("").arg(oxi->settings_wavg(OXI_SPO2Drop)); html+=QString("").arg(oxi->count(OXI_SPO2Drop)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_SPO2Drop)/3600.0)); html+=QString("").arg(oxi->count(OXI_PulseChange)).arg((100.0/oxi->hours()) * (oxi->sum(OXI_PulseChange)/3600.0)); + html+=QString("").arg(oxi->settings_wavg(OXI_SPO2Drop)); html+="
"+oxi->machine->properties[STR_PROP_Brand]+"
"+oxi->machine->properties[STR_PROP_Model]+"
 
SpO2 Baseline Used: %1\%
SpO2 Desaturations: %1 (%2)\%
Pulse Change events: %1 (%2)\%
SpO2 Baseline Used: %1\%
"; } if ((cpap && !isBrick) || oxi) { diff --git a/mainwindow.cpp b/mainwindow.cpp index 07960e81..ffc4979c 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -75,7 +75,7 @@ MainWindow::MainWindow(QWidget *parent) : QString version=VersionString; if (QString(GIT_BRANCH)!="master") version+=QString(" ")+QString(GIT_BRANCH); this->setWindowTitle(tr("SleepyHead")+QString(" v%1 (Profile: %2)").arg(version).arg(PREF[STR_GEN_Profile].toString())); - ui->tabWidget->setCurrentIndex(0); + //ui->tabWidget->setCurrentIndex(1); overview=NULL; daily=NULL; @@ -116,8 +116,12 @@ MainWindow::MainWindow(QWidget *parent) : // Load previous Window geometry this->restoreGeometry(settings.value("MainWindow/geometry").toByteArray()); + daily=new Daily(ui->tabWidget,NULL); + ui->tabWidget->insertTab(1,daily,STR_TR_Daily); + + // Start with the Welcome Tab - ui->tabWidget->setCurrentWidget(ui->welcome); + ui->tabWidget->setCurrentWidget(daily); // Nifty Notification popups in System Tray (uses Growl on Mac) if (QSystemTrayIcon::isSystemTrayAvailable() && QSystemTrayIcon::supportsMessages()) { @@ -136,6 +140,7 @@ MainWindow::MainWindow(QWidget *parent) : systray=NULL; systraymenu=NULL; } + daily->graphView()->redraw(); } extern MainWindow *mainwin; MainWindow::~MainWindow() @@ -194,9 +199,6 @@ void MainWindow::Startup() //SnapshotGraph->setMinimumSize(1024,512); SnapshotGraph->hide(); - daily=new Daily(ui->tabWidget,NULL); - ui->tabWidget->insertTab(1,daily,STR_TR_Daily); - overview=new Overview(ui->tabWidget,daily->graphView()); ui->tabWidget->insertTab(2,overview,STR_TR_Overview); if (PROFILE.oxi->oximetryEnabled()) { @@ -205,11 +207,12 @@ void MainWindow::Startup() } + ui->tabWidget->setCurrentWidget(ui->welcome); if (daily) daily->ReloadGraphs(); if (overview) overview->ReloadGraphs(); qprogress->hide(); qstatus->setText(""); - on_homeButton_clicked(); + on_summaryButton_clicked(); } @@ -472,6 +475,10 @@ bool RXSort(const RXChange * comp1, const RXChange * comp2) { //} void MainWindow::on_homeButton_clicked() +{ + ui->webView->setUrl(QUrl("qrc:/docs/index.html")); +} +void MainWindow::on_summaryButton_clicked() { QString html=htmlHeader(); @@ -497,13 +504,16 @@ void MainWindow::on_homeButton_clicked() mach.append(oximeters); int cpapdays=PROFILE.countDays(MT_CPAP,firstcpap,lastcpap); + CPAPMode cpapmode=(CPAPMode)p_profile->calcSettingsMax(CPAP_Mode,MT_CPAP,firstcpap,lastcpap); + if (mach.size()==0) { html+="

No Machine Data Imported

"; } else { + html+="
"; html+=QString("

Summary Information as of %1

").arg(lastcpap.toString(Qt::SystemLocaleLongDate)); - html+=QString(""); + html+=QString("
"); if (cpap_machines.size()>0) { html+=QString("").arg(tr("CPAP Summary")); @@ -543,7 +553,7 @@ void MainWindow::on_homeButton_clicked() .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); - if (p_profile->calcSettingsMax(CPAP_Mode,MT_CPAP,firstcpap,lastcpap)>MODE_CPAP) { + if (cpapmode>MODE_CPAP) { html+=QString("") .arg(tr("90% Pressure")) .arg(p_profile->calcPercentile(CPAP_Pressure,0.9,MT_CPAP),0,'f',3) @@ -562,6 +572,13 @@ void MainWindow::on_homeButton_clicked() .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+=QString("") + .arg(tr("Median Leaks")) + .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP),0,'f',3) + .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP,cpapweek,lastcpap),0,'f',3) + .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP,cpapmonth,lastcpap),0,'f',3) + .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP,cpap6month,lastcpap),0,'f',3) + .arg(p_profile->calcPercentile(CPAP_Leak,0.5,MT_CPAP,cpapyear,lastcpap),0,'f',3); html+=""; } if (oximeters.size()>0) { @@ -608,13 +625,13 @@ void MainWindow::on_homeButton_clicked() .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oximonth,lastoxi)/p_profile->calcHours(MT_OXIMETER,oximonth,lastoxi),0,'f',3) .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oxi6month,lastoxi)/p_profile->calcHours(MT_OXIMETER,oxi6month,lastoxi),0,'f',3) .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oxiyear,lastoxi)/p_profile->calcHours(MT_OXIMETER,oxiyear,lastoxi),0,'f',3); - html+=QString("") - .arg(tr("SpO2 Events / Hour")) - .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER)/p_profile->calcHours(MT_OXIMETER),0,'f',3) - .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oxiweek,lastoxi)/p_profile->calcHours(MT_OXIMETER,oxiweek,lastoxi),0,'f',3) - .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oximonth,lastoxi)/p_profile->calcHours(MT_OXIMETER,oximonth,lastoxi),0,'f',3) - .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oxi6month,lastoxi)/p_profile->calcHours(MT_OXIMETER,oxi6month,lastoxi),0,'f',3) - .arg(p_profile->calcCount(OXI_SPO2Drop,MT_OXIMETER,oxiyear,lastoxi)/p_profile->calcHours(MT_OXIMETER,oxiyear,lastoxi),0,'f',3); + html+=QString("") + .arg(tr("% of time in SpO2 Events")) + .arg(100.0/p_profile->calcHours(MT_OXIMETER)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER)/3600.0,0,'f',3) + .arg(100.0/p_profile->calcHours(MT_OXIMETER,oxiweek,lastoxi)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER,oxiweek,lastoxi)/3600.0,0,'f',3) + .arg(100.0/p_profile->calcHours(MT_OXIMETER,oximonth,lastoxi)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER,oximonth,lastoxi)/3600.0,0,'f',3) + .arg(100.0/p_profile->calcHours(MT_OXIMETER,oxi6month,lastoxi)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER,oxi6month,lastoxi)/3600.0,0,'f',3) + .arg(100.0/p_profile->calcHours(MT_OXIMETER,oxiyear,lastoxi)*p_profile->calcSum(OXI_SPO2Drop,MT_OXIMETER,oxiyear,lastoxi)/3600.0,0,'f',3); html+=QString("") .arg(tr("Average Pulse Rate")) .arg(p_profile->calcWavg(OXI_Pulse,MT_OXIMETER),0,'f',3) @@ -639,19 +656,9 @@ void MainWindow::on_homeButton_clicked() } html+="
%1
%1%2%3%4%5%6
%1%2%3%4%5%6
What about median leak values? 90% Leaks?
%1%2%3%4%5%6
%1%2\%%3\%%4\%%5\%%6\%
%1%2%3%4%5%6
"; - if (cpap_machines.size()>0) { - html+=QString("
Changes to Prescription Settings"); - html+=QString(""); - html+=QString("") - .arg(tr("First")) - .arg(tr("Last")) - .arg(tr("Days")) - .arg(tr("AHI")) - .arg(tr("Mode")) - .arg(tr("Min Pressure")) - .arg(tr("Max Pressure")) - .arg(tr("90% Pressure")); + html+=""; + if (cpap_machines.size()>0) { QDate first,last=lastcpap; CPAPMode mode,cmode=MODE_UNKNOWN; EventDataType cmin=0,cmax=0,min,max; @@ -717,7 +724,7 @@ void MainWindow::on_homeButton_clicked() QVector tmpRX; for (int i=0;i1) + if (rx.days>5) tmpRX.push_back(&rx); } RXsort=RX_ahi; @@ -725,43 +732,69 @@ void MainWindow::on_homeButton_clicked() tmpRX[0]->highlight=4; // worst tmpRX[tmpRX.size()-1]->highlight=1; //best - if (tmpRX.size()>4) { - tmpRX[1]->highlight=3; // worst - tmpRX[tmpRX.size()-2]->highlight=2; //best - } + // show the second best and worst.. +// if (tmpRX.size()>4) { +// tmpRX[1]->highlight=3; // worst +// tmpRX[tmpRX.size()-2]->highlight=2; //best +// } //RXsort=RX_first; //qSort(rxchange); + cpapmode=MODE_CPAP; + html+="
"; + html+=QString("
Changes to Prescription Settings"); + html+=QString("
%1%2%3%4%5%6%7%8
"); + QString extratxt; + if (cpapmode>MODE_CPAP) { + extratxt=QString("") + .arg(tr("Min Pressure")).arg(tr("Max Pressure")).arg(tr("90% Pressure")); + } else { + extratxt=QString("") + .arg(tr("Pressure")); + } + html+=QString("%6") + .arg(tr("First")) + .arg(tr("Last")) + .arg(tr("Days")) + .arg(tr("AHI")) + .arg(tr("Mode")) + .arg(extratxt); + for (int i=0;i") + if (cpapmode>MODE_CPAP) + extratxt=QString("").arg(rx.max).arg(rx.p90); + else extratxt=""; + html+=QString("%7") .arg(rx.first.toString(Qt::SystemLocaleShortDate)) .arg(rx.last.toString(Qt::SystemLocaleShortDate)) .arg(rx.days) .arg(rx.ahi,0,'f',2) .arg(schema::channel[CPAP_Mode].option(int(rx.mode)-1)) .arg(rx.min) - .arg(rx.max) - .arg(rx.p90); + .arg(extratxt); } html+="
%1%2%3%1
%1%2%3%4%5
%1%2%3%4%5%6%7%8
%1%2%1%2%3%4%5%6
"; + html+="The above has a threshold which excludes day counts less than it from the best/worst highlighting
"; + html+="
"; } } if (mach.size()>0) { + html+="
"; html+=QString("
Machine Information"); - html+=QString(""); + html+=QString("
"); html+=QString("") .arg(tr("Brand")) .arg(tr("Model")) @@ -782,6 +815,7 @@ void MainWindow::on_homeButton_clicked() .arg(m->LastDay().toString(Qt::SystemLocaleShortDate)); } html+="
%1%2%3%4%5
"; + html+="
"; } html+=htmlFooter(); ui->webView->setHtml(html); @@ -1283,38 +1317,89 @@ void MainWindow::PrintReport(gGraphView *gv,QString name, QDate date) QVector start,end; qint64 st,et; gv->GetXBounds(st,et); - for (int i=0;isize();i++) { - bool normal=true; - gGraph *g=(*gv)[i]; - if (g->isEmpty()) continue; - if (!g->visible()) continue; - if (print_bookmarks) { - normal=false; - start.push_back(st); - end.push_back(et); - graphs.push_back(g); - labels.push_back(tr("Current Selection")); - if (journal) { - if (journal->settings.contains(Bookmark_Start)) { - QVariantList st1=journal->settings[Bookmark_Start].toList(); - QVariantList et1=journal->settings[Bookmark_End].toList(); - QStringList notes=journal->settings[Bookmark_Notes].toStringList(); - for (int i=0;ititle()==tr("Flow Rate")) || (g->title()==tr("SpO2")) || (g->title()==tr("Pulse"))) { - labels.push_back(notes.at(i)); - start.push_back(st1.at(i).toLongLong()); - end.push_back(et1.at(i).toLongLong()); - graphs.push_back(g); - } + gGraph *g; + if (!print_bookmarks) { + for (int i=0;isize();i++) { + bool normal=true; + gGraph *g=(*gv)[i]; + if (g->isEmpty()) continue; + if (!g->visible()) continue; + if (print_bookmarks) { + normal=false; + start.push_back(st); + end.push_back(et); + graphs.push_back(g); + labels.push_back(tr("Current Selection")); + } + } + } else { + if (g=gv->findGraph(tr("Event Flags"))) { + if ((!g->isEmpty()) && (g->visible())) { + start.push_back(st); + start.push_back(et); + graphs.push_back(g); + labels.push_back(""); + } + } + if (journal) { + if (journal->settings.contains(Bookmark_Start)) { + QVariantList st1=journal->settings[Bookmark_Start].toList(); + QVariantList et1=journal->settings[Bookmark_End].toList(); + QStringList notes=journal->settings[Bookmark_Notes].toStringList(); + gGraph *flow=gv->findGraph(tr("Flow Rate")), + *spo2=gv->findGraph(tr("SpO2")), + *pulse=gv->findGraph(tr("Pulse")); + + if (flow && !flow->isEmpty() && flow->visible()) { + labels.push_back(""); + start.push_back(st); + end.push_back(et); + graphs.push_back(flow); + } + if (spo2 && !spo2->isEmpty() && spo2->visible()) { + labels.push_back(""); + start.push_back(st); + end.push_back(et); + graphs.push_back(spo2); + } + if (pulse && !pulse->isEmpty() && pulse->visible()) { + labels.push_back(""); + start.push_back(st); + end.push_back(et); + graphs.push_back(pulse); + } + for (int i=0;iisEmpty() && flow->visible()) { + labels.push_back(notes.at(i)); + start.push_back(st1.at(i).toLongLong()); + end.push_back(et1.at(i).toLongLong()); + graphs.push_back(flow); + } + if (spo2 && !spo2->isEmpty() && spo2->visible()) { + labels.push_back(notes.at(i)); + start.push_back(st1.at(i).toLongLong()); + end.push_back(et1.at(i).toLongLong()); + graphs.push_back(spo2); + } + if (pulse && !pulse->isEmpty() && pulse->visible()) { + labels.push_back(notes.at(i)); + start.push_back(st1.at(i).toLongLong()); + end.push_back(et1.at(i).toLongLong()); + graphs.push_back(pulse); } } } } - if (normal) { - start.push_back(st); - end.push_back(et); - graphs.push_back(g); - labels.push_back(""); + for (int i=0;isize();i++) { + gGraph *g=(*gv)[i]; + if (g->isEmpty()) continue; + if (!g->visible()) continue; + if ((g->title()!=tr("Flow Rate")) && (g->title()!=tr("SpO2")) && (g->title()!=tr("Pulse"))) { + start.push_back(st); + end.push_back(et); + graphs.push_back(g); + labels.push_back(tr("")); + } } } int pages=ceil(float(graphs.size()+graph_slots)/float(graphs_per_page)); @@ -1634,3 +1719,4 @@ void MainWindow::on_actionAll_Data_for_current_CPAP_machine_triggered() } } } + diff --git a/mainwindow.h b/mainwindow.h index db754dba..fb9d4f00 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -238,6 +238,8 @@ private slots: //! \brief Destroy ALL the CPAP data for the currently selected machine, so it can be freshly imported again void on_actionAll_Data_for_current_CPAP_machine_triggered(); + void on_summaryButton_clicked(); + private: Ui::MainWindow *ui; diff --git a/mainwindow.ui b/mainwindow.ui index ac5c367a..ecffba90 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -220,6 +220,13 @@ + + + + Summary + + +