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

Lessen the fruitsalad via an option. (You can't half tell I'm bored and need to sleep)

Browse Source
This commit is contained in:
Mark Watkins 2011-06-08 04:15:21 +10:00
parent f16284b75d
commit dd696784c5
8 changed files with 90 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Projects/CodeBlocks/SleepyHead.depend
View File

@ -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"
<wx/wx.h>
"GUIFrame.h"
1307418393 /home/mark/projects/git/sleepyhead/src/GUIFrame.h
1307470075 /home/mark/projects/git/sleepyhead/src/GUIFrame.h
<wx/intl.h>
<wx/string.h>
<wx/bitmap.h>
@ -8249,7 +8249,7 @@
1307418393 /home/mark/projects/git/sleepyhead/src/SleepyHeadApp.h
<wx/app.h>
1307442005 /home/mark/projects/git/sleepyhead/src/SleepyHeadMain.h
1307470130 /home/mark/projects/git/sleepyhead/src/SleepyHeadMain.h
<wx/listbox.h>
<wx/treectrl.h>
"SleepyHeadApp.h"
@ -8295,7 +8295,7 @@
<sleeplib/machine.h>
<list>
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"
<wx/app.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
<wx/settings.h>
<wx/dcbuffer.h>
<wx/log.h>

5
src/GUIFrame.cpp
View File

@ -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 ) );

2
src/GUIFrame.h
View File

@ -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(); }

72
src/SleepyHeadMain.cpp
View File

