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

Updates to BIPAP names

Browse Source
This commit is contained in:
Mark Watkins 2011-05-29 21:29:32 +10:00
parent dc9f58575a
commit 191d498573
6 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SleepyHead.depend
View File

@ -7835,7 +7835,7 @@
"sleeplib/machine.h"
"graphs/graph.h"
1306645236 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h
1306667662 /home/mark/projects/git/sleepyhead/libs/sleeplib/machine.h
<wx/string.h>
<wx/variant.h>
<wx/dir.h>
@ -7873,7 +7873,7 @@
<sleeplib/machine.h>
<list>
1306667429 /home/mark/projects/git/sleepyhead/version.h
1306667877 /home/mark/projects/git/sleepyhead/version.h
1306549105 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h"
@ -7890,7 +7890,7 @@
"preferences.h"
"tinyxml/tinyxml.h"
1306667345 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
1306667876 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
"wx_pch.h"
"version.h"
<wx/app.h>
@ -7919,7 +7919,7 @@
<wx/ffile.h>
<wx/utils.h>
1306647390 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
1306667681 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp
<tr1/random>
<wx/colour.h>
<wx/log.h>
@ -7951,7 +7951,7 @@
"machine_loader.h"
"tinyxml/tinyxml.h"
1306650068 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
1306667633 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
<wx/dir.h>
<wx/filename.h>
<wx/ffile.h>

24
SleepyHeadMain.cpp
View File

@ -427,11 +427,11 @@ Daily::Daily(wxWindow *win)
TAP->SetMargins(20,15,5,50);
TAP->AddLayer(new gCandleStick(tap));
TAP_IAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@IAP"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER);
TAP_IAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@IPAP"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER);
TAP_IAP->SetMargins(20,15,5,50);
TAP_IAP->AddLayer(new gCandleStick(tap_iap));
TAP_EAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@EAP"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER);
TAP_EAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@EPAP"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER);
TAP_EAP->SetMargins(20,15,5,50);
TAP_EAP->AddLayer(new gCandleStick(tap_eap));
@ -639,12 +639,12 @@ void Daily::OnCalendarDay( wxCalendarEvent& event )
html=html+wxT("<tr><td><b>")+_("Max&nbsp;Reached")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMaxAchieved))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("90%&nbsp;Pressure?")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(CPAP_PressurePercentValue))+wxT("</td></tr>\n");
} else if (mode==MODE_BIPAP) {
html=html+wxT("<tr><td><b>")+_("Avg IAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(BIPAP_IAPAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Avg EAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(BIPAP_EAPAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Min IAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH2O"),d->summary_min(BIPAP_IAPMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Max IAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_IAPMax))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Min EAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(BIPAP_EAPMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Max EAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_EAPMax))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Avg IPAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(BIPAP_IAPAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Avg EPAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(BIPAP_EAPAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Min IPAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.2fcmH2O"),d->summary_min(BIPAP_IAPMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Max IPAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_IAPMax))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Min EPAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(BIPAP_EAPMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Max EPAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_EAPMax))+wxT("</td></tr>\n");
}
html=html+wxT("<tr><td><b>")+_("Avg Leak")+wxT("</b></td><td>")+wxString::Format(wxT("%.2f"),d->summary_avg(CPAP_LeakAverage))+wxT("</td></tr>\n");
@ -655,11 +655,11 @@ 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&nbsp;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&nbsp;Max")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Min&nbsp;Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Max&nbsp;Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
} else if (mode==MODE_BIPAP) {
html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;IAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;EAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("IPAP&nbsp;Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("EPAP&nbsp;Pressure")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
}
html=html+wxT("<tr><td><b>")+_("Ramp-Time")+wxT("</b></td><td>")+wxString::Format(wxT("%imin"),(int)d->summary_max(CPAP_RampTime))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Ramp-Prs.")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_RampStartingPressure))+wxT("</td></tr>\n");

1
libs/sleeplib/machine.cpp
View File

@ -63,6 +63,7 @@ map<PRTypes,wxString> PressureReliefNames={
{PR_CFLEX,wxT("C-Flex")},
{PR_CFLEXPLUS,wxT("C-Flex+")},
{PR_AFLEX,wxT("A-Flex")},
{PR_BIFLEX,wxT("Bi-Flex")},
{PR_EPR,wxT("Exhalation Pressure Relief (EPR)")},
{PR_SMARTFLEX,wxT("SmartFlex")}
};

2
libs/sleeplib/machine.h
View File

@ -64,7 +64,7 @@ short {
};
enum PRTypes:
short {
PR_NONE=0,PR_CFLEX,PR_CFLEXPLUS,PR_AFLEX,PR_EPR,PR_SMARTFLEX
PR_NONE=0,PR_CFLEX,PR_CFLEXPLUS,PR_AFLEX,PR_BIFLEX,PR_EPR,PR_SMARTFLEX
};
extern map<MachineCode,wxString> DefaultMCShortNames;

3
libs/sleeplib/prs1_loader.cpp
View File

@ -295,6 +295,9 @@ int PRS1Loader::OpenMachine(Machine *m,wxString path)
if (sess->count_events(CPAP_IAP)>0) {
sess->summary[CPAP_Mode]=(long)MODE_BIPAP;
if (sess->summary[CPAP_PressureReliefType].GetInteger()!=(long)PR_NONE) {
sess->summary[CPAP_PressureReliefType]=(long)PR_BIFLEX;
}
sess->summary[CPAP_PressureMedian]=(sess->avg_event_field(CPAP_EAP,0)+sess->avg_event_field(CPAP_IAP,0))/2.0;
sess->summary[CPAP_PressureAverage]=(sess->weighted_avg_event_field(CPAP_IAP,0)+sess->weighted_avg_event_field(CPAP_EAP,0))/2.0;
sess->summary[CPAP_PressureMinAchieved]=sess->min_event_field(CPAP_IAP,0);

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 = 1872;
static const long REVISION = 4785;
static const long BUILD = 1878;
static const long REVISION = 4819;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 6275;
#define RC_FILEVERSION 0,7,1872,4785
#define RC_FILEVERSION_STRING "0, 7, 1872, 4785\0"
static const char FULLVERSION_STRING[] = "0.7.1872.4785";
static const long BUILDS_COUNT = 6282;
#define RC_FILEVERSION 0,7,1878,4819
#define RC_FILEVERSION_STRING "0, 7, 1878, 4819\0"
static const char FULLVERSION_STRING[] = "0.7.1878.4819";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62;