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 Day::hours() calculation glitch with empty sessions

Browse Source
This commit is contained in:
Mark Watkins 2014-05-07 10:10:13 +10:00
parent 8aa0c2b8b4
commit 3f86358507
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sleepyhead/SleepLib/day.cpp
View File

@ -383,20 +383,27 @@ qint64 Day::total_time()
// Remember sessions may overlap.. // Remember sessions may overlap..
qint64 first, last;
QList<Session *>::iterator end = sessions.end(); QList<Session *>::iterator end = sessions.end();
for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) { for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
Session &sess = *(*it); Session &sess = *(*it);
if (sess.enabled()) { if (sess.enabled()) {
range.insert(sess.first(), 0); first = sess.first();
range.insert(sess.last(), 1); last = sess.last();
d_totaltime += sess.length();
// This algorithm relies on non zero length, and correctly ordered sessions
if (last > first) {
range.insert(first, 0);
range.insert(last, 1);
d_totaltime += sess.length();
}
} }
} }
qint64 ti = 0;
bool b; bool b;
int nest = 0; int nest = 0;
qint64 ti = 0;
qint64 total = 0; qint64 total = 0;
// This is my implementation of a typical "brace counting" algorithm mentioned here: // This is my implementation of a typical "brace counting" algorithm mentioned here:

13
sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -1582,13 +1582,14 @@ int ResmedLoader::Open(QString &path, Profile *profile)
// Add the session to the machine & profile objects // Add the session to the machine & profile objects
//if (!dodgy) //if (!dodgy)
if (sess->length() > 0) { // FIXME: Deliberately broken, uncomment
// if (sess->length() > 0) {
m->AddSession(sess, profile); m->AddSession(sess, profile);
} else { // } else {
// Hmm.. this means a ton of these could slow down import. // // Hmm.. this means a ton of these could slow down import.
// I could instead set these to disabled by default, or implement a dodgy session marker // // I could instead set these to disabled by default, or implement a dodgy session marker
delete sess; // delete sess;
} // }
} }
} }

3
sleepyhead/SleepLib/session.h
View File

@ -61,6 +61,9 @@ class Session
//! \brief Put the events away until needed again, freeing memory //! \brief Put the events away until needed again, freeing memory
void TrashEvents(); void TrashEvents();
//! \brief Returns true if session contains an empty duration
inline bool isEmpty() { return (s_first == s_last); }
//! \brief Search for Event code happening within dist milliseconds of supplied time (ms since epoch) //! \brief Search for Event code happening within dist milliseconds of supplied time (ms since epoch)
bool SearchEvent(ChannelID code, qint64 time, qint64 dist = 15000); bool SearchEvent(ChannelID code, qint64 time, qint64 dist = 15000);

2
sleepyhead/sleepyhead.pro
View File

@ -56,7 +56,7 @@ unix:!macx {
} }
macx { macx {
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 # QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6.8
LIBS += -lz LIBS += -lz
ICON = icons/iconfile.icns ICON = icons/iconfile.icns