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

May as well test it properly. Main candlesticks are turned off for a bit.

Browse Source
This commit is contained in:
Mark Watkins 2011-06-07 21:26:10 +10:00
parent 7e485171c9
commit 351179f70a
5 changed files with 88 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8249,7 +8249,7 @@
1307418393 /home/mark/projects/git/sleepyhead/src/SleepyHeadApp.h
<wx/app.h>
1307436654 /home/mark/projects/git/sleepyhead/src/SleepyHeadMain.h
1307442005 /home/mark/projects/git/sleepyhead/src/SleepyHeadMain.h
<wx/listbox.h>
<wx/treectrl.h>
"SleepyHeadApp.h"
@ -8295,7 +8295,7 @@
<sleeplib/machine.h>
<list>
1307440007 /home/mark/projects/git/sleepyhead/src/version.h
1307445805 /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"
1307438186 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp
1307445804 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"
1307439942 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
1307444087 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<wx/settings.h>
<wx/dcbuffer.h>
<wx/log.h>

88
src/SleepyHeadMain.cpp
View File

@ -546,8 +546,9 @@ void Summary::OnClose(wxCloseEvent &event)
Daily::Daily(wxWindow *win,Profile *p)
:DailyPanel(win),profile(p)
{
ahi_bmp=NULL;
tiap_bmp=teap_bmp=tap_bmp=ahi_bmp=NULL;
HTMLInfo=new wxHtmlWindow(this);
HTMLInfo->SetBorders(4);
EventTree=new wxTreeCtrl(this);
this->Connect(wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( Daily::OnEventTreeSelection), NULL, this);
@ -557,20 +558,21 @@ Daily::Daily(wxWindow *win,Profile *p)
AddCPAPData(tap_iap=new TAPData(CPAP_IAP));
AddCPAPData(tap=new TAPData(CPAP_Pressure));
TAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@Pressure"),wxPoint(0,0), wxSize(600,60), wxNO_BORDER);
TAP->SetMargins(20,15,5,50);
TAP=new gGraphWindow(ScrolledWindow,-1,wxT(""),wxPoint(0,0), wxSize(600,30), wxNO_BORDER); //Time@Pressure
//TAP->SetMargins(20,15,5,50);
TAP->SetMargins(0,1,0,1);
TAP->AddLayer(new gCandleStick(tap));
TAP_IAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@IPAP"),wxPoint(0,0), wxSize(600,60), wxNO_BORDER);
TAP_IAP->SetMargins(20,15,5,50);
TAP_IAP=new gGraphWindow(ScrolledWindow,-1,wxT(""),wxPoint(0,0), wxSize(600,30), wxNO_BORDER); //Time@IPAP
TAP_IAP->SetMargins(0,1,0,1);
TAP_IAP->AddLayer(new gCandleStick(tap_iap));
TAP_EAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@EPAP"),wxPoint(0,0), wxSize(600,60), wxNO_BORDER);
TAP_EAP->SetMargins(20,15,5,50);
TAP_EAP=new gGraphWindow(ScrolledWindow,-1,wxT(""),wxPoint(0,0), wxSize(600,30), wxNO_BORDER); //Time@EPAP
TAP_EAP->SetMargins(0,1,0,1);
TAP_EAP->AddLayer(new gCandleStick(tap_eap));
G_AHI=new gGraphWindow(ScrolledWindow,-1,wxT(""),wxPoint(0,0), wxSize(600,60), wxNO_BORDER); //Event Breakdown")
G_AHI->SetMargins(0,2,0,2);
G_AHI=new gGraphWindow(ScrolledWindow,-1,wxT(""),wxPoint(0,0), wxSize(600,30), wxNO_BORDER); //Event Breakdown")
G_AHI->SetMargins(0,1,0,1);
AddCPAPData(g_ahi=new AHIData());
gCandleStick *l=new gCandleStick(g_ahi);
l->AddName(wxT("H"));
@ -682,9 +684,9 @@ Daily::Daily(wxWindow *win,Profile *p)
fgSizer->Add(PULSE,1,wxEXPAND);
fgSizer->Add(SPO2,1,wxEXPAND);
//fgSizer->Add(G_AHI,1,wxEXPAND);
fgSizer->Add(TAP,1,wxEXPAND);
fgSizer->Add(TAP_IAP,1,wxEXPAND);
fgSizer->Add(TAP_EAP,1,wxEXPAND);
//fgSizer->Add(TAP,1,wxEXPAND);
//fgSizer->Add(TAP_IAP,1,wxEXPAND);
//fgSizer->Add(TAP_EAP,1,wxEXPAND);
ResetDate();
@ -695,6 +697,18 @@ Daily::~Daily()
wxMemoryFSHandler::RemoveFile(_T("ahi.png"));
delete ahi_bmp;
}
if (tap_bmp) {
wxMemoryFSHandler::RemoveFile(_T("tap.png"));
delete tap_bmp;
}
if (tiap_bmp) {
wxMemoryFSHandler::RemoveFile(_T("tiap.png"));
delete tiap_bmp;
}
if (teap_bmp) {
wxMemoryFSHandler::RemoveFile(_T("teap.png"));
delete teap_bmp;
}
this->Disconnect(wxEVT_COMMAND_TREE_SEL_CHANGED, wxTreeEventHandler( Daily::OnEventTreeSelection), NULL, this);
}
@ -794,9 +808,29 @@ void Daily::RefreshData()
wxMemoryFSHandler::RemoveFile(_T("ahi.png"));
delete ahi_bmp;
}
ahi_bmp=G_AHI->RenderBitmap(180,40);
//delete ahi_bmp;
if (tap_bmp) {
wxMemoryFSHandler::RemoveFile(_T("tap.png"));
delete tap_bmp;
}
if (tiap_bmp) {
wxMemoryFSHandler::RemoveFile(_T("tiap.png"));
delete tiap_bmp;
}
if (teap_bmp) {
wxMemoryFSHandler::RemoveFile(_T("teap.png"));
delete teap_bmp;
}
wxRect r=HTMLInfo->GetRect();
int w=r.width-25;
ahi_bmp=G_AHI->RenderBitmap(w,25);
tap_bmp=TAP->RenderBitmap(w,25);
teap_bmp=TAP_EAP->RenderBitmap(w,25);
tiap_bmp=TAP_IAP->RenderBitmap(w,25);
wxMemoryFSHandler::AddFile(_T("ahi.png"), *ahi_bmp, wxBITMAP_TYPE_PNG);
wxMemoryFSHandler::AddFile(_T("tap.png"), *tap_bmp, wxBITMAP_TYPE_PNG);
wxMemoryFSHandler::AddFile(_T("tiap.png"), *tiap_bmp, wxBITMAP_TYPE_PNG);
wxMemoryFSHandler::AddFile(_T("teap.png"), *teap_bmp, wxBITMAP_TYPE_PNG);
PRTypes pr=(PRTypes)cpap->summary_max(CPAP_PressureReliefType);
@ -831,8 +865,7 @@ void Daily::RefreshData()
html=html+wxT("<tr><td><b>")+_("Wake")+wxT("</b></td><td>")+cpap->last().Format(wxT("%H:%M"))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Total Time")+wxT("</b></td><td><i>")+cpap->total_time().Format(wxT("%H:%M&nbsp;hours"))+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Event Breakdown")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center cellspacing=0 cellpadding=0><img src=\"memory:ahi.png\" ></td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Indices")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td><b>")+_("AHI")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f"),ahi)+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Obstructive")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f"),oai)+wxT("</td></tr>\n");
@ -843,6 +876,10 @@ void Daily::RefreshData()
html=html+wxT("<tr><td><b>")+_("Vsnore")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f"),vsi)+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("CSR")+wxT("</b></td><td>")+wxString::Format(wxT("%0.2f%%"),csr)+wxT("</td></tr>\n");
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Event Breakdown")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center cellspacing=0 cellpadding=0><img src=\"memory:ahi.png\" ></td></tr>\n");
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Other Information")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Mode")+wxT("</b></td><td>")+modestr+wxT("</td></tr>\n");
@ -867,6 +904,20 @@ void Daily::RefreshData()
}
html=html+wxT("<tr><td><b>")+_("Avg Leak")+wxT("</b></td><td>")+wxString::Format(wxT("%.2f"),cpap->summary_weighted_avg(CPAP_LeakAverage))+wxT("</td></tr>\n");
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
if (mode==MODE_BIPAP) {
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Time@IPAP")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center cellspacing=0 cellpadding=0><img src=\"memory:tiap.png\" ></td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Time@EPAP")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center cellspacing=0 cellpadding=0><img src=\"memory:teap.png\" ></td></tr>\n");
} else { //if (mode==MODE_APAP) {
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("Time@Pressure")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td colspan=2 align=center cellspacing=0 cellpadding=0><img src=\"memory:tap.png\" ></td></tr>\n");
}
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
if (mode!=MODE_BIPAP) {
TAP_EAP->Show(false);
@ -881,7 +932,7 @@ void Daily::RefreshData()
PRD->Show(true);
G_AHI->Show(true);
LEAK->Show(true);
TAP->Show(true);
//TAP->Show(true);
SF->Show(true);
} else {
html+=_("<tr><td colspan=2 align=center><i>No CPAP data available</i></td></tr>");
@ -904,6 +955,7 @@ void Daily::RefreshData()
html=html+wxT("<tr><td><b>")+_("SpO2 Avg")+wxT("</b></td><td>")+wxString::Format(wxT("%.1f%%"),oxi->summary_avg(OXI_SPO2Average))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("SpO2 Min")+wxT("</b></td><td>")+wxString::Format(wxT("%.1f%%"),oxi->summary_min(OXI_SPO2Min))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("SpO2 Max")+wxT("</b></td><td>")+wxString::Format(wxT("%.1f%%"),oxi->summary_max(OXI_SPO2Max))+wxT("</td></tr>\n");
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
PULSE->Show(true);
SPO2->Show(true);
} else {
@ -916,8 +968,6 @@ void Daily::RefreshData()
if (cpap) {
// fgSizer->Layout();
html=html+wxT("<tr><td>&nbsp;</td><td>&nbsp;</td></tr>\n");
if (cpap->summary_avg(CPAP_BrokenSummary)==1) {
html=html+wxT("<tr><td colspan=2 align=center><i>")+_("No System Settings Recorded")+wxT("</i></td></tr>\n");
} else {

2
src/SleepyHeadMain.h
View File

@ -83,7 +83,7 @@ protected:
wxHtmlWindow *HTMLInfo;
wxTreeCtrl *EventTree;
wxBitmap *ahi_bmp;
wxBitmap *ahi_bmp,*tap_bmp,*teap_bmp,*tiap_bmp;
};

11
src/graphs/graph.cpp
View File

@ -1002,7 +1002,12 @@ void gCandleStick::Plot(wxDC & dc, gGraphWindow & w)
dc.DrawText(w.Title(),start_px,0);
double t1,t2;
int barwidth=25;
int barwidth;
if (m_direction==wxVERTICAL) {
barwidth=width;
} else {
barwidth=height;
}
int textX, textY;
wxString str;
@ -1029,9 +1034,9 @@ void gCandleStick::Plot(wxDC & dc, gGraphWindow & w)
if ((int)m_names.size()>i) {
str=m_names[i]+wxT(" ");
}
str+=wxString::Format(wxT("%0.2f"),data->point[0][i].x);
str+=wxString::Format(wxT("%0.1f"),data->point[0][i].x);
dc.GetTextExtent(str, &textX, &textY);
textX+=10;
textX+=5;
if (t2>(textX)) {
int j=t1+((t2/2)-(textX/2));
if (m_direction==wxVERTICAL) {

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 = 3413;
static const long REVISION = 1781;
static const long BUILD = 3455;
static const long REVISION = 2026;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 709;
#define RC_FILEVERSION 0,7,3413,1781
#define RC_FILEVERSION_STRING "0, 7, 3413, 1781\0"
static const char FULLVERSION_STRING[] = "0.7.3413.1781";
static const long BUILDS_COUNT = 827;
#define RC_FILEVERSION 0,7,3455,2026
#define RC_FILEVERSION_STRING "0, 7, 3455, 2026\0"
static const char FULLVERSION_STRING[] = "0.7.3455.2026";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0;