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

Merge branch 'master' into add-zip-archiving

Browse Source
This commit is contained in:
sawinglogz 2020-01-22 17:35:26 -05:00
commit 65a48a6384
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -891,7 +891,7 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin
QDateTime datetime; QDateTime datetime;
qint64 ignoreBefore = p_profile->session->ignoreOlderSessionsDate().toSecsSinceEpoch(); qint64 ignoreBefore = p_profile->session->ignoreOlderSessionsDate().toMSecsSinceEpoch()/1000;
bool ignoreOldSessions = p_profile->session->ignoreOlderSessions(); bool ignoreOldSessions = p_profile->session->ignoreOlderSessions();
QSet<SessionID> skipped; QSet<SessionID> skipped;
@ -1015,8 +1015,8 @@ void PRS1Loader::ScanFiles(const QStringList & paths, int sessionid_base, Machin
} }
if (ignoreOldSessions && chunk->timestamp < ignoreBefore) { if (ignoreOldSessions && chunk->timestamp < ignoreBefore) {
qDebug().noquote() << relativePath(path) << "skipping session" << chunk_sid << ":" qDebug().noquote() << relativePath(path) << "skipping session" << chunk_sid << ":"
<< QDateTime::fromSecsSinceEpoch(chunk->timestamp).toString() << "older than" << QDateTime::fromMSecsSinceEpoch(chunk->timestamp*1000).toString() << "older than"
<< QDateTime::fromSecsSinceEpoch(ignoreBefore).toString(); << QDateTime::fromMSecsSinceEpoch(ignoreBefore*1000).toString();
skipped += chunk_sid; skipped += chunk_sid;
delete chunk; delete chunk;
continue; continue;
@ -7683,14 +7683,14 @@ QList<PRS1DataChunk *> PRS1Import::CoalesceWaveformChunks(QList<PRS1DataChunk *>
// This won't be perfect, since any coalesced chunks starting after midnight of the threshhold // This won't be perfect, since any coalesced chunks starting after midnight of the threshhold
// date will also be imported, but those should be relatively few, and tolerable imprecision. // date will also be imported, but those should be relatively few, and tolerable imprecision.
QList<PRS1DataChunk *> coalescedAndFiltered; QList<PRS1DataChunk *> coalescedAndFiltered;
qint64 ignoreBefore = p_profile->session->ignoreOlderSessionsDate().toSecsSinceEpoch(); qint64 ignoreBefore = p_profile->session->ignoreOlderSessionsDate().toMSecsSinceEpoch()/1000;
bool ignoreOldSessions = p_profile->session->ignoreOlderSessions(); bool ignoreOldSessions = p_profile->session->ignoreOlderSessions();
for (auto & chunk : coalesced) { for (auto & chunk : coalesced) {
if (ignoreOldSessions && chunk->timestamp < ignoreBefore) { if (ignoreOldSessions && chunk->timestamp < ignoreBefore) {
qWarning().noquote() << relativePath(chunk->m_path) << "skipping session" << chunk->sessionid << ":" qWarning().noquote() << relativePath(chunk->m_path) << "skipping session" << chunk->sessionid << ":"
<< QDateTime::fromSecsSinceEpoch(chunk->timestamp).toString() << "older than" << QDateTime::fromMSecsSinceEpoch(chunk->timestamp*1000).toString() << "older than"
<< QDateTime::fromSecsSinceEpoch(ignoreBefore).toString(); << QDateTime::fromMSecsSinceEpoch(ignoreBefore*1000).toString();
continue; continue;
} }
coalescedAndFiltered.append(chunk); coalescedAndFiltered.append(chunk);

4
oscar/oscar.pro
View File

@ -487,6 +487,10 @@ memdebug {
!win32 { # add memory checking on Linux and macOS debug builds !win32 { # add memory checking on Linux and macOS debug builds
QMAKE_CFLAGS += -g -Werror -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope QMAKE_CFLAGS += -g -Werror -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope
QMAKE_CXXFLAGS += -g -Werror -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope QMAKE_CXXFLAGS += -g -Werror -fsanitize=address -fno-omit-frame-pointer -fno-common -fsanitize-address-use-after-scope
lessThan(QT_MAJOR_VERSION,5)|lessThan(QT_MINOR_VERSION,9) {
QMAKE_CFLAGS -= -fsanitize-address-use-after-scope
QMAKE_CXX_FLAGS -= -fsanitize-address-use-after-scope
}
QMAKE_LFLAGS += -fsanitize=address QMAKE_LFLAGS += -fsanitize=address
} }
} }