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

Fix Pressure Calculations

Browse Source
This commit is contained in:
Mark Watkins 2011-05-28 15:38:43 +10:00
parent 9061677642
commit f6bde6dc34
9 changed files with 91 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
GUIFrame.cpp
View File

@ -27,11 +27,11 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
menubar = new wxMenuBar( 0 );
FileMenu = new wxMenu();
wxMenuItem* FileMenuImportSD;
FileMenuImportSD = new wxMenuItem( FileMenu, wxID_ANY, wxString( _("&Import SD") ) , wxEmptyString, wxITEM_NORMAL );
FileMenuImportSD = new wxMenuItem( FileMenu, wxID_ANY, wxString( _("&Import SD") ) + wxT('\t') + wxT("F9"), wxEmptyString, wxITEM_NORMAL );
FileMenu->Append( FileMenuImportSD );
wxMenuItem* FileMenuPreferences;
FileMenuPreferences = new wxMenuItem( FileMenu, wxID_ANY, wxString( _("&Preferences") ) , wxEmptyString, wxITEM_NORMAL );
FileMenuPreferences = new wxMenuItem( FileMenu, wxID_ANY, wxString( _("&Preferences") ) + wxT('\t') + wxT("F10"), wxEmptyString, wxITEM_NORMAL );
FileMenu->Append( FileMenuPreferences );
wxMenuItem* m_separator1;
@ -45,18 +45,25 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
ViewMenu = new wxMenu();
wxMenuItem* ViewMenuSummary;
ViewMenuSummary = new wxMenuItem( ViewMenu, wxID_ANY, wxString( _("&Summary") ) , wxEmptyString, wxITEM_NORMAL );
ViewMenuSummary = new wxMenuItem( ViewMenu, wxID_ANY, wxString( _("&Summary") ) + wxT('\t') + wxT("F5"), wxEmptyString, wxITEM_NORMAL );
ViewMenu->Append( ViewMenuSummary );
wxMenuItem* ViewMenuDaily;
ViewMenuDaily = new wxMenuItem( ViewMenu, wxID_ANY, wxString( _("&Daily") ) , wxEmptyString, wxITEM_NORMAL );
ViewMenuDaily = new wxMenuItem( ViewMenu, wxID_ANY, wxString( _("&Daily") ) + wxT('\t') + wxT("F6"), wxEmptyString, wxITEM_NORMAL );
ViewMenu->Append( ViewMenuDaily );
wxMenuItem* m_separator2;
m_separator2 = ViewMenu->AppendSeparator();
wxMenuItem* ViewMenuFullscreen;
ViewMenuFullscreen = new wxMenuItem( ViewMenu, wxID_ANY, wxString( _("Full Screen") ) + wxT('\t') + wxT("F11"), wxEmptyString, wxITEM_NORMAL );
ViewMenu->Append( ViewMenuFullscreen );
menubar->Append( ViewMenu, _("&View") );
ToolsMenu = new wxMenu();
wxMenuItem* ToolsMenuScreenshot;
ToolsMenuScreenshot = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("Screenshot") ) , wxEmptyString, wxITEM_NORMAL );
ToolsMenuScreenshot = new wxMenuItem( ToolsMenu, wxID_ANY, wxString( _("Screenshot") ) + wxT('\t') + wxT("Shift+F12"), wxEmptyString, wxITEM_NORMAL );
ToolsMenu->Append( ToolsMenuScreenshot );
menubar->Append( ToolsMenu, _("Tools") );
@ -85,6 +92,7 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons
this->Connect( FileMenuExit->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnQuit ) );
this->Connect( ViewMenuSummary->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuSummary ) );
this->Connect( ViewMenuDaily->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuDaily ) );
this->Connect( ViewMenuFullscreen->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnFullscreen ) );
this->Connect( ToolsMenuScreenshot->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnScreenshot ) );
this->Connect( HelpMenuAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnAbout ) );
}
@ -98,6 +106,7 @@ GUIFrame::~GUIFrame()
this->Disconnect( wxID_QUIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnQuit ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuSummary ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuDaily ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnFullscreen ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnScreenshot ) );
this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnAbout ) );

