diff --git a/mainwindow.cpp b/mainwindow.cpp
index 3191d9a1..23424fbd 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -504,7 +504,11 @@ struct DateData {
};
bool operator <(const DateData & c1, const DateData & c2)
{
- return c1.value < c2.value;
+ if (c1.value < c2.value)
+ return true;
+ if ((c1.value == c2.value) && (c1.date > c1.date)) return true;
+ return false;
+ //return c1.value < c2.value;
}
class MyStatsPage:public QWebPage
@@ -843,12 +847,12 @@ void MainWindow::on_summaryButton_clicked()
EventDataType hours=day->hours();
- if (hours>PROFILE.cpap->complianceHours()) {
+ //if (hours>PROFILE.cpap->complianceHours()) {
EventDataType ahi=day->count(CPAP_Obstructive)+day->count(CPAP_Hypopnea)+day->count(CPAP_Apnea)+day->count(CPAP_ClearAirway);
if (PROFILE.general->calculateRDI()) ahi+=day->count(CPAP_RERA);
ahi/=day->hours();
AHI.push_back(DateData(date,ahi));
- }
+ //}
prelief=(PRTypes)round(day->settings_wavg(CPAP_PresReliefType));
prelset=round(day->settings_wavg(CPAP_PresReliefSet));
mode=(CPAPMode)round(day->settings_wavg(CPAP_Mode));
diff --git a/preferencesdialog.ui b/preferencesdialog.ui
index 9799331b..28069f55 100644
--- a/preferencesdialog.ui
+++ b/preferencesdialog.ui
@@ -42,7 +42,7 @@
-
- 5
+ 0
@@ -309,6 +309,14 @@ p, li { white-space: pre-wrap; }
-
+
+ This maintains a backup of SD-card data for ResMed machines,
+
+ResMed machines delete high resolution data older than 7 days, and graph data older than 30 days..
+
+Sleepyhead can keep a copy of this data if you ever need to reinstall.
+(Highly recomended, unless your short on disk space and don't care about the graph data)
+
Create SD Card Backups during Import (only works with ResMed for now)
@@ -316,6 +324,10 @@ p, li { white-space: pre-wrap; }
-
+
+ This makes SleepyHead's data take less disk space (about half as much),
+but it makes import take longer, and also makes switching between days a little slower.
+
Compress Session Data (slower, but makes SleepyHead data smaller)
@@ -323,6 +335,14 @@ p, li { white-space: pre-wrap; }
-
+
+ Compress ResMed (EDF) backups to save disk space.
+Backed up EDF files are stored in the .gz format,
+which is common on Mac & Linux platforms..
+
+SleepyHead can import from this compressed backup directory natively..
+To use with ResScan will require the .gz files to be uncompressed first..
+
Compress SD Card Backups (slower, but makes backups smaller)
@@ -425,6 +445,9 @@ p, li { white-space: pre-wrap; }
-
+
+ Generic mask type. Select the one that's closest to your mask.
+
-
@@ -446,7 +469,11 @@ p, li { white-space: pre-wrap; }
-
-
+
+
+ The name of your mask, or at least the name you call it.
+
+
-
@@ -456,6 +483,9 @@ p, li { white-space: pre-wrap; }
0
+
+ Ignore this, it's not implemented yet.
+
-
Total Leaks
@@ -502,6 +532,9 @@ p, li { white-space: pre-wrap; }
0
+
+ The date you started using this mask
+
true
@@ -579,6 +612,9 @@ p, li { white-space: pre-wrap; }
true
+
+ Shows Respiratory Disturbance Index instead of Apnea/Hypopnea Index (RDI=AHI + RERA)
+
Use RDI instead of AHI (PRS1 only)
@@ -586,6 +622,9 @@ p, li { white-space: pre-wrap; }
-
+
+ Don't show any compliance information
+
Show Compliance
@@ -608,7 +647,7 @@ p, li { white-space: pre-wrap; }
- Regard days with under this usage as "incompliant".
+ Regard days with under this usage as "incompliant". 4 hours is usually considered compliant.
hours
@@ -649,6 +688,12 @@ p, li { white-space: pre-wrap; }
-
+
+ Enable/disable experimental event flagging enhancements.
+It allows detecting borderline events on PRS1 machines..
+
+Has no effect on other machines (yet).
+
Custom PRS1 Event Flagging
@@ -683,6 +728,9 @@ p, li { white-space: pre-wrap; }
0
+
+ Percentage of restriction in airflow
+
%
@@ -727,6 +775,9 @@ p, li { white-space: pre-wrap; }
-
+
+ Duration of airflow restriction
+
s
@@ -754,7 +805,10 @@ p, li { white-space: pre-wrap; }
AHI/Hour Graph Settings
- true
+ false
+
+
+ false
@@ -778,9 +832,18 @@ p, li { white-space: pre-wrap; }
-
+
+ Adjusts the amount of data considered for each point in the AHI/Hour graph.
+
minutes
+
+ 5
+
+
+ 999
+
60
@@ -788,6 +851,9 @@ p, li { white-space: pre-wrap; }
-
+
+ Reset the counter to zero at beginning of each (time) window
+
Zero Reset
@@ -905,7 +971,11 @@ p, li { white-space: pre-wrap; }
-
-
+
+
+ Filters the graph list. Simply start typing the name of the graph your looking for.
+
+
@@ -1058,6 +1128,9 @@ p, li { white-space: pre-wrap; }
-
+
+ Percentage drop in oxygen saturation
+
%
@@ -1084,6 +1157,9 @@ p, li { white-space: pre-wrap; }
-
+
+ Sudden change in Pulse Rate of at least this amount
+
bpm
@@ -1097,6 +1173,9 @@ p, li { white-space: pre-wrap; }
-
+
+ Minimum duration of drop in oxygen saturation
+
s
@@ -1107,6 +1186,9 @@ p, li { white-space: pre-wrap; }
-
+
+ Minimum duration of pulse change event.
+
s
@@ -1127,6 +1209,9 @@ p, li { white-space: pre-wrap; }
-
+
+ Small chunks of oximetry data under this amount will be discarded.
+
s
@@ -1210,6 +1295,9 @@ p, li { white-space: pre-wrap; }
-
+
+ Daily view navigation buttons will skip over days without data records
+
Skip over Empty Days
@@ -1218,7 +1306,8 @@ p, li { white-space: pre-wrap; }
-
- Allow use of multiple CPU cores where available to improve performance. May cause problems.
+ Allow use of multiple CPU cores where available to improve performance.
+Mainly affects the importer.
Enable Multithreading
@@ -1553,6 +1642,9 @@ p, li { white-space: pre-wrap; }
0
+
+ Default display height of graphs in pixels
+
50
@@ -1594,6 +1686,13 @@ p, li { white-space: pre-wrap; }
-
+
+ Anti-Aliasing applies smoothing to graph plots..
+Certain plots look more attractive with this on.
+This also affects printed reports.
+
+Try it and see if you like it.
+
Use Anti-Aliasing
@@ -1601,6 +1700,9 @@ p, li { white-space: pre-wrap; }
-
+
+ Makes certain plots look more "square waved".
+
Square Wave Plots
@@ -1622,6 +1724,9 @@ this application to be unstable with this feature enabled.
-
+
+ Turn on/off the spinning "context" cube.
+
Animations && Fancy Stuff