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

Daily page enable/disable oximeter session now works correctly.

Browse Source 
Prevoiusly, disabling an oximeter session could cause bookmarks to be
disabled and/or OSCAR to crash. OSCAR was looking up the session for
the oximeter session and not noticing it got a Journal session instead.
This commit is contained in:
Guy Scharf 2020-11-04 21:12:05 -07:00
parent fac7803880
commit 5fb837ccb9
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oscar/SleepLib/day.cpp
View File

@ -98,6 +98,16 @@ Session *Day::find(SessionID sessid)
return nullptr; return nullptr;
} }
Session *Day::find(SessionID sessid, MachineType mt)
{
for (auto & sess : sessions) {
if ((sess->session() == sessid) && (sess->s_machtype == mt)) {
return sess;
}
}
return nullptr;
}
void Day::addSession(Session *s) void Day::addSession(Session *s)
{ {
if (s == nullptr) { if (s == nullptr) {

2
oscar/SleepLib/day.h
View File

@ -202,6 +202,8 @@ class Day
Session *find(SessionID sessid); Session *find(SessionID sessid);
Session *find(SessionID sessid, MachineType mt);
//! \brief Returns the number of Sessions in this day record //! \brief Returns the number of Sessions in this day record
int size() { return sessions.size(); } int size() { return sessions.size(); }

4
oscar/daily.cpp
View File

@ -560,7 +560,7 @@ void Daily::Link_clicked(const QUrl &url)
if (code=="togglecpapsession") { // Enable/Disable CPAP session if (code=="togglecpapsession") { // Enable/Disable CPAP session
day=p_profile->GetDay(previous_date,MT_CPAP); day=p_profile->GetDay(previous_date,MT_CPAP);
if (!day) return; if (!day) return;
Session *sess=day->find(sid); Session *sess=day->find(sid, MT_CPAP);
if (!sess) if (!sess)
return; return;
// int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical); // int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical);
@ -571,7 +571,7 @@ void Daily::Link_clicked(const QUrl &url)
// webView->page()->mainFrame()->setScrollBarValue(Qt::Vertical, webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-i); // webView->page()->mainFrame()->setScrollBarValue(Qt::Vertical, webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-i);
} else if (code=="toggleoxisession") { // Enable/Disable Oximetry session } else if (code=="toggleoxisession") { // Enable/Disable Oximetry session
day=p_profile->GetDay(previous_date,MT_OXIMETER); day=p_profile->GetDay(previous_date,MT_OXIMETER);
Session *sess=day->find(sid); Session *sess=day->find(sid, MT_OXIMETER);
if (!sess) if (!sess)
return; return;
// int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical); // int i=webView->page()->mainFrame()->scrollBarMaximum(Qt::Vertical)-webView->page()->mainFrame()->scrollBarValue(Qt::Vertical);