diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index 22e994a0..ee24c78e 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -17,13 +17,10 @@ #include #include #include -#include #include #include #include -//#include -//#include #include "daily.h" #include "ui_daily.h" @@ -111,15 +108,22 @@ Daily::Daily(QWidget *parent,gGraphView * shared) ui->calNavWidget->setMaximumHeight(ui->calNavWidget->height()); ui->calNavWidget->setMinimumHeight(ui->calNavWidget->height()); - sessbar=nullptr; + QWidget *widget = new QWidget(ui->tabWidget); + sessionbar = new SessionBar(widget); + sessionbar->setMinimumHeight(25); + sessionbar->setMouseTracking(true); + connect(sessionbar, SIGNAL(sessionClicked(Session*)), this, SLOT(doToggleSession(Session*))); + QVBoxLayout *layout2 = new QVBoxLayout(); + layout2->setMargin(0); + widget->setLayout(layout2); - webView=new MyWebView(this); + webView=new QTextBrowser(widget); + webView->setOpenLinks(false); + layout2->insertWidget(0,webView, 1); + layout2->insertWidget(1,sessionbar,0); + // add the sessionbar after it. - - - QWebSettings::globalSettings()->setAttribute(QWebSettings::PluginsEnabled, true); - - ui->tabWidget->insertTab(0,webView,QIcon(),"Details"); + ui->tabWidget->insertTab(0,widget,QIcon(),"Details"); ui->graphFrame->setLayout(layout); //ui->graphMainArea->setLayout(layout); @@ -377,11 +381,9 @@ Daily::Daily(QWidget *parent,gGraphView * shared) ui->calendar->setFirstDayOfWeek(dow); - ui->tabWidget->setCurrentWidget(webView); + ui->tabWidget->setCurrentWidget(widget); - webView->settings()->setFontSize(QWebSettings::DefaultFontSize,QApplication::font().pointSize()); - webView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); - connect(webView,SIGNAL(linkClicked(QUrl)),this,SLOT(Link_clicked(QUrl))); + connect(webView,SIGNAL(anchorClicked(QUrl)),this,SLOT(Link_clicked(QUrl))); int ews=p_profile->general->eventWindowSize(); ui->evViewSlider->setValue(ews); @@ -420,42 +422,9 @@ Daily::Daily(QWidget *parent,gGraphView * shared) } -//void Daily::populateSessionWidget() -//{ - -// ui->sessionWidget->clearContents(); -// ui->sessionWidget->setColumnCount(2); - -// QMap::iterator it; -// QMap::iterator it_end = p_profile->daylist.end(); - -// int row = 0; -// for (it = p_profile->daylist.begin(); it != it_end; ++it) { -// const QDate & date = it.key(); -// Day * day = it.value(); -// QList sessions = day->getSessions(MT_CPAP); -// int size = sessions.size(); -// if (size > 0) { -// QTableWidgetItem * item = new QTableWidgetItem(date.toString(Qt::SystemLocaleShortDate)); -// item->setData(Qt::UserRole, date); -// ui->sessionWidget->setItem(row, 0, item); -// SessionBar * sb = new SessionBar(); - -// for (int i=0; i < size; i++) { -// Session * sess = sessions[i]; -// QColor col = Qt::blue; -// sb->add(sess, col); -// } -// ui->sessionWidget->setCellWidget(row, 1, sb); -// row++; -// } -// } -// ui->sessionWidget->setRowCount(row-1); -// ui->sessionWidget->setCurrentCell(row-1, 0); -// ui->sessionWidget->scrollToBottom(); -//} Daily::~Daily() { + disconnect(sessionbar, SIGNAL(sessionClicked(Session*)), this, SLOT(doToggleSession(Session*))); // disconnect(sessbar, SIGNAL(toggledSession(Session*)), this, SLOT(doToggleSession(Session*))); // Save any last minute changes.. @@ -505,23 +474,23 @@ void Daily::Link_clicked(const QUrl &url) Session *sess=day->find(sid); if (!sess) return; - int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical); +// int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical); sess->setEnabled(!sess->enabled()); // Reload day LoadDate(previous_date); - webView->page()->mainFrame()->setScrollBarValue(Qt::Vertical, webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-i); + // webView->page()->mainFrame()->setScrollBarValue(Qt::Vertical, webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-i); } else if (code=="toggleoxisession") { // Enable/Disable Oximetry session day=p_profile->GetDay(previous_date,MT_OXIMETER); Session *sess=day->find(sid); if (!sess) return; - int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical); +// int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical); sess->setEnabled(!sess->enabled()); // Reload day LoadDate(previous_date); - webView->page()->mainFrame()->setScrollBarValue(Qt::Vertical, webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-i); + // webView->page()->mainFrame()->setScrollBarValue(Qt::Vertical, webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-i); } else if (code=="cpap") { day=p_profile->GetDay(previous_date,MT_CPAP); if (day) { @@ -836,37 +805,6 @@ void Daily::graphtogglebutton_toggled(bool b) GraphView->redraw(); } -MyWebPage::MyWebPage(QObject *parent): - QWebPage(parent) -{ - // Enable plugin support - settings()->setAttribute(QWebSettings::PluginsEnabled, true); -} - -QObject *MyWebPage::createPlugin(const QString &classid, const QUrl &url, const QStringList & paramNames, const QStringList & paramValues) -{ - Q_UNUSED(paramNames) - Q_UNUSED(paramValues) - Q_UNUSED(url) - - if (classid=="SessionBar") { - return mainwin->getDaily()->sessionBar(); - } - qDebug() << "Request for unknown MyWebPage plugin"; - return new QWidget(); -} - -MyWebView::MyWebView(QWidget *parent): - QWebView(parent), - m_page(this) -{ - // Set the page of our own PageView class, MyPageView, - // because only objects of this class will handle - // object-tags correctly. - setPage(&m_page); -} - - QString Daily::getSessionInformation(Day * day) { QString html; @@ -880,20 +818,8 @@ QString Daily::getSessionInformation(Day * day) Machine * cpap = day->machine(MT_CPAP); - if (cpap) { - html+=QString("" - "" -// "" - "").arg(r.height()*3,0,10); - html+="  "; - } - - QDateTime fd,ld; bool corrupted_waveform=false; - QString tooltip; QString type; @@ -947,10 +873,10 @@ QString Daily::getSessionInformation(Day * day) Session *sess=*s; QString tooltip = QObject::tr("Click to %1 this session.").arg(sess->enabled() ? QObject::tr("disable") : QObject::tr("enable")); - html+=QString("%2" - "" + html+=QString("%2" + "" "" - "" + "" "%5" "%6" "%7" @@ -1009,7 +935,7 @@ QString Daily::getMachineSettings(Day * day) { ChannelID cpapmode = loader->CPAPModeChannel(); schema::Channel & chan = schema::channel[cpapmode]; - first[cpapmode] = QString("%1%2%3") + first[cpapmode] = QString("

