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

Fix Resvent loader

Browse Source
This commit is contained in:
LoudSnorer 2024-02-20 06:08:52 -05:00
parent 7d43ea739d
commit fb51563442
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
oscar/SleepLib/loader_plugins/resvent_loader.cpp
View File

@ -202,6 +202,7 @@ constexpr double kTenthGain = 0.1;
constexpr double kNoGain = 1.0; constexpr double kNoGain = 1.0;
constexpr double kDefaultGain = kHundredthGain ; // For Flow (rate) and (mask)Pressure - High Resolutions data. constexpr double kDefaultGain = kHundredthGain ; // For Flow (rate) and (mask)Pressure - High Resolutions data.
const QDate baseDate(2010 , 1, 1);
double applyGain(QString value, double gain) { double applyGain(QString value, double gain) {
return (gain*(double)value.toUInt()); return (gain*(double)value.toUInt());
@ -743,17 +744,23 @@ int ResventLoader::LoadSession(const QString& dirpath, const QDate& session_date
const auto session_folder_path = GetSessionFolder(dirpath, session_date); const auto session_folder_path = GetSessionFolder(dirpath, session_date);
const auto different_usage = GetDifferentUsage(session_folder_path); const auto different_usage = GetDifferentUsage(session_folder_path);
//return std::accumulate(different_usage.cbegin(), different_usage.cend(), 0, [&](int base, const UsageData& usage)
// std::accumulate(different_usage.cbegin(), different_usage.cend(), 0, [&](int base, const UsageData& usage)
int base = 0; int base = 0;
// Session ID must be unique.
// SessioId is defined as an unsigned int. Oscar however has a problem .
// if the most signifigant bit is set then Oscat misbehaves.
// typically with signed vs unsigned int issues.
// so sessionID has an implicit limit of a max postive value of of signed int.
// sessionID be must a unique positive ingteger ei. <= (2**31 -1) (2,147,483,647)
//
SessionID sessionId = (baseDate.daysTo(session_date)) * 64; // leave space for N sessions.
for (auto usage : different_usage) for (auto usage : different_usage)
{ {
if (machine->SessionExists(usage.start_time.toMSecsSinceEpoch() + kDateTimeOffset - timezoneOffset())) { if (machine->SessionExists(sessionId)) {
// session alreadt exists // session alreadt exists
//return base; //return base;
continue; continue;
} }
Session* session = new Session(machine, usage.start_time.toMSecsSinceEpoch() + kDateTimeOffset - timezoneOffset()); Session* session = new Session(machine, sessionId++);
session->SetChanged(true); session->SetChanged(true);
session->really_set_first(usage.start_time.toMSecsSinceEpoch() + kDateTimeOffset - timezoneOffset()); session->really_set_first(usage.start_time.toMSecsSinceEpoch() + kDateTimeOffset - timezoneOffset());
session->really_set_last(usage.end_time.toMSecsSinceEpoch() + kDateTimeOffset - timezoneOffset()); session->really_set_last(usage.end_time.toMSecsSinceEpoch() + kDateTimeOffset - timezoneOffset());