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

Ignoring short sessions under 5 minutes

Browse Source
This commit is contained in:
Mark Watkins 2011-05-27 18:22:24 +10:00
parent d45dbe3711
commit e9f2346b8f
5 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SleepyHead.depend
View File

@ -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
<wx/string.h>
<wx/variant.h>
<wx/dir.h>
@ -7870,7 +7870,7 @@
<sleeplib/machine.h>
<list>
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"
<wx/app.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
<wx/settings.h>
<wx/dcbuffer.h>
<wx/log.h>
@ -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
<wx/dir.h>
<wx/filename.h>
<wx/ffile.h>

21
SleepyHeadMain.cpp
View File

@ -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("<tr><td><b>")+_("Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
} else if (mode==MODE_APAP) {
html=html+wxT("<tr><td><b>")+_("Pressure-Min")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMinAchieved))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure-Min")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure-Max")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Avg Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(CPAP_PressureAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("90% Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(CPAP_PressurePercentValue))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure-Min2")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMinAchieved))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure-Max2")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMaxAchieved))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Avg Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("90% Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressurePercentValue))+wxT("</td></tr>\n");
}
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
@ -490,6 +497,12 @@ void Daily::OnCalendarDay( wxCalendarEvent& event )
html=html+wxT("<tr><td><b>")+_("Show-AHI")+wxT("</b></td><td>")+(bool(d->summary_max(PRS1_ShowAHI)) ? _("On") : _("Off"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Hose-Size")+wxT("</b></td><td>")+(bool(d->summary_max(PRS1_HoseDiameter)) ? _("22mm") : _("15mm"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Sys-Resist.")+wxT("</b></td><td>")+wxString::Format(wxT("%i"),int(d->summary_max(PRS1_SystemResistanceStatus)))+wxT("</td></tr>\n");
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Session Files")+wxT("</i></td></tr>\n");
for (auto i=d->begin();i!=d->end();i++) {
html=html+wxT("<tr><td colspan=2 align=center>")+(*i)->first().Format(wxT("%d-%m-%Y %H:%M:%S"))+wxT(" ")+wxString::Format(wxT("%05i"),(*i)->session())+wxT("</td></tr>\n");
}
//PRS1_SystemLockStatus
html=html+wxT("</table>");

2
graphs/graph.cpp
View File

@ -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);

3
libs/sleeplib/prs1_loader.cpp
View File

@ -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()<ignore_thresh) {
delete sess;
continue;
}

12
version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 7;
static const long BUILD = 1252;
static const long REVISION = 1304;
static const long BUILD = 1284;
static const long REVISION = 1487;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 4810;
#define RC_FILEVERSION 0,7,1252,1304
#define RC_FILEVERSION_STRING "0, 7, 1252, 1304\0"
static const char FULLVERSION_STRING[] = "0.7.1252.1304";
static const long BUILDS_COUNT = 4879;
#define RC_FILEVERSION 0,7,1284,1487
#define RC_FILEVERSION_STRING "0, 7, 1284, 1487\0"
static const char FULLVERSION_STRING[] = "0.7.1284.1487";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62;