%1

%3") .arg(chan.label()) .arg(chan.description()) .arg(day->getCPAPMode()); @@ -1036,7 +962,7 @@ QString Daily::getMachineSettings(Day * day) { data = it.value().toString() + " "+ chan.units(); } - QString tmp = QString("%1%2%3") + QString tmp = QString("

%1

%3") .arg(schema::channel[code].label()) .arg(schema::channel[code].description()) .arg(data); @@ -1132,25 +1058,19 @@ QString Daily::getCPAPInformation(Day * day) Machine * cpap = day->machine(MT_CPAP); if (!cpap) return html; - MachineInfo info = cpap->getInfo(); html="\n"; - html+="\n"; - //CPAPMode mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode); + html+="\n"; html+="\n"; - if (day->noSettings(cpap)) { // (day->settingExists(CPAP_BrokenSummary))) { - //html+="\n"; + if (day->noSettings(cpap)) { html+=QString("").arg(tr("(Mode/Pressure settings are guessed on this day.)")); } @@ -1246,7 +1166,7 @@ QString Daily::getStatisticsInfo(Day * day) } } - html+=QString("") + html+=QString("") .arg(schema::channel[code].label()) .arg(mn,0,'f',2) .arg(med,0,'f',2) @@ -1385,53 +1305,11 @@ void Daily::Load(QDate date) } } - // Don't really see a point in unlinked oximetery sessions anymore... All I can say is BLEH... -// if ((cpap && oxi) && day->hasEnabledSessions(MT_OXIMETER)) { -// int gr; - -// if (qAbs(day->first(MT_CPAP) - day->first(MT_OXIMETER)) > 30000) { -// mainwin->Notify(tr("Oximetry data exists for this day, but its timestamps are too different, so the Graphs will not be linked."),"",3000); -// gr=1; -// } else -// gr=0; - -// (*GraphView)[schema::channel[OXI_Pulse].code()]->setGroup(gr); -// (*GraphView)[schema::channel[OXI_SPO2].code()]->setGroup(gr); -// (*GraphView)[schema::channel[OXI_Plethy].code()]->setGroup(gr); -// } lastcpapday=day; - QString html="" - "" - "" + QString html="" "" ""; - QString tmp; if (day) { day->OpenEvents(); @@ -1439,10 +1317,6 @@ void Daily::Load(QDate date) GraphView->setDay(day); -// UpdateOXIGraphs(oxi); -// UpdateCPAPGraphs(cpap); -// UpdateSTAGEGraphs(stage); -// UpdatePOSGraphs(posit); UpdateEventsTree(ui->treeWidget, day); // FIXME: @@ -1451,15 +1325,6 @@ void Daily::Load(QDate date) snapGV->setDay(day); - // GraphView->ResetBounds(false); - - // wtf is hiding the scrollbars for??? -// if (!cpap && !oxi) { -// scrollbar->hide(); -// } else { -// scrollbar->show(); -// } - QString modestr; CPAPMode mode=MODE_UNKNOWN; QString a; @@ -1486,9 +1351,6 @@ void Daily::Load(QDate date) GraphView->setEmptyImage(QPixmap(":/docs/sheep.png")); } if (cpap) { - //QHash > list; - - float hours=day->hours(MT_CPAP); if (GraphView->isEmpty() && (hours>0)) { if (!p_profile->hasChannel(CPAP_Obstructive) && !p_profile->hasChannel(CPAP_Hypopnea)) { @@ -1519,7 +1381,7 @@ void Daily::Load(QDate date) ahichan=CPAP_RDI; ahiname=STR_TR_RDI; } - html+=QString("\n") + html+=QString("\n") .arg("#F88017").arg(COLOR_Text.name()).arg(ahiname).arg(schema::channel[ahichan].fullname()).arg(ahi,0,'f',2); } else { html+=QString("\n") @@ -1556,23 +1418,10 @@ void Daily::Load(QDate date) } values[code] = val; QColor altcolor = (brightness(chan.defaultColor()) < 0.3) ? Qt::white : Qt::black; // pick a contrasting color - html+=QString("\n") + html+=QString("\n") .arg(chan.defaultColor().name()).arg(altcolor.name()).arg(chan.fullname()).arg(data).arg(code); } - -// for (int i=0;ichannelHasData(chans[i].id)) -// continue; -// if ((cpap->machine->loaderName() == STR_MACH_PRS1) && (chans[i].id == CPAP_VSnore)) -// continue; -// html+=QString("\n") -// .arg(schema::channel[chans[i].id].defaultColor().name()).arg(chans[i].color2.name()).arg(schema::channel[chans[i].id].fullname()).arg(chans[i].value,0,'f',2).arg(chans[i].id); - -// // keep in case tooltips are needed -// //html+=QString("\n") -// // .arg(chans[i].color.name()).arg(chans[i].color2.name()).arg(chans[i].name).arg(schema::channel[chans[i].id].description()).arg(chans[i].value,0,'f',2).arg(chans[i].id); -// } html+="
"+info.brand + " "+ info.series+"
"+info.model+""; - QString tooltip=("Model "+info.modelnumber+" - "+info.serial); + QString tooltip=tr("Model %1 - %2").arg(info.modelnumber).arg(info.serial); tooltip=tooltip.replace(" "," "); - - html+=tooltip; - html+="

