From b6cff809915ff37f84e167ae537f068c20967c7c Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 3 Jul 2014 02:16:12 +1000 Subject: [PATCH] 0.9.7 version bump --- sleepyhead/docs/release_notes.html | 21 ++++++++++++++++++++- sleepyhead/mainwindow.cpp | 18 +++++++++++++++--- sleepyhead/mainwindow.h | 2 ++ sleepyhead/mainwindow.ui | 16 ---------------- sleepyhead/version.h | 2 +- 5 files changed, 38 insertions(+), 21 deletions(-) diff --git a/sleepyhead/docs/release_notes.html b/sleepyhead/docs/release_notes.html index da1b1f7e..057868ab 100644 --- a/sleepyhead/docs/release_notes.html +++ b/sleepyhead/docs/release_notes.html @@ -1,11 +1,30 @@ -

SleepyHead v0.9.6 Testing

+

SleepyHead v0.9.7 Testing

Release Notes

Greetings!

Here is a new and hopefully improved SleepyHead build.

+

0.9.7 already? Yup.. otherwise I can't tell them apart, and you probably won't be able to either. Before anyone asks, yes, version numbers will go past 0.9.10 before 1.0.0 is reached.

+

Not a gigantic set of changes this time, but I've been busily working my way through a lot of bugs mentioned on the forums, trying to knock them down one by one. Please don't be offended if yours isn't in here yet.. I have a memory like a goldfish, plus I tried to focus on stability issues first.

+

A gentle reminder for anyone submitting bug reports (either via message or through sourceforges bug reporting system), please (please please) remember to state the SleepyHead version number, your computers platform and operating system type version (and service packs), and your CPAP machines type and model number. Without this information I pretty much don't have a clue what you are talking about.

+
+New features & bug fixes in v0.9.7
+ +
  • Stopped faulty statistics calculations where only summary data was present (For now it should show zero where calculations are impossible)
    • +
  • Added .spo2 file import support for firmware 3.7 CMS50F oximeters.
    • +
  • Some pre-v3.7 firmware CMS50 oximeter serial importer improvements
    • +
  • Fixed ResMed AutoSet minimum pressure not displaying correctly
    • +
  • Fix ResMed EPR setting display
    • +
  • Restore display of MaskPressureHi plots when available
    • +
  • Fix wiki URL's thanks to sourceForge forcing move of SleepyHead's wiki
    • +
  • Fix ResMed importer crashes, finished rewriting stage2 multithreading code
    • +
  • Made database upgrade/purge process a bit more friendly (ResMed users Keep your backups switched on!)
    • +
  • Fixed a SleepyHead summary error that prevented count indexes from being stored properly
    • +
  • Some other minor stuff
    • +     +
    New features & bugs fixes in v0.9.6
  • Threadsafety improvements to debug/logger
    • diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp index 32b664f1..449e0cd8 100644 --- a/sleepyhead/mainwindow.cpp +++ b/sleepyhead/mainwindow.cpp @@ -592,11 +592,17 @@ QStringList MainWindow::detectCPAPCards() QDialog popup(this, Qt::SplashScreen); QLabel waitmsg(tr("Please wait, scanning for CPAP data cards...")); QProgressBar progress; - QVBoxLayout waitlayout(&popup); - QPushButton skipbtn(tr("Click here to choose a folder")); + QVBoxLayout waitlayout; + popup.setLayout(&waitlayout); + + QHBoxLayout layout2; + QIcon icon("://icons/sdcard.png"); + QPushButton skipbtn(icon, tr("Choose a folder")); + skipbtn.setMinimumHeight(40); waitlayout.addWidget(&waitmsg,1,Qt::AlignCenter); waitlayout.addWidget(&progress,1); - waitlayout.addWidget(&skipbtn); + waitlayout.addLayout(&layout2,1); + layout2.addWidget(&skipbtn); popup.connect(&skipbtn, SIGNAL(clicked()), &popup, SLOT(hide())); progress.setValue(0); progress.setMaximum(timeout); @@ -2349,3 +2355,9 @@ void MainWindow::on_actionPurgeCurrentDaysOximetry_triggered() tr("Select the day with valid oximetry data in daily view first."),QMessageBox::Ok); } } + +void MainWindow::on_importButton_clicked() +{ + on_action_Import_Data_triggered(); +} + diff --git a/sleepyhead/mainwindow.h b/sleepyhead/mainwindow.h index fc7ef29c..af57fd2e 100644 --- a/sleepyhead/mainwindow.h +++ b/sleepyhead/mainwindow.h @@ -316,6 +316,8 @@ class MainWindow : public QMainWindow void logMessage(QString msg); + void on_importButton_clicked(); + private: void importCPAPBackups(); void finishCPAPImport(); diff --git a/sleepyhead/mainwindow.ui b/sleepyhead/mainwindow.ui index 13d2da4e..393bf88d 100644 --- a/sleepyhead/mainwindow.ui +++ b/sleepyhead/mainwindow.ui @@ -3435,22 +3435,6 @@ border-radius: 10px; - - importButton - clicked() - action_Import_Data - trigger() - - - 850 - 460 - - - -1 - -1 - - - actionView_Daily triggered() diff --git a/sleepyhead/version.h b/sleepyhead/version.h index 48fa007f..be712eed 100644 --- a/sleepyhead/version.h +++ b/sleepyhead/version.h @@ -16,7 +16,7 @@ const int major_version = 0; // incompatible API changes const int minor_version = 9; // new features that don't break things -const int patch_number = 6; // bugfixes, revisions +const int patch_number = 7; // bugfixes, revisions #ifdef TEST_BUILD const QString ReleaseStatus = "testing";