From 95278e04081fbd1152d61dad4e6a3aebb42b7be6 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 11 Jan 2012 19:10:40 +1000 Subject: [PATCH] Preferences shouldn't recalc on empty profile --- SleepyHeadQT.pro | 3 ++- mainwindow.cpp | 5 ++++- preferencesdialog.cpp | 8 +++++--- update.xml | 48 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 update.xml diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index bd7ba679..0795114f 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -186,7 +186,8 @@ OTHER_FILES += \ docs/tz.txt \ LICENSE.txt \ docs/tooltips.css \ - docs/script.js + docs/script.js \ + update.xml diff --git a/mainwindow.cpp b/mainwindow.cpp index a76b3699..777da831 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -2500,6 +2500,9 @@ void MainWindow::FreeSessions() void MainWindow::doReprocessEvents() { + if (PROFILE.countDays(MT_CPAP,PROFILE.FirstDay(),PROFILE.LastDay())==0) + return; + m_inRecalculation=true; QDate first=PROFILE.FirstDay(); QDate date=PROFILE.LastDay(); @@ -2513,7 +2516,7 @@ void MainWindow::doReprocessEvents() int daycount=first.daysTo(date); int idx=0; - QList machines=PROFILE.GetMachines(MT_UNKNOWN); + QList machines=PROFILE.GetMachines(MT_CPAP); // Disabling multithreaded save as it appears it's causing problems bool cache_sessions=false; //PROFILE.session->cacheSessions(); diff --git a/preferencesdialog.cpp b/preferencesdialog.cpp index c93fa5ba..2b868738 100644 --- a/preferencesdialog.cpp +++ b/preferencesdialog.cpp @@ -315,9 +315,11 @@ bool PreferencesDialog::Save() recalc_events=true; if (recalc_events) { - if (QMessageBox::question(this,tr("Data Reindex Required"),tr("A data reindexing proceedure is required to apply these changes. This operation may take a couple of minutes to complete.\n\nAre you sure you want to make these changes?"),QMessageBox::Yes,QMessageBox::No)==QMessageBox::No) { - return false; - } + if (PROFILE.countDays(MT_CPAP,PROFILE.FirstDay(),PROFILE.LastDay())>0) { + if (QMessageBox::question(this,tr("Data Reindex Required"),tr("A data reindexing proceedure is required to apply these changes. This operation may take a couple of minutes to complete.\n\nAre you sure you want to make these changes?"),QMessageBox::Yes,QMessageBox::No)==QMessageBox::No) { + return false; + } + } else recalc_events=false; } else if (needs_restart) { if (QMessageBox::question(this,tr("Restart Required"),tr("One or more of the changes you have made will require this application to be restarted,\nin order for these changes to come into effect.\n\nWould you like do this now?"),QMessageBox::Yes,QMessageBox::No)==QMessageBox::No) { return false; diff --git a/update.xml b/update.xml new file mode 100644 index 00000000..7667442c --- /dev/null +++ b/update.xml @@ -0,0 +1,48 @@ + + + + + + + + + + Initial v0.9.1 release. + + + + + + The Official v0.9.1 release. (You've been using a sneak preview) + + + <p>SleepyHead has finally reached beta.. Welcome to the 0.9 series.</p> + <b>Features</b> + <list> + <li>New Auto-Updater for Mac & Windows platforms</li> + <li>SleepLib database improvements, and lots of other underneath stuff and code cleanups you don't see.</li> + <li>New Statistics page showing some more useful data.</li> + <li>Welcome page has become a Help Browser.</li> + <li>New Navigation Panel on the right side, now accessible from all tabs. It can be hidden to reclaim screen space.</li> + <li>New Favourites tab in this right panel for bookmarking days and quickly finding them again.</li> + <li>New Records tab to show some best/worst entries, which have links going directly to the related day or overview range.</li> + <li>Daily reports bookmarked areas show oximetry data when available.</li> + <li>Can print from both the Statistics & Help Browser pages.</li> + <li>New Context cube can be switched on to make empty pages more attractive.</li> + <li>More stuff that's mentioned in the official release notes.. (Editing in this xml file sucks)</li> + <li>Plenty of other bug fixes, including more oximetry fixes.</li> + <li> </li> + </list> + + Linux Rules. But you already knew that! + Always remember to write-protect your SD card, as MacOSX occasionally likes to eat them. + Nothing particularly platform relevant to this Windows build + + +