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

Added Debug-wx29 build target to CodeBlocks

Browse Source
This commit is contained in:
Mark Watkins 2011-06-08 19:04:45 +10:00
parent 3d3aecf62b
commit a6839ffc06
6 changed files with 52 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8201,7 +8201,7 @@
"wx/treebase.h"
"wx/hashmap.h"
1307516814 source:/home/mark/projects/git/sleepyhead/src/GUIFrame.cpp
1307521170 source:/home/mark/projects/git/sleepyhead/src/GUIFrame.cpp
"wx/wxprec.h"
<wx/wx.h>
"GUIFrame.h"
@ -8295,7 +8295,7 @@
<sleeplib/machine.h>
<list>
1307518841 /home/mark/projects/git/sleepyhead/src/version.h
1307522091 /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"
1307518564 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
1307518841 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
"wx_pch.h"
"version.h"
<wx/app.h>
@ -8380,7 +8380,7 @@
"machine_loader.h"
"tinyxml/tinyxml.h"
1307515453 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp
1307522085 source:/home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.cpp
<wx/dir.h>
<wx/filename.h>
<wx/ffile.h>
@ -8663,3 +8663,32 @@
"tinyxml.h"
<windows.h>
1305215600 /usr/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"
1305215600 /usr/include/wx-2.9/wx/treebase.h
"wx/defs.h"
"wx/window.h"
"wx/event.h"
"wx/dynarray.h"
1305215599 /usr/include/wx-2.9/wx/generic/treectlg.h
"wx/scrolwin.h"
"wx/pen.h"
1305215600 /usr/include/wx-2.9/wx/aboutdlg.h
"wx/defs.h"
"wx/app.h"
"wx/icon.h"

18
Projects/CodeBlocks/SleepyHead.layout
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
<ActiveTarget name="Windows" />
<ActiveTarget name="Debug" />
<File name="../../src/GUIFrame.cpp" open="0" top="0" tabpos="14">
<Cursor position="1300" topLine="24" />
</File>
@ -11,13 +11,13 @@
<Cursor position="1042" topLine="7" />
</File>
<File name="../../src/SleepyHeadMain.cpp" open="1" top="0" tabpos="2">
<Cursor position="45006" topLine="1004" />
<Cursor position="35219" topLine="888" />
</File>
<File name="../../src/SleepyHeadMain.h" open="1" top="0" tabpos="3">
<Cursor position="2540" topLine="75" />
<Cursor position="2209" topLine="51" />
</File>
<File name="../../src/graphs/graph.cpp" open="1" top="1" tabpos="9">
<Cursor position="9786" topLine="365" />
<File name="../../src/graphs/graph.cpp" open="1" top="0" tabpos="9">
<Cursor position="0" topLine="0" />
</File>
<File name="../../src/graphs/graph.h" open="1" top="0" tabpos="10">
<Cursor position="12935" topLine="338" />
@ -32,10 +32,10 @@
<Cursor position="579" topLine="0" />
</File>
<File name="../../src/libs/sleeplib/machine.cpp" open="1" top="0" tabpos="8">
<Cursor position="22029" topLine="747" />
<Cursor position="0" topLine="0" />
</File>
<File name="../../src/libs/sleeplib/machine.h" open="1" top="0" tabpos="6">
<Cursor position="2133" topLine="25" />
<Cursor position="1712" topLine="36" />
</File>
<File name="../../src/libs/sleeplib/profiles.cpp" open="0" top="0" tabpos="12">
<Cursor position="4619" topLine="141" />
@ -43,7 +43,7 @@
<File name="../../src/libs/sleeplib/profiles.h" open="0" 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" />
<File name="../../src/libs/sleeplib/prs1_loader.cpp" open="1" top="1" tabpos="7">
<Cursor position="12527" topLine="329" />
</File>
</CodeBlocks_layout_file>

2
src/GUIFrame.cpp
View File

@ -150,7 +150,7 @@ DailyPanel::DailyPanel( wxWindow* parent, wxWindowID id, const wxPoint& pos, con
ScrolledWindow->Layout();
fgSizer->Fit( ScrolledWindow );
Notebook = new wxAuiNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_NB_TAB_MOVE|wxAUI_NB_TAB_SPLIT );
m_mgr.AddPane( Notebook, wxAuiPaneInfo() .Left() .Caption( wxT("Summary") ).PaneBorder( false ).Dock().Resizable().FloatingSize( wxSize( 280,-1 ) ).DockFixed( false ).Position( 1 ).BestSize( wxSize( 280,-1 ) ) );
m_mgr.AddPane( Notebook, wxAuiPaneInfo() .Left() .Caption( wxT("Summary") ).PaneBorder( false ).Dock().Resizable().FloatingSize( wxSize( 280,480 ) ).DockFixed( false ).Position( 1 ).BestSize( wxSize( 280,480 ) ) );

4
src/WxWizFrame.fbp
View File

@ -830,7 +830,7 @@
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_name"></property>
<property name="best_size">280,-1</property>
<property name="best_size">280,480</property>
<property name="bg"></property>
<property name="caption">Summary</property>
<property name="caption_visible">1</property>
@ -860,7 +860,7 @@
<property name="name">Notebook</property>
<property name="pane_border">0</property>
<property name="pane_position"></property>
<property name="pane_size">280,-1</property>
<property name="pane_size">280,480</property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>

2
src/libs/sleeplib/prs1_loader.cpp
View File

@ -347,7 +347,7 @@ int PRS1Loader::OpenMachine(Machine *m,wxString path,Profile *profile)
sess->summary[CPAP_SnoreMinimum]=sess->min_event_field(CPAP_SnoreGraph,0);
sess->summary[CPAP_SnoreMaximum]=sess->max_event_field(CPAP_SnoreGraph,0);
sess->summary[CPAP_SnoreMedian]=sess->avg_event_field(CPAP_SnoreGraph,0);
sess->summary[CPAP_SnoreAverage]=sess->weighted_avg_event_field(CPAP_SnoreGraph,0);
sess->summary[CPAP_SnoreAverage]=sess->weighted_avg_event_field(PRS1_VSnore2,0);
//wxPrintf(sess->start().Format()+wxT(" avgsummary=%.3f avgmine=%.3f\n"),sess->summary[CPAP_PressureAverage].GetDouble(),sess->weighted_avg_event_field(CPAP_Pressure,0));
sess->SetChanged(true);

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 7;
static const long BUILD = 3700;
static const long REVISION = 3455;
static const long BUILD = 3701;
static const long REVISION = 3457;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 1484;
#define RC_FILEVERSION 0,7,3700,3455
#define RC_FILEVERSION_STRING "0, 7, 3700, 3455\0"
static const char FULLVERSION_STRING[] = "0.7.3700.3455";
static const long BUILDS_COUNT = 1491;
#define RC_FILEVERSION 0,7,3701,3457
#define RC_FILEVERSION_STRING "0, 7, 3701, 3457\0"
static const char FULLVERSION_STRING[] = "0.7.3701.3457";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0;