From 191d498573567ae6dad9339ae9e7f2b5ba0a439f Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sun, 29 May 2011 21:29:32 +1000 Subject: [PATCH] Updates to BIPAP names --- SleepyHead.depend | 10 +++++----- SleepyHeadMain.cpp | 24 ++++++++++++------------ libs/sleeplib/machine.cpp | 1 + libs/sleeplib/machine.h | 2 +- libs/sleeplib/prs1_loader.cpp | 3 +++ version.h | 12 ++++++------ 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/SleepyHead.depend b/SleepyHead.depend index cc378420..8788f998 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -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 @@ -7873,7 +7873,7 @@ -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" @@ -7919,7 +7919,7 @@ -1306647390 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp +1306667681 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/machine.cpp @@ -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 diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index 0fd0285f..87f66960 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -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("")+_("Max Reached")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMaxAchieved))+wxT("\n"); html=html+wxT("")+_("90% Pressure?")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(CPAP_PressurePercentValue))+wxT("\n"); } else if (mode==MODE_BIPAP) { - html=html+wxT("")+_("Avg IAP")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(BIPAP_IAPAverage))+wxT("\n"); - html=html+wxT("")+_("Avg EAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(BIPAP_EAPAverage))+wxT("\n"); - html=html+wxT("")+_("Min IAP")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),d->summary_min(BIPAP_IAPMin))+wxT("\n"); - html=html+wxT("")+_("Max IAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_IAPMax))+wxT("\n"); - html=html+wxT("")+_("Min EAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(BIPAP_EAPMin))+wxT("\n"); - html=html+wxT("")+_("Max EAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_EAPMax))+wxT("\n"); + html=html+wxT("")+_("Avg IPAP")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),d->summary_avg(BIPAP_IAPAverage))+wxT("\n"); + html=html+wxT("")+_("Avg EPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_avg(BIPAP_EAPAverage))+wxT("\n"); + html=html+wxT("")+_("Min IPAP")+wxT("")+wxString::Format(wxT("%.2fcmH2O"),d->summary_min(BIPAP_IAPMin))+wxT("\n"); + html=html+wxT("")+_("Max IPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_IAPMax))+wxT("\n"); + html=html+wxT("")+_("Min EPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(BIPAP_EAPMin))+wxT("\n"); + html=html+wxT("")+_("Max EPAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(BIPAP_EAPMax))+wxT("\n"); } html=html+wxT("")+_("Avg Leak")+wxT("")+wxString::Format(wxT("%.2f"),d->summary_avg(CPAP_LeakAverage))+wxT("\n"); @@ -655,11 +655,11 @@ 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_PressureMin))+wxT("\n"); - html=html+wxT("")+_("Pressure Max")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("\n"); + html=html+wxT("")+_("Min Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("\n"); + html=html+wxT("")+_("Max Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("\n"); } else if (mode==MODE_BIPAP) { - html=html+wxT("")+_("Pressure IAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("\n"); - html=html+wxT("")+_("Pressure EAP")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("\n"); + html=html+wxT("")+_("IPAP Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("\n"); + html=html+wxT("")+_("EPAP Pressure")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("\n"); } html=html+wxT("")+_("Ramp-Time")+wxT("")+wxString::Format(wxT("%imin"),(int)d->summary_max(CPAP_RampTime))+wxT("\n"); html=html+wxT("")+_("Ramp-Prs.")+wxT("")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_RampStartingPressure))+wxT("\n"); diff --git a/libs/sleeplib/machine.cpp b/libs/sleeplib/machine.cpp index 796f94f4..f089fc5e 100644 --- a/libs/sleeplib/machine.cpp +++ b/libs/sleeplib/machine.cpp @@ -63,6 +63,7 @@ map 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")} }; diff --git a/libs/sleeplib/machine.h b/libs/sleeplib/machine.h index f87edfec..3997e67c 100644 --- a/libs/sleeplib/machine.h +++ b/libs/sleeplib/machine.h @@ -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 DefaultMCShortNames; diff --git a/libs/sleeplib/prs1_loader.cpp b/libs/sleeplib/prs1_loader.cpp index d536e2b6..4ff844fc 100644 --- a/libs/sleeplib/prs1_loader.cpp +++ b/libs/sleeplib/prs1_loader.cpp @@ -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); diff --git a/version.h b/version.h index b4b48bbe..1f42f7f0 100644 --- a/version.h +++ b/version.h @@ -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;