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

Time-weighted percentile calc bugfix, more F&P work

Browse Source
This commit is contained in:
Mark Watkins 2012-02-02 00:53:31 +10:00
parent 5a076a2777
commit 61111088f9
14 changed files with 367 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SleepLib/common.h
View File

@ -22,7 +22,7 @@ struct ValueCount {
p=copy.p;
}
EventDataType value;
int count;
qint64 count;
double p;
};

48
SleepLib/day.cpp
View File

@ -166,12 +166,13 @@ EventDataType Day::percentile(ChannelID code,EventDataType percentile)
QVector<Session *>::iterator s;
QHash<EventStoreType, int> wmap;
QHash<EventStoreType, qint64> 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<ChannelID,QHash<EventStoreType, EventStoreType> > ::iterator ei=sess.m_valuesummary.find(code);
if (ei==sess.m_valuesummary.end()) continue;
QHash<ChannelID,QHash<EventStoreType, quint32> > ::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<EventStoreType,int>::iterator wit;
for (QHash<EventStoreType, EventStoreType>::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<EventStoreType, quint32>::iterator i=tei.value().begin();i!=tei.value().end();i++) {
value=i.key();
weight=i.value();
SN+=weight;
wmap[value]+=weight;
}
} else {
for (QHash<EventStoreType, EventStoreType>::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<ValueCount> valcnt;
// Build sorted list of value/counts
for (QHash<EventStoreType, int>::iterator n=wmap.begin();n!=wmap.end();n++) {
for (QHash<EventStoreType, qint64>::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;

364
SleepLib/loader_plugins/icon_loader.cpp
View File

@ -12,6 +12,8 @@ Copyright: (c)2012 Mark Watkins
#include <QProgressBar>
#include <QMessageBox>
#include <QDataStream>
#include <QTextStream>
#include <cmath>
#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<flw.size();i++) {
OpenFLW(mach,flw[i],profile);
}
SessionID zz,sid,st;
float hours,dur,mins;
qDebug() << "Last 20 Sessions";
int cnt=0;
QDateTime dt;
QString a;
QMap<SessionID, Session *>::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()<date) break;
++cnt;
} while (it!=Sessions.begin());
qDebug() << "Unmatched Sessions";
QList<FPWaveChunk> chunks;
for (QMap<int,QDate>::iterator dit=FLWDate.begin();dit!=FLWDate.end();dit++) {
int k=dit.key();
QDate date=dit.value();
// QList<Session *> values = SessDate.values(date);
for (int j=0;j<FLWTS[k].size();j++) {
FPWaveChunk chunk(FLWTS[k].at(j),FLWDuration[k].at(j),k);
chunk.flow=FLWMapFlow[k].at(j);
chunk.leak=FLWMapLeak[k].at(j);
chunk.pressure=FLWMapPres[k].at(j);
chunks.push_back(chunk);
zz=FLWTS[k].at(j)/1000;
dur=double(FLWDuration[k].at(j))/60000.0;
bool b,c=false;
if (Sessions.contains(zz)) b=true; else b=false;
if (b) {
if (Sessions[zz]->channelDataExists(CPAP_FlowRate)) c=true;
}
qDebug() << k << "-" <<j << ":" << zz << qRound(dur) << "minutes" << (b ? "*" : "") << (c ? QDateTime::fromTime_t(zz).toString() : "");
}
}
qSort(chunks);
bool b,c;
for (int i=0;i<chunks.size();i++) {
const FPWaveChunk & chunk=chunks.at(i);
zz=chunk.st/1000;
dur=double(chunk.duration)/60000.0;
if (Sessions.contains(zz)) b=true; else b=false;
if (b) {
if (Sessions[zz]->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()<QDate(2010,1,1))) {
pos=0;
buf-=4;
datetime=QDateTime(QDate(2000,1,1),QTime(0,0,0));
date=datetime.date();
ts=datetime.toTime_t();
} else {
date=datetime.date();
time=datetime.time();
ts=datetime.toTime_t();
}
FLWDate[filenum]=date;
ti=qint64(ts)*1000L;
qint64 st=ti;
QList<Session *> values = SessDate.values(date);
EventStoreType pbuf[256];
QMap<SessionID, Session *>::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;chunks<values.size();++chunks) { // each chunk is a seperate session
ts=values.at(chunks)->session();
for (int chunks=0;buf<endbuf;++chunks) { // each chunk is a seperate session
datetime=datetime.toTimeSpec(Qt::UTC);
QTime time=datetime.time();
flow=new EventList(EVL_Waveform,1.0,0,0,0,rate);
leak=new EventList(EVL_Event,1.0,0,0,0,rate*50.0); // 1 per second
pressure=new EventList(EVL_Event,0.01,0,0,0,rate*50.0); // 1 per second
//ts=datetime.toTime_t();
flow->setFirst(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;i<len/2;i++) {
c=bb[1];// & 0x1f;
//c-=0x10;
tmp=c << 8 | bb[0];
if (tmp<0) tmp=-tmp;
//tmp ^= 0x8000;
EventDataType val;
for (int i=0;i<len;i++) {
//c=bb[1];
tmp=bb[1] << 8 | bb[0];
val=(EventDataType(tmp)/100.0)-lkaj;
if (val<-128) val=-128;
else if (val>128) 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<Session *> 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();

8
SleepLib/loader_plugins/icon_loader.h
View File

@ -77,8 +77,14 @@ public:
protected:
QString last;
QHash<QString,Machine *> MachList;
QHash<SessionID, Session *> Sessions;
QMap<SessionID, Session *> Sessions;
QMultiMap<QDate,Session *> SessDate;
QMap<int,QList<EventList *> > FLWMapFlow;
QMap<int,QList<EventList *> > FLWMapLeak;
QMap<int,QList<EventList *> > FLWMapPres;
QMap<int,QList<qint64> > FLWDuration;
QMap<int,QList<qint64> > FLWTS;
QMap<int,QDate> FLWDate;
unsigned char * m_buffer;
};

2
SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -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;

4
SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -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);

2
SleepLib/machine.cpp
View File

@ -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;

4
SleepLib/machine_common.h
View File

@ -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;

50
SleepLib/profiles.cpp
View File

@ -728,14 +728,17 @@ EventDataType Profile::calcPercentile(ChannelID code, EventDataType percent, Mac
QDate date=start;
QMap<EventDataType, int> wmap;
QMap<EventDataType, qint64> wmap;
QHash<ChannelID,QHash<EventStoreType, EventStoreType> >::iterator vsi;
QHash<ChannelID,QHash<EventStoreType, quint32> >::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<EventStoreType, EventStoreType> & vsum=vsi.value();
QHash<EventStoreType, quint32> & tsum=tsi.value();
for (QHash<EventStoreType, EventStoreType>::iterator k=vsum.begin();k!=vsum.end();k++) {
weight=k.value();
value=EventDataType(k.key())*gain;
if (timeweight) {
for (QHash<EventStoreType, quint32>::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<EventStoreType, EventStoreType>::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<ValueCount> valcnt;
// Build sorted list of value/counts
for (QMap<EventDataType, int>::iterator n=wmap.begin();n!=wmap.end();n++) {
for (QMap<EventDataType, qint64>::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;

2
SleepLib/schema.cpp
View File

@ -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();

3
SleepLib/session.cpp
View File

@ -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;i<ev.value().size();i++) {
EventList & e=*(ev.value()[i]);
start=e.first();

7
daily.cpp
View File

@ -1106,11 +1106,12 @@ void Daily::Load(QDate date)
.arg(tr("Pr. Relief"))
.arg(schema::channel[CPAP_PresReliefType].description())
.arg(flexstr);
if (cpap->machine->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("<tr><td><a class='info' href='#'>%1<span>%2</span></a></td><td colspan=4>%3</td></tr>")
.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));
}

3
newprofile.ui
View File

@ -28,7 +28,7 @@
<item>
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
<number>2</number>
<number>0</number>
</property>
<widget class="QWidget" name="welcomePage">
<layout class="QVBoxLayout" name="verticalLayout_8">
@ -80,6 +80,7 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This software has been released freely under the &lt;a href=&quot;qrc:/LICENSE.txt&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;GNU Public License&lt;/span&gt;&lt;/a&gt;, and comes with no warranty, and without ANY claims to fitness for any purpose.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Accuracy of any data displayed is not and can not be guaranteed. &lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;Any reports generated are for PERSONAL USE ONLY, and not fit for compliance purposes.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The author will not be held liable for &lt;span style=&quot; text-decoration: underline;&quot;&gt;anything&lt;/span&gt; related to the use or misuse of this software. &lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;

2
overview.cpp
View File

@ -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);