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

BIPAP Time@Pressure additions

Browse Source
This commit is contained in:
Mark Watkins 2011-05-29 17:53:37 +10:00
parent 430dc64063
commit a75a2072ef
6 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SleepyHead.depend
View File

@ -7829,7 +7829,7 @@
1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h 1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h
<wx/app.h> <wx/app.h>
1306584929 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h 1306655333 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h
"SleepyHeadApp.h" "SleepyHeadApp.h"
"GUIFrame.h" "GUIFrame.h"
"sleeplib/machine.h" "sleeplib/machine.h"
@ -7869,11 +7869,11 @@
<map> <map>
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1306652249 /home/mark/projects/git/sleepyhead/graphs/graph.h 1306654979 /home/mark/projects/git/sleepyhead/graphs/graph.h
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1306652337 /home/mark/projects/git/sleepyhead/version.h 1306655544 /home/mark/projects/git/sleepyhead/version.h
1306549105 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h 1306549105 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -7890,7 +7890,7 @@
"preferences.h" "preferences.h"
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1306650852 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp 1306655045 source:/home/mark/projects/git/sleepyhead/SleepyHeadMain.cpp
"wx_pch.h" "wx_pch.h"
"version.h" "version.h"
<wx/app.h> <wx/app.h>
@ -7905,7 +7905,7 @@
"SleepyHeadMain.h" "SleepyHeadMain.h"
"sleeplib/profiles.h" "sleeplib/profiles.h"
1306652144 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp 1306655056 source:/home/mark/projects/git/sleepyhead/graphs/graph.cpp
<wx/settings.h> <wx/settings.h>
<wx/dcbuffer.h> <wx/dcbuffer.h>
<wx/log.h> <wx/log.h>

24
SleepyHeadMain.cpp
View File

@ -411,11 +411,22 @@ Daily::Daily(wxWindow *win)
{ {
machine=NULL; machine=NULL;
AddData(tap_eap=new TAPData(CPAP_EAP));
AddData(tap_iap=new TAPData(CPAP_IAP));
AddData(tap=new TAPData(CPAP_Pressure));
TAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@Pressure"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER); TAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@Pressure"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER);
TAP->SetMargins(20,15,5,50); TAP->SetMargins(20,15,5,50);
AddData(tap=new TAPData());
TAP->AddLayer(new gCandleStick(tap)); TAP->AddLayer(new gCandleStick(tap));
TAP_IAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@IAP"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER);
TAP_IAP->SetMargins(20,15,5,50);
TAP_IAP->AddLayer(new gCandleStick(tap_iap));
TAP_EAP=new gGraphWindow(ScrolledWindow,-1,wxT("Time@EAP"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER);
TAP_EAP->SetMargins(20,15,5,50);
TAP_EAP->AddLayer(new gCandleStick(tap_eap));
G_AHI=new gGraphWindow(ScrolledWindow,-1,wxT("Event Breakdown"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER); G_AHI=new gGraphWindow(ScrolledWindow,-1,wxT("Event Breakdown"),wxPoint(0,0), wxSize(600,50), wxNO_BORDER);
G_AHI->SetMargins(20,15,5,50); G_AHI->SetMargins(20,15,5,50);
AddData(g_ahi=new AHIData()); AddData(g_ahi=new AHIData());
@ -499,6 +510,8 @@ Daily::Daily(wxWindow *win)
fgSizer->Add(PRD,1,wxEXPAND); fgSizer->Add(PRD,1,wxEXPAND);
fgSizer->Add(LEAK,1,wxEXPAND); fgSizer->Add(LEAK,1,wxEXPAND);
fgSizer->Add(TAP,1,wxEXPAND); fgSizer->Add(TAP,1,wxEXPAND);
fgSizer->Add(TAP_IAP,1,wxEXPAND);
fgSizer->Add(TAP_EAP,1,wxEXPAND);
foobar_datehack=false; // this exists due to a wxGTK bug. foobar_datehack=false; // this exists due to a wxGTK bug.
// RefreshData(); // RefreshData();
@ -617,9 +630,18 @@ void Daily::OnCalendarDay( wxCalendarEvent& event )
html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;Min")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;Min")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;Max")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;Max")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
} else if (mode==MODE_BIPAP) { } else if (mode==MODE_BIPAP) {
TAP->Hide();
TAP_EAP->Show();
TAP_IAP->Show();
html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;IAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;IAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_PressureMin))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;EAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Pressure&nbsp;EAP")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_max(CPAP_PressureMax))+wxT("</td></tr>\n");
} }
if (mode!=MODE_BIPAP) {
TAP->Show();
TAP_EAP->Hide();
TAP_IAP->Hide();
}
html=html+wxT("<tr><td><b>")+_("Ramp-Time")+wxT("</b></td><td>")+wxString::Format(wxT("%imin"),(int)d->summary_max(CPAP_RampTime))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Ramp-Time")+wxT("</b></td><td>")+wxString::Format(wxT("%imin"),(int)d->summary_max(CPAP_RampTime))+wxT("</td></tr>\n");
html=html+wxT("<tr><td><b>")+_("Ramp-Prs.")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_RampStartingPressure))+wxT("</td></tr>\n"); html=html+wxT("<tr><td><b>")+_("Ramp-Prs.")+wxT("</b></td><td>")+wxString::Format(wxT("%.1fcmH2O"),d->summary_min(CPAP_RampStartingPressure))+wxT("</td></tr>\n");

