From d0469637ce52dc4b3e91725753588a0f0aaeee53 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Fri, 27 May 2011 19:46:47 +1000
Subject: [PATCH] Try to rescue some corrupt flow waveform data during import

---
 SleepyHead.depend             |  6 +++---
 SleepyHeadMain.cpp            |  4 ++--
 libs/sleeplib/prs1_loader.cpp | 32 +++++++++++++++++++++++++-------
 version.h                     | 12 ++++++------
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/SleepyHead.depend b/SleepyHead.depend
index 342605fc..ea91a903 100644
--- a/SleepyHead.depend
+++ b/SleepyHead.depend
@@ -7870,7 +7870,7 @@
 	<sleeplib/machine.h>
 	<list>
 
-1306486059 /home/mark/projects/git/sleepyhead/version.h
+1306489214 /home/mark/projects/git/sleepyhead/version.h
 
 1306415077 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
 	"machine.h"
@@ -7887,7 +7887,7 @@
 	"preferences.h"
 	"tinyxml/tinyxml.h"
 
-1306485080 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
+1306488246 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
 	"wx_pch.h"
 	"version.h"
 	<wx/app.h>
@@ -7947,7 +7947,7 @@
 	"machine_loader.h"
 	"tinyxml/tinyxml.h"
 
-1306485176 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
+1306489211 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
 	<wx/dir.h>
 	<wx/filename.h>
 	<wx/ffile.h>
diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp
index 5eddc6e2..4d957cb2 100644
--- a/SleepyHeadMain.cpp
+++ b/SleepyHeadMain.cpp
@@ -215,13 +215,13 @@ Summary::Summary(wxWindow *win)
     fgSizer->Add(AHI,1,wxEXPAND);
 
     pressure=new HistoryCodeData(machine,CPAP_PressureAverage,30);
-    PRESSURE=new gGraphWindow(ScrolledWindow,-1,wxT("Average Pressure"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER);
+    PRESSURE=new gGraphWindow(ScrolledWindow,-1,wxT("Pressure"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER);
     PRESSURE->SetMargins(10,15,60,80);
     PRESSURE->AddLayer(new gBarChart(pressure,wxBLUE));
     fgSizer->Add(PRESSURE,1,wxEXPAND);
 
     leak=new HistoryCodeData(machine,CPAP_LeakAverage,30);
-    LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Average Leak"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER);
+    LEAK=new gGraphWindow(ScrolledWindow,-1,wxT("Mask Leak"),wxPoint(0,0), wxSize(400,200), wxNO_BORDER);
     LEAK->SetMargins(10,15,60,80);
     LEAK->AddLayer(new gBarChart(leak,wxYELLOW));
     fgSizer->Add(LEAK,1,wxEXPAND);
diff --git a/libs/sleeplib/prs1_loader.cpp b/libs/sleeplib/prs1_loader.cpp
index 4b9c96fb..d13430e0 100644
--- a/libs/sleeplib/prs1_loader.cpp
+++ b/libs/sleeplib/prs1_loader.cpp
@@ -385,6 +385,10 @@ bool PRS1Loader::OpenSummary(Session *session,wxString filename)
     session->summary[CPAP_PressurePercentName]=90.0;
     session->summary[CPAP_PressureAverage]=buffer[0x19]/10.0;
 
+    if (max==0) {
+        session->summary[CPAP_PressureAverage]=session->summary[CPAP_PressureMin];
+    }
+
     session->summary[CPAP_Obstructive]=(long)buffer[0x1C] | (buffer[0x1D] << 8);
     session->summary[CPAP_ClearAirway]=(long)buffer[0x20] | (buffer[0x21] << 8);
     session->summary[CPAP_Hypopnea]=(long)buffer[0x2A] | (buffer[0x2B] << 8);
@@ -552,16 +556,20 @@ bool PRS1Loader::OpenWaveforms(Session *session,wxString filename)
     vector<int> wavesize;
     int samples=0;
     int duration=0;
-
     while (true) {
         br=f.Read(header,hl);
 
         if (br<hl) {
-            if (cnt==0) return false;
+            if (cnt==0)
+                return false;
             else break;
         }
 
-        if (header[0]!=header[5]) return false;
+        if (header[0]!=header[5]) {
+            if (cnt==0)
+                return false;
+            else break;
+        }
 
         sequence=size=timestamp=seconds=ext=0;
         sequence=(header[10] << 24) | (header[9] << 16) | (header[8] << 8) | header[7];
@@ -569,16 +577,24 @@ bool PRS1Loader::OpenWaveforms(Session *session,wxString filename)
         size=(header[2] << 8) | header[1];
         ext=header[6];
 
+        if (sequence==328) {
+            seconds=0;
+        }
         if (!start) start=timestamp;
         seconds=(header[16] << 8) | header[15];
 
         size-=(hl+2);
 
-        if (ext!=5) return false;
+        if (ext!=5) {
+            if (cnt==0)
+                return false;
+            else break;
+        }
 
         unsigned char sum=0;
         for (int i=0; i<hl-1; i++) sum+=header[i];
-        if (sum!=header[hl-1]) return false;
+        if (sum!=header[hl-1])
+            return false;
 
         char * buffer=new char [size];
         br=f.Read(buffer,size);
@@ -596,12 +612,14 @@ bool PRS1Loader::OpenWaveforms(Session *session,wxString filename)
         char chkbuf[2];
         wxInt16 chksum;
         br=f.Read(chkbuf,2);
-        if (br<2) return false;
+        if (br<2)
+            return false;
         chksum=chkbuf[0] << 8 | chkbuf[1];
 
     }
 
-    if (samples==0) return false;
+    if (samples==0)
+        return false;
 
     //double rate=double(duration)/double(samples);
 
diff --git a/version.h b/version.h
index 026c810a..bac4deb1 100644
--- a/version.h
+++ b/version.h
@@ -16,14 +16,14 @@ namespace AutoVersion{
 	//Standard Version Type
 	static const long MAJOR = 0;
 	static const long MINOR = 7;
-	static const long BUILD = 1292;
-	static const long REVISION = 1534;
+	static const long BUILD = 1300;
+	static const long REVISION = 1576;
 	
 	//Miscellaneous Version Types
-	static const long BUILDS_COUNT = 4892;
-	#define RC_FILEVERSION 0,7,1292,1534
-	#define RC_FILEVERSION_STRING "0, 7, 1292, 1534\0"
-	static const char FULLVERSION_STRING[] = "0.7.1292.1534";
+	static const long BUILDS_COUNT = 4913;
+	#define RC_FILEVERSION 0,7,1300,1576
+	#define RC_FILEVERSION_STRING "0, 7, 1300, 1576\0"
+	static const char FULLVERSION_STRING[] = "0.7.1300.1576";
 	
 	//These values are to keep track of your versioning state, don't modify them.
 	static const long BUILD_HISTORY = 62;