diff --git a/sleepyhead/Graphs/gGraph.cpp b/sleepyhead/Graphs/gGraph.cpp index 6e9c0e92..fbd839e6 100644 --- a/sleepyhead/Graphs/gGraph.cpp +++ b/sleepyhead/Graphs/gGraph.cpp @@ -679,6 +679,7 @@ qint64 gGraph::currentTime() const void gGraph::mouseMoveEvent(QMouseEvent *event) { // qDebug() << m_title << "Move" << event->pos() << m_graphview->pointClicked(); + if (m_rect.width() == 0) return; int y = event->y(); int x = event->x(); @@ -698,6 +699,7 @@ void gGraph::mouseMoveEvent(QMouseEvent *event) int w = m_rect.width() - left - right; + double xx = max_x - min_x; double xmult = xx / w; @@ -713,6 +715,7 @@ void gGraph::mouseMoveEvent(QMouseEvent *event) a *= xmult; a += m_blockzoom ? rmin_x : min_x; + m_currentTime = a; m_graphview->setCurrentTime(a); } @@ -850,6 +853,7 @@ void gGraph::mousePressEvent(QMouseEvent *event) void gGraph::mouseReleaseEvent(QMouseEvent *event) { + int y = event->pos().y(); int x = event->pos().x(); diff --git a/sleepyhead/Graphs/gGraph.h b/sleepyhead/Graphs/gGraph.h index 99b1f46f..2c78e716 100644 --- a/sleepyhead/Graphs/gGraph.h +++ b/sleepyhead/Graphs/gGraph.h @@ -349,6 +349,10 @@ class gGraph : public QObject QRect m_rect; qint64 m_selectedDuration; + + qint64 m_currentTime; + qint64 m_clickTime; + QString m_selDurString; protected slots: diff --git a/sleepyhead/Graphs/gGraphView.cpp b/sleepyhead/Graphs/gGraphView.cpp index 592ba341..3e5f199d 100644 --- a/sleepyhead/Graphs/gGraphView.cpp +++ b/sleepyhead/Graphs/gGraphView.cpp @@ -1292,10 +1292,10 @@ void gGraphView::mouseMoveEvent(QMouseEvent *event) m_horiz_travel += qAbs(x - m_lastxpos) + qAbs(y - m_lastypos); m_lastxpos = x; m_lastypos = y; - // QPoint p(x,y); - // QMouseEvent e(event->type(),p,event->button(),event->buttons(),event->modifiers()); - m_graphs[i]->mouseMoveEvent(event); - + gGraph *g = m_graphs[i]; + if (g) { + g->mouseMoveEvent(event); + } } @@ -1371,13 +1371,13 @@ void gGraphView::mousePressEvent(QMouseEvent *event) // first handle pinned graphs. // Calculate total height of all pinned graphs for (int i = 0; i < m_graphs.size(); i++) { - if (m_graphs[i]->isEmpty() - || !m_graphs[i]->visible() - || !m_graphs[i]->isPinned()) { + gGraph *g = m_graphs[i]; + + if (!g || g->isEmpty() || !g->visible() || !g->isPinned()) { continue; } - h = m_graphs[i]->height() * m_scaleY; + h = g->height() * m_scaleY; pinned_height += h + graphSpacer; if (py > height()) { @@ -1423,8 +1423,8 @@ void gGraphView::mousePressEvent(QMouseEvent *event) m_metaselect = event->modifiers() && Qt::AltModifier; m_horiz_travel = 0; m_graph_index = i; - m_selected_graph = m_graphs[i]; - m_graphs[i]->mousePressEvent(event); + m_selected_graph = g; + g->mousePressEvent(event); } done = true; @@ -1443,10 +1443,12 @@ void gGraphView::mousePressEvent(QMouseEvent *event) if (!done) for (int i = 0; i < m_graphs.size(); i++) { + gGraph * g = m_graphs[i]; + if (!g) continue; - if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible() || m_graphs[i]->isPinned()) { continue; } + if (!g || g->isEmpty() || !g->visible() || g->isPinned()) { continue; } - h = m_graphs[i]->height() * m_scaleY; + h = g->height() * m_scaleY; if (py > height()) { break; @@ -1486,8 +1488,8 @@ void gGraphView::mousePressEvent(QMouseEvent *event) m_horiz_travel = 0; m_graph_index = i; - m_selected_graph = m_graphs[i]; - m_graphs[i]->mousePressEvent(event); + m_selected_graph = g; + g->mousePressEvent(event); } } @@ -1508,11 +1510,13 @@ void gGraphView::mouseReleaseEvent(QMouseEvent *event) // Handle pinned graphs first for (int i = 0; i < m_graphs.size(); i++) { - if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible() || !m_graphs[i]->isPinned()) { + gGraph *g = m_graphs[i]; + + if (!g || g->isEmpty() || !g->visible() || !g->isPinned()) { continue; } - h = m_graphs[i]->height() * m_scaleY; + h = g->height() * m_scaleY; pinned_height += h + graphSpacer; if (py > height()) { @@ -1525,7 +1529,7 @@ void gGraphView::mouseReleaseEvent(QMouseEvent *event) } else if ((y >= py + 1) && (y <= py + h)) { // if (!m_sizer_dragging && !m_graph_dragging) { - // m_graphs[i]->mouseReleaseEvent(event); + // g->mouseReleaseEvent(event); // } if (x >= titleWidth + 10) { @@ -1546,12 +1550,13 @@ void gGraphView::mouseReleaseEvent(QMouseEvent *event) if (done) for (int i = 0; i < m_graphs.size(); i++) { + gGraph *g = m_graphs[i]; - if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible() || m_graphs[i]->isPinned()) { + if (!g || g->isEmpty() || !g->visible() || g->isPinned()) { continue; } - h = m_graphs[i]->height() * m_scaleY; + h = g->height() * m_scaleY; if (py > height()) { break; // we are done.. can't draw anymore @@ -1562,7 +1567,7 @@ void gGraphView::mouseReleaseEvent(QMouseEvent *event) } else if ((y >= py + 1) && (y <= py + h)) { // if (!m_sizer_dragging && !m_graph_dragging) { - // m_graphs[i]->mouseReleaseEvent(event); + // g->mouseReleaseEvent(event); // } if (x >= titleWidth + 10) { @@ -1602,7 +1607,9 @@ void gGraphView::mouseReleaseEvent(QMouseEvent *event) if (m_metaselect) { m_point_released = event->pos(); } else { - m_graphs[m_graph_index]->mouseReleaseEvent(event); + if (m_graphs[m_graph_index]) { + m_graphs[m_graph_index]->mouseReleaseEvent(event); + } } } } @@ -1651,11 +1658,12 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent *event) // Handle pinned graphs first for (int i = 0; i < m_graphs.size(); i++) { - if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible() || !m_graphs[i]->isPinned()) { + gGraph *g = m_graphs[i]; + if (!g || g->isEmpty() || !g->visible() || !g->isPinned()) { continue; } - h = m_graphs[i]->height() * m_scaleY; + h = g->height() * m_scaleY; pinned_height += h + graphSpacer; if (py > height()) { @@ -1667,13 +1675,13 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent *event) if (x < titleWidth) { // What to do when double clicked on the graph title ?? - m_graphs[i]->mouseDoubleClickEvent(event); + g->mouseDoubleClickEvent(event); // pin the graph?? - m_graphs[i]->setPinned(false); + g->setPinned(false); redraw(); } else { // send event to graph.. - m_graphs[i]->mouseDoubleClickEvent(event); + g->mouseDoubleClickEvent(event); } done = true; @@ -1693,12 +1701,12 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent *event) if (!done) // then handle unpinned graphs for (int i = 0; i < m_graphs.size(); i++) { - - if (m_graphs[i]->isEmpty() || !m_graphs[i]->visible() || m_graphs[i]->isPinned()) { + gGraph *g = m_graphs[i]; + if (!g || g->isEmpty() || !g->visible() || g->isPinned()) { continue; } - h = m_graphs[i]->height() * m_scaleY; + h = g->height() * m_scaleY; if (py > height()) { break; @@ -1708,13 +1716,13 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent *event) if ((y >= py) && (y <= py + h)) { if (x < titleWidth) { // What to do when double clicked on the graph title ?? - m_graphs[i]->mouseDoubleClickEvent(event); + g->mouseDoubleClickEvent(event); - m_graphs[i]->setPinned(true); + g->setPinned(true); redraw(); } else { // send event to graph.. - m_graphs[i]->mouseDoubleClickEvent(event); + g->mouseDoubleClickEvent(event); } } else if ((y >= py + h) && (y <= py + h + graphSpacer + 1)) { // What to do when double clicked on the resize handle? @@ -1726,6 +1734,7 @@ void gGraphView::mouseDoubleClickEvent(QMouseEvent *event) py += graphSpacer; // do we want the extra spacer down the bottom? } } + void gGraphView::wheelEvent(QWheelEvent *event) { // Hmm.. I could optionalize this to change mousewheel behaviour without affecting the scrollbar now.. @@ -1739,10 +1748,10 @@ void gGraphView::wheelEvent(QWheelEvent *event) float h; for (int i = 0; i < m_graphs.size(); i++) { + gGraph *g = m_graphs[i]; + if (!g || g->isEmpty() || !g->visible()) { continue; } - if (m_graphs[i]->isEmpty() || (!m_graphs[i]->visible())) { continue; } - - h = m_graphs[i]->height() * m_scaleY; + h = g->height() * m_scaleY; if (py > height()) { break; @@ -1755,7 +1764,7 @@ void gGraphView::wheelEvent(QWheelEvent *event) } else { // send event to graph.. if (!m_button_down) { - m_graphs[i]->wheelEvent(event); + g->wheelEvent(event); } } } else if ((y >= py + h) && (y <= py + h + graphSpacer + 1)) { @@ -1792,6 +1801,7 @@ void gGraphView::wheelEvent(QWheelEvent *event) // Pick the first valid graph in the primary group for (int i = 0; i < m_graphs.size(); i++) { + if (!m_graphs[i]) continue; if (m_graphs[i]->group() == group) { if (!m_graphs[i]->isEmpty() && m_graphs[i]->visible()) { g = m_graphs[i]; @@ -1803,6 +1813,7 @@ void gGraphView::wheelEvent(QWheelEvent *event) if (!g) { // just pick any graph then for (int i = 0; i < m_graphs.size(); i++) { + if (!m_graphs[i]) continue; if (!m_graphs[i]->isEmpty()) { g = m_graphs[i]; group = g->group(); @@ -1847,9 +1858,12 @@ void gGraphView::keyPressEvent(QKeyEvent *event) // bool meta = m_metaselect; m_metaselect = event->modifiers() & Qt::AltModifier; -// if (meta != m_metaselect) { -// timedRedraw(30); -// } + if ((m_metaselect) && (event->key() >= Qt::Key_0) && (event->key() <= Qt::Key_9)) { + int bk = (int)event->key()-Qt::Key_0; + m_metaselect = false; + + timedRedraw(30); + } if (event->key() == Qt::Key_F3) { p_profile->appearance->setLineCursorMode(!p_profile->appearance->lineCursorMode()); @@ -1965,10 +1979,11 @@ void gGraphView::keyPressEvent(QKeyEvent *event) void gGraphView::setDay(Day *day) { + m_day = day; for (int i = 0; i < m_graphs.size(); i++) { - m_graphs[i]->setDay(day); + if (m_graphs[i]) m_graphs[i]->setDay(day); } ResetBounds(false); @@ -2010,7 +2025,7 @@ void gGraphView::resetLayout() int default_height = p_profile->appearance->graphHeight(); for (int i = 0; i < m_graphs.size(); i++) { - m_graphs[i]->setHeight(default_height); + if (m_graphs[i]) m_graphs[i]->setHeight(default_height); } updateScale(); @@ -2019,7 +2034,7 @@ void gGraphView::resetLayout() void gGraphView::deselect() { for (int i = 0; i < m_graphs.size(); i++) { - m_graphs[i]->deselect(); + if (m_graphs[i]) m_graphs[i]->deselect(); } } @@ -2041,6 +2056,8 @@ void gGraphView::SaveSettings(QString title) out << (qint16)size(); for (qint16 i = 0; i < size(); i++) { + if (!m_graphs[i]) continue; + out << m_graphs[i]->name(); out << m_graphs[i]->height(); out << m_graphs[i]->visible(); diff --git a/sleepyhead/Graphs/gLineChart.cpp b/sleepyhead/Graphs/gLineChart.cpp index 1995b5ae..ad8801e6 100644 --- a/sleepyhead/Graphs/gLineChart.cpp +++ b/sleepyhead/Graphs/gLineChart.cpp @@ -43,7 +43,7 @@ bool gLineChart::isEmpty() ChannelID code = m_codes[j]; for (int i = 0; i < m_day->size(); i++) { - Session *sess = m_day->getSessions()[i]; + Session *sess = m_day->sessions[i]; if (sess->channelExists(code)) { return false; @@ -76,7 +76,7 @@ void gLineChart::SetDay(Day *d) ChannelID code = m_codes[j]; for (int i = 0; i < d->size(); i++) { - Session *sess = d->getSessions()[i]; + Session *sess = d->sessions[i]; if (code == CPAP_MaskPressure) { if (sess->channelExists(CPAP_MaskPressureHi)) { diff --git a/sleepyhead/Graphs/gSummaryChart.cpp b/sleepyhead/Graphs/gSummaryChart.cpp index 02392abd..c961a827 100644 --- a/sleepyhead/Graphs/gSummaryChart.cpp +++ b/sleepyhead/Graphs/gSummaryChart.cpp @@ -83,7 +83,14 @@ void SummaryChart::SetDay(Day * nullday) addSlice(CPAP_IPAP, QColor("dark cyan"), ST_PERC, perc); //addSlice(CPAP_IPAP,QColor("light blue"),ST_PERC,0.95); addSlice(CPAP_IPAPHi, QColor("blue"), ST_SETMAX); - } else if (cpapmode >= MODE_BIPAP) { + } else if (cpapmode >= MODE_BILEVEL_AUTO_FIXED_PS) { + addSlice(CPAP_EPAP, QColor("green"), ST_SETMIN); + addSlice(CPAP_IPAP, QColor("light cyan"), mid, 0.5); + addSlice(CPAP_IPAP, QColor("light blue"), ST_PERC, perc); + addSlice(CPAP_PSMin, QColor("blue"), ST_SETMIN, perc); + addSlice(CPAP_PSMax, QColor("red"), ST_SETMAX, perc); + + } else if (cpapmode >= MODE_BILEVEL_FIXED) { addSlice(CPAP_EPAP, QColor("green"), ST_SETMIN); addSlice(CPAP_EPAP, QColor("light green"), ST_PERC, perc); addSlice(CPAP_IPAP, QColor("light cyan"), mid, 0.5); diff --git a/sleepyhead/Resources.qrc b/sleepyhead/Resources.qrc index 87ab1038..d615103b 100644 --- a/sleepyhead/Resources.qrc +++ b/sleepyhead/Resources.qrc @@ -43,5 +43,11 @@ icons/Bob Strikes Back.png icons/Jedimark.png COPYING + icons/sdcard-lock.png + icons/statistics.png + icons/prs1.png + icons/cms50f.png + icons/rms9.png + icons/intellipap.png diff --git a/sleepyhead/SleepLib/day.cpp b/sleepyhead/SleepLib/day.cpp index 82d7b2f8..31e074ad 100644 --- a/sleepyhead/SleepLib/day.cpp +++ b/sleepyhead/SleepLib/day.cpp @@ -937,9 +937,48 @@ qint64 Day::last() return date; } -void Day::removeSession(Session *sess) +bool Day::removeSession(Session *sess) { - if (sessions.removeAll(sess) < 1) { - // something went wrong - } + return sessions.removeAll(sess) > 0; +} + +QString Day::getCPAPMode() +{ + CPAPMode mode = (CPAPMode)(int)settings_max(CPAP_Mode); + if (mode == MODE_CPAP) { + return QObject::tr("Fixed"); + } else if (mode == MODE_APAP) { + return QObject::tr("Auto"); + } else if (mode == MODE_BILEVEL_FIXED ) { + return QObject::tr("Fixed Bi-Level"); + } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) { + return QObject::tr("Auto Bi-Level (Fixed PS)"); + } else if (mode == MODE_ASV) { + return QObject::tr("ASV Fixed EPAP"); + } else if (mode == MODE_ASV_VARIABLE_EPAP) { + return QObject::tr("ASV Variable EPAP"); + } + return STR_TR_Unknown; +} + +QString Day::getPressureSettings() +{ + CPAPMode mode = (CPAPMode)(int)settings_max(CPAP_Mode); + QString units = schema::channel[CPAP_Pressure].units(); + + if (mode == MODE_CPAP) { + return QObject::tr("%1 %2").arg(settings_min(CPAP_Pressure)).arg(units); + } else if (mode == MODE_APAP) { + return QObject::tr("%1-%2 %3").arg(settings_min(CPAP_PressureMin)).arg(settings_max(CPAP_PressureMax)).arg(units); + } else if (mode == MODE_BILEVEL_FIXED ) { + return QObject::tr("%1-%2 %3").arg(settings_min(CPAP_EPAP),0,'f',1).arg(settings_max(CPAP_IPAP),0,'f',1).arg(units); + } else if (mode == MODE_BILEVEL_AUTO_FIXED_PS) { + return QObject::tr("PS %3 over %1-%2 %4 ").arg(settings_min(CPAP_EPAPLo),0,'f',1).arg(settings_max(CPAP_IPAPHi),0,'f',1).arg(settings_max(CPAP_PS),0,'f',1).arg(units); + } else if (mode == MODE_ASV) { + return QObject::tr("PS %4-%5 over %1-%3 %6").arg(settings_min(CPAP_EPAP),0,'f',1).arg(settings_max(CPAP_IPAP),0,'f',1).arg(settings_min(CPAP_PSMin),0,'f',1).arg(settings_max(CPAP_PSMax),0,'f',1).arg(units); + } else if (mode == MODE_ASV_VARIABLE_EPAP) { + return QObject::tr("PS %4-%5 over EPAP %1-%2 Max %3 %6").arg(settings_min(CPAP_EPAPLo),0,'f',1).arg(settings_max(CPAP_EPAPHi),0,'f',1).arg(settings_max(CPAP_IPAPHi),0,'f',1).arg(settings_min(CPAP_PSMin),0,'f',1).arg(settings_max(CPAP_PSMax),0,'f',1).arg(units); + } + + return STR_TR_Unknown; } diff --git a/sleepyhead/SleepLib/day.h b/sleepyhead/SleepLib/day.h index b6a159d9..9cf302dd 100644 --- a/sleepyhead/SleepLib/day.h +++ b/sleepyhead/SleepLib/day.h @@ -160,9 +160,6 @@ class Day //! \brief Closes all Events files for this Days Sessions void CloseEvents(); - //! \brief Returns this days sessions list - QList &getSessions() { return sessions; } - //! \brief Returns true if this Day contains loaded Event Data for this channel. bool channelExists(ChannelID id); @@ -175,11 +172,15 @@ class Day //! \brief Returns true if this day contains the supplied settings Channel id bool settingExists(ChannelID id); - void removeSession(Session *sess); + bool removeSession(Session *sess); + + + QString getCPAPMode(); + QString getPressureSettings(); + QList sessions; protected: //! \brief A Vector containing all sessions for this day - QList sessions; QHash > perc_cache; //qint64 d_first,d_last; private: diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp index 9b965d7b..ed2ad56e 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp @@ -1364,7 +1364,7 @@ bool PRS1SessionData::ParseEvents() if (res) { if (session->count(CPAP_IPAP) > 0) { if (session->settings[CPAP_Mode].toInt() != (int)MODE_ASV) { - session->settings[CPAP_Mode] = MODE_BIPAP; + session->settings[CPAP_Mode] = MODE_BILEVEL_FIXED; } if (session->settings[CPAP_PresReliefType].toInt() != PR_NONE) { diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp index 3195ccab..943e07f6 100644 --- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp @@ -251,14 +251,18 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles) if ((sig = str.lookupSignal(CPAP_EPAPLo))) { R.min_epap = EventDataType(sig->data[rec]) * sig->gain + sig->offset; } + bool haveipap = false; if ((sig = str.lookupSignal(CPAP_IPAP))) { R.ipap = EventDataType(sig->data[rec]) * sig->gain + sig->offset; + haveipap = true; } if ((sig = str.lookupSignal(CPAP_IPAPHi))) { R.max_ipap = EventDataType(sig->data[rec]) * sig->gain + sig->offset; + haveipap = true; } if ((sig = str.lookupSignal(CPAP_IPAPLo))) { R.min_ipap = EventDataType(sig->data[rec]) * sig->gain + sig->offset; + haveipap = true; } if ((sig = str.lookupSignal(CPAP_PS))) { R.ps = EventDataType(sig->data[rec]) * sig->gain + sig->offset; @@ -275,14 +279,34 @@ void ResmedLoader::ParseSTR(Machine *mach, QStringList strfiles) if ((sig = str.lookupSignal(RMS9_EPRLevel))) { R.epr_level = EventDataType(sig->data[rec]) * sig->gain + sig->offset; } + if ((sig = str.lookupSignal(CPAP_Mode))) { int mod = EventDataType(sig->data[rec]) * sig->gain + sig->offset; CPAPMode mode; - if (mod >= 7) { // mod 7 == vpap adapt - mode = MODE_ASV; // mod 6 == vpap auto (Min EPAP, Max IPAP, PS) +// if (R.epap > 0) { +// if (R.max_epap < 0) R.max_epap = R.epap; +// if (R.min_epap < 0) R.min_epap = R.epap; +// } +// if (R.ipap > 0) { +// if (R.max_ipap < 0) R.max_ipap = R.ipap; +// if (R.min_ipap < 0) R.min_ipap = R.ipap; +// } + + if (mod >= 8) { // mod 8 == vpap adapt variable epap + mode = MODE_ASV_VARIABLE_EPAP; + if (!haveipap) { + R.ipap = R.min_ipap = R.max_ipap = R.max_epap + R.max_ps; + } + } else if (mod >= 7) { // mod 7 == vpap adapt + mode = MODE_ASV; + if (!haveipap) { + R.ipap = R.min_ipap = R.max_ipap = R.max_epap + R.max_ps; + } + } else if (mod >= 6) { // mod 6 == vpap auto (Min EPAP, Max IPAP, PS) + mode = MODE_BILEVEL_AUTO_FIXED_PS; } else if (mod >= 3) {// mod 3 == vpap s fixed pressure (EPAP, IPAP, No PS) - mode = MODE_BIPAP; + mode = MODE_BILEVEL_FIXED; } else if (mod >= 1) { mode = MODE_APAP; // mod 1 == apap } else { @@ -577,6 +601,8 @@ badfile: void ResmedImport::run() { + loader->saveMutex.lock(); + Session * sess = mach->SessionExists(sessionid); if (sess) { if (sess->summaryOnly()) { @@ -584,15 +610,19 @@ void ResmedImport::run() sess->wipeSummary(); } else { // Already imported + loader->saveMutex.unlock(); return; } } else { // Could be importing from an older backup.. if so, destroy the summary only records quint32 key = int(sessionid / 60) * 60; + sess = mach->SessionExists(key); if (sess) { if (sess->summaryOnly()) { + sess->Destroy(); + //mach->sessionlist.remove(sess->session()); delete sess; } } @@ -600,6 +630,7 @@ void ResmedImport::run() // Create the session sess = new Session(mach, sessionid); } + loader->saveMutex.unlock(); if (!group.EVE.isEmpty()) { loader->LoadEVE(sess, group.EVE); @@ -614,7 +645,11 @@ void ResmedImport::run() loader->LoadSAD(sess, group.SAD); } - if (!sess->first()) { + if (sess->first() == 0) { + //if (mach->sessionlist.contains(sess->session())) { + sess->Destroy(); + //mach->sessionlist.remove(sess->session()); + //} delete sess; return; } @@ -1917,7 +1952,7 @@ bool ResmedLoader::LoadPLD(Session *sess, const QString & path) ToTimeDelta(sess, edf, es, code, recs, duration, 0, 0); } else if (matchSignal(CPAP_IPAP, es.label)) { code = CPAP_IPAP; - sess->settings[CPAP_Mode] = MODE_BIPAP; + sess->settings[CPAP_Mode] = MODE_BILEVEL_FIXED; es.physical_maximum = 25; es.physical_minimum = 4; ToTimeDelta(sess, edf, es, code, recs, duration, 0, 0); diff --git a/sleepyhead/SleepLib/machine.cpp b/sleepyhead/SleepLib/machine.cpp index 1163cd21..c0e04f21 100644 --- a/sleepyhead/SleepLib/machine.cpp +++ b/sleepyhead/SleepLib/machine.cpp @@ -199,23 +199,69 @@ bool Machine::AddSession(Session *s) if (combine_next_day) { for (QList::iterator i = nextday.value()->begin(); i != nextday.value()->end(); i++) { + // i may need to do something here + unlinkSession(*i); dd->AddSession(*i); } - QMap >::iterator nd = p_profile->daylist.find(date.addDays(1)); +// QMap >::iterator nd = p_profile->daylist.find(date.addDays(1)); +// if (nd != p_profile->daylist.end()) { +// p_profile->unlinkDay(nd.key(), nd.value()); +// } - for (QList::iterator i = nd->begin(); i != nd->end(); i++) { - if (*i == nextday.value()) { - nd.value().erase(i); - } - } +// QList::iterator iend = nd.value().end(); +// for (QList::iterator i = nd.value()->begin(); i != iend; ++i) { +// if (*i == nextday.value()) { +// nd.value().erase(i); +// } +// } - day.erase(nextday); +// day.erase(nextday); } return true; } +bool Machine::unlinkDay(Day * d) +{ + return day.remove(day.key(d)) > 0; +} + +bool Machine::unlinkSession(Session * sess) +{ + // Remove the object from the machine object's session list + bool b=sessionlist.remove(sess->session()); + + QList dates; + + QList days; + QMap::iterator it; + + Day * d; + + // Doing this in case of accidental double linkages + for (it = day.begin(); it != day.end(); ++it) { + d = it.value(); + if (it.value()->sessions.contains(sess)) { + days.push_back(d); + dates.push_back(it.key()); + } + } + + for (int i=0; i < days.size(); ++i) { + d = days.at(i); + if (d->sessions.removeAll(sess)) { + b=true; + if (d->size() == 0) { + day.remove(dates[i]); + p_profile->unlinkDay(d); + } + } + } + + return b; +} + // This functions purpose is murder and mayhem... It deletes all of a machines data. bool Machine::Purge(int secret) { @@ -248,8 +294,9 @@ bool Machine::Purge(int secret) qDebug() << "Could not destroy "+ m_class+" ("+properties[STR_PROP_Serial]+") session" << sess->session(); success = false; } else { - sessionlist.erase(sessionlist.find(sess->session())); +// sessionlist.remove(sess->session()); } + delete sess; } diff --git a/sleepyhead/SleepLib/machine.h b/sleepyhead/SleepLib/machine.h index af11fa07..bbf8ff49 100644 --- a/sleepyhead/SleepLib/machine.h +++ b/sleepyhead/SleepLib/machine.h @@ -96,6 +96,11 @@ class Machine //! \brief Deletes the crud out of all machine data in the SleepLib database bool Purge(int secret); + //! \brief Unlink a session from any Machine related indexes + bool unlinkSession(Session * sess); + + bool unlinkDay(Day * day); + //! \brief Contains a secondary index of day data, containing just this machines sessions QMap day; diff --git a/sleepyhead/SleepLib/machine_common.h b/sleepyhead/SleepLib/machine_common.h index 2d62427c..1be69e7b 100644 --- a/sleepyhead/SleepLib/machine_common.h +++ b/sleepyhead/SleepLib/machine_common.h @@ -58,7 +58,7 @@ enum MachineType { MT_UNKNOWN = 0, MT_CPAP, MT_OXIMETER, MT_SLEEPSTAGE, MT_JOURN \brief CPAP Machines mode of operation */ enum CPAPMode { //:short - MODE_UNKNOWN = 0, MODE_CPAP, MODE_APAP, MODE_BIPAP, MODE_ASV + MODE_UNKNOWN = 0, MODE_CPAP, MODE_APAP, MODE_BILEVEL_FIXED, MODE_BILEVEL_AUTO_FIXED_PS, MODE_ASV, MODE_ASV_VARIABLE_EPAP }; /*! \enum PRTypes diff --git a/sleepyhead/SleepLib/profiles.cpp b/sleepyhead/SleepLib/profiles.cpp index 744db156..aef3c14e 100644 --- a/sleepyhead/SleepLib/profiles.cpp +++ b/sleepyhead/SleepLib/profiles.cpp @@ -684,51 +684,67 @@ Machine *Profile::GetMachine(MachineType t) return vec[0]; } -void Profile::RemoveSession(Session *sess) +//bool Profile::trashMachine(Machine * mach) +//{ +// QMap >::iterator it_end = daylist.end(); +// QMap >::iterator it; + +// QList datelist; +// QList days; + +// for (it = daylist.begin(); it != it_end; ++it) { +// for (int i = 0; i< it.value().size(); ++i) { +// Day * day = it.value().at(i); +// if (day->machine() == mach) { +// days.push_back(day); +// datelist.push_back(it.key()); +// } +// } +// } + +// for (int i=0; i < datelist.size(); ++i) { +// Day * day = days.at(i); +// it = daylist.find(datelist.at(i)); +// if (it != daylist.end()) { +// it.value().removeAll(day); +// if (it.value().size() == 0) { +// daylist.erase(it); +// } +// } +// mach->unlinkDay(days.at(i)); +// } + +//} + +bool Profile::unlinkDay(Day * day) { - QMap >::iterator di; - QMap >::iterator daylist_end=daylist.end(); - Machine * mach = sess->machine(); + bool b=false; - for (di = daylist.begin(); di != daylist_end; di++) { - for (int d = 0; d < di.value().size(); d++) { - Day *day = di.value()[d]; + QList dates; - int i = day->getSessions().indexOf(sess); - - if (i >= 0) { - for (; i < day->getSessions().size() - 1; i++) { - day->getSessions()[i] = day->getSessions()[i + 1]; - } - - day->getSessions().pop_back(); - qint64 first = 0, last = 0; - - for (int i = 0; i < day->getSessions().size(); i++) { - Session &sess = *day->getSessions()[i]; - - if (!first || first > sess.first()) { - first = sess.first(); - } - - if (!last || last < sess.last()) { - last = sess.last(); - } - } - - if (day->size() == 0) { - di.value().removeAll(day); - mach->day.erase(mach->day.find(di.key())); - delete day; - } - - // day->setFirst(first); - // day->setLast(last); - return; - } + QMap >::iterator it; + QMap >::iterator it_end = daylist.end(); + for (it = daylist.begin(); it != it_end; ++it) { + if (it.value().contains(day)) { + dates.push_back(it.key()); } } + + for (int i=0; i < dates.size(); ++i) { + it = daylist.find(dates.at(i)); + + if (it != daylist.end()) { + it.value().removeAll(day); + // TODO: Check it doesn't change from the above... + + if (it.value().size() == 0) { + daylist.erase(it); + } + } + } + + return b; } diff --git a/sleepyhead/SleepLib/profiles.h b/sleepyhead/SleepLib/profiles.h index 83d222a4..3091b8f0 100644 --- a/sleepyhead/SleepLib/profiles.h +++ b/sleepyhead/SleepLib/profiles.h @@ -80,8 +80,10 @@ class Profile : public Preferences */ int Import(QString path); - //! \brief Remove a session from day object, without deleting the Session object - void RemoveSession(Session *sess); + //! \brief Removes a given day from the date, destroying the daylist date record if empty + bool unlinkDay(Day * day); + +// bool trashMachine(Machine * mach); //! \brief Add Day record to Profile Day list void AddDay(QDate date, Day *day, MachineType mt); diff --git a/sleepyhead/SleepLib/session.cpp b/sleepyhead/SleepLib/session.cpp index 86299d1b..51364e2e 100644 --- a/sleepyhead/SleepLib/session.cpp +++ b/sleepyhead/SleepLib/session.cpp @@ -52,11 +52,14 @@ Session::Session(Machine *m, SessionID session) s_evchecksum_checked = false; s_summaryOnly = false; + + destroyed = false; } Session::~Session() { TrashEvents(); + destroyed = true; } void Session::TrashEvents() @@ -114,8 +117,7 @@ bool Session::Destroy() { QString path = p_profile->Get(s_machine->properties[STR_PROP_Path]); - p_profile->RemoveSession(this); - s_machine->sessionlist.erase(s_machine->sessionlist.find(s_session)); + s_machine->unlinkSession(this); QDir dir(path); QString base; @@ -1697,6 +1699,7 @@ EventDataType Session::sph(ChannelID id) // sum per hour, assuming id is a time EventDataType Session::timeAboveThreshold(ChannelID id, EventDataType threshold) { + this->OpenEvents(); QHash >::iterator j = eventlist.find(id); if (j == eventlist.end()) { return 0.0f; diff --git a/sleepyhead/SleepLib/session.h b/sleepyhead/SleepLib/session.h index 5950cab5..2e310500 100644 --- a/sleepyhead/SleepLib/session.h +++ b/sleepyhead/SleepLib/session.h @@ -343,6 +343,9 @@ protected: char s_enabled; QString s_eventfile; + // for debugging + bool destroyed; + }; diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index 95e8c677..730dc5ab 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -739,6 +739,10 @@ void Daily::UpdateCalendarDay(QDate date) } void Daily::LoadDate(QDate date) { + if (!date.isValid()) { + qDebug() << "LoadDate called with invalid date"; + return; + } ui->calendar->blockSignals(true); if (date.month()!=previous_date.month()) { on_calendar_currentPageChanged(date.year(),date.month()); @@ -1027,74 +1031,11 @@ QString Daily::getCPAPInformation(Day * cpap) html+=tooltip; html+="\n"; - CPAPMode mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode); + //CPAPMode mode=(CPAPMode)(int)cpap->settings_max(CPAP_Mode); html+=""; - - QString modestr; - - if (mode==MODE_CPAP) modestr=STR_TR_CPAP; - else if (mode==MODE_APAP) modestr=STR_TR_APAP; - else if (mode==MODE_BIPAP) modestr=STR_TR_BiLevel; - else if (mode==MODE_ASV) modestr=STR_TR_ASV; - else modestr=STR_TR_Unknown; - html+=tr("PAP Mode: %1
").arg(modestr); - - if (mode==MODE_CPAP) { - EventDataType min=round(cpap->settings_wavg(CPAP_Pressure)*2)/2.0; - // eg: Pressure: 13cmH2O - html+=QString("%1: %2%3").arg(STR_TR_Pressure).arg(min).arg(STR_UNIT_CMH2O); - } else if (mode==MODE_APAP) { - EventDataType min=cpap->settings_min(CPAP_PressureMin); - EventDataType max=cpap->settings_max(CPAP_PressureMax); - // eg: Pressure: 7.0-10.0cmH2O - html+=QString("%1: %2-%3%4").arg(STR_TR_Pressure).arg(min,0,'f',1).arg(max,0,'f',1).arg(STR_UNIT_CMH2O); - } else if (mode>=MODE_BIPAP) { - if (cpap->settingExists(CPAP_EPAPLo)) { - html+=QString(STR_TR_EPAPLo+": %1") - .arg(cpap->settings_min(CPAP_EPAPLo),0,'f',1); - - if (cpap->settingExists(CPAP_EPAPHi)) { - html+=QString("-%2") - .arg(cpap->settings_max(CPAP_EPAPHi),0,'f',1); - } - html+=STR_UNIT_CMH2O+"
"; - } else if (cpap->settingExists(CPAP_EPAP)) { - EventDataType epap=cpap->settings_min(CPAP_EPAP); - - html+=QString("%1: %2%3
").arg(STR_TR_EPAP) - .arg(epap,0,'f',1) - .arg(STR_UNIT_CMH2O); - - if (!cpap->settingExists(CPAP_IPAPHi)) { - if (cpap->settingExists(CPAP_PSMax)) { - html+=QString("%1: %2%3
").arg(STR_TR_IPAPHi) - .arg(epap+cpap->settings_max(CPAP_PSMax),0,'f',1) - .arg(STR_UNIT_CMH2O); - - } - } - } - if (cpap->settingExists(CPAP_IPAPHi)) { - html+=QString(STR_TR_IPAPHi+": %1"+STR_UNIT_CMH2O+"
") - .arg(cpap->settings_max(CPAP_IPAPHi),0,'f',1); - } else - if (cpap->settingExists(CPAP_IPAP)) { - html+=QString(STR_TR_IPAP+": %1"+STR_UNIT_CMH2O+"
") - .arg(cpap->settings_max(CPAP_IPAP),0,'f',1); - } - - if (cpap->settingExists(CPAP_PSMin)) { - EventDataType psl=cpap->settings_min(CPAP_PSMin); - EventDataType psh=cpap->settings_max(CPAP_PSMax); - html+=QString(STR_TR_PS+": %1-%2"+STR_UNIT_CMH2O+"
") - .arg(psl,0,'f',1) - .arg(psh,0,'f',1); - } else if (cpap->settingExists(CPAP_PS)) { - html+=QString(STR_TR_PS+": %1"+STR_UNIT_CMH2O+"
") - .arg(cpap->settings_max(CPAP_PS),0,'f',1); - } - } + html+=tr("PAP Mode: %1
").arg(cpap->getCPAPMode()); + html+= cpap->getPressureSettings(); html+="\n"; if ((cpap && cpap->settingExists(CPAP_BrokenSummary))) { html+=" \n"; @@ -1669,6 +1610,13 @@ void Daily::clearLastDay() void Daily::Unload(QDate date) { + if (!date.isValid()) { + date = getDate(); + if (!date.isValid()) { + graphView()->setDay(nullptr); + return; + } + } webView->setHtml(""); Session *journal=GetJournalSession(date); diff --git a/sleepyhead/daily.h b/sleepyhead/daily.h index d7ea0fee..8b12efe1 100644 --- a/sleepyhead/daily.h +++ b/sleepyhead/daily.h @@ -137,7 +137,7 @@ public: \brief Saves any journal changes for the provided date. \param QDate date */ - void Unload(QDate date); + void Unload(QDate date=QDate()); private slots: diff --git a/sleepyhead/docs/channels.xml b/sleepyhead/docs/channels.xml index 6531a479..d699177d 100644 --- a/sleepyhead/docs/channels.xml +++ b/sleepyhead/docs/channels.xml @@ -28,8 +28,10 @@ Important: One id code per item, DO NOT CHANGE ID NUMBERS!!!