From e9f2346b8f8aeb0c4cbd4443e34ecdf269134b79 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 27 May 2011 18:22:24 +1000 Subject: [PATCH] Ignoring short sessions under 5 minutes --- SleepyHead.depend | 10 +++++----- SleepyHeadMain.cpp | 21 +++++++++++++++++---- graphs/graph.cpp | 2 +- libs/sleeplib/prs1_loader.cpp | 3 ++- version.h | 12 ++++++------ 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/SleepyHead.depend b/SleepyHead.depend index 5af52170..c5f87f3b 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7832,7 +7832,7 @@ "sleeplib/machine.h" "graphs/graph.h" -1306415028 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h +1306483536 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h @@ -7870,7 +7870,7 @@ -1306476387 /home/mark/projects/git/sleepyhead/version.h +1306484375 /home/mark/projects/git/sleepyhead/version.h 1306415077 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -7887,7 +7887,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1306476387 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp +1306483872 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -7901,7 +7901,7 @@ "SleepyHeadMain.h" "sleeplib/profiles.h" -1306414974 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp +1306476745 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp @@ -7947,7 +7947,7 @@ "machine_loader.h" "tinyxml/tinyxml.h" -1306414968 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp +1306484375 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index 959f0b1c..4c251641 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -141,7 +141,12 @@ void SleepyHeadFrame::OnQuit(wxCommandEvent &event) void SleepyHeadFrame::OnScreenshot(wxCommandEvent& event) { - Refresh(); // Make sure the menu is closed.. (It pushes the Update event in front of the manual event we push next) + ToolsMenu->UpdateUI(); + //wxWindow::DoUpdateWindowUI(); + wxWindow::UpdateWindowUI(); + //Refresh(true); // Make sure the menu is closed.. (It pushes the Update event in front of the manual event we push next) + // Update(true); + wxCommandEvent MyEvent( wxEVT_DO_SCREENSHOT); wxPostEvent(this, MyEvent); } @@ -466,10 +471,12 @@ void Daily::OnCalendarDay( wxCalendarEvent& event ) if (mode==MODE_CPAP) { html=html+wxT("")+_("Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("\n"); } else if (mode==MODE_APAP) { - html=html+wxT("")+_("Pressure-Min")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMinAchieved))+wxT("\n"); + html=html+wxT("")+_("Pressure-Min")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMin))+wxT("\n"); html=html+wxT("")+_("Pressure-Max")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("\n"); - html=html+wxT("")+_("Avg Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(CPAP_PressureAverage))+wxT("\n"); - html=html+wxT("")+_("90% Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(CPAP_PressurePercentValue))+wxT("\n"); + html=html+wxT("")+_("Pressure-Min2")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMinAchieved))+wxT("\n"); + html=html+wxT("")+_("Pressure-Max2")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMaxAchieved))+wxT("\n"); + html=html+wxT("")+_("Avg Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureAverage))+wxT("\n"); + html=html+wxT("")+_("90% Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressurePercentValue))+wxT("\n"); } html=html+wxT("  \n"); @@ -490,6 +497,12 @@ void Daily::OnCalendarDay( wxCalendarEvent& event ) html=html+wxT("")+_("Show-AHI")+wxT("")+(bool(d->summary_max(PRS1_ShowAHI)) ? _("On") : _("Off"))+wxT("\n"); html=html+wxT("")+_("Hose-Size")+wxT("")+(bool(d->summary_max(PRS1_HoseDiameter)) ? _("22mm") : _("15mm"))+wxT("\n"); html=html+wxT("")+_("Sys-Resist.")+wxT("")+wxString::Format(wxT("%i"),int(d->summary_max(PRS1_SystemResistanceStatus)))+wxT("\n"); + + html=html+wxT("  \n"); + html=html+wxT("")+_("Session Files")+wxT("\n"); + for (auto i=d->begin();i!=d->end();i++) { + html=html+wxT("")+(*i)->first().Format(wxT("%d-%m-%Y %H:%M:%S"))+wxT(" ")+wxString::Format(wxT("%05i"),(*i)->session())+wxT("\n"); + } //PRS1_SystemLockStatus html=html+wxT(""); diff --git a/graphs/graph.cpp b/graphs/graph.cpp index 2d8083d0..cde9a84d 100644 --- a/graphs/graph.cpp +++ b/graphs/graph.cpp @@ -337,7 +337,7 @@ void gGraphWindow::OnPaint(wxPaintEvent& WXUNUSED(event)) dc.GradientFillLinear(r,*gradient_start_color,*gradient_end_color,gradient_direction); //dc.DrawRectangle(0,0,m_scrX,m_scrY); - wxLogMessage(wxT("Paint")); + //wxLogMessage(wxT("Paint")); //dc.DrawText(m_title,m_marginLeft,3); for (auto l=layers.rbegin();l!=layers.rend();l++) { (*l)->Plot(dc,*this); diff --git a/libs/sleeplib/prs1_loader.cpp b/libs/sleeplib/prs1_loader.cpp index c7c76887..ffe6a93a 100644 --- a/libs/sleeplib/prs1_loader.cpp +++ b/libs/sleeplib/prs1_loader.cpp @@ -256,7 +256,8 @@ int PRS1Loader::OpenMachine(Machine *m,wxString path) delete sess; continue; } - if (sess->hours()<0.016666667) { // Ignore useless sessions under 1 minute + const double ignore_thresh=300.0/3600.0;// Ignore useless sessions under 5 minute + if (sess->hours()