4
SleepyHeadMain.h
View File

@ -50,9 +50,9 @@ protected:
void UpdateGraphs(wxDateTime date); void UpdateGraphs(wxDateTime date);
bool foobar_datehack; bool foobar_datehack;
gPointData *tap,*g_ahi,*frw,*prd,*leakdata,*pressure_iap,*pressure_eap; gPointData *tap,*tap_eap,*tap_iap,*g_ahi,*frw,*prd,*leakdata,*pressure_iap,*pressure_eap;
gPointData *flags[10]; gPointData *flags[10];
gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF; gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF,*TAP_EAP,*TAP_IAP;
Machine *machine; Machine *machine;

5
graphs/graph.cpp
View File

@ -1768,8 +1768,8 @@ void PressureData::Reload(Day *day)
//graph->Refresh(false); //graph->Refresh(false);
} }
TAPData::TAPData() TAPData::TAPData(MachineCode _code)
:gPointData(256) :gPointData(256),code(_code)
{ {
AddSegment(max_points); AddSegment(max_points);
} }
@ -1793,7 +1793,6 @@ void TAPData::Reload(Day *day)
int lastval,val; int lastval,val;
int field=0; int field=0;
MachineCode code=CPAP_Pressure;
for (auto s=day->begin();s!=day->end();s++) { for (auto s=day->begin();s!=day->end();s++) {
if ((*s)->events.find(code)==(*s)->events.end()) continue; if ((*s)->events.find(code)==(*s)->events.end()) continue;

3
graphs/graph.h
View File

@ -402,12 +402,13 @@ protected:
class TAPData:public gPointData class TAPData:public gPointData
{ {
public: public:
TAPData(); TAPData(MachineCode _code);
virtual ~TAPData(); virtual ~TAPData();
virtual void Reload(Day *day=NULL); virtual void Reload(Day *day=NULL);
static const int max_slots=256; static const int max_slots=256;
wxTimeSpan pTime[max_slots]; wxTimeSpan pTime[max_slots];
MachineCode code;
}; };

12
version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 1804; static const long BUILD = 1810;
static const long REVISION = 4413; static const long REVISION = 4453;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 6086; static const long BUILDS_COUNT = 6099;
#define RC_FILEVERSION 0,7,1804,4413 #define RC_FILEVERSION 0,7,1810,4453
#define RC_FILEVERSION_STRING "0, 7, 1804, 4413\0" #define RC_FILEVERSION_STRING "0, 7, 1810, 4453\0"
static const char FULLVERSION_STRING[] = "0.7.1804.4413"; static const char FULLVERSION_STRING[] = "0.7.1810.4453";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 62; static const long BUILD_HISTORY = 62;