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

Fixed Event Tab

Browse Source
This commit is contained in:
Mark Watkins 2011-06-07 11:22:05 +10:00
parent 584beecc28
commit b302f528bc
4 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8295,7 +8295,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
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 1307358939 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -8312,7 +8312,7 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.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" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>

28
Projects/CodeBlocks/SleepyHead.layout
View File

@ -2,36 +2,42 @@
<CodeBlocks_layout_file> <CodeBlocks_layout_file>
<ActiveTarget name="Debug" /> <ActiveTarget name="Debug" />
<File name="../../src/SleepyHeadApp.cpp" open="1" top="0" tabpos="1"> <File name="../../src/SleepyHeadApp.cpp" open="1" top="0" tabpos="1">
<Cursor position="1042" topLine="21" /> <Cursor position="1042" topLine="7" />
</File> </File>
<File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="2"> <File name="../../src/SleepyHeadMain.cpp" open="1" top="1" tabpos="2">
<Cursor position="9011" topLine="191" /> <Cursor position="28432" topLine="739" />
</File> </File>
<File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="3"> <File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="3">
<Cursor position="546" topLine="0" /> <Cursor position="546" topLine="42" />
</File> </File>
<File name="../../src/graphs/graph.cpp" open="1" top="1" tabpos="9"> <File name="../../src/graphs/graph.cpp" open="1" top="0" tabpos="9">
<Cursor position="52327" topLine="1854" /> <Cursor position="31458" topLine="1176" />
</File> </File>
<File name="../../src/graphs/graph.h" open="1" top="0" tabpos="10"> <File name="../../src/graphs/graph.h" open="1" top="0" tabpos="10">
<Cursor position="15761" topLine="437" /> <Cursor position="12935" topLine="338" />
</File> </File>
<File name="../../src/libs/sleeplib/binary_file.cpp" open="1" top="0" tabpos="11"> <File name="../../src/libs/sleeplib/binary_file.cpp" open="1" top="0" tabpos="11">
<Cursor position="7148" topLine="269" /> <Cursor position="7148" topLine="269" />
</File> </File>
<File name="../../src/libs/sleeplib/loader_plugins/cms50_loader.cpp" open="1" top="0" tabpos="4"> <File name="../../src/libs/sleeplib/loader_plugins/cms50_loader.cpp" open="1" top="0" tabpos="4">
<Cursor position="3214" topLine="116" /> <Cursor position="6650" topLine="205" />
</File> </File>
<File name="../../src/libs/sleeplib/loader_plugins/cms50_loader.h" open="1" top="0" tabpos="7"> <File name="../../src/libs/sleeplib/loader_plugins/cms50_loader.h" open="1" top="0" tabpos="5">
<Cursor position="579" topLine="0" /> <Cursor position="579" topLine="0" />
</File> </File>
<File name="../../src/libs/sleeplib/machine.cpp" open="1" top="0" tabpos="8"> <File name="../../src/libs/sleeplib/machine.cpp" open="1" top="0" tabpos="8">
<Cursor position="22029" topLine="747" /> <Cursor position="22029" topLine="747" />
</File> </File>
<File name="../../src/libs/sleeplib/machine.h" open="1" top="0" tabpos="5"> <File name="../../src/libs/sleeplib/machine.h" open="1" top="0" tabpos="6">
<Cursor position="2133" topLine="25" /> <Cursor position="2133" topLine="25" />
</File> </File>
<File name="../../src/libs/sleeplib/prs1_loader.cpp" open="1" top="0" tabpos="6"> <File name="../../src/libs/sleeplib/profiles.cpp" open="1" top="0" tabpos="12">
<Cursor position="4619" topLine="141" />
</File>
<File name="../../src/libs/sleeplib/profiles.h" open="1" top="0" tabpos="13">
<Cursor position="757" topLine="15" />
</File>
<File name="../../src/libs/sleeplib/prs1_loader.cpp" open="1" top="0" tabpos="7">
<Cursor position="24147" topLine="688" /> <Cursor position="24147" topLine="688" />
</File> </File>
</CodeBlocks_layout_file> </CodeBlocks_layout_file>

10
src/SleepyHeadMain.cpp
View File

@ -655,8 +655,8 @@ Daily::Daily(wxWindow *win,Profile *p)
SF->LinkZoom(FRW); SF->LinkZoom(FRW);
FRW->LinkZoom(SF); FRW->LinkZoom(SF);
#if defined(__UNIX__) #if defined(__UNIX__)
// SF->LinkZoom(PRD); // Uncomment to link in more graphs.. Too slow on windows. SF->LinkZoom(PRD); // Uncomment to link in more graphs.. Too slow on windows.
// SF->LinkZoom(LEAK); SF->LinkZoom(LEAK);
#endif #endif
const int sfc=9; const int sfc=9;
@ -675,10 +675,10 @@ Daily::Daily(wxWindow *win,Profile *p)
fgSizer->Add(SF,1,wxEXPAND); fgSizer->Add(SF,1,wxEXPAND);
fgSizer->Add(FRW,1,wxEXPAND); fgSizer->Add(FRW,1,wxEXPAND);
fgSizer->Add(PULSE,1,wxEXPAND);
fgSizer->Add(SPO2,1,wxEXPAND);
fgSizer->Add(PRD,1,wxEXPAND); fgSizer->Add(PRD,1,wxEXPAND);
fgSizer->Add(LEAK,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(G_AHI,1,wxEXPAND);
fgSizer->Add(TAP,1,wxEXPAND); fgSizer->Add(TAP,1,wxEXPAND);
fgSizer->Add(TAP_IAP,1,wxEXPAND); fgSizer->Add(TAP_IAP,1,wxEXPAND);
@ -775,7 +775,7 @@ void Daily::RefreshData()
if (code==CPAP_CSR) { if (code==CPAP_CSR) {
t-=wxTimeSpan::Seconds((*(*e))[0]/2); 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);
} }
} }
} }

12
src/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 = 3332; static const long BUILD = 3335;
static const long REVISION = 1335; static const long REVISION = 1351;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 498; static const long BUILDS_COUNT = 506;
#define RC_FILEVERSION 0,7,3332,1335 #define RC_FILEVERSION 0,7,3335,1351
#define RC_FILEVERSION_STRING "0, 7, 3332, 1335\0" #define RC_FILEVERSION_STRING "0, 7, 3335, 1351\0"
static const char FULLVERSION_STRING[] = "0.7.3332.1335"; static const char FULLVERSION_STRING[] = "0.7.3335.1351";
//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 = 0; static const long BUILD_HISTORY = 0;