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

F&P Icon Importer Fixes

Browse Source
This commit is contained in:
Mark Watkins 2012-01-23 20:04:33 +10:00
parent 5f0720816b
commit 96ef1c9094
3 changed files with 118 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
SleepLib/loader_plugins/icon_loader.cpp
View File

@ -30,7 +30,6 @@ FPIcon::~FPIcon()
FPIconLoader::FPIconLoader() FPIconLoader::FPIconLoader()
{ {
epoch=QDateTime(QDate(1970,1,1),QTime(0,0,0)).secsTo(QDateTime(QDate(1995,1,1),QTime(0,0,0)));
m_buffer=NULL; m_buffer=NULL;
} }
@ -137,9 +136,16 @@ int FPIconLoader::OpenMachine(Machine *mach, QString & path, Profile * profile)
for (int i=0;i<det.size();i++) { for (int i=0;i<det.size();i++) {
OpenDetail(mach,det[i],profile); OpenDetail(mach,det[i],profile);
} }
mach->Save();
return true; return true;
} }
QDateTime decodeTime(quint32 time)
{
}
bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile) bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile)
{ {
qDebug() << filename; qDebug() << filename;
@ -168,7 +174,7 @@ bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile)
in.setVersion(QDataStream::Qt_4_6); in.setVersion(QDataStream::Qt_4_6);
in.setByteOrder(QDataStream::LittleEndian); in.setByteOrder(QDataStream::LittleEndian);
quint16 t1,t2; quint16 t1;
quint32 ts; quint32 ts;
qint64 ti; qint64 ti;
qint8 b; qint8 b;
@ -179,13 +185,33 @@ bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile)
EventList * flow=NULL; EventList * flow=NULL;
qint16 dat[0x34]; qint16 dat[0x34];
EventDataType rate=200; EventDataType rate=200;
QDateTime datetime;
quint8 a1,a2;
int month,day,year,hour,minute,second;
do { do {
in >> t1; in >> a1;
in >> t2; in >> a2;
t1=a2 << 8 | a1;
ts=(t1*86400)+(t2*1.5); if (t1==0xfafe)
break;
ts+=epoch; day=t1 & 0x1f;
month=(t1 >> 5) & 0x0f;
year=2000+((t1 >> 9) & 0x7f);
in >> a1;
in >> a2;
t1=a2 << 8 | a1;
second=(t1 & 0x1f) * 2;
minute=(t1 >> 5) & 0x3f;
hour=(t1 >> 11) & 0x1f;
datetime=QDateTime(QDate(year,month,day),QTime(hour,minute,second));
ts=datetime.toTime_t();
if (!Sessions.contains(ts)) { if (!Sessions.contains(ts)) {
// Skip until ends in 0xFF FF FF 7F // Skip until ends in 0xFF FF FF 7F
@ -265,38 +291,58 @@ bool FPIconLoader::OpenSummary(Machine * mach,QString filename, Profile * profil
QDate date; QDate date;
QTime time; QTime time;
int runtime,usage;
int day,month,year,hour,minute,second;
quint32 tmp;
do { do {
in >> t1; in >> a1;
in >> t2; in >> a2;
t1=a2 << 8 | a1;
ts=(t1*86400)+(t2*1.5); if (t1==0xfafe)
break;
ts+=epoch; day=t1 & 0x1f;
//ts*=1; month=(t1 >> 5) & 0x0f;
datetime=QDateTime::fromTime_t(ts); year=2000+((t1 >> 9) & 0x7f);
in >> a1;
in >> a2;
t1=a2 << 8 | a1;
second=(t1 & 0x1f) * 2;
minute=(t1 >> 5) & 0x3f;
hour=(t1 >> 11) & 0x1f;
datetime=QDateTime(QDate(year,month,day),QTime(hour,minute,second));
ts=datetime.toTime_t();
date=datetime.date(); date=datetime.date();
time=datetime.time(); time=datetime.time();
// the following two quite often match in value // the following two quite often match in value
in >> a1; // 0x04 in >> a1; // 0x04 Run Time
in >> a2; // 0x05 in >> a2; // 0x05 Usage Time
runtime=a1 * 360; // durations are in tenth of an hour intervals
usage=a2 * 360;
in >> a3; // 0x06 in >> a3; // 0x06 // Ramps???
in >> a4; // 0x07 // pressure value? in >> a4; // 0x07 // a pressure value?
in >> a5; // 0x08 in >> a5; // 0x08 // ?? varies.. always less than 90% leak..
in >> d1; // 0x09 in >> d1; // 0x09
in >> d2; // 0x0b in >> d2; // 0x0b
in >> d3; // 0x0d // offset 0x0d is always more than offset 0x08 in >> d3; // 0x0d // 90% Leak value..
in >> p1; // 0x0f in >> p1; // 0x0f
in >> p2; // 0x10 in >> p2; // 0x10
in >> j1; // 0x11 in >> j1; // 0x11
in >> j2; // 0x12 in >> j2; // 0x12 // Apnea Events
in >> j3; // 0x13 in >> j3; // 0x13 // Hypopnea events
in >> j4; // 0x14 in >> j4; // 0x14 // Flow Limitation events
in >> j5; // 0x15 in >> j5; // 0x15
in >> j6; // 0x16 in >> j6; // 0x16
in >> j7; // 0x17 in >> j7; // 0x17
@ -306,10 +352,15 @@ bool FPIconLoader::OpenSummary(Machine * mach,QString filename, Profile * profil
in >> p5; // 0x1a in >> p5; // 0x1a
in >> x1; // 0x1b in >> x1; // 0x1b
in >> x2; // 0x1c in >> x2; // 0x1c // humidifier setting
if (!mach->SessionExists(ts)) { if (!mach->SessionExists(ts)) {
Session *sess=new Session(mach,ts); Session *sess=new Session(mach,ts);
sess->really_set_first(qint64(ts)*1000L);
sess->really_set_last(qint64(ts+usage)*1000L);
sess->SetChanged(true);
sess->setCount(CPAP_Obstructive, j2);
sess->setCount(CPAP_Hypopnea, j3);
// sess->setCount(CPAP_Obstructive,j1); // sess->setCount(CPAP_Obstructive,j1);
// sess->setCount(CPAP_Hypopnea,j2); // sess->setCount(CPAP_Hypopnea,j2);
// sess->setCount(CPAP_ClearAirway,j3); // sess->setCount(CPAP_ClearAirway,j3);
@ -324,6 +375,7 @@ bool FPIconLoader::OpenSummary(Machine * mach,QString filename, Profile * profil
sess->settings[CPAP_Pressure]=p1/10.0; sess->settings[CPAP_Pressure]=p1/10.0;
} }
Sessions[ts]=sess; Sessions[ts]=sess;
mach->AddSession(sess,profile);
} }
} while (!in.atEnd()); } while (!in.atEnd());
@ -370,23 +422,38 @@ bool FPIconLoader::OpenDetail(Machine * mach, QString filename, Profile * profil
QVector<quint16> start; QVector<quint16> start;
QVector<quint8> records; QVector<quint8> records;
quint16 t1,t2; quint16 t1;
quint16 strt; quint16 strt;
quint8 recs; quint8 recs,z1,z2;
int day,month,year,hour,minute,second;
int totalrecs=0; int totalrecs=0;
do { do {
in >> t1; // 0x00 day? in >> z1;
in >> t2; // 0x02 time? in >> z2;
if (t1==0xffff) break; t1=z2 << 8 | z1;
//ts = (t1 << 16) + t2; if (t1==0xfafe)
ts=(t1*86400)+(t2*1.5); break;
ts+=epoch; day=t1 & 0x1f;
month=(t1 >> 5) & 0x0f;
year=2000+((t1 >> 9) & 0x7f);
in >> z1;
in >> z2;
t1=z2 << 8 | z1;
second=(t1 & 0x1f) * 2;
minute=(t1 >> 5) & 0x3f;
hour=(t1 >> 11) & 0x1f;
datetime=QDateTime(QDate(year,month,day),QTime(hour,minute,second));
ts=datetime.toTime_t();
datetime=QDateTime::fromTime_t(ts);
date=datetime.date(); date=datetime.date();
time=datetime.time(); time=datetime.time();
in >> strt; in >> strt;
@ -427,8 +494,9 @@ bool FPIconLoader::OpenDetail(Machine * mach, QString filename, Profile * profil
unsigned stidx=start[r]; unsigned stidx=start[r];
int rec=records[r]; int rec=records[r];
idx=stidx*5; idx=stidx*15;
for (int i=0;i<rec;i++) { for (int i=0;i<rec;i++) {
for (int j=0;j<3;j++) {
pressure=data[idx]; pressure=data[idx];
leak=data[idx+1]; leak=data[idx+1];
a1=data[idx+2]; a1=data[idx+2];
@ -440,14 +508,14 @@ bool FPIconLoader::OpenDetail(Machine * mach, QString filename, Profile * profil
if (a2>0) H->AddEvent(ti,a2); if (a2>0) H->AddEvent(ti,a2);
if (a3>0) FL->AddEvent(ti,a3); if (a3>0) FL->AddEvent(ti,a3);
FLG->AddEvent(ti,a3); FLG->AddEvent(ti,a3);
ti+=300000L; ti+=120000L;
idx+=5; idx+=5;
} }
sess->really_set_last(ti-300000L);
sess->SetChanged(true);
mach->AddSession(sess,profile);
} }
mach->Save(); // sess->really_set_last(ti-360000L);
// sess->SetChanged(true);
// mach->AddSession(sess,profile);
}
return 1; return 1;
} }

1
SleepLib/loader_plugins/icon_loader.h
View File

@ -79,7 +79,6 @@ protected:
QHash<SessionID, Session *> Sessions; QHash<SessionID, Session *> Sessions;
unsigned char * m_buffer; unsigned char * m_buffer;
quint32 epoch;
}; };
#endif // ICON_LOADER_H #endif // ICON_LOADER_H

2
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -1007,7 +1007,7 @@ int ResmedLoader::Open(QString & path,Profile *profile)
// Create the session // Create the session
sess=new Session(m,sessionid); sess=new Session(m,sessionid);
QString filename,fullpath,backupfile,backfile, crcfile; QString fullpath,backupfile,backfile, crcfile;
// Process EDF File List // Process EDF File List
for (int i=0;i<si.value().size();++i) { for (int i=0;i<si.value().size();++i) {