From 7044ea6e8b26d2b45ee400fc8c03a746fa2e4909 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 11 Jan 2012 14:58:46 +1000 Subject: [PATCH] Session hiding details display fixes, disabled multithreaded recalcs again --- SleepLib/session.cpp | 10 +++-- daily.cpp | 92 +++++++++++++++++++++++++++----------------- mainwindow.cpp | 5 ++- 3 files changed, 65 insertions(+), 42 deletions(-) diff --git a/SleepLib/session.cpp b/SleepLib/session.cpp index 1da6238c..d60e6618 100644 --- a/SleepLib/session.cpp +++ b/SleepLib/session.cpp @@ -816,13 +816,15 @@ bool Session::SearchEvent(ChannelID code, qint64 time, qint64 dist) bool Session::enabled() { if (s_enabled>=0) { - return s_enabled; + return s_enabled!=0; } if (!settings.contains(SESSION_ENABLED)) { - settings[SESSION_ENABLED]=s_enabled=true; - return true; + bool b=true; + settings[SESSION_ENABLED]=b; + s_enabled=b ? 1 : 0; + return b; } - s_enabled=settings[SESSION_ENABLED].toBool(); + s_enabled=settings[SESSION_ENABLED].toBool() ? 1 : 0; return s_enabled; } diff --git a/daily.cpp b/daily.cpp index db911706..78d19345 100644 --- a/daily.cpp +++ b/daily.cpp @@ -503,12 +503,15 @@ void Daily::UpdateEventsTree(QTreeWidget *tree,Day *day) } else { mcr=mcroot[code]; } + for (int z=0;zcount();o++) { - qint64 t=m.value()[z]->time(o); + EventList & ev=*(m.value()[z]); + + for (quint32 o=0;oraw(o)/2.0)*1000.0; + t-=float(ev.raw(o)/2.0)*1000.0; } QStringList a; QDateTime d=QDateTime::fromTime_t(t/1000); @@ -706,7 +709,8 @@ void Daily::Load(QDate date) updateGraphCombo(); if (cpap) { - if (GraphView->isEmpty()) { + float hours=cpap->hours(); + if (GraphView->isEmpty() && (hours>0)) { if (cpap->machine->GetClass()!=STR_MACH_ResMed) { GraphView->setCubeImage(images["brick"]); GraphView->setEmptyText(tr("No Graphs :(")); @@ -721,17 +725,17 @@ void Daily::Load(QDate date) float ahi=(cpap->count(CPAP_Obstructive)+cpap->count(CPAP_Hypopnea)+cpap->count(CPAP_ClearAirway)+cpap->count(CPAP_Apnea)); if (PROFILE.general->calculateRDI()) ahi+=cpap->count(CPAP_RERA); - ahi/=cpap->hours(); + ahi/=hours; float csr=(100.0/cpap->hours())*(cpap->sum(CPAP_CSR)/3600.0); - float uai=cpap->count(CPAP_Apnea)/cpap->hours(); - float oai=cpap->count(CPAP_Obstructive)/cpap->hours(); - float hi=(cpap->count(CPAP_ExP)+cpap->count(CPAP_Hypopnea))/cpap->hours(); - float cai=cpap->count(CPAP_ClearAirway)/cpap->hours(); - float rei=cpap->count(CPAP_RERA)/cpap->hours(); - float fli=cpap->count(CPAP_FlowLimit)/cpap->hours(); - float nri=cpap->count(CPAP_NRI)/cpap->hours(); - float lki=cpap->count(CPAP_LeakFlag)/cpap->hours(); - float exp=cpap->count(CPAP_ExP)/cpap->hours(); + float uai=cpap->count(CPAP_Apnea)/hours; + float oai=cpap->count(CPAP_Obstructive)/hours; + float hi=(cpap->count(CPAP_ExP)+cpap->count(CPAP_Hypopnea))/hours; + float cai=cpap->count(CPAP_ClearAirway)/hours; + float rei=cpap->count(CPAP_RERA)/hours; + float fli=cpap->count(CPAP_FlowLimit)/hours; + float nri=cpap->count(CPAP_NRI)/hours; + float lki=cpap->count(CPAP_LeakFlag)/hours; + float exp=cpap->count(CPAP_ExP)/hours; //float p90=cpap->p90(CPAP_Pressure); //eap90=cpap->p90(CPAP_EPAP); @@ -780,24 +784,26 @@ void Daily::Load(QDate date) html+="\n"; - html+=""+tr("Date")+""+tr("Sleep")+""+tr("Wake")+""+STR_UNIT_Hours+""; - int tt=qint64(cpap->total_time())/1000L; - QDateTime date=QDateTime::fromTime_t(cpap->first()/1000L); - QDateTime date2=QDateTime::fromTime_t(cpap->last()/1000L); + if (hours>0) { + html+=""+tr("Date")+""+tr("Sleep")+""+tr("Wake")+""+STR_UNIT_Hours+""; + int tt=qint64(cpap->total_time())/1000L; + QDateTime date=QDateTime::fromTime_t(cpap->first()/1000L); + QDateTime date2=QDateTime::fromTime_t(cpap->last()/1000L); - int h=tt/3600; - int m=(tt/60)%60; - int s=tt % 60; - html+=QString("%1%2%3%4\n" - "
\n") - .arg(date.date().toString(Qt::SystemLocaleShortDate)) - .arg(date.toString("HH:mm")) - .arg(date2.toString("HH:mm")) - .arg(QString().sprintf("%02i:%02i:%02i",h,m,s)); + int h=tt/3600; + int m=(tt/60)%60; + int s=tt % 60; + html+=QString("%1%2%3%4\n" + "
\n") + .arg(date.date().toString(Qt::SystemLocaleShortDate)) + .arg(date.toString("HH:mm")) + .arg(date2.toString("HH:mm")) + .arg(QString().sprintf("%02i:%02i:%02i",h,m,s)); + } QString cs; - if (!isBrick) { + if (!isBrick && hours>0) { if (PROFILE.general->calculateRDI()) { html+=QString("%3%4 %5\n") .arg("#F88017").arg("black").arg(tr("RDI")).arg(schema::channel[CPAP_RDI].description()).arg(ahi,0,'f',2); @@ -878,8 +884,8 @@ void Daily::Load(QDate date) // as it only relates to text drawing, which the Pie chart does not do // ^^ Scratch that.. pie now includes text.. - if (PROFILE.appearance->graphSnapshots()) { // AHI Pie Chart - if (oai+hi+cai+uai+rei+fli>0) { + if ((hours > 0) && PROFILE.appearance->graphSnapshots()) { // AHI Pie Chart + if ((oai+hi+cai+uai+rei+fli)>0) { html+=" "; html+=QString("%1").arg(tr("Event Breakdown")); html+="
"; @@ -898,9 +904,20 @@ void Daily::Load(QDate date) } else { // machine is a brick - html+="

"+tr("BRICK :(")+"

"; - html+=""+tr("Sorry, your machine does not record data.")+"\n"; - html+=""+tr("Complain to your Equipment Provider!")+"\n"; + if (!isBrick) { + html+=" \n"; + if (cpap->size()>0) { + html+="

"+tr("Sessions all off!")+"

"; + html+=""+tr("Sessions exist for this day but are switched off.")+"\n"; + } else { + html+="

"+tr("Impossibly short session")+"

"; + html+=""+tr("Zero hours??")+"\n"; + } + } else { + html+="

"+tr("BRICK :(")+"

"; + html+=""+tr("Sorry, your machine does not record data.")+"\n"; + html+=""+tr("Complain to your Equipment Provider!")+"\n"; + } html+=" \n"; } html+=""; @@ -909,7 +926,7 @@ void Daily::Load(QDate date) html+="\n"; float percentile=0.95; - if ((cpap && !isBrick) || oxi) { + if ((cpap && !isBrick && (cpap->hours()>0)) || oxi) { html+="\n"; html+=QString("\n").arg(tr("Statistics")); @@ -985,8 +1002,11 @@ void Daily::Load(QDate date) html+=QString("").arg(tr("Please Note: This day just contains summary data, only limited information is available .")); } } else { - html+=""; - html+="\n"; + if (cpap && cpap->hours()==0) { + } else { + html+=""; + html+="\n"; + } } if (oxi && oxi->hasEnabledSessions()) { diff --git a/mainwindow.cpp b/mainwindow.cpp index c2fe6b26..a76b3699 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -2515,7 +2515,8 @@ void MainWindow::doReprocessEvents() QList machines=PROFILE.GetMachines(MT_UNKNOWN); - bool cache_sessions=PROFILE.session->cacheSessions(); + // Disabling multithreaded save as it appears it's causing problems + bool cache_sessions=false; //PROFILE.session->cacheSessions(); if (cache_sessions) { // Use multithreaded save to handle reindexing.. (hogs memory like hell) qstatus->setText(tr("Loading Event Data")); } else { @@ -2526,7 +2527,6 @@ void MainWindow::doReprocessEvents() qprogress->setVisible(true); } bool isopen; - QDate current=daily->getDate(); do { day=PROFILE.GetDay(date,MT_CPAP); if (day) { @@ -2585,6 +2585,7 @@ void MainWindow::doReprocessEvents() Notify("Recalculations are now complete.","Task Completed"); FreeSessions(); + QDate current=daily->getDate(); daily->LoadDate(current); if (overview) overview->ReloadGraphs(); }
 
%1
%1
"+tr("No data available")+"
 
"+tr("No data available")+"