1
GUIFrame.h
View File

@ -55,6 +55,7 @@ class GUIFrame : public wxFrame
virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }
virtual void OnViewMenuSummary( wxCommandEvent& event ) { event.Skip(); }
virtual void OnViewMenuDaily( wxCommandEvent& event ) { event.Skip(); }
virtual void OnFullscreen( wxCommandEvent& event ) { event.Skip(); }
virtual void OnScreenshot( wxCommandEvent& event ) { event.Skip(); }
virtual void OnAbout( wxCommandEvent& event ) { event.Skip(); }

15
SleepyHead.depend
View File

@ -7785,12 +7785,12 @@
"wx/progdlg.h"
"wx/dialog.h"
1306463640 source:/home/mark/projects/git/sleepyhead/GUIFrame.cpp
1306556741 source:/home/mark/projects/git/sleepyhead/GUIFrame.cpp
"wx/wxprec.h"
<wx/wx.h>
"GUIFrame.h"
1306463640 /home/mark/projects/git/sleepyhead/GUIFrame.h
1306556260 /home/mark/projects/git/sleepyhead/GUIFrame.h
<wx/intl.h>
<wx/string.h>
<wx/bitmap.h>
@ -7826,7 +7826,7 @@
1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h
<wx/app.h>
1306502006 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h
1306557150 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h
"SleepyHeadApp.h"
"GUIFrame.h"
"sleeplib/machine.h"
@ -7870,7 +7870,7 @@
<sleeplib/machine.h>
<list>
1306553923 /home/mark/projects/git/sleepyhead/version.h
1306560972 /home/mark/projects/git/sleepyhead/version.h
1306549105 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h"
@ -7887,7 +7887,7 @@
"preferences.h"
"tinyxml/tinyxml.h"
1306505345 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
1306560520 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
"wx_pch.h"
"version.h"
<wx/app.h>
@ -7898,6 +7898,7 @@
<wx/log.h>
<wx/dcscreen.h>
<wx/dcmemory.h>
<wx/filedlg.h>
"SleepyHeadMain.h"
"sleeplib/profiles.h"
@ -7915,7 +7916,7 @@
<wx/ffile.h>
<wx/utils.h>
1306486059 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
1306560805 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
<tr1/random>
<wx/colour.h>
<wx/log.h>
@ -7947,7 +7948,7 @@
"machine_loader.h"
"tinyxml/tinyxml.h"
1306553279 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
1306560504 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
<wx/dir.h>
<wx/filename.h>
<wx/ffile.h>

38
SleepyHeadMain.cpp
View File

