From f11f5fe28482faf0e4de13ae10b2e278e28ea6d7 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 8 May 2018 18:12:32 +1000 Subject: [PATCH] Clean up journal notes save logic, fix QTextBrowsers image handling --- sleepyhead/daily.cpp | 102 +++++++++++++++++++++---------- sleepyhead/daily.h | 13 +++- sleepyhead/icons/session-off.png | Bin 172 -> 114 bytes sleepyhead/icons/session-on.png | Bin 180 -> 121 bytes sleepyhead/mainwindow.cpp | 24 ++++---- sleepyhead/translation.cpp | 5 +- sleepyhead/welcome.cpp | 18 +----- sleepyhead/welcome.ui | 12 ++-- 8 files changed, 103 insertions(+), 71 deletions(-) diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index ee24c78e..6c199d40 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include @@ -117,7 +118,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) layout2->setMargin(0); widget->setLayout(layout2); - webView=new QTextBrowser(widget); + webView=new MyTextBrowser(widget); webView->setOpenLinks(false); layout2->insertWidget(0,webView, 1); layout2->insertWidget(1,sessionbar,0); @@ -754,6 +755,12 @@ void Daily::on_calendar_selectionChanged() void Daily::on_ReloadDay() { + static volatile bool inReload = false; + + if (inReload) { + qDebug() << "attempt to renter on_ReloadDay()"; + } + inReload = true; graphView()->releaseKeyboard(); QTime time; time_t unload_time, load_time, other_time; @@ -789,6 +796,7 @@ void Daily::on_ReloadDay() other_time=time.restart(); qDebug() << "Page change time (in ms): Unload ="<enabled() ? QObject::tr("disable") : QObject::tr("enable")); html+=QString("%2" "" - "" - "" + "" +#ifdef DITCH_ICONS + "[%4]" +#else + "" +#endif + "" "%5" "%6" "%7" @@ -1269,6 +1282,18 @@ QString Daily::getSleepTime(Day * day) return html; } +QVariant MyTextBrowser::loadResource(int type, const QUrl &url) +{ + if (type == QTextDocument::ImageResource + && url.scheme().compare(QLatin1String("data"), Qt::CaseInsensitive) == 0) + { + static QRegularExpression re("^image/[^;]+;base64,.+={0,2}$"); + QRegularExpressionMatch match = re.match(url.path()); + if (match.hasMatch()) + return QVariant(); + } + return QTextBrowser::loadResource(type, url); +} void Daily::Load(QDate date) @@ -1440,7 +1465,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"); + html += "\n"; } else { html += "Unable to display Pie Chart on this system\n"; } @@ -1465,7 +1490,7 @@ void Daily::Load(QDate date) html+=" \n"; if (day->size()>0) { html+=""+tr("Sessions all off!")+""; - html+=""; + html+=""; html+=""+tr("Sessions exist for this day but are switched off.")+"\n"; GraphView->setEmptyText(STR_Empty_NoSessions); } else { @@ -1494,7 +1519,7 @@ void Daily::Load(QDate date) html+=""; html+=""; html+=""; - html+=""; + html+=""; html+=""; html+=""; html+=""; @@ -1531,6 +1556,16 @@ void Daily::Load(QDate date) } //sessbar->update(); +#ifdef DEBUG_DAILY_HTML + QString name = GetAppRoot()+"/test.html"; + QFile file(name); + if (file.open(QFile::WriteOnly)) { + const QByteArray & b = html.toLocal8Bit(); + file.write(b.data(), b.size()); + file.close(); + } +#endif + webView->setHtml(html); ui->JournalNotes->clear(); @@ -1679,39 +1714,43 @@ void Daily::Unload(QDate date) } } - webView->setHtml(""); - Session *journal=GetJournalSession(date); + // Update the journal notes + Session *journal = GetJournalSession(date); - bool nonotes=ui->JournalNotes->toPlainText().isEmpty(); - if (journal) { - QString jhtml=ui->JournalNotes->toHtml(); - if ((!journal->settings.contains(Journal_Notes) && !nonotes) || (journal->settings[Journal_Notes]!=jhtml)) { - journal->settings[Journal_Notes]=jhtml; - journal->SetChanged(true); - } - } else { - if (!nonotes) { - journal=CreateJournalSession(date); - if (!nonotes) { - journal->settings[Journal_Notes]=ui->JournalNotes->toHtml(); - journal->SetChanged(true); - } - } + bool editorHasContent = !ui->JournalNotes->toPlainText().isEmpty(); // have a look as plaintext to see if really empty. + + if (!journal && editorHasContent) { + journal = CreateJournalSession(date); } if (journal) { - if (nonotes) { - QHash::iterator it=journal->settings.find(Journal_Notes); - if (it!=journal->settings.end()) { - journal->settings.erase(it); + auto jit = journal->settings.find(Journal_Notes); + + if (jit != journal->settings.end()) { + // we do have a journal_notes record + if (editorHasContent) { + const QString & html = ui->JournalNotes->toHtml(); + + if (jit.value() != html) { // has the content of it changed? + jit.value() = html; + journal->SetChanged(true); + } + } else { + // empty, so don't need this notes setting anymore + journal->settings.erase(jit); + journal->SetChanged(true); } + } else if (editorHasContent) { + // Create the note + journal->settings[Journal_Notes] = ui->JournalNotes->toHtml(); + journal->SetChanged(true); } + if (journal->IsChanged()) { - journal->settings[LastUpdated]=QDateTime::currentDateTime(); - // blah.. was updating overview graphs here.. Was too slow. + journal->settings[LastUpdated] = QDateTime::currentDateTime(); + journal->machine()->SaveSummary(); + journal->SetChanged(false); // save summary doesn't automatically do this } - Machine *jm=p_profile->GetMachine(MT_JOURNAL); - if (jm) jm->SaveSummary(); //(journal); } UpdateCalendarDay(date); } @@ -2269,7 +2308,6 @@ void Daily::updateCube() ui->toggleGraphs->setChecked(true); ui->toggleGraphs->blockSignals(false); - if (ui->graphCombo->count() > 0) { GraphView->setEmptyText(STR_Empty_NoGraphs); } else { diff --git a/sleepyhead/daily.h b/sleepyhead/daily.h index 79f50726..43aa3d71 100644 --- a/sleepyhead/daily.h +++ b/sleepyhead/daily.h @@ -35,6 +35,16 @@ namespace Ui { class MainWindow; + +class MyTextBrowser:public QTextBrowser +{ + Q_OBJECT +public: + MyTextBrowser(QWidget * parent):QTextBrowser(parent) {} + virtual ~MyTextBrowser() {} + virtual QVariant loadResource(int type, const QUrl &url) Q_DECL_OVERRIDE; +}; + /*! \class Daily \brief SleepyHead's Daily view which displays the calendar and all the graphs relative to a selected Day */ @@ -341,7 +351,7 @@ private: SessionBar * sessionbar; MyLabel * dateDisplay; - QTextBrowser * webView; + MyTextBrowser * webView; Day * lastcpapday; gLineChart *leakchart; @@ -350,4 +360,5 @@ private: bool BookmarksChanged; }; + #endif // DAILY_H diff --git a/sleepyhead/icons/session-off.png b/sleepyhead/icons/session-off.png index 8025eb8f764b1e3de8d7d3485243044488acdb56..477fbb360cb07b9967d3110f0840a9cce76aa42a 100644 GIT binary patch delta 66 zcmZ3(STsRpVt}Znil>WXh(>VopYsP8T#hhjD%81o2nr=AEolfc$YOK^VFre8UzqvN SRagR93=E#GelF{r5}E+knH19i delta 122 zcmXR~!#F`jQz6+S$d`ekN{xY`p@o6r7Xy%f!N5>zz`*b-fq}tl1_Oh5!JJ)zHWL*k z+!>R+-CdZ{xNA~?%2YjF978PplmDDQz~FL(Ia8sIEm4Sd#sZVG2Uf7M90XzpW@d(O XUzqtF4-{+yYGCkm^>bP0l+XkKBef&6 diff --git a/sleepyhead/icons/session-on.png b/sleepyhead/icons/session-on.png index 3773176a411abb5dda4362345fa26c124ffa2a8b..1115dd78c1d1e38d60570a02949764b817fab1b9 100644 GIT binary patch delta 73 zcmdnOSUEvuVt}ZFwx^3@h(>U7N2!Z<-iQz6+S$d`ekN{xY`p@o6r7Xy%f!N5>zz`*b-fq}tl1_Oh5!JJ)zHWL*k z{27zH-CdZ{xNA~?%5*(l978PplT#8Be()c0VJx#_WBXmj))qg1A(IP(nuf2jK^CJU f5HlV)z`*d>iuwEvp?^1l8W}uY{an^LB{Ts5BGx6x diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index 5e5e7fc4..b6205686 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -105,6 +105,7 @@ MainWindow::MainWindow(QWidget *parent) : daily = nullptr; prefdialog = nullptr; profileSelector = nullptr; + welcome = nullptr; ui->oximetryButton->setDisabled(true); ui->dailyButton->setDisabled(true); @@ -1917,7 +1918,7 @@ void MainWindow::on_actionRebuildCPAP(QAction *action) daily->clearLastDay(); // otherwise Daily will crash daily->ReloadGraphs(); } - welcome->refreshPage(); + if (welcome) welcome->refreshPage(); PopulatePurgeMenu(); GenerateStatistics(); p_profile->StoreMachines(); @@ -2002,6 +2003,8 @@ void MainWindow::purgeMachine(Machine * mach) daily->clearLastDay(); // otherwise Daily will crash daily->ReloadGraphs(); } + if (welcome) welcome->refreshPage(); + //GenerateStatistics(); return; } @@ -2015,14 +2018,9 @@ void MainWindow::purgeMachine(Machine * mach) daily->clearLastDay(); // otherwise Daily will crash daily->ReloadGraphs(); } - - welcome->refreshPage(); + if (welcome) welcome->refreshPage(); QApplication::processEvents(); - - - -// GenerateStatistics(); } void MainWindow::keyPressEvent(QKeyEvent *event) @@ -2532,16 +2530,18 @@ void MainWindow::on_actionPurgeCurrentDaysOximetry_triggered() QList sessionlist; sessionlist.append(day->sessions); - for (int i=0; i < sessionlist.size(); ++i) { - Session * sess = sessionlist.at(i); + for (auto & sess : sessionlist) { sess->Destroy(); delete sess; } - daily->clearLastDay(); // otherwise Daily will crash - - getDaily()->ReloadGraphs(); + if (daily) { + daily->clearLastDay(); // otherwise Daily will crash + daily->ReloadGraphs(); + } + if (overview) overview->ReloadGraphs(); + if (welcome) welcome->refreshPage(); } else { QMessageBox::information(this, STR_MessageBox_Information, tr("Select the day with valid oximetry data in daily view first."),QMessageBox::Ok); diff --git a/sleepyhead/translation.cpp b/sleepyhead/translation.cpp index 8822f754..32d15105 100644 --- a/sleepyhead/translation.cpp +++ b/sleepyhead/translation.cpp @@ -1,4 +1,4 @@ -/* Multilingual Support files +/* Multilingual Support files * * Copyright (c) 2011-2018 Mark Watkins * @@ -64,8 +64,7 @@ void initTranslations(QSettings & settings) { langNames[en]="English US"; // Scan through available translations, and add them to the list - for (int i = 0; i < list.size(); ++i) { - QFileInfo fi = list.at(i); + for (const auto & fi : list) { QString name = fi.fileName().section('.', 0, 0); QString code = fi.fileName().section('.', 1, 1); diff --git a/sleepyhead/welcome.cpp b/sleepyhead/welcome.cpp index f085575f..6116185a 100644 --- a/sleepyhead/welcome.cpp +++ b/sleepyhead/welcome.cpp @@ -112,7 +112,7 @@ QString Welcome::GenerateCPAPHTML() "p,a,td,body { font-size: "+QString::number(QApplication::font().pointSize() + 2)+"px; }" "" "" - ""; + ""; Machine * cpap = nullptr; if (!havecpapdata && !haveoximeterdata) { @@ -240,22 +240,6 @@ QString Welcome::GenerateCPAPHTML() } } -/* html += QString("
"+tr("\"Nothing's here!\"")+"
"+tr("Bob is bored with this days lack of data.")+"
")+ - "" - "" - "" - "" - "" - "
"+QObject::tr("Very Important Warning For ResMed S9 Users")+"
"+ - "

