chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-17 19:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fuzzy attempt to resolve rx lists duplicates

Browse Source
This commit is contained in:
Mark Watkins 2016-03-01 21:13:52 +10:00
parent 70a8e12231
commit b4a88ee259
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sleepyhead/statistics.cpp
View File

@ -147,29 +147,38 @@ void Statistics::updateRXChanges()
quint64 tmp; quint64 tmp;
// Scan through each profile day in ascending date order
for (it = p_profile->daylist.begin(); it != it_end; ++it) { for (it = p_profile->daylist.begin(); it != it_end; ++it) {
const QDate & date = it.key(); const QDate & date = it.key();
Day * day = it.value(); Day * day = it.value();
Machine * mach = day->machine(MT_CPAP); Machine * mach = day->machine(MT_CPAP);
if (mach == nullptr) continue; if (mach == nullptr)
continue;
bool fnd = false; bool fnd = false;
// Scan through pre-existing rxitems list
ri_end = rxitems.end(); ri_end = rxitems.end();
for (ri = rxitems.begin(); ri != ri_end; ++ri) { for (ri = rxitems.begin(); ri != ri_end; ++ri) {
RXItem & rx = ri.value(); RXItem & rx = ri.value();
// Is it date between this rxitems entry date range?
if ((date >= rx.start) && (date <= rx.end)) { if ((date >= rx.start) && (date <= rx.end)) {
// Fits in date range
if (rx.dates.contains(date)) { if (rx.dates.contains(date)) {
// Already there, abort.
fnd = true; fnd = true;
break; break;
} }
// First up, check if fits in date range, but isn't loaded for some reason // First up, check if fits in date range, but isn't loaded for some reason
// Need summaries for this // Need summaries for this, so load them if not present.
day->OpenSummary(); day->OpenSummary();
QList<ChannelID> flags = day->getSortedMachineChannels(MT_CPAP, schema::FLAG | schema::MINOR_FLAG | schema::SPAN); QList<ChannelID> flags = day->getSortedMachineChannels(MT_CPAP, schema::FLAG | schema::MINOR_FLAG | schema::SPAN);
QString relief = day->getPressureRelief(); QString relief = day->getPressureRelief();
@ -302,7 +311,9 @@ void Statistics::updateRXChanges()
for (ri = rxitems.begin(); ri != ri_end; ++ri) { for (ri = rxitems.begin(); ri != ri_end; ++ri) {
RXItem & rx = ri.value(); RXItem & rx = ri.value();
if (rx.end.daysTo(date) == 1) {
// This miffs me why I did this... Commenting it out will probably backfire on me.
//if (rx.end.daysTo(date) == 1) {
if ((rx.relief == relief) && (rx.mode == mode) && (rx.pressure == pressure) && (rx.machine == day->machine(MT_CPAP)) ) { if ((rx.relief == relief) && (rx.mode == mode) && (rx.pressure == pressure) && (rx.machine == day->machine(MT_CPAP)) ) {
@ -324,7 +335,7 @@ void Statistics::updateRXChanges()
fnd = true; fnd = true;
break; break;
} }
} // }
} }
if (!fnd) { if (!fnd) {