@ -24,6 +24,7 @@
#include <wx/log.h>
#include <wx/dcscreen.h>
#include <wx/dcmemory.h>
#include <wx/filedlg.h>
#include "SleepyHeadMain.h"
#include "sleeplib/profiles.h"
//#include "graphs/sleepflagsgraph.h"
@ -90,10 +91,18 @@ void SleepyHeadFrame::DoScreenshot( wxCommandEvent &event )
mdc.SelectObject(wxNullBitmap);
wxString fileName = wxT("myImage.png");
wxDateTime d=wxDateTime::Now();
// wxDirDialog sfs(this,_("Choose a Directory")); //,wxT(""),wxT(""),style=wxFD_OPEN);
wxString filename=wxSaveFileSelector(_("Please give a filename for the screenshot"),wxT("png"),wxT("Sleepyhead-")+d.Format(wxT("%Y%m%d-%H%M%S")),this);
if (!filename.IsEmpty()) {
if (!filename.Lower().EndsWith(wxT(".png"))) filename+=wxT(".png");
wxImage img=bmp.ConvertToImage();
if (!img.SaveFile(fileName, wxBITMAP_TYPE_PNG)) {
wxLogError(wxT("Couldn't save screenshot ")+fileName);
if (!img.SaveFile(filename, wxBITMAP_TYPE_PNG)) {
wxLogError(wxT("Couldn't save screenshot ")+filename);
}
}
}
@ -138,7 +147,14 @@ void SleepyHeadFrame::OnQuit(wxCommandEvent &event)
{
Destroy();
}
void SleepyHeadFrame::OnFullscreen(wxCommandEvent& event)
{
if (!IsFullScreen()) {
ShowFullScreen(true,wxFULLSCREEN_NOBORDER|wxFULLSCREEN_NOCAPTION|wxFULLSCREEN_NOSTATUSBAR);
} else {
ShowFullScreen(false);
}
}
void SleepyHeadFrame::OnScreenshot(wxCommandEvent& event)
{
ToolsMenu->UpdateUI();
@ -265,7 +281,7 @@ void Summary::RefreshData()
double avp=pressure->GetAverage();
double bt=fmod(bedtime->GetAverage(),12.0);
double ua=usage->GetAverage();
double wt=fmod(bt+ua,12.0);
double wt=waketime->GetAverage(); //fmod(bt+ua,12.0);
wxString html=wxT("<html><body leftmargin=0 rightmargin=0 topmargin=0 marginwidth=0 marginheight=0><table cellspacing=2 cellpadding=0>\n");
@ -438,7 +454,7 @@ void Daily::OnCalendarDay( wxCalendarEvent& event )
day.SetHour(0);
day-=wxTimeSpan::Days(1);
Day *d;
if (machine && (machine->day.find(day)!=machine->day.end()) && (d=machine->day[day]) && (d->size()>0) && ((d->last()-d->first())>wxTimeSpan::Minutes(15))) {
if (machine && (machine->day.find(day)!=machine->day.end()) && (d=machine->day[day]) && (d->size()>0)) { // && ((d->last()-d->first())>wxTimeSpan::Minutes(15))) {
//HTMLInfo->SetPage(wxT(""));
UpdateGraphs(day);
@ -491,12 +507,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_max(CPAP_PressureMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Avg Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(CPAP_PressureAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("90% Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(CPAP_PressurePercentValue))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure-Min")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(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>")+_("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-Min2")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(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");
@ -579,7 +595,7 @@ void Daily::OnCalendarMonth( wxCalendarEvent& event )
if (i>j) break;
wxDateTime d(i,m,y,0,0,0,0);
d-=wxTimeSpan::Days(1);
if ((machine->day.find(d)!=machine->day.end()) && ((machine->day[d]->last() - machine->day[d]->first())>wxTimeSpan::Minutes(15))) {
if ((machine->day.find(d)!=machine->day.end())) {
#if wxCHECK_VERSION(2,9,0)
Calendar->Mark(i,true);
#else

1
SleepyHeadMain.h
View File

@ -71,6 +71,7 @@ class SleepyHeadFrame: public GUIFrame
virtual void OnQuit(wxCommandEvent& event);
virtual void OnAbout(wxCommandEvent& event);
virtual void OnScreenshot(wxCommandEvent& event);
virtual void OnFullscreen(wxCommandEvent& event);
virtual void DoScreenshot(wxCommandEvent& event);
virtual void OnImportSD(wxCommandEvent& event);
virtual void OnViewMenuDaily(wxCommandEvent& event);

29
WxWizFrame.fbp
View File

@ -211,7 +211,7 @@
<property name="label">&amp;Import SD</property>
<property name="name">FileMenuImportSD</property>
<property name="permission">none</property>
<property name="shortcut"></property>
<property name="shortcut">F9</property>
<property name="unchecked_bitmap"></property>
<event name="OnMenuSelection">OnImportSD</event>
<event name="OnUpdateUI"></event>
@ -226,7 +226,7 @@
<property name="label">&amp;Preferences</property>
<property name="name">FileMenuPreferences</property>
<property name="permission">none</property>
<property name="shortcut"></property>
<property name="shortcut">F10</property>
<property name="unchecked_bitmap"></property>
<event name="OnMenuSelection">OnPreferencesClicked</event>
<event name="OnUpdateUI"></event>
@ -265,7 +265,7 @@
<property name="label">&amp;Summary</property>
<property name="name">ViewMenuSummary</property>
<property name="permission">none</property>
<property name="shortcut"></property>
<property name="shortcut">F5</property>
<property name="unchecked_bitmap"></property>
<event name="OnMenuSelection">OnViewMenuSummary</event>
<event name="OnUpdateUI"></event>
@ -280,11 +280,30 @@
<property name="label">&amp;Daily</property>
<property name="name">ViewMenuDaily</property>
<property name="permission">none</property>
<property name="shortcut"></property>
<property name="shortcut">F6</property>
<property name="unchecked_bitmap"></property>
<event name="OnMenuSelection">OnViewMenuDaily</event>
<event name="OnUpdateUI"></event>
</object>
<object class="separator" expanded="1">
<property name="name">m_separator2</property>
<property name="permission">none</property>
</object>
<object class="wxMenuItem" expanded="1">
<property name="bitmap"></property>
<property name="checked">0</property>
<property name="enabled">1</property>
<property name="help"></property>
<property name="id">wxID_ANY</property>
<property name="kind">wxITEM_NORMAL</property>
<property name="label">Full Screen</property>
<property name="name">ViewMenuFullscreen</property>
<property name="permission">none</property>
<property name="shortcut">F11</property>
<property name="unchecked_bitmap"></property>
<event name="OnMenuSelection">OnFullscreen</event>
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="wxMenu" expanded="1">
<property name="label">Tools</property>
@ -300,7 +319,7 @@
<property name="label">Screenshot</property>
<property name="name">ToolsMenuScreenshot</property>
<property name="permission">none</property>
<property name="shortcut"></property>
<property name="shortcut">Shift+F12</property>
<property name="unchecked_bitmap"></property>
<event name="OnMenuSelection">OnScreenshot</event>
<event name="OnUpdateUI"></event>

7
libs/sleeplib/machine.cpp
View File

@ -267,12 +267,7 @@ EventDataType Day::summary_max(MachineCode code)
Session & sess=*(*s);
if (sess.summary.find(code)!=sess.summary.end()) {
tmp=sess.summary[code].GetDouble();
if (fir) {
val=tmp;
fir=false;
} else {
if (val>tmp) val=tmp;
}
if (tmp>val) val=tmp;
}
}
return val;

8
libs/sleeplib/prs1_loader.cpp
View File

@ -259,7 +259,7 @@ int PRS1Loader::OpenMachine(Machine *m,wxString path)
delete sess;
continue;
}
const double ignore_thresh=0;//300.0/3600.0;// Ignore useless sessions under 5 minute
const double ignore_thresh=300.0/3600.0;// Ignore useless sessions under 5 minute
if (sess->hours()<=ignore_thresh) {
delete sess;
continue;
@ -279,10 +279,16 @@ int PRS1Loader::OpenMachine(Machine *m,wxString path)
}
}
sess->summary[CPAP_CSR]=sess->sum_event_field(CPAP_CSR,0);
sess->summary[CPAP_VSnore]=(long)sess->count_events(CPAP_VSnore);
sess->summary[PRS1_VSnore2]=sess->sum_event_field(PRS1_VSnore2,0);
sess->summary[CPAP_PressureMedian]=sess->avg_event_field(CPAP_Pressure,0);
sess->summary[CPAP_PressureAverage]=sess->weighted_avg_event_field(CPAP_Pressure,0);
sess->summary[CPAP_PressureMinAchieved]=sess->min_event_field(CPAP_Pressure,0);
sess->summary[CPAP_PressureMaxAchieved]=sess->max_event_field(CPAP_Pressure,0);
sess->summary[CPAP_LeakMinimum]=sess->min_event_field(CPAP_Leak,0);
sess->summary[CPAP_LeakMaximum]=sess->max_event_field(CPAP_Leak,0); // should be merged..

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 = 1406;
static const long REVISION = 2152;
static const long BUILD = 1432;
static const long REVISION = 2314;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 5159;
#define RC_FILEVERSION 0,7,1406,2152
#define RC_FILEVERSION_STRING "0, 7, 1406, 2152\0"
static const char FULLVERSION_STRING[] = "0.7.1406.2152";
static const long BUILDS_COUNT = 5234;
#define RC_FILEVERSION 0,7,1432,2314
#define RC_FILEVERSION_STRING "0, 7, 1432, 2314\0"
static const char FULLVERSION_STRING[] = "0.7.1432.2314";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62;