diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index ba572eb0..b32f5b4d 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8201,12 +8201,12 @@ "wx/treebase.h" "wx/hashmap.h" -1307461025 source:/home/mark/projects/git/sleepyhead/src/GUIFrame.cpp +1307470332 source:/home/mark/projects/git/sleepyhead/src/GUIFrame.cpp "wx/wxprec.h" "GUIFrame.h" -1307418393 /home/mark/projects/git/sleepyhead/src/GUIFrame.h +1307470075 /home/mark/projects/git/sleepyhead/src/GUIFrame.h @@ -8249,7 +8249,7 @@ 1307418393 /home/mark/projects/git/sleepyhead/src/SleepyHeadApp.h -1307442005 /home/mark/projects/git/sleepyhead/src/SleepyHeadMain.h +1307470130 /home/mark/projects/git/sleepyhead/src/SleepyHeadMain.h "SleepyHeadApp.h" @@ -8295,7 +8295,7 @@ -1307464570 /home/mark/projects/git/sleepyhead/src/version.h +1307470427 /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" -1307464513 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1307470291 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -8332,7 +8332,7 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1307444087 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1307466914 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp diff --git a/src/GUIFrame.cpp b/src/GUIFrame.cpp index a114dd94..90316015 100644 --- a/src/GUIFrame.cpp +++ b/src/GUIFrame.cpp @@ -58,6 +58,9 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons ViewMenuSerial = new wxMenuItem( ViewMenu, wxID_ANY, wxString( _("Show Serial Numbers") ) , wxEmptyString, wxITEM_CHECK ); ViewMenu->Append( ViewMenuSerial ); + ViewMenuFruitsalad = new wxMenuItem( ViewMenu, wxID_ANY, wxString( _("Fruit Salad") ) , wxEmptyString, wxITEM_CHECK ); + ViewMenu->Append( ViewMenuFruitsalad ); + wxMenuItem* m_separator2; m_separator2 = ViewMenu->AppendSeparator(); @@ -102,6 +105,7 @@ GUIFrame::GUIFrame( wxWindow* parent, wxWindowID id, const wxString& title, cons this->Connect( ViewMenuSummary->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuSummary ) ); this->Connect( ViewMenuDaily->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuDaily ) ); this->Connect( ViewMenuSerial->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnShowSerial ) ); + this->Connect( ViewMenuFruitsalad->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnFruitsalad ) ); this->Connect( ViewMenuFullscreen->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnFullscreen ) ); this->Connect( ToolsMenuScreenshot->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnScreenshot ) ); this->Connect( HelpMenuAbout->GetId(), wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnAbout ) ); @@ -117,6 +121,7 @@ GUIFrame::~GUIFrame() this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuSummary ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnViewMenuDaily ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnShowSerial ) ); + this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnFruitsalad ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnFullscreen ) ); this->Disconnect( wxID_ANY, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnScreenshot ) ); this->Disconnect( wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GUIFrame::OnAbout ) ); diff --git a/src/GUIFrame.h b/src/GUIFrame.h index b455e6db..d58b0610 100644 --- a/src/GUIFrame.h +++ b/src/GUIFrame.h @@ -48,6 +48,7 @@ class GUIFrame : public wxFrame wxMenu* FileMenu; wxMenu* ViewMenu; wxMenuItem* ViewMenuSerial; + wxMenuItem* ViewMenuFruitsalad; wxMenu* ProfileMenu; wxMenu* ToolsMenu; wxMenu* HelpMenu; @@ -61,6 +62,7 @@ class GUIFrame : public wxFrame virtual void OnViewMenuSummary( wxCommandEvent& event ) { event.Skip(); } virtual void OnViewMenuDaily( wxCommandEvent& event ) { event.Skip(); } virtual void OnShowSerial( wxCommandEvent& event ) { event.Skip(); } + virtual void OnFruitsalad( wxCommandEvent& event ) { event.Skip(); } virtual void OnFullscreen( wxCommandEvent& event ) { event.Skip(); } virtual void OnScreenshot( wxCommandEvent& event ) { event.Skip(); } virtual void OnAbout( wxCommandEvent& event ) { event.Skip(); } diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp index f2b8cd94..95d3ec58 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -81,6 +81,7 @@ SleepyHeadFrame::SleepyHeadFrame(wxFrame *frame) UpdateProfiles(); if (pref.Exists("ShowSerialNumbers")) ViewMenuSerial->Check(pref["ShowSerialNumbers"]); + if (pref.Exists("fruitsalad")) ViewMenuFruitsalad->Check(pref["fruitsalad"]); else pref["fruitsalad"]=true; // wxDisableAsserts(); @@ -242,6 +243,10 @@ void SleepyHeadFrame::OnShowSerial(wxCommandEvent& event) { pref["ShowSerialNumbers"]=event.IsChecked(); } +void SleepyHeadFrame::OnFruitsalad(wxCommandEvent& event) +{ + pref["fruitsalad"]=event.IsChecked(); +} void SleepyHeadFrame::OnAbout(wxCommandEvent &event) { @@ -683,6 +688,10 @@ Daily::Daily(wxWindow *win,Profile *p) fgSizer->Add(LEAK,1,wxEXPAND); fgSizer->Add(PULSE,1,wxEXPAND); fgSizer->Add(SPO2,1,wxEXPAND); + G_AHI->Hide(); + TAP->Hide(); + TAP_IAP->Hide(); + TAP_EAP->Hide(); //fgSizer->Add(G_AHI,1,wxEXPAND); //fgSizer->Add(TAP,1,wxEXPAND); //fgSizer->Add(TAP_IAP,1,wxEXPAND); @@ -828,7 +837,7 @@ void Daily::RefreshData() teap_bmp=NULL; } wxRect r=HTMLInfo->GetRect(); - int w=r.width-30; + int w=r.width-27; ahi_bmp=G_AHI->RenderBitmap(w,25); tap_bmp=TAP->RenderBitmap(w,25); wxMemoryFSHandler::AddFile(_T("ahi.png"), *ahi_bmp, wxBITMAP_TYPE_PNG); @@ -881,22 +890,37 @@ void Daily::RefreshData() // html=html+wxT(" \n"); html=html+wxT("
\n"); - html=html+wxT(""); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("
")+_("AHI")+wxT("")+wxString::Format(wxT("%0.2f"),ahi)+wxT("
")+_("Obstructive")+wxT("")+wxString::Format(wxT("%0.2f"),oai)+wxT("
")+_("Hypopnea")+wxT("")+wxString::Format(wxT("%0.2f"),hi)+wxT("
")+_("ClearAirway")+wxT("")+wxString::Format(wxT("%0.2f"),cai)+wxT("
"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("\n"); - html=html+wxT("
")+_("RERA")+wxT("")+wxString::Format(wxT("%0.2f"),rei)+wxT("
")+_("FlowLimit")+wxT("")+wxString::Format(wxT("%0.2f"),fli)+wxT("
")+_("Vsnore")+wxT("")+wxString::Format(wxT("%0.2f"),vsi)+wxT("
")+_("CSR")+wxT("")+wxString::Format(wxT("%0.2f%%"),csr)+wxT("
"); + //pref["fruitsalad"]=false; + if (pref.Exists("fruitsalad") && pref["fruitsalad"]) { + html=html+wxT(""); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("
")+_("AHI")+wxT("")+wxString::Format(wxT("%0.2f"),ahi)+wxT("
")+_("Obstructive")+wxT("")+wxString::Format(wxT("%0.2f"),oai)+wxT("
")+_("Hypopnea")+wxT("")+wxString::Format(wxT("%0.2f"),hi)+wxT("
")+_("ClearAirway")+wxT("")+wxString::Format(wxT("%0.2f"),cai)+wxT("
"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("
")+_("RERA")+wxT("")+wxString::Format(wxT("%0.2f"),rei)+wxT("
")+_("FlowLimit")+wxT("")+wxString::Format(wxT("%0.2f"),fli)+wxT("
")+_("Vsnore")+wxT("")+wxString::Format(wxT("%0.2f"),vsi)+wxT("
")+_("PB/CSR")+wxT("")+wxString::Format(wxT("%0.2f%%"),csr)+wxT("
"); + } else { + html=html+wxT(""); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("
")+_("AHI")+wxT("")+wxString::Format(wxT("%0.2f"),ahi)+wxT("
")+_("Obstructive")+wxT("")+wxString::Format(wxT("%0.2f"),oai)+wxT("
")+_("Hypopnea")+wxT("")+wxString::Format(wxT("%0.2f"),hi)+wxT("
")+_("ClearAirway")+wxT("")+wxString::Format(wxT("%0.2f"),cai)+wxT("
"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("\n"); + html=html+wxT("
")+_("RERA")+wxT("")+wxString::Format(wxT("%0.2f"),rei)+wxT("
")+_("FlowLimit")+wxT("")+wxString::Format(wxT("%0.2f"),fli)+wxT("
")+_("Vsnore")+wxT("")+wxString::Format(wxT("%0.2f"),vsi)+wxT("
")+_("PB/CSR")+wxT("")+wxString::Format(wxT("%0.2f%%"),csr)+wxT("
"); + } // html=html+wxT(" \n"); //html=html+wxT(" \n"); html=html+wxT("")+_("Event Breakdown")+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT("\n"); //html=html+wxT(" \n"); //html=html+wxT("")+_("Other Information")+wxT("\n"); @@ -944,7 +968,7 @@ void Daily::RefreshData() // html=html+wxT(" \n"); - if (mode!=MODE_BIPAP) { + /*if (mode!=MODE_BIPAP) { TAP_EAP->Show(false); TAP_IAP->Show(false); TAP->Show(true); @@ -952,24 +976,22 @@ void Daily::RefreshData() TAP->Show(false); TAP_IAP->Show(true); TAP_EAP->Show(true); - } + } */ + //G_AHI->Show(true); FRW->Show(true); PRD->Show(true); - G_AHI->Show(true); LEAK->Show(true); - //TAP->Show(true); SF->Show(true); } else { html+=_("No CPAP data available"); html=html+wxT("  \n"); - TAP_EAP->Show(false); - TAP_IAP->Show(false); + //TAP_EAP->Show(false); + //TAP_IAP->Show(false); + //G_AHI->Show(false); FRW->Show(false); PRD->Show(false); - G_AHI->Show(false); LEAK->Show(false); - TAP->Show(false); SF->Show(false); } if (oxi) { @@ -1000,12 +1022,12 @@ void Daily::RefreshData() if (mode==MODE_BIPAP) { html=html+wxT("")+_("Time@IPAP")+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT("\n"); html=html+wxT("")+_("Time@EPAP")+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT("\n"); } else if (mode==MODE_APAP) { html=html+wxT("")+_("Time@Pressure")+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT("\n"); } html=html+wxT("
"); @@ -1046,7 +1068,7 @@ void Daily::RefreshData() } else str=wxT("No"); html=html+wxT("")+_("Sys-Resist.")+wxT("")+str+wxT("\n"); } - html=html+wxT("
"); + html=html+wxT("
"); html=html+wxT("\n"); //html=html+wxT("\n"); //html=html+wxT("\n"); diff --git a/src/SleepyHeadMain.h b/src/SleepyHeadMain.h index 04d62c7f..c3c6faae 100644 --- a/src/SleepyHeadMain.h +++ b/src/SleepyHeadMain.h @@ -109,6 +109,8 @@ class SleepyHeadFrame: public GUIFrame virtual void OnViewMenuSummary(wxCommandEvent& event); virtual void OnShowSerial(wxCommandEvent& event); virtual void OnProfileSelected(wxCommandEvent& event); + virtual void OnFruitsalad(wxCommandEvent& event); + virtual void UpdateProfiles(); diff --git a/src/WxWizFrame.fbp b/src/WxWizFrame.fbp index 7515a315..45debd12 100644 --- a/src/WxWizFrame.fbp +++ b/src/WxWizFrame.fbp @@ -305,6 +305,21 @@ OnShowSerial + + + 0 + 1 + + wxID_ANY + wxITEM_CHECK + Fruit Salad + ViewMenuFruitsalad + protected + + + OnFruitsalad + + m_separator2 none diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index 825d0dfa..3f508fef 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -381,19 +381,18 @@ wxBitmap * gGraphWindow::RenderBitmap(int width,int height) m_scrX=width; m_scrY=height; - wxBitmap *bmp=new wxBitmap(width, height,-1); + wxBitmap *bmp=new wxBitmap(width, height,24); dc.SelectObject(*bmp); - dc.SetPen( *wxTRANSPARENT_PEN ); - - dc.SetTextForeground(m_fgColour); + // dc.SetPen( *wxTRANSPARENT_PEN ); +// dc.SetTextForeground(m_fgColour); wxRect r=wxRect(0,0,width,height); -// dc.GradientFillLinear(r,*gradient_start_color,*gradient_end_color,gradient_direction); - wxBrush brush( GetBackgroundColour() ); - dc.SetBrush( brush ); - dc.DrawRectangle(r); + dc.GradientFillLinear(r,*gradient_start_color,*gradient_end_color,gradient_direction); + //wxBrush brush( GetBackgroundColour() ); + //dc.SetBrush( brush ); +// dc.DrawRectangle(r); for (list::iterator l=layers.begin();l!=layers.end();l++) { (*l)->Plot(dc,*this); } diff --git a/src/version.h b/src/version.h index c0984972..2f108357 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 = 3643; - static const long REVISION = 3130; + static const long BUILD = 3665; + static const long REVISION = 3253; //Miscellaneous Version Types - static const long BUILDS_COUNT = 1297; - #define RC_FILEVERSION 0,7,3643,3130 - #define RC_FILEVERSION_STRING "0, 7, 3643, 3130\0" - static const char FULLVERSION_STRING[] = "0.7.3643.3130"; + static const long BUILDS_COUNT = 1366; + #define RC_FILEVERSION 0,7,3665,3253 + #define RC_FILEVERSION_STRING "0, 7, 3665, 3253\0" + static const char FULLVERSION_STRING[] = "0.7.3665.3253"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;