"+info.brand + " "+ info.series+"
"+info.model+"

"; html+=tr("PAP Mode: %1
").arg(day->getCPAPMode()); html+= day->getPressureSettings(); html+="
 
%1
%1%6%2%3%4%5
%1%2%3%4%5
%3%4   %5

%3

  %5		%2
%3%4
%3%4
%3%4
%3%4%5
"; html+="\n"; @@ -1591,7 +1440,7 @@ void Daily::Load(QDate date) QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray buffer.open(QIODevice::WriteOnly); pixmap.save(&buffer, "PNG"); - html += "\n").arg(w).arg(h); + html += "\n"); } else { html += "\n"; } @@ -1616,7 +1465,7 @@ void Daily::Load(QDate date) html+="\n"; if (day->size()>0) { html+=""; - html+=""; + html+=""; html+="\n"; GraphView->setEmptyText(STR_Empty_NoSessions); } else { @@ -1670,18 +1519,16 @@ void Daily::Load(QDate date) // WebView trashes it without asking.. :( if (cpap) { - sessbar=new SessionBar(this); - sessbar->setMouseTracking(true); - connect(sessbar, SIGNAL(sessionClicked(Session*)), this, SLOT(doToggleSession(Session*))); int c=0; + sessionbar->clear(); for (i=day->begin();i!=day->end();++i) { Session * s=*i; if ((*s).type() == MT_CPAP) - sessbar->add(s, cols[c % maxcolors]); + sessionbar->add(s, cols[c % maxcolors]); c++; } - } else sessbar=nullptr; + } //sessbar->update(); webView->setHtml(html); @@ -2020,30 +1867,6 @@ void Daily::on_RangeUpdate(double minx, double /*maxx*/) } else { dateDisplay->setText(QString(GraphView->emptyText())); } - -/* // Delay render some stats... - Day * day = GraphView->day(); - if (day) { - QTime time; - time.start(); - QList list = day->getSortedMachineChannels(schema::WAVEFORM); - for (int i=0; i< list.size();i++) { - schema::Channel & chan = schema::channel[list.at(i)]; - ChannelID code = chan.id(); - if (!day->channelExists(code)) continue; - float avg = day->rangeAvg(code, minx, maxx); - float wavg = day->rangeWavg(code, minx, maxx); - float median = day->rangePercentile(code, 0.5, minx, maxx); - float p90 = day->rangePercentile(code, 0.9, minx, maxx); -// qDebug() << chan.label() -// << "AVG=" << avg -// << "WAVG=" << wavg; - // << "MED" << median - // << "90%" << p90; - } - - qDebug() << time.elapsed() << "ms"; - }*/ } @@ -2304,9 +2127,6 @@ void Daily::on_ZombieMeter_valueChanged(int action) } journal->settings[Journal_ZombieMeter]=ui->ZombieMeter->value(); journal->SetChanged(true); - - // shouldn't be needed anymore with new overview model.. - //if (mainwin->getOverview()) mainwin->getOverview()->ResetGraph("Zombie"); } void Daily::on_bookmarkTable_itemChanged(QTableWidgetItem *item) @@ -2407,18 +2227,14 @@ void Daily::on_ouncesSpinBox_editingFinished() } } journal->SetChanged(true); - - // shouldn't be needed anymore with new overview model - //if (mainwin->getOverview()) mainwin->getOverview()->ResetGraph(STR_GRAPH_Weight); } QString Daily::GetDetailsText() { - webView->triggerPageAction(QWebPage::SelectAll); - QString text=webView->page()->selectedText(); - webView->triggerPageAction(QWebPage::MoveToEndOfDocument); - webView->triggerPageAction(QWebPage::SelectEndOfDocument); - return text; + QTextDocument * doc = webView->document(); + QString content = doc->toHtml(); + + return content; } void Daily::on_graphCombo_activated(int index) diff --git a/sleepyhead/daily.h b/sleepyhead/daily.h index c1a5bbe0..79f50726 100644 --- a/sleepyhead/daily.h +++ b/sleepyhead/daily.h @@ -1,4 +1,4 @@ -/* Daily GUI Headers +/* Daily GUI Headers * * Copyright (C) 2011-2018 Mark Watkins * @@ -20,14 +20,12 @@ #include #include #include -#include -#include -#include "Graphs/gSummaryChart.h" +#include -#include +#include "SleepLib/profiles.h" #include "mainwindow.h" +#include "Graphs/gSummaryChart.h" #include "Graphs/gGraphView.h" - #include "Graphs/gLineChart.h" #include "sessionbar.h" @@ -35,26 +33,6 @@ namespace Ui { class Daily; } -class MyWebPage:public QWebPage -{ -Q_OBJECT -public: - MyWebPage(QObject *parent = 0); -protected: - QObject *createPlugin(const QString & classid, const QUrl & url, const QStringList & paramNames, const QStringList & paramValues); -}; - -class MyWebView:public QWebView -{ - Q_OBJECT - private: - MyWebPage m_page; - public: - MyWebView(QWidget *parent = 0); -}; - - - class MainWindow; /*! \class Daily @@ -126,7 +104,6 @@ public: \returns gGraph * object containing this chart */ gGraph * eventBreakdownPie() { return graphlist["EventBreakdown"]; } - QWidget * sessionBar() { return sessbar; } void clearLastDay(); @@ -361,10 +338,10 @@ private: QIcon * icon_on; QIcon * icon_off; - SessionBar * sessbar; + SessionBar * sessionbar; MyLabel * dateDisplay; - MyWebView * webView; + QTextBrowser * webView; Day * lastcpapday; gLineChart *leakchart; diff --git a/sleepyhead/icons/session-off.png b/sleepyhead/icons/session-off.png index 3279d6de..8025eb8f 100644 Binary files a/sleepyhead/icons/session-off.png and b/sleepyhead/icons/session-off.png differ diff --git a/sleepyhead/icons/session-on.png b/sleepyhead/icons/session-on.png index 9c3c335c..3773176a 100644 Binary files a/sleepyhead/icons/session-on.png and b/sleepyhead/icons/session-on.png differ diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index e16da5df..5e5e7fc4 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -2617,6 +2617,7 @@ void MainWindow::on_actionReport_a_Bug_triggered() { QSettings settings(getDeveloperName(), getAppName()); QString language = settings.value(LangSetting).toString(); + QDesktopServices::openUrl(QUrl(QString("https://sleepyhead.jedimark.net/report_bugs.php?lang=%1&version=%2&platform=%3").arg(language).arg(VersionString).arg(PlatformString))); }
Unable to display Pie Chart on this system
 
"+tr("Sessions all off!")+"
"+tr("Sessions exist for this day but are switched off.")+"