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 m_cnt LoadSummary upgrade error

Browse Source
This commit is contained in:
Mark Watkins 2014-06-26 04:54:17 +10:00
parent 0d01550f95
commit 870f456b35
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sleepyhead/SleepLib/session.cpp
View File

@ -282,20 +282,11 @@ bool Session::LoadSummary(QString filename)
settings[code] = i.value();
}
if (version < 13) {
QHash<QString, int> zcnt;
in >> zcnt;
for (QHash<QString, int>::iterator i = zcnt.begin(); i != zcnt.end(); i++) {
code = schema::channel[i.key()].id();
m_cnt[code] = i.value();
}
} else {
QHash<QString, EventDataType> zcnt;
in >> zcnt;
for (QHash<QString, EventDataType>::iterator i = zcnt.begin(); i != zcnt.end(); i++) {
code = schema::channel[i.key()].id();
m_cnt[code] = i.value();
}
QHash<QString, int> zcnt;
in >> zcnt;
for (QHash<QString, int>::iterator i = zcnt.begin(); i != zcnt.end(); i++) {
code = schema::channel[i.key()].id();
m_cnt[code] = i.value();
}
QHash<QString, double> zsum;
@ -375,7 +366,18 @@ bool Session::LoadSummary(QString filename)
//SetChanged(true);
} else {
in >> settings;
in >> m_cnt;
if (version < 13) {
QHash<ChannelID, int> cnt2;
in >> cnt2;
QHash<ChannelID, int>::iterator it;
for (it = cnt2.begin(); it != cnt2.end(); ++it) {
m_cnt[it.key()] = it.value();
}
} else {
in >> m_cnt;
}
in >> m_sum;
in >> m_avg;
in >> m_wavg;