diff --git a/sleepyhead/build_number.h b/sleepyhead/build_number.h index 6534128e..ec10d6b9 100644 --- a/sleepyhead/build_number.h +++ b/sleepyhead/build_number.h @@ -1 +1 @@ -const int build_number = 5; +const int build_number = 6; diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index d002fe45..7e62f59d 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -1025,22 +1025,21 @@ QString Daily::getCPAPInformation(Day * cpap) html="\n"; - html+="\n"; //CPAPMode mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode); - html+="\n"; if ((cpap && cpap->settingExists(CPAP_BrokenSummary))) { - html+="\n"; - html+=QString("").arg(""+STR_MessageBox_PleaseNote+": "+ tr("This day has missing pressure, mode and settings data.")); + html+="\n"; + html+=QString("").arg(""+STR_MessageBox_PleaseNote+": "+ tr("This day has missing pressure, mode and settings data.")); } html+="
"+info.model+""; + html+="
"+info.model+""; QString tooltip=(info.brand+"\n"+info.series+" "+info.modelnumber+"\n"+info.serial); tooltip=tooltip.replace(" "," "); - html+=tooltip; html+="
"; + html+="
"; html+=tr("PAP Mode: %1
").arg(cpap->getCPAPMode()); html+= cpap->getPressureSettings(); html+="
 
%1
 
%1
\n"; @@ -1169,13 +1168,13 @@ QString Daily::getStatisticsInfo(Day * cpap,Day * oxi,Day *pos) if (cpap) { int l = cpap->sum(CPAP_Ramp); - // if (l>0) { + if (l>0) { int h = l / 3600; int m = (l / 60) % 60; int s = l % 60; html+=""+tr("Time spent in ramp")+ QString("%1:%2:%3").arg(h, 2, 10, QChar('0')).arg(m, 2, 10, QChar('0')).arg(s, 2, 10, QChar('0')); -// } + } } @@ -1334,7 +1333,7 @@ void Daily::Load(QDate date) } html+=""; html+=QString("%3%4   %5\n") - .arg("#F88017").arg(COLOR_Text.name()).arg(ahiname).arg(schema::channel[ahichan].description()).arg(ahi,0,'f',2); + .arg("#F88017").arg(COLOR_Text.name()).arg(ahiname).arg(schema::channel[ahichan].fullname()).arg(ahi,0,'f',2); html+="\n"; html+="\n"; html+=getCPAPInformation(cpap); diff --git a/sleepyhead/docs/release_notes.html b/sleepyhead/docs/release_notes.html index a2883b29..3d9617ef 100644 --- a/sleepyhead/docs/release_notes.html +++ b/sleepyhead/docs/release_notes.html @@ -10,7 +10,10 @@
New features & bug fixes in v0.9.7
-
  • New Feature: Show current pressure while holding in Alt and hovering over LineCharts
  • +
  • New Feature: Added a Welcome page to make things a little friendlier
  • +
  • Fixes another issue that caused session dupplicates on ResMed machines
  • +
  • Improved support for Intellipap BiLevel machines
  • +
  • New Feature: Press F3 to switch on/off a "line cursor", and display current graph information above graphs while hovering over graphs
  • New Feature: Preference option to Realign machine detected codes and fix dodgy PRS1 durations using user event flagging.
  • New Feature: Added second set of User Flags detection and preferences.
  • New Feature: Hit Escape key to go back through previous graph selection history
  • diff --git a/sleepyhead/mainwindow.h b/sleepyhead/mainwindow.h index 39ebb47b..edfb22cf 100644 --- a/sleepyhead/mainwindow.h +++ b/sleepyhead/mainwindow.h @@ -61,6 +61,9 @@ class MainWindow; extern QStatusBar *qstatusbar; +QString getCPAPPixmap(QString mach_class); + + class Daily; class Report; class Overview; diff --git a/sleepyhead/scripts/build_number b/sleepyhead/scripts/build_number index 7ed6ff82..1e8b3149 100644 --- a/sleepyhead/scripts/build_number +++ b/sleepyhead/scripts/build_number @@ -1 +1 @@ -5 +6