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

Added hack to make CSR line up with Event Tree

Browse Source
This commit is contained in:
Mark Watkins 2011-06-04 12:49:04 +10:00
parent 74ce4850a9
commit 507f0bb067
3 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
SleepyHead.depend
View File

@ -7877,7 +7877,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
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 1306724655 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -8171,3 +8171,33 @@
"wx/scrolwin.h" "wx/scrolwin.h"
"wx/pen.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"

6
SleepyHeadMain.cpp
View File

@ -789,7 +789,11 @@ void Daily::RefreshData()
mcr=mcroot[code]; mcr=mcroot[code];
} }
for (vector<Event *>::iterator e=(*s)->events[code].begin();e!=(*s)->events[code].end();e++) { for (vector<Event *>::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);
} }
} }
} }

12
version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 3051; static const long BUILD = 3053;
static const long REVISION = 11257; static const long REVISION = 11270;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 8949; static const long BUILDS_COUNT = 8956;
#define RC_FILEVERSION 0,7,3051,11257 #define RC_FILEVERSION 0,7,3053,11270
#define RC_FILEVERSION_STRING "0, 7, 3051, 11257\0" #define RC_FILEVERSION_STRING "0, 7, 3053, 11270\0"
static const char FULLVERSION_STRING[] = "0.7.3051.11257"; static const char FULLVERSION_STRING[] = "0.7.3053.11270";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62; static const long BUILD_HISTORY = 62;