@ -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("<tr><td colspan=4>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=center><hr></td></tr>\n");
html=html+wxT("<tr><td colspan=2><table cellspacing=0 cellpadding=2 border=0 width='100%'>");
html=html+wxT("<tr><td align='right' bgcolor='#F88017'><b><font color='black'>")+_("AHI")+wxT("</font></b></td><td bgcolor='#F88017'><b><font color='black'>")+wxString::Format(wxT("%0.2f"),ahi)+wxT("</font></b></td></tr>\n");
html=html+wxT("<tr><td align='right' bgcolor='#afbfff'><b>")+_("Obstructive")+wxT("</b></td><td bgcolor='#afbfff'>")+wxString::Format(wxT("%0.2f"),oai)+wxT("</td></tr>\n");
html=html+wxT("<tr><td align='right' bgcolor='#4040ff'><b><font color='white'>")+_("Hypopnea")+wxT("</font></b></td><td bgcolor='#4040ff'><font color='white'>")+wxString::Format(wxT("%0.2f"),hi)+wxT("</font></td></tr>\n");
html=html+wxT("<tr><td align='right' bgcolor='#ff80ff'><b>")+_("ClearAirway")+wxT("</b></td><td bgcolor='#ff80ff'>")+wxString::Format(wxT("%0.2f"),cai)+wxT("</td></tr>\n");
html=html+wxT("</table></td><td colspan=2><table cellspacing=0 cellpadding=2 border=0 width='100%'>");
html=html+wxT("<tr><td align='right' bgcolor='#ffff80'><b>")+_("RERA")+wxT("</b></td><td bgcolor='#ffff80'>")+wxString::Format(wxT("%0.2f"),rei)+wxT("</td></tr>\n");
html=html+wxT("<tr><td align='right' bgcolor='#404040'><b><font color='white'>")+_("FlowLimit")+wxT("</font></b></td><td bgcolor='#404040'><font color='white'>")+wxString::Format(wxT("%0.2f"),fli)+wxT("</font></td></tr>\n");
html=html+wxT("<tr><td align='right' bgcolor='#ff4040'><b>")+_("Vsnore")+wxT("</b></td><td bgcolor='#ff4040'>")+wxString::Format(wxT("%0.2f"),vsi)+wxT("</td></tr>\n");
html=html+wxT("<tr><td align='right' bgcolor='#80ff80'><b>")+_("CSR")+wxT("</b></td><td bgcolor='#80ff80'>")+wxString::Format(wxT("%0.2f%%"),csr)+wxT("</td></tr>\n");
html=html+wxT("</table></td></tr>");
//pref["fruitsalad"]=false;
if (pref.Exists("fruitsalad") && pref["fruitsalad"]) {
html=html+wxT("<tr><td colspan=2><table cellspacing=0 cellpadding=2 border=0 width='100%'>");
html=html+wxT("<tr><td align='right' bgcolor='#F88017'><b><font color='black'>")+_("AHI")+wxT("</font></b></td><td bgcolor='#F88017'><b><font color='black'>")+wxString::Format(wxT("%0.2f"),ahi)+wxT("</font></b></td></tr>\n");
html=html+wxT("<tr><td align='right' bgcolor='#afbfff'><b>")+_("Obstructive")+wxT("</b></td><td bgcolor='#afbfff'>")+wxString::Format(wxT("%0.2f"),oai)+wxT("</td></tr>\n");
html=html+wxT("<tr><td align='right' bgcolor='#4040ff'><b><font color='white'>")+_("Hypopnea")+wxT("</font></b></td><td bgcolor='#4040ff'><font color='white'>")+wxString::Format(wxT("%0.2f"),hi)+wxT("</font></td></tr>\n");
html=html+wxT("<tr><td align='right' bgcolor='#ff80ff'><b>")+_("ClearAirway")+wxT("</b></td><td bgcolor='#ff80ff'>")+wxString::Format(wxT("%0.2f"),cai)+wxT("</td></tr>\n");
html=html+wxT("</table></td><td colspan=2><table cellspacing=0 cellpadding=2 border=0 width='100%'>");
html=html+wxT("<tr><td align='right' bgcolor='#ffff80'><b>")+_("RERA")+wxT("</b></td><td bgcolor='#ffff80'>")+wxString::Format(wxT("%0.2f"),rei)+wxT("</td></tr>\n");
html=html+wxT("<tr><td align='right' bgcolor='#404040'><b><font color='white'>")+_("FlowLimit")+wxT("</font></b></td><td bgcolor='#404040'><font color='white'>")+wxString::Format(wxT("%0.2f"),fli)+wxT("</font></td></tr>\n");
html=html+wxT("<tr><td align='right' bgcolor='#ff4040'><b>")+_("Vsnore")+wxT("</b></td><td bgcolor='#ff4040'>")+wxString::Format(wxT("%0.2f"),vsi)+wxT("</td></tr>\n");
html=html+wxT("<tr><td align='right' bgcolor='#80ff80'><b>")+_("PB/CSR")+wxT("</b></td><td bgcolor='#80ff80'>")+wxString::Format(wxT("%0.2f%%"),csr)+wxT("</td></tr>\n");
html=html+wxT("</table></td></tr>");
} else {
html=html+wxT("<tr><td colspan=2><table cellspacing=0 cellpadding=2 border=0 width='100%'>");
html=html+wxT("<tr><td align='right'><b><font color='black'>")+_("AHI")+wxT("</font></b></td><td><b><font color='black'>")+wxString::Format(wxT("%0.2f"),ahi)+wxT("</font></b></td></tr>\n");
html=html+wxT("<tr><td align='right'><b>")+_("Obstructive")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f"),oai)+wxT("</td></tr>\n");
html=html+wxT("<tr><td align='right'><b>")+_("Hypopnea")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f"),hi)+wxT("</td></tr>\n");
html=html+wxT("<tr><td align='right'><b>")+_("ClearAirway")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f"),cai)+wxT("</td></tr>\n");
html=html+wxT("</table></td><td colspan=2><table cellspacing=0 cellpadding=2 border=0 width='100%'>");
html=html+wxT("<tr><td align='right'><b>")+_("RERA")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f"),rei)+wxT("</td></tr>\n");
html=html+wxT("<tr><td align='right'><b>")+_("FlowLimit")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f"),fli)+wxT("</td></tr>\n");
html=html+wxT("<tr><td align='right'><b>")+_("Vsnore")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f"),vsi)+wxT("</td></tr>\n");
html=html+wxT("<tr><td align='right'><b>")+_("PB/CSR")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f%%"),csr)+wxT("</td></tr>\n");
html=html+wxT("</table></td></tr>");
}
// html=html+wxT("<tr><td colspan=4>&nbsp;</td></tr>\n");
//html=html+wxT("<tr><td colspan=4>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=center><i>")+_("Event Breakdown")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=left cellspacing=0 cellpadding=0><img src=\"memory:ahi.png\" ></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=center><img src=\"memory:ahi.png\" ></td></tr>\n");
//html=html+wxT("<tr><td colspan=4>&nbsp;</td></tr>\n");
//html=html+wxT("<tr><td colspan=4 align=center><i>")+_("Other Information")+wxT("</i></td></tr>\n");
@ -944,7 +968,7 @@ void Daily::RefreshData()
// html=html+wxT("<tr><td colspan=4>&nbsp;</td></tr>\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+=_("<tr><td colspan=2 align=center><i>No CPAP data available</i></td></tr>");
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\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("<tr><td colspan=4 align=center><i>")+_("Time@IPAP")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=left cellspacing=0 cellpadding=0><img src=\"memory:tiap.png\" ></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=center><img src=\"memory:tiap.png\" ></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=center><i>")+_("Time@EPAP")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=left cellspacing=0 cellpadding=0><img src=\"memory:teap.png\" ></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=center><img src=\"memory:teap.png\" ></td></tr>\n");
} else if (mode==MODE_APAP) {
html=html+wxT("<tr><td colspan=4 align=center><i>")+_("Time@Pressure")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=left cellspacing=0 cellpadding=0><img src=\"memory:tap.png\" ></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=center><img src=\"memory:tap.png\"></td></tr>\n");
}
html=html+wxT("</table><hr>");
@ -1046,7 +1068,7 @@ void Daily::RefreshData()
} else str=wxT("No");
html=html+wxT("<tr><td><b>")+_("Sys-Resist.")+wxT("</b></td><td>")+str+wxT("</td></tr>\n");
}
html=html+wxT("</table><hr>");
html=html+wxT("</table><hr><div align=center>");
html=html+wxT("<table cellspacing=0 cellpadding=0 border=0>\n");
//html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
//html=html+wxT("<tr><td colspan=2 align=center><hr></td></tr>\n");

2
src/SleepyHeadMain.h
View File

@ -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();

15
src/WxWizFrame.fbp
View File

@ -305,6 +305,21 @@
<event name="OnMenuSelection">OnShowSerial</event>
<event name="OnUpdateUI"></event>
</object>
<object class="wxMenuItem" expanded="1">
<property name="bitmap"></property>
<property name="checked">0</property>
<property name="enabled">1</property>
<property name="help"></property>
<property name="id">wxID_ANY</property>
<property name="kind">wxITEM_CHECK</property>
<property name="label">Fruit Salad</property>
<property name="name">ViewMenuFruitsalad</property>
<property name="permission">protected</property>
<property name="shortcut"></property>
<property name="unchecked_bitmap"></property>
<event name="OnMenuSelection">OnFruitsalad</event>
<event name="OnUpdateUI"></event>
</object>
<object class="separator" expanded="1">
<property name="name">m_separator2</property>
<property name="permission">none</property>

15
src/graphs/graph.cpp
View File

@ -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<gLayer *>::iterator l=layers.begin();l!=layers.end();l++) {
(*l)->Plot(dc,*this);
}

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 = 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;