chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 02:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try to rescue some corrupt flow waveform data during import

Browse Source
This commit is contained in:
Mark Watkins 2011-05-27 19:46:47 +10:00
parent 10268288f5
commit d0469637ce
4 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SleepyHead.depend
View File

@ -7870,7 +7870,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <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 1306415077 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -7887,7 +7887,7 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.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" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>
@ -7947,7 +7947,7 @@
"machine_loader.h" "machine_loader.h"
"tinyxml/tinyxml.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/dir.h>
<wx/filename.h> <wx/filename.h>
<wx/ffile.h> <wx/ffile.h>

4
SleepyHeadMain.cpp
View File

@ -215,13 +215,13 @@ Summary::Summary(wxWindow *win)
fgSizer->Add(AHI,1,wxEXPAND); fgSizer->Add(AHI,1,wxEXPAND);
pressure=new HistoryCodeData(machine,CPAP_PressureAverage,30); 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->SetMargins(10,15,60,80);
PRESSURE->AddLayer(new gBarChart(pressure,wxBLUE)); PRESSURE->AddLayer(new gBarChart(pressure,wxBLUE));
fgSizer->Add(PRESSURE,1,wxEXPAND); fgSizer->Add(PRESSURE,1,wxEXPAND);
leak=new HistoryCodeData(machine,CPAP_LeakAverage,30); 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->SetMargins(10,15,60,80);
LEAK->AddLayer(new gBarChart(leak,wxYELLOW)); LEAK->AddLayer(new gBarChart(leak,wxYELLOW));
fgSizer->Add(LEAK,1,wxEXPAND); fgSizer->Add(LEAK,1,wxEXPAND);

32
libs/sleeplib/prs1_loader.cpp
View File

@ -385,6 +385,10 @@ bool PRS1Loader::OpenSummary(Session *session,wxString filename)
session->summary[CPAP_PressurePercentName]=90.0; session->summary[CPAP_PressurePercentName]=90.0;
session->summary[CPAP_PressureAverage]=buffer[0x19]/10.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_Obstructive]=(long)buffer[0x1C] | (buffer[0x1D] << 8);
session->summary[CPAP_ClearAirway]=(long)buffer[0x20] | (buffer[0x21] << 8); session->summary[CPAP_ClearAirway]=(long)buffer[0x20] | (buffer[0x21] << 8);
session->summary[CPAP_Hypopnea]=(long)buffer[0x2A] | (buffer[0x2B] << 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; vector<int> wavesize;
int samples=0; int samples=0;
int duration=0; int duration=0;
while (true) { while (true) {
br=f.Read(header,hl); br=f.Read(header,hl);
if (br<hl) { if (br<hl) {
if (cnt==0) return false; if (cnt==0)
return false;
else break; 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=size=timestamp=seconds=ext=0;
sequence=(header[10] << 24) | (header[9] << 16) | (header[8] << 8) | header[7]; 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]; size=(header[2] << 8) | header[1];
ext=header[6]; ext=header[6];
if (sequence==328) {
seconds=0;
}
if (!start) start=timestamp; if (!start) start=timestamp;
seconds=(header[16] << 8) | header[15]; seconds=(header[16] << 8) | header[15];
size-=(hl+2); size-=(hl+2);
if (ext!=5) return false; if (ext!=5) {
if (cnt==0)
return false;
else break;
}
unsigned char sum=0; unsigned char sum=0;
for (int i=0; i<hl-1; i++) sum+=header[i]; 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]; char * buffer=new char [size];
br=f.Read(buffer,size); br=f.Read(buffer,size);
@ -596,12 +612,14 @@ bool PRS1Loader::OpenWaveforms(Session *session,wxString filename)
char chkbuf[2]; char chkbuf[2];
wxInt16 chksum; wxInt16 chksum;
br=f.Read(chkbuf,2); br=f.Read(chkbuf,2);
if (br<2) return false; if (br<2)
return false;
chksum=chkbuf[0] << 8 | chkbuf[1]; chksum=chkbuf[0] << 8 | chkbuf[1];
} }
if (samples==0) return false; if (samples==0)
return false;
//double rate=double(duration)/double(samples); //double rate=double(duration)/double(samples);

12
version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 1292; static const long BUILD = 1300;
static const long REVISION = 1534; static const long REVISION = 1576;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 4892; static const long BUILDS_COUNT = 4913;
#define RC_FILEVERSION 0,7,1292,1534 #define RC_FILEVERSION 0,7,1300,1576
#define RC_FILEVERSION_STRING "0, 7, 1292, 1534\0" #define RC_FILEVERSION_STRING "0, 7, 1300, 1576\0"
static const char FULLVERSION_STRING[] = "0.7.1292.1534"; static const char FULLVERSION_STRING[] = "0.7.1300.1576";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62; static const long BUILD_HISTORY = 62;