"+QObject::tr("ALWAYS write protect CPAP SDCards before inserting them into your computer.")+"

"+ - +""+ - QObject::tr("Certain operating systems write index files to the card without asking, which can render your card unreadable by your cpap machine.")+ " "+ - QObject::tr("As a second line of protection, make sure to unmount the data card properly before removing it!")+"

" - "
" - "";*/ -// } else { - // } - html += ""; return html; } diff --git a/sleepyhead/welcome.ui b/sleepyhead/welcome.ui index 94f513cc..6a5825fa 100644 --- a/sleepyhead/welcome.ui +++ b/sleepyhead/welcome.ui @@ -7,7 +7,7 @@ 0 0 965 - 719 + 742 @@ -259,7 +259,7 @@ border: 2px solid #56789a; border-radius: 10px; } - View Daily + Daily View @@ -297,7 +297,7 @@ border: 2px solid #56789a; border-radius: 10px; } - View Overview + Overview @@ -335,7 +335,7 @@ border: 2px solid #56789a; border-radius: 10px; } - View Statistics + Statistics @@ -435,7 +435,7 @@ border: 2px solid #56789a; border-radius: 10px; - border: 1px solid; border-radius:20px; background-color: palette(base); + border: 1px solid; border-radius:20px; background-color: #ffffd0; Qt::ScrollBarAlwaysOff @@ -513,7 +513,7 @@ p, li { white-space: pre-wrap; } - border: 1px solid; border-radius:20px; background-color: palette(base); + border: 1px solid; border-radius:20px; background-color: #ffffd0; QAbstractScrollArea::AdjustToContents