From b302f528bc3b8d0ead7afd11bcc7d1a078350b2c Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 7 Jun 2011 11:22:05 +1000 Subject: [PATCH] Fixed Event Tab --- Projects/CodeBlocks/SleepyHead.depend | 4 ++-- Projects/CodeBlocks/SleepyHead.layout | 28 ++++++++++++++++----------- src/SleepyHeadMain.cpp | 10 +++++----- src/version.h | 12 ++++++------ 4 files changed, 30 insertions(+), 24 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 30c7b5a0..ede6a98b 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8295,7 +8295,7 @@ -1307376195 /home/mark/projects/git/sleepyhead/src/version.h +1307409339 /home/mark/projects/git/sleepyhead/src/version.h 1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" @@ -8312,7 +8312,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1307376195 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1307376956 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp "wx_pch.h" "version.h" diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout index cb11fd2f..e5f170ec 100644 --- a/Projects/CodeBlocks/SleepyHead.layout +++ b/Projects/CodeBlocks/SleepyHead.layout @@ -2,36 +2,42 @@ - + - - + + - + - - + + - + - + - + - + - + + + + + + + diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp index a88fda6f..9082fa9c 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -655,8 +655,8 @@ Daily::Daily(wxWindow *win,Profile *p) SF->LinkZoom(FRW); FRW->LinkZoom(SF); #if defined(__UNIX__) - // SF->LinkZoom(PRD); // Uncomment to link in more graphs.. Too slow on windows. - // SF->LinkZoom(LEAK); + SF->LinkZoom(PRD); // Uncomment to link in more graphs.. Too slow on windows. + SF->LinkZoom(LEAK); #endif const int sfc=9; @@ -675,10 +675,10 @@ Daily::Daily(wxWindow *win,Profile *p) fgSizer->Add(SF,1,wxEXPAND); fgSizer->Add(FRW,1,wxEXPAND); - fgSizer->Add(PULSE,1,wxEXPAND); - fgSizer->Add(SPO2,1,wxEXPAND); fgSizer->Add(PRD,1,wxEXPAND); fgSizer->Add(LEAK,1,wxEXPAND); + fgSizer->Add(PULSE,1,wxEXPAND); + fgSizer->Add(SPO2,1,wxEXPAND); fgSizer->Add(G_AHI,1,wxEXPAND); fgSizer->Add(TAP,1,wxEXPAND); fgSizer->Add(TAP_IAP,1,wxEXPAND); @@ -775,7 +775,7 @@ void Daily::RefreshData() if (code==CPAP_CSR) { t-=wxTimeSpan::Seconds((*(*e))[0]/2); } - EventTree->AppendItem(mcr,t.Format(wxT("%Y-%m-%cpap %H:%M:%S")),-1,-1); + EventTree->AppendItem(mcr,t.Format(wxT("%Y-%m-%d %H:%M:%S")),-1,-1); } } } diff --git a/src/version.h b/src/version.h index 8232fcc7..815449bb 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 = 3332; - static const long REVISION = 1335; + static const long BUILD = 3335; + static const long REVISION = 1351; //Miscellaneous Version Types - static const long BUILDS_COUNT = 498; - #define RC_FILEVERSION 0,7,3332,1335 - #define RC_FILEVERSION_STRING "0, 7, 3332, 1335\0" - static const char FULLVERSION_STRING[] = "0.7.3332.1335"; + static const long BUILDS_COUNT = 506; + #define RC_FILEVERSION 0,7,3335,1351 + #define RC_FILEVERSION_STRING "0, 7, 3335, 1351\0" + static const char FULLVERSION_STRING[] = "0.7.3335.1351"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;