From 507f0bb067b2af16ff2632092dc136ab2d00b213 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Sat, 4 Jun 2011 12:49:04 +1000 Subject: [PATCH] Added hack to make CSR line up with Event Tree --- SleepyHead.depend | 32 +++++++++++++++++++++++++++++++- SleepyHeadMain.cpp | 6 +++++- version.h | 12 ++++++------ 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/SleepyHead.depend b/SleepyHead.depend index 311498dd..9ffd69a5 100644 --- a/SleepyHead.depend +++ b/SleepyHead.depend @@ -7877,7 +7877,7 @@ -1307154989 /home/mark/projects/git/sleepyhead/version.h +1307155688 /home/mark/projects/git/sleepyhead/version.h 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h "machine.h" @@ -8171,3 +8171,33 @@ "wx/scrolwin.h" "wx/pen.h" +1305615468 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/treectrl.h + "wx/defs.h" + "wx/control.h" + "wx/treebase.h" + "wx/textctrl.h" + "wx/generic/treectlg.h" + "wx/generic/treectlg.h" + "wx/msw/treectrl.h" + "wx/generic/treectlg.h" + "wx/generic/treectlg.h" + "wx/generic/treectlg.h" + "wx/generic/treectlg.h" + "wx/generic/treectlg.h" + +1305615468 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/treebase.h + "wx/defs.h" + "wx/window.h" + "wx/event.h" + "wx/dynarray.h" + +1305615468 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/generic/treectlg.h + "wx/scrolwin.h" + "wx/pen.h" + +1305615469 /opt/mingw/usr/i686-pc-mingw32//include/wx-2.9/wx/msw/treectrl.h + "wx/textctrl.h" + "wx/dynarray.h" + "wx/treebase.h" + "wx/hashmap.h" + diff --git a/SleepyHeadMain.cpp b/SleepyHeadMain.cpp index c8fbaeb5..ab60b612 100644 --- a/SleepyHeadMain.cpp +++ b/SleepyHeadMain.cpp @@ -789,7 +789,11 @@ void Daily::RefreshData() mcr=mcroot[code]; } for (vector::iterator e=(*s)->events[code].begin();e!=(*s)->events[code].end();e++) { - EventTree->AppendItem(mcr,(*e)->time().Format(wxT("%Y-%m-%d %H:%M:%S")),-1,-1); + wxDateTime t=(*e)->time(); + if (code==CPAP_CSR) { + t-=wxTimeSpan::Seconds((*(*e))[0]/2); + } + EventTree->AppendItem(mcr,t.Format(wxT("%Y-%m-%d %H:%M:%S")),-1,-1); } } } diff --git a/version.h b/version.h index 10cb635b..74a9f75a 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 = 3051; - static const long REVISION = 11257; + static const long BUILD = 3053; + static const long REVISION = 11270; //Miscellaneous Version Types - static const long BUILDS_COUNT = 8949; - #define RC_FILEVERSION 0,7,3051,11257 - #define RC_FILEVERSION_STRING "0, 7, 3051, 11257\0" - static const char FULLVERSION_STRING[] = "0.7.3051.11257"; + static const long BUILDS_COUNT = 8956; + #define RC_FILEVERSION 0,7,3053,11270 + #define RC_FILEVERSION_STRING "0, 7, 3053, 11270\0" + static const char FULLVERSION_STRING[] = "0.7.3053.11270"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 62;