diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 24f20520..6c9d55e7 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -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" "GUIFrame.h" @@ -8295,7 +8295,7 @@ -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" @@ -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 @@ -8663,3 +8663,32 @@ "tinyxml.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" + diff --git a/Projects/CodeBlocks/SleepyHead.layout b/Projects/CodeBlocks/SleepyHead.layout index 491c75e9..b41fa996 100644 --- a/Projects/CodeBlocks/SleepyHead.layout +++ b/Projects/CodeBlocks/SleepyHead.layout @@ -1,6 +1,6 @@ - + @@ -11,13 +11,13 @@ - + - + - - + + @@ -32,10 +32,10 @@ - + - + @@ -43,7 +43,7 @@ - - + + diff --git a/src/GUIFrame.cpp b/src/GUIFrame.cpp index 22ab55e4..88483944 100644 --- a/src/GUIFrame.cpp +++ b/src/GUIFrame.cpp @@ -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 ) ) ); diff --git a/src/WxWizFrame.fbp b/src/WxWizFrame.fbp index 3e8c771f..57172dc9 100644 --- a/src/WxWizFrame.fbp +++ b/src/WxWizFrame.fbp @@ -830,7 +830,7 @@ 1 1 - 280,-1 + 280,480 Summary 1 @@ -860,7 +860,7 @@ Notebook 0 - 280,-1 + 280,480 protected 1 diff --git a/src/libs/sleeplib/prs1_loader.cpp b/src/libs/sleeplib/prs1_loader.cpp index 616bd1cf..430d0fcf 100644 --- a/src/libs/sleeplib/prs1_loader.cpp +++ b/src/libs/sleeplib/prs1_loader.cpp @@ -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); diff --git a/src/version.h b/src/version.h index 843c80a2..070dd94f 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 = 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;