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

Fix hang on startup with new profile

Browse Source
This commit is contained in:
Mark Watkins 2013-09-11 22:57:06 +10:00
parent 0c8398d4e1
commit fd7e20b957
1 changed files with 113 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
SleepLib/profiles.cpp
View File

@ -50,10 +50,12 @@ Profile::Profile(QString path)
{ {
const QString xmlext=".xml"; const QString xmlext=".xml";
p_name=STR_GEN_Profile; p_name=STR_GEN_Profile;
if (path.isEmpty()) p_path=GetAppRoot(); if (path.isEmpty())
p_path=GetAppRoot();
else p_path=path; else p_path=path;
(*this)[STR_GEN_DataFolder]=p_path; (*this)[STR_GEN_DataFolder]=p_path;
if (!p_path.endsWith("/")) p_path+="/"; if (!p_path.endsWith("/"))
p_path+="/";
p_filename=p_path+p_name+xmlext; p_filename=p_path+p_name+xmlext;
machlist.clear(); machlist.clear();
@ -185,9 +187,12 @@ void Profile::ExtraLoad(QDomElement & root)
//if (ml) { //if (ml) {
// ml->CreateMachine // ml->CreateMachine
//} //}
if (m_type==MT_CPAP) m=new CPAP(this,m_id); if (m_type==MT_CPAP)
else if (m_type==MT_OXIMETER) m=new Oximeter(this,m_id); m=new CPAP(this,m_id);
else if (m_type==MT_SLEEPSTAGE) m=new SleepStage(this,m_id); else if (m_type==MT_OXIMETER)
m=new Oximeter(this,m_id);
else if (m_type==MT_SLEEPSTAGE)
m=new SleepStage(this,m_id);
else { else {
m=new Machine(this,m_id); m=new Machine(this,m_id);
m->SetType(m_type); m->SetType(m_type);
@ -253,8 +258,10 @@ void Profile::AddDay(QDate date,Day *day,MachineType mt) {
m_first=m_last=date; m_first=m_last=date;
is_first_day=false; is_first_day=false;
} }
if (m_first>date) m_first=date; if (m_first>date)
if (m_last<date) m_last=date; m_first=date;
if (m_last<date)
m_last=date;
// Check for any other machines of same type.. Throw an exception if one already exists. // Check for any other machines of same type.. Throw an exception if one already exists.
QList<Day *> & dl=daylist[date]; QList<Day *> & dl=daylist[date];
@ -330,11 +337,13 @@ int Profile::Import(QString path)
int c=0; int c=0;
qDebug() << "Importing " << path; qDebug() << "Importing " << path;
path=path.replace("\\","/"); path=path.replace("\\","/");
if (path.endsWith("/")) path.chop(1); if (path.endsWith("/"))
path.chop(1);
QList<MachineLoader *>loaders=GetLoaders(); QList<MachineLoader *>loaders=GetLoaders();
for (QList<MachineLoader *>::iterator i=loaders.begin(); i!=loaders.end(); i++) { for (QList<MachineLoader *>::iterator i=loaders.begin(); i!=loaders.end(); i++) {
if (c+=(*i)->Open(path,this)) break; if (c+=(*i)->Open(path,this))
break;
} }
//qDebug() << "Import Done"; //qDebug() << "Import Done";
return c; return c;
@ -376,7 +385,8 @@ QList<Machine *> Profile::GetMachines(MachineType t)
Machine * Profile::GetMachine(MachineType t) Machine * Profile::GetMachine(MachineType t)
{ {
QList<Machine *>vec=GetMachines(t); QList<Machine *>vec=GetMachines(t);
if (vec.size()==0) return NULL; if (vec.size()==0)
return NULL;
return vec[0]; return vec[0];
} }
@ -398,8 +408,10 @@ void Profile::RemoveSession(Session * sess)
qint64 first=0,last=0; qint64 first=0,last=0;
for (int i=0;i<day->getSessions().size();i++) { for (int i=0;i<day->getSessions().size();i++) {
Session & sess=*day->getSessions()[i]; Session & sess=*day->getSessions()[i];
if (!first || first>sess.first()) first=sess.first(); if (!first || first>sess.first())
if (!last || last<sess.last()) last=sess.last(); first=sess.first();
if (!last || last<sess.last())
last=sess.last();
} }
// day->setFirst(first); // day->setFirst(first);
// day->setLast(last); // day->setLast(last);
@ -447,7 +459,8 @@ Profile *Create(QString name)
{ {
QString path=PREF.Get("{home}/Profiles/")+name; QString path=PREF.Get("{home}/Profiles/")+name;
QDir dir(path); QDir dir(path);
if (!dir.exists(path)) dir.mkpath(path); if (!dir.exists(path))
dir.mkpath(path);
//path+="/"+name; //path+="/"+name;
Profile *prof=new Profile(path); Profile *prof=new Profile(path);
prof->Open(); prof->Open();
@ -540,6 +553,10 @@ int Profile::countDays(MachineType mt, QDate start, QDate end)
return 0; return 0;
//end=LastDay(mt); //end=LastDay(mt);
QDate date=start; QDate date=start;
if (date.isNull())
return 0;
int days=0; int days=0;
do { do {
Day * day=GetGoodDay(date,mt); Day * day=GetGoodDay(date,mt);
@ -554,9 +571,13 @@ int Profile::countDays(MachineType mt, QDate start, QDate end)
EventDataType Profile::calcCount(ChannelID code, MachineType mt, QDate start, QDate end) EventDataType Profile::calcCount(ChannelID code, MachineType mt, QDate start, QDate end)
{ {
if (!start.isValid()) start=LastGoodDay(mt); if (!start.isValid())
if (!end.isValid()) end=LastGoodDay(mt); start=LastGoodDay(mt);
if (!end.isValid())
end=LastGoodDay(mt);
QDate date=start; QDate date=start;
if (date.isNull())
return 0;
double val=0; double val=0;
do { do {
@ -570,8 +591,10 @@ EventDataType Profile::calcCount(ChannelID code, MachineType mt, QDate start, QD
} }
double Profile::calcSum(ChannelID code, MachineType mt, QDate start, QDate end) double Profile::calcSum(ChannelID code, MachineType mt, QDate start, QDate end)
{ {
if (!start.isValid()) start=LastGoodDay(mt); if (!start.isValid())
if (!end.isValid()) end=LastGoodDay(mt); start=LastGoodDay(mt);
if (!end.isValid())
end=LastGoodDay(mt);
QDate date=start; QDate date=start;
double val=0; double val=0;
@ -591,6 +614,8 @@ EventDataType Profile::calcHours(MachineType mt, QDate start, QDate end)
if (!end.isValid()) if (!end.isValid())
end=LastGoodDay(mt); end=LastGoodDay(mt);
QDate date=start; QDate date=start;
if (date.isNull())
return 0;
double val=0; double val=0;
do { do {
@ -604,9 +629,13 @@ EventDataType Profile::calcHours(MachineType mt, QDate start, QDate end)
} }
EventDataType Profile::calcAvg(ChannelID code, MachineType mt, QDate start, QDate end) EventDataType Profile::calcAvg(ChannelID code, MachineType mt, QDate start, QDate end)
{ {
if (!start.isValid()) start=LastGoodDay(mt); if (!start.isValid())
if (!end.isValid()) end=LastGoodDay(mt); start=LastGoodDay(mt);
if (!end.isValid())
end=LastGoodDay(mt);
QDate date=start; QDate date=start;
if (date.isNull())
return 0;
double val=0; double val=0;
int cnt=0; int cnt=0;
@ -618,7 +647,8 @@ EventDataType Profile::calcAvg(ChannelID code, MachineType mt, QDate start, QDat
} }
date=date.addDays(1); date=date.addDays(1);
} while (date<=end); } while (date<=end);
if (!cnt) return 0; if (!cnt)
return 0;
return val/float(cnt); return val/float(cnt);
} }
EventDataType Profile::calcWavg(ChannelID code, MachineType mt, QDate start, QDate end) EventDataType Profile::calcWavg(ChannelID code, MachineType mt, QDate start, QDate end)
@ -628,6 +658,8 @@ EventDataType Profile::calcWavg(ChannelID code, MachineType mt, QDate start, QDa
if (!end.isValid()) if (!end.isValid())
end=LastGoodDay(mt); end=LastGoodDay(mt);
QDate date=start; QDate date=start;
if (date.isNull())
return 0;
double val=0,tmp,tmph,hours=0; double val=0,tmp,tmph,hours=0;
do { do {
@ -640,32 +672,42 @@ EventDataType Profile::calcWavg(ChannelID code, MachineType mt, QDate start, QDa
} }
date=date.addDays(1); date=date.addDays(1);
} while (date<=end); } while (date<=end);
if (!hours) return 0; if (!hours)
return 0;
val=val/hours; val=val/hours;
return val; return val;
} }
EventDataType Profile::calcMin(ChannelID code, MachineType mt, QDate start, QDate end) EventDataType Profile::calcMin(ChannelID code, MachineType mt, QDate start, QDate end)
{ {
if (!start.isValid()) start=LastGoodDay(mt); if (!start.isValid())
if (!end.isValid()) end=LastGoodDay(mt); start=LastGoodDay(mt);
if (!end.isValid())
end=LastGoodDay(mt);
QDate date=start; QDate date=start;
if (date.isNull())
return 0;
double min=99999999,tmp; double min=99999999,tmp;
do { do {
Day * day=GetGoodDay(date,mt); Day * day=GetGoodDay(date,mt);
if (day) { if (day) {
tmp=day->Min(code); tmp=day->Min(code);
if (min>tmp) min=tmp; if (min>tmp)
min=tmp;
} }
date=date.addDays(1); date=date.addDays(1);
} while (date<=end); } while (date<=end);
if (min>=99999999) min=0; if (min>=99999999)
min=0;
return min; return min;
} }
EventDataType Profile::calcMax(ChannelID code, MachineType mt, QDate start, QDate end) EventDataType Profile::calcMax(ChannelID code, MachineType mt, QDate start, QDate end)
{ {
if (!start.isValid()) start=LastGoodDay(mt); if (!start.isValid())
if (!end.isValid()) end=LastGoodDay(mt); start=LastGoodDay(mt);
if (!end.isValid())
end=LastGoodDay(mt);
QDate date=start; QDate date=start;
double max=-99999999,tmp; double max=-99999999,tmp;
@ -673,47 +715,61 @@ EventDataType Profile::calcMax(ChannelID code, MachineType mt, QDate start, QDat
Day * day=GetGoodDay(date,mt); Day * day=GetGoodDay(date,mt);
if (day) { if (day) {
tmp=day->Max(code); tmp=day->Max(code);
if (max<tmp) max=tmp; if (max<tmp)
max=tmp;
} }
date=date.addDays(1); date=date.addDays(1);
} while (date<=end); } while (date<=end);
if (max<=-99999999) max=0; if (max<=-99999999)
max=0;
return max; return max;
} }
EventDataType Profile::calcSettingsMin(ChannelID code, MachineType mt, QDate start, QDate end) EventDataType Profile::calcSettingsMin(ChannelID code, MachineType mt, QDate start, QDate end)
{ {
if (!start.isValid()) start=LastGoodDay(mt); if (!start.isValid())
if (!end.isValid()) end=LastGoodDay(mt); start=LastGoodDay(mt);
if (!end.isValid())
end=LastGoodDay(mt);
QDate date=start; QDate date=start;
if (date.isNull())
return 0;
double min=99999999,tmp; double min=99999999,tmp;
do { do {
Day * day=GetGoodDay(date,mt); Day * day=GetGoodDay(date,mt);
if (day) { if (day) {
tmp=day->settings_min(code); tmp=day->settings_min(code);
if (min>tmp) min=tmp; if (min>tmp)
min=tmp;
} }
date=date.addDays(1); date=date.addDays(1);
} while (date<=end); } while (date<=end);
if (min>=99999999) min=0; if (min>=99999999)
min=0;
return min; return min;
} }
EventDataType Profile::calcSettingsMax(ChannelID code, MachineType mt, QDate start, QDate end) EventDataType Profile::calcSettingsMax(ChannelID code, MachineType mt, QDate start, QDate end)
{ {
if (!start.isValid()) start=LastGoodDay(mt); if (!start.isValid())
if (!end.isValid()) end=LastGoodDay(mt); start=LastGoodDay(mt);
if (!end.isValid())
end=LastGoodDay(mt);
QDate date=start; QDate date=start;
if (date.isNull())
return 0;
double max=-99999999,tmp; double max=-99999999,tmp;
do { do {
Day * day=GetGoodDay(date,mt); Day * day=GetGoodDay(date,mt);
if (day) { if (day) {
tmp=day->settings_max(code); tmp=day->settings_max(code);
if (max<tmp) max=tmp; if (max<tmp)
max=tmp;
} }
date=date.addDays(1); date=date.addDays(1);
} while (date<=end); } while (date<=end);
if (max<=-99999999) max=0; if (max<=-99999999)
max=0;
return max; return max;
} }
@ -726,10 +782,14 @@ struct CountSummary {
EventDataType Profile::calcPercentile(ChannelID code, EventDataType percent, MachineType mt, QDate start, QDate end) EventDataType Profile::calcPercentile(ChannelID code, EventDataType percent, MachineType mt, QDate start, QDate end)
{ {
if (!start.isValid()) start=LastGoodDay(mt); if (!start.isValid())
if (!end.isValid()) end=LastGoodDay(mt); start=LastGoodDay(mt);
if (!end.isValid())
end=LastGoodDay(mt);
QDate date=start; QDate date=start;
if (date.isNull())
return 0;
QMap<EventDataType, qint64> wmap; QMap<EventDataType, qint64> wmap;
@ -859,7 +919,8 @@ QDate Profile::FirstDay(MachineType mt)
QDate d=m_first; QDate d=m_first;
do { do {
if (GetDay(d,mt)!=NULL) return d; if (GetDay(d,mt)!=NULL)
return d;
d=d.addDays(1); d=d.addDays(1);
} while (d<=m_last); } while (d<=m_last);
return m_last; return m_last;
@ -870,7 +931,8 @@ QDate Profile::LastDay(MachineType mt)
return m_last; return m_last;
QDate d=m_last; QDate d=m_last;
do { do {
if (GetDay(d,mt)!=NULL) return d; if (GetDay(d,mt)!=NULL)
return d;
d=d.addDays(-1); d=d.addDays(-1);
} while (d>=m_first); } while (d>=m_first);
return m_first; return m_first;
@ -886,7 +948,8 @@ QDate Profile::FirstGoodDay(MachineType mt)
if (!d.isValid() || !l.isValid()) if (!d.isValid() || !l.isValid())
return QDate(); return QDate();
do { do {
if (GetGoodDay(d,mt)!=NULL) return d; if (GetGoodDay(d,mt)!=NULL)
return d;
d=d.addDays(1); d=d.addDays(1);
} while (d<=l); } while (d<=l);
return l; //m_last; return l; //m_last;
@ -897,9 +960,11 @@ QDate Profile::LastGoodDay(MachineType mt)
return FirstDay(); return FirstDay();
QDate d=LastDay(mt); QDate d=LastDay(mt);
QDate f=FirstDay(mt); QDate f=FirstDay(mt);
if (!(d.isValid() && f.isValid())) return QDate(); if (!(d.isValid() && f.isValid()))
return QDate();
do { do {
if (GetGoodDay(d,mt)!=NULL) return d; if (GetGoodDay(d,mt)!=NULL)
return d;
d=d.addDays(-1); d=d.addDays(-1);
} while (d>=f); } while (d>=f);
return f; //m_first; return f; //m_first;
@ -908,7 +973,8 @@ bool Profile::hasChannel(ChannelID code)
{ {
QDate d=LastDay(); QDate d=LastDay();
QDate f=FirstDay(); QDate f=FirstDay();
if (!(d.isValid() && f.isValid())) return false; if (!(d.isValid() && f.isValid()))
return false;
QMap<QDate,QList<Day *> >::iterator dit; QMap<QDate,QList<Day *> >::iterator dit;
bool found=false; bool found=false;
do { do {
@ -922,7 +988,8 @@ bool Profile::hasChannel(ChannelID code)
} }
} }
} }
if (found) break; if (found)
break;
d=d.addDays(-1); d=d.addDays(-1);
} while (d>=f); } while (d>=f);
return found; return found;