From 61111088f9fc40170cec7f2f41dc57b3ba45ee17 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Thu, 2 Feb 2012 00:53:31 +1000 Subject: [PATCH] Time-weighted percentile calc bugfix, more F&P work --- SleepLib/common.h | 2 +- SleepLib/day.cpp | 48 +-- SleepLib/loader_plugins/icon_loader.cpp | 364 +++++++++++++++++----- SleepLib/loader_plugins/icon_loader.h | 8 +- SleepLib/loader_plugins/prs1_loader.cpp | 2 +- SleepLib/loader_plugins/resmed_loader.cpp | 4 +- SleepLib/machine.cpp | 2 +- SleepLib/machine_common.h | 4 +- SleepLib/profiles.cpp | 50 ++- SleepLib/schema.cpp | 2 +- SleepLib/session.cpp | 3 + daily.cpp | 7 +- newprofile.ui | 3 +- overview.cpp | 2 +- 14 files changed, 367 insertions(+), 134 deletions(-) diff --git a/SleepLib/common.h b/SleepLib/common.h index 6423b679..7a575f63 100644 --- a/SleepLib/common.h +++ b/SleepLib/common.h @@ -22,7 +22,7 @@ struct ValueCount { p=copy.p; } EventDataType value; - int count; + qint64 count; double p; }; diff --git a/SleepLib/day.cpp b/SleepLib/day.cpp index d2194563..a3f9bbf7 100644 --- a/SleepLib/day.cpp +++ b/SleepLib/day.cpp @@ -166,12 +166,13 @@ EventDataType Day::percentile(ChannelID code,EventDataType percentile) QVector::iterator s; - QHash wmap; + QHash wmap; - int SN=0; + qint64 SN=0; EventDataType lastgain=0, gain=0; // First Calculate count of all events + bool timeweight; for (s=sessions.begin();s!=sessions.end();s++) { if (!(*s)->enabled()) continue; @@ -179,6 +180,9 @@ EventDataType Day::percentile(ChannelID code,EventDataType percentile) QHash > ::iterator ei=sess.m_valuesummary.find(code); if (ei==sess.m_valuesummary.end()) continue; + QHash > ::iterator tei=sess.m_timesummary.find(code); + timeweight=(tei!=sess.m_timesummary.end()); + timeweight=false; gain=sess.m_gain[code]; // Here's assuming gains don't change accross a days sessions @@ -190,29 +194,33 @@ EventDataType Day::percentile(ChannelID code,EventDataType percentile) } lastgain=gain; - int weight,value; - QHash::iterator wit; - for (QHash::iterator i=ei.value().begin();i!=ei.value().end();i++) { - weight=i.value(); - value=i.key(); + int value; + qint64 weight; + qint64 tval; + if (timeweight) { + for (QHash::iterator i=tei.value().begin();i!=tei.value().end();i++) { + value=i.key(); + weight=i.value(); + SN+=weight; + wmap[value]+=weight; + } + } else { + for (QHash::iterator i=ei.value().begin();i!=ei.value().end();i++) { - SN+=weight; + value=i.key(); + weight=i.value(); - // Cheating here.. On first access, it initializes to zero - wmap[value]+=weight; -// wit=wmap.find(value); -// if (wit==wmap.end()) { -// wmap[value]=weight; -// } else { -// wit.value()+=weight; -// } + SN+=weight; + + wmap[value]+=weight; + } } } QVector valcnt; // Build sorted list of value/counts - for (QHash::iterator n=wmap.begin();n!=wmap.end();n++) { + for (QHash::iterator n=wmap.begin();n!=wmap.end();n++) { ValueCount vc; vc.value=EventDataType(n.key()) * gain; vc.count=n.value(); @@ -228,9 +236,9 @@ EventDataType Day::percentile(ChannelID code,EventDataType percentile) double nth=double(SN)*percentile; // index of the position in the unweighted set would be double nthi=floor(nth); - int sum1=0,sum2=0; - int w1,w2=0; - EventDataType v1=0,v2; + qint64 sum1=0,sum2=0; + qint64 w1,w2=0; + double v1=0,v2; int N=valcnt.size(); int k=0; diff --git a/SleepLib/loader_plugins/icon_loader.cpp b/SleepLib/loader_plugins/icon_loader.cpp index 52bfe322..752c105b 100644 --- a/SleepLib/loader_plugins/icon_loader.cpp +++ b/SleepLib/loader_plugins/icon_loader.cpp @@ -12,6 +12,8 @@ Copyright: (c)2012 Mark Watkins #include #include #include +#include +#include #include "icon_loader.h" @@ -101,6 +103,36 @@ int FPIconLoader::Open(QString & path,Profile *profile) return MachList.size(); } +struct FPWaveChunk { + FPWaveChunk(){ + st=0; + duration=0; + flow=NULL; + pressure=NULL; + leak=NULL; + file=0; + } + FPWaveChunk(qint64 start, qint64 dur,int f) { st=start; duration=dur; file=f, flow=NULL; leak=NULL; pressure=NULL; } + FPWaveChunk(const FPWaveChunk & copy) { + st=copy.st; + duration=copy.duration; + flow=copy.flow; + leak=copy.leak; + pressure=copy.pressure; + file=copy.file; + } + qint64 st; + qint64 duration; + int file; + EventList * flow; + EventList * leak; + EventList * pressure; +}; + +bool operator<(const FPWaveChunk & a, const FPWaveChunk & b) { + return (a.st < b.st); +} + int FPIconLoader::OpenMachine(Machine *mach, QString & path, Profile * profile) { qDebug() << "Opening FPIcon " << path; @@ -138,6 +170,75 @@ int FPIconLoader::OpenMachine(Machine *mach, QString & path, Profile * profile) for (int i=0;i::iterator it=Sessions.end(); + it--; + dt=QDateTime::fromTime_t(qint64(it.value()->first())/1000L); + QDate date=dt.date().addDays(-7); + it++; + + do { + it--; + Session *sess=it.value(); + sid=sess->session(); + hours=sess->hours(); + mins=hours*60; + dt=QDateTime::fromTime_t(sid); + + if (sess->channelDataExists(CPAP_FlowRate)) a="(flow)"; else a=""; + qDebug() << cnt << ":" << dt << "session" << sid << "," << mins << "minutes" << a; + + if (dt.date() chunks; + for (QMap::iterator dit=FLWDate.begin();dit!=FLWDate.end();dit++) { + int k=dit.key(); + QDate date=dit.value(); +// QList values = SessDate.values(date); + for (int j=0;jchannelDataExists(CPAP_FlowRate)) c=true; + } + qDebug() << k << "-" <channelDataExists(CPAP_FlowRate)) c=true; + } + qDebug() << chunk.file << ":" << i << zz << dur << "minutes" << (b ? "*" : "") << (c ? QDateTime::fromTime_t(zz).toString() : ""); + } + mach->Save(); return true; @@ -146,6 +247,20 @@ int FPIconLoader::OpenMachine(Machine *mach, QString & path, Profile * profile) bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile) { + QByteArray data; + quint16 t1; + quint32 ts; + double ti; + qint8 b; + EventList * flow=NULL, * pressure=NULL, *leak=NULL; + QDateTime datetime; + quint8 a1,a2; + unsigned char * buf, *endbuf; + + int month,day,year,hour,minute,second; + + long pos=0; + qDebug() << filename; QByteArray header; QFile file(filename); @@ -165,35 +280,28 @@ bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile) if (hsum!=header[0x1ff]) { qDebug() << "Header checksum mismatch" << filename; } + QTextStream htxt(&header); + QString h1,version,fname,serial,model,type; + htxt >> h1; + htxt >> version; + htxt >> fname; + htxt >> serial; + htxt >> model; + htxt >> type; + + fname.chop(4); + QString num=fname.right(4); + int filenum=num.toInt(); - QByteArray data; data=file.readAll(); - QDataStream in(data); - in.setVersion(QDataStream::Qt_4_6); - in.setByteOrder(QDataStream::LittleEndian); - quint16 t1; - quint32 ts; - double ti; - qint8 b; - //QByteArray line; + buf=(unsigned char *)data.data(); + endbuf=buf+data.size(); - unsigned char * buf=(unsigned char *)data.data(); - - unsigned char * endbuf=buf+data.size(); - - EventList * flow=NULL; -// qint16 dat[0x32]; - QDateTime datetime; - // quint8 a1,a2; - - int month,day,year,hour,minute,second; - - long pos=0; - - t1=buf[pos+1] << 8 | buf[pos]; + a1=*buf++; + a2=*buf++; + t1=a2 << 8 | a1; pos+=2; - buf+=2; if (t1==0xfafe) // End of file marker.. { @@ -202,102 +310,153 @@ bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile) } day=t1 & 0x1f; - month=(t1 >> 5) & 0x0f; + month=((t1 >> 5) & 0x0f); year=2000+((t1 >> 9) & 0x7f); - //in >> a1; - //in >> a2; - t1=buf[pos+1] << 8 | buf[pos]; + a1=*buf++; + a2=*buf++; + + t1=a2 << 8 | a1; + + // Why the heck does F&P do this? This affects the MINUTES field and the HOURS field. + // But is clearly not a valid UTC conversion.. Bug? Or idiotic obfuscation attempt? + // It would of made (idiotic) sense if they shifted the bits on bit further to the right. + t1-=0xc0; + pos+=2; - buf+=2; second=(t1 & 0x1f) * 2; minute=(t1 >> 5) & 0x3f; hour=(t1 >> 11) & 0x1f; - datetime=QDateTime(QDate(year,month,day),QTime(hour,minute,second)); - QDate date=datetime.date(); + datetime=QDateTime(QDate(year,month,day),QTime(hour,minute,second),Qt::UTC); + + QDate date; + QTime time; + if (!datetime.isValid() || (datetime.date() values = SessDate.values(date); EventStoreType pbuf[256]; + QMap::iterator sit=Sessions.find(ts); + Session *sess; + if (sit!=Sessions.end()) { + sess=sit.value(); + qDebug() << filenum << ":" << date << sess->session() << ":" << sess->hours()*60.0; + } else { + sess=NULL; + qDebug() << filenum << ":" << date << "couldn't find matching session for" << ts; + } + + + const double rate=1000.0/50.0; + + int count; - for (int chunks=0;chunkssession(); + for (int chunks=0;bufsetFirst(ti); + leak->setFirst(ti); + pressure->setFirst(ti); - flow=NULL; - if (Sessions.contains(ts)) { - sess=Sessions[ts]; - - } else sess=NULL; - - ti=qint64(ts)*1000L; - - // Little endian. - // 100 byte blocks ending in 0x84 03 ?? ff ff (900) - // 0x90 01 ?? ff ff (400) - - // 900 / 400 Waveform ID? - // entire sequence ends in 0xff 7f + FLWMapFlow[filenum].push_back(flow); + FLWMapLeak[filenum].push_back(leak); + FLWMapPres[filenum].push_back(pressure); + FLWTS[filenum].push_back(ti); count=0; int len; - qint16 z1; - qint8 z2; + qint16 pr; + quint16 lkaj; do { unsigned char * p=buf,*p2; // scan ahead to 0xffff marker - do { - while ((*p++ != 0xff) && (p < endbuf)) { - pos++; + p2=buf+103; + if (p2>endbuf) + break; + if (!((p2[0]==0xff) && (p2[1]==0xff))) { + if (count>0) { + int i=5; } + do { + while ((*p++ != 0xff) && (p < endbuf)) { + pos++; + } + if (p >= endbuf) + break; + pos++; + } while ((*p++ != 0xff) && (p < endbuf)); if (p >= endbuf) break; - pos++; - } while ((*p++ != 0xff) && (p < endbuf)); - if (p >= endbuf) - break; + } else { + //if (count>0) + p=p2+2; + } p2=p-5; len=p2-buf; - z1=p2[1] << 8 | p2[0]; - z2=p2[2]; + pr=p2[1] << 8 | p2[0]; // pressure * 100 + lkaj=p2[2]; // Could this value perhaps be Leak??? + len/=2; count++; - double rate=1000.0/23.5; - if (sess && !flow) { - flow=sess->AddEventList(CPAP_FlowRate,EVL_Waveform,1.0,0,0,0,rate); + if (pr<0) { + quint16 z3=pr; + int i=5; } + + if (leak) { + leak->AddEvent(ti,lkaj); + } + if (pressure) { + pressure->AddEvent(ti,pr); + } + if (flow) { - quint16 tmp; + qint16 tmp; unsigned char * bb=(unsigned char *)buf; char c; - if (len>100) { + if (len>50) { int i=5; } - for (int i=0;i128) val=128; bb+=2; - pbuf[i]=tmp; + pbuf[i]=val; } - flow->AddWaveform(ti,pbuf,len/2,rate); + + flow->AddWaveform(ti,pbuf,len,rate); } - ti+=qint64(len/2)*rate; + ti+=len*rate; buf=p; @@ -308,16 +467,36 @@ bool FPIconLoader::OpenFLW(Machine * mach,QString filename, Profile * profile) while ((*buf++ == 0) && (buf < endbuf)) pos++; break; } - } while (buf < endbuf); - if (buf >= endbuf) - break; - } +// pressure->setType(EVL_Waveform); +// pressure->getTime().clear(); +// leak->getTime().clear(); +// leak->setType(EVL_Waveform); + if (sess && FLWMapFlow[filenum].size()==1 && (st==sess->first())) { + sess->eventlist[CPAP_FlowRate].push_back(FLWMapFlow[filenum].at(0)); + sess->eventlist[CPAP_Leak].push_back(FLWMapLeak[filenum].at(0)); + sess->eventlist[CPAP_MaskPressure].push_back(FLWMapPres[filenum].at(0)); +// FLWMapFlow[filenum].erase(FLWMapFlow[filenum].begin()); +// FLWMapLeak[filenum].erase(FLWMapLeak[filenum].begin()); +// FLWMapPres[filenum].erase(FLWMapPres[filenum].begin()); + } + + + qDebug() << ts << dec << double(ti-st)/60000.0; + FLWDuration[filenum].push_back(ti-st); + st=ti; + } while (buf < endbuf); + + + QList values = SessDate.values(date); + for (int i = 0; i < values.size(); ++i) { + sess=values.at(i); + qDebug() << date << sess->session() << ":" << QString::number(sess->hours()*60.0,'f',0); + } return true; } - bool FPIconLoader::OpenSummary(Machine * mach,QString filename, Profile * profile) { qDebug() << filename; @@ -339,10 +518,20 @@ bool FPIconLoader::OpenSummary(Machine * mach,QString filename, Profile * profil if (hsum!=header[0x1ff]) { qDebug() << "Header checksum mismatch" << filename; } + QTextStream htxt(&header); + QString h1,version,fname,serial,model,type; + htxt >> h1; + htxt >> version; + htxt >> fname; + htxt >> serial; + htxt >> model; + htxt >> type; + mach->properties[STR_PROP_Model]=model+" "+type; + QByteArray data; data=file.readAll(); - long size=data.size(),pos=0; + //long size=data.size(),pos=0; QDataStream in(data); in.setVersion(QDataStream::Qt_4_6); in.setByteOrder(QDataStream::LittleEndian); @@ -376,15 +565,16 @@ bool FPIconLoader::OpenSummary(Machine * mach,QString filename, Profile * profil 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)); + datetime=QDateTime(QDate(year,month,day),QTime(hour,minute,second),Qt::UTC); + date=datetime.date(); - datetime=datetime.toTimeSpec(Qt::UTC); ts=datetime.toTime_t(); // the following two quite often match in value @@ -440,6 +630,8 @@ bool FPIconLoader::OpenSummary(Machine * mach,QString filename, Profile * profil sess->settings[CPAP_Mode]=(int)MODE_CPAP; sess->settings[CPAP_Pressure]=p1/10.0; } + sess->settings[CPAP_HumidSetting]=x2; + //sess->settings[CPAP_PresReliefType]=PR_SENSAWAKE; Sessions[ts]=sess; mach->AddSession(sess,profile); } @@ -516,8 +708,8 @@ bool FPIconLoader::OpenDetail(Machine * mach, QString filename, Profile * profil minute=(t1 >> 5) & 0x3f; hour=(t1 >> 11) & 0x1f; - datetime=QDateTime(QDate(year,month,day),QTime(hour,minute,second)); - datetime=datetime.toTimeSpec(Qt::UTC); + datetime=QDateTime(QDate(year,month,day),QTime(hour,minute,second),Qt::UTC); + //datetime=datetime.toTimeSpec(Qt::UTC); ts=datetime.toTime_t(); diff --git a/SleepLib/loader_plugins/icon_loader.h b/SleepLib/loader_plugins/icon_loader.h index aabee43c..602e2c4d 100644 --- a/SleepLib/loader_plugins/icon_loader.h +++ b/SleepLib/loader_plugins/icon_loader.h @@ -77,8 +77,14 @@ public: protected: QString last; QHash MachList; - QHash Sessions; + QMap Sessions; QMultiMap SessDate; + QMap > FLWMapFlow; + QMap > FLWMapLeak; + QMap > FLWMapPres; + QMap > FLWDuration; + QMap > FLWTS; + QMap FLWDate; unsigned char * m_buffer; }; diff --git a/SleepLib/loader_plugins/prs1_loader.cpp b/SleepLib/loader_plugins/prs1_loader.cpp index 1b70ce04..d504588c 100644 --- a/SleepLib/loader_plugins/prs1_loader.cpp +++ b/SleepLib/loader_plugins/prs1_loader.cpp @@ -504,7 +504,7 @@ bool PRS1Loader::ParseSummary(Machine *mach, qint32 sequence, quint32 timestamp, session->settings[CPAP_PresReliefSet]=(int)(data[offset+0x08] & 7); - session->settings[PRS1_HumidSetting]=(int)data[offset+0x09]&0x0f; + session->settings[CPAP_HumidSetting]=(int)data[offset+0x09]&0x0f; session->settings[PRS1_HumidStatus]=(data[offset+0x09]&0x80)==0x80; session->settings[PRS1_SysLock]=(data[offset+0x0a]&0x80)==0x80; session->settings[PRS1_SysOneResistStat]=(data[offset+0x0a]&0x40)==0x40; diff --git a/SleepLib/loader_plugins/resmed_loader.cpp b/SleepLib/loader_plugins/resmed_loader.cpp index 4f6f2cf9..65c750dc 100644 --- a/SleepLib/loader_plugins/resmed_loader.cpp +++ b/SleepLib/loader_plugins/resmed_loader.cpp @@ -1596,7 +1596,9 @@ bool ResmedLoader::LoadPLD(Session *sess,EDFParser &edf) code=CPAP_Leak; es.gain*=60; es.physical_dimension="L/M"; - a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0,true); + a=sess->AddEventList(code,EVL_Waveform,es.gain,es.offset,0,0,rate); + a->AddWaveform(edf.startdate,es.data,recs,duration); + //a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0,true); } else if (es.label=="FFL Index") { code=CPAP_FLG; a=ToTimeDelta(sess,edf,es, code,recs,duration,0,0); diff --git a/SleepLib/machine.cpp b/SleepLib/machine.cpp index 1a3b23cd..fbef30ac 100644 --- a/SleepLib/machine.cpp +++ b/SleepLib/machine.cpp @@ -461,7 +461,7 @@ ChannelID INTP_SmartFlex; ChannelID INTELLIPAP_Unknown1, INTELLIPAP_Unknown2; ChannelID PRS1_00, PRS1_01, PRS1_08, PRS1_0A, PRS1_0B, PRS1_0C, PRS1_0E, PRS1_0F, PRS1_10, PRS1_12, -PRS1_FlexMode, PRS1_FlexSet, PRS1_HumidStatus, PRS1_HumidSetting, PRS1_SysLock, PRS1_SysOneResistStat, +PRS1_FlexMode, PRS1_FlexSet, PRS1_HumidStatus, CPAP_HumidSetting, PRS1_SysLock, PRS1_SysOneResistStat, PRS1_SysOneResistSet, PRS1_HoseDiam, PRS1_AutoOn, PRS1_AutoOff, PRS1_MaskAlert, PRS1_ShowAHI; ChannelID OXI_Pulse, OXI_SPO2, OXI_PulseChange, OXI_SPO2Drop, OXI_Plethy; diff --git a/SleepLib/machine_common.h b/SleepLib/machine_common.h index f897bb3c..7ce8067a 100644 --- a/SleepLib/machine_common.h +++ b/SleepLib/machine_common.h @@ -62,7 +62,7 @@ enum CPAPMode//:short */ enum PRTypes//:short { - PR_UNKNOWN=0,PR_NONE,PR_CFLEX,PR_CFLEXPLUS,PR_AFLEX,PR_BIFLEX,PR_EPR,PR_SMARTFLEX,PR_EASYBREATHE + PR_UNKNOWN=0,PR_NONE,PR_CFLEX,PR_CFLEXPLUS,PR_AFLEX,PR_BIFLEX,PR_EPR,PR_SMARTFLEX,PR_EASYBREATHE,PR_SENSAWAKE }; enum PRModes//:short { @@ -96,7 +96,7 @@ CPAP_PresReliefSet, CPAP_PresReliefMode, CPAP_PresReliefType, CPAP_PSMin, CPAP_P extern ChannelID RMS9_E01, RMS9_E02, RMS9_EPR, RMS9_EPRSet, RMS9_SetPressure; extern ChannelID INTP_SmartFlex; extern ChannelID PRS1_00, PRS1_01, PRS1_08, PRS1_0A, PRS1_0B, PRS1_0C, PRS1_0E, PRS1_0F, PRS1_10, PRS1_12, -PRS1_FlexMode, PRS1_FlexSet, PRS1_HumidStatus, PRS1_HumidSetting, PRS1_SysLock, PRS1_SysOneResistStat, +PRS1_FlexMode, PRS1_FlexSet, PRS1_HumidStatus, CPAP_HumidSetting, PRS1_SysLock, PRS1_SysOneResistStat, PRS1_SysOneResistSet, PRS1_HoseDiam, PRS1_AutoOn, PRS1_AutoOff, PRS1_MaskAlert, PRS1_ShowAHI; extern ChannelID INTELLIPAP_Unknown1, INTELLIPAP_Unknown2; diff --git a/SleepLib/profiles.cpp b/SleepLib/profiles.cpp index 4b323626..cf2cc902 100644 --- a/SleepLib/profiles.cpp +++ b/SleepLib/profiles.cpp @@ -728,14 +728,17 @@ EventDataType Profile::calcPercentile(ChannelID code, EventDataType percent, Mac QDate date=start; - QMap wmap; + QMap wmap; QHash >::iterator vsi; + QHash >::iterator tsi; EventDataType gain; //bool setgain=false; - EventDataType weight,value; + EventDataType value; + int weight; - int SN=0; + qint64 SN=0; + bool timeweight; do { Day * day=GetGoodDay(date,mt); if (day) { @@ -749,18 +752,35 @@ EventDataType Profile::calcPercentile(ChannelID code, EventDataType percent, Mac if (!gain) gain=1; vsi=sess->m_valuesummary.find(code); if (vsi==sess->m_valuesummary.end()) continue; + tsi=sess->m_timesummary.find(code); + timeweight=(tsi!=sess->m_timesummary.end()); QHash & vsum=vsi.value(); + QHash & tsum=tsi.value(); - for (QHash::iterator k=vsum.begin();k!=vsum.end();k++) { - weight=k.value(); - value=EventDataType(k.key())*gain; + if (timeweight) { + for (QHash::iterator k=tsum.begin();k!=tsum.end();k++) { + weight=k.value(); + value=EventDataType(k.key())*gain; - SN+=weight; - if (wmap.contains(value)) { - wmap[value]+=weight; - } else { - wmap[value]=weight; + SN+=weight; + if (wmap.contains(value)) { + wmap[value]+=weight; + } else { + wmap[value]=weight; + } + } + } else { + for (QHash::iterator k=vsum.begin();k!=vsum.end();k++) { + weight=k.value(); + value=EventDataType(k.key())*gain; + + SN+=weight; + if (wmap.contains(value)) { + wmap[value]+=weight; + } else { + wmap[value]=weight; + } } } } @@ -771,7 +791,7 @@ EventDataType Profile::calcPercentile(ChannelID code, EventDataType percent, Mac QVector valcnt; // Build sorted list of value/counts - for (QMap::iterator n=wmap.begin();n!=wmap.end();n++) { + for (QMap::iterator n=wmap.begin();n!=wmap.end();n++) { ValueCount vc; vc.value=n.key(); vc.count=n.value(); @@ -787,9 +807,9 @@ EventDataType Profile::calcPercentile(ChannelID code, EventDataType percent, Mac double nth=double(SN)*percent; // index of the position in the unweighted set would be double nthi=floor(nth); - int sum1=0,sum2=0; - int w1,w2=0; - EventDataType v1=0,v2=0; + qint64 sum1=0,sum2=0; + qint64 w1,w2=0; + double v1=0,v2=0; int N=valcnt.size(); int k=0; diff --git a/SleepLib/schema.cpp b/SleepLib/schema.cpp index 9cd55d23..4a9e96b4 100644 --- a/SleepLib/schema.cpp +++ b/SleepLib/schema.cpp @@ -137,7 +137,7 @@ void init() PRS1_FlexMode=schema::channel["FlexMode"].id(); PRS1_FlexSet=schema::channel["FlexSet"].id(); PRS1_HumidStatus=schema::channel["HumidStat"].id(); - PRS1_HumidSetting=schema::channel["HumidSet"].id(); + CPAP_HumidSetting=schema::channel["HumidSet"].id(); PRS1_SysLock=schema::channel["SysLock"].id(); PRS1_SysOneResistStat=schema::channel["SysOneResistStat"].id(); PRS1_SysOneResistSet=schema::channel["SysOneResistSet"].id(); diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index 7f49fc5f..ac0cdf55 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -686,6 +686,9 @@ void Session::updateCountSummary(ChannelID code) qint32 len,cnt; quint32 * tptr; EventStoreType * dptr, * eptr; + if (code==CPAP_MinuteVent) { + int i=5; + } for (int i=0;imachine->GetClass()==STR_MACH_PRS1) { - int humid=round(cpap->settings_wavg(PRS1_HumidSetting)); + QString mclass=cpap->machine->GetClass(); + if (mclass==STR_MACH_PRS1 || mclass==STR_MACH_FPIcon) { + int humid=round(cpap->settings_wavg(CPAP_HumidSetting)); html+=QString("%1%2%3") .arg(tr("Humidifier")) - .arg(schema::channel[PRS1_HumidSetting].description()) + .arg(schema::channel[CPAP_HumidSetting].description()) .arg(humid==0 ? STR_GEN_Off : "x"+QString::number(humid)); } diff --git a/newprofile.ui b/newprofile.ui index 22de30ef..041a5b9e 100644 --- a/newprofile.ui +++ b/newprofile.ui @@ -28,7 +28,7 @@ - 2 + 0 @@ -80,6 +80,7 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">This software has been released freely under the <a href="qrc:/LICENSE.txt"><span style=" text-decoration: underline; color:#0000ff;">GNU Public License</span></a>, and comes with no warranty, and without ANY claims to fitness for any purpose.</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Accuracy of any data displayed is not and can not be guaranteed. </p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br />Any reports generated are for PERSONAL USE ONLY, and not fit for compliance purposes.</p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">The author will not be held liable for <span style=" text-decoration: underline;">anything</span> related to the use or misuse of this software. </p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> diff --git a/overview.cpp b/overview.cpp index 8c8c53cf..87508347 100644 --- a/overview.cpp +++ b/overview.cpp @@ -195,7 +195,7 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : set=new SummaryChart("",GT_LINE); //set->addSlice(PRS1_SysOneResistSet,QColor("grey"),ST_SETAVG); - set->addSlice(PRS1_HumidSetting,QColor("blue"),ST_SETWAVG); + set->addSlice(CPAP_HumidSetting,QColor("blue"),ST_SETWAVG); set->addSlice(CPAP_PresReliefSet,QColor("red"),ST_SETWAVG); //set->addSlice(RMS9_EPRSet,QColor("green"),ST_SETWAVG); //set->addSlice(INTP_SmartFlex,QColor("purple"),ST_SETWAVG);