diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index bc070ec7..161c6bd2 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8295,7 +8295,7 @@ -1307445805 /home/mark/projects/git/sleepyhead/src/version.h +1307446079 /home/mark/projects/git/sleepyhead/src/version.h 1307418393 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" @@ -8312,7 +8312,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1307445804 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1307446078 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp "wx_pch.h" "version.h" diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp index 52fd8d77..59340c45 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -815,22 +815,27 @@ void Daily::RefreshData() if (tiap_bmp) { wxMemoryFSHandler::RemoveFile(_T("tiap.png")); delete tiap_bmp; + tiap_bmp=NULL; } if (teap_bmp) { wxMemoryFSHandler::RemoveFile(_T("teap.png")); delete teap_bmp; + teap_bmp=NULL; } wxRect r=HTMLInfo->GetRect(); int w=r.width-25; ahi_bmp=G_AHI->RenderBitmap(w,25); tap_bmp=TAP->RenderBitmap(w,25); - teap_bmp=TAP_EAP->RenderBitmap(w,25); - tiap_bmp=TAP_IAP->RenderBitmap(w,25); - wxMemoryFSHandler::AddFile(_T("ahi.png"), *ahi_bmp, wxBITMAP_TYPE_PNG); wxMemoryFSHandler::AddFile(_T("tap.png"), *tap_bmp, wxBITMAP_TYPE_PNG); - wxMemoryFSHandler::AddFile(_T("tiap.png"), *tiap_bmp, wxBITMAP_TYPE_PNG); - wxMemoryFSHandler::AddFile(_T("teap.png"), *teap_bmp, wxBITMAP_TYPE_PNG); + + if (mode==MODE_BIPAP) { + teap_bmp=TAP_EAP->RenderBitmap(w,25); + tiap_bmp=TAP_IAP->RenderBitmap(w,25); + wxMemoryFSHandler::AddFile(_T("tiap.png"), *tiap_bmp, wxBITMAP_TYPE_PNG); + wxMemoryFSHandler::AddFile(_T("teap.png"), *teap_bmp, wxBITMAP_TYPE_PNG); + } + PRTypes pr=(PRTypes)cpap->summary_max(CPAP_PressureReliefType); diff --git a/src/version.h b/src/version.h index 0f0d0b57..5dab82d2 100644 --- a/src/version.h +++ b/src/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 = 3455; - static const long REVISION = 2026; + static const long BUILD = 3456; + static const long REVISION = 2033; //Miscellaneous Version Types - static const long BUILDS_COUNT = 827; - #define RC_FILEVERSION 0,7,3455,2026 - #define RC_FILEVERSION_STRING "0, 7, 3455, 2026\0" - static const char FULLVERSION_STRING[] = "0.7.3455.2026"; + static const long BUILDS_COUNT = 834; + #define RC_FILEVERSION 0,7,3456,2033 + #define RC_FILEVERSION_STRING "0, 7, 3456, 2033\0" + static const char FULLVERSION_STRING[] = "0.7.3456.2033"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;