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

Additional PRS1 VSnore Sleep Flag

Browse Source
This commit is contained in:
Mark Watkins 2011-05-27 19:54:12 +10:00
parent d0469637ce
commit e117dd3045
5 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SleepyHead.depend
View File

@ -7826,7 +7826,7 @@
1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h 1305881106 /home/mark/projects/git/sleepyhead/SleepyHeadApp.h
<wx/app.h> <wx/app.h>
1306476329 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h 1306489831 /home/mark/projects/git/sleepyhead/SleepyHeadMain.h
"SleepyHeadApp.h" "SleepyHeadApp.h"
"GUIFrame.h" "GUIFrame.h"
"sleeplib/machine.h" "sleeplib/machine.h"
@ -7870,7 +7870,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1306489214 /home/mark/projects/git/sleepyhead/version.h 1306489908 /home/mark/projects/git/sleepyhead/version.h
1306415077 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h 1306415077 /home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -7947,7 +7947,7 @@
"machine_loader.h" "machine_loader.h"
"tinyxml/tinyxml.h" "tinyxml/tinyxml.h"
1306489211 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp 1306489627 source:/home/mark/projects/git/sleepyhead/libs/sleeplib/prs1_loader.cpp
<wx/dir.h> <wx/dir.h>
<wx/filename.h> <wx/filename.h>
<wx/ffile.h> <wx/ffile.h>

16
SleepyHeadMain.cpp
View File

@ -333,6 +333,7 @@ Daily::Daily(wxWindow *win)
AddData(flags[5]=new FlagData(CPAP_VSnore,2)); AddData(flags[5]=new FlagData(CPAP_VSnore,2));
AddData(flags[6]=new FlagData(CPAP_RERA,1)); AddData(flags[6]=new FlagData(CPAP_RERA,1));
AddData(flags[7]=new FlagData(PRS1_PressurePulse,1)); AddData(flags[7]=new FlagData(PRS1_PressurePulse,1));
AddData(flags[8]=new FlagData(PRS1_VSnore2,1));
FRW->AddLayer(new gLineChart(frw,wxBLACK,200000,true)); FRW->AddLayer(new gLineChart(frw,wxBLACK,200000,true));
FRW->AddLayer(new gLineOverlayBar(flags[6],wxYELLOW,wxT("RE"))); FRW->AddLayer(new gLineOverlayBar(flags[6],wxYELLOW,wxT("RE")));
@ -346,13 +347,14 @@ Daily::Daily(wxWindow *win)
SF=new gGraphWindow(ScrolledWindow,-1,wxT("Sleep Flags"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER); SF=new gGraphWindow(ScrolledWindow,-1,wxT("Sleep Flags"),wxPoint(0,0), wxSize(600,150), wxNO_BORDER);
SF->SetMargins(10,15,20,80); SF->SetMargins(10,15,20,80);
SF->AddLayer(new gFlagsLine(flags[6],wxYELLOW,wxT("RE"),6,7)); SF->AddLayer(new gFlagsLine(flags[8],wxRED,wxT("VS2"),6,sfc));
SF->AddLayer(new gFlagsLine(flags[5],wxRED,wxT("VS"),5,7)); SF->AddLayer(new gFlagsLine(flags[6],wxYELLOW,wxT("RE"),7,sfc));
SF->AddLayer(new gFlagsLine(flags[4],wxBLACK,wxT("FL"),4,7)); SF->AddLayer(new gFlagsLine(flags[5],wxRED,wxT("VS"),5,sfc));
SF->AddLayer(new gFlagsLine(flags[3],wxBLUE,wxT("H"),3,7)); SF->AddLayer(new gFlagsLine(flags[4],wxBLACK,wxT("FL"),4,sfc));
SF->AddLayer(new gFlagsLine(flags[2],wxAQUA,wxT("OA"),2,7)); SF->AddLayer(new gFlagsLine(flags[3],wxBLUE,wxT("H"),3,sfc));
SF->AddLayer(new gFlagsLine(flags[1],wxPURPLE,wxT("CA"),1,7)); SF->AddLayer(new gFlagsLine(flags[2],wxAQUA,wxT("OA"),2,sfc));
SF->AddLayer(new gFlagsLine(flags[0],wxGREEN2,wxT("CSR"),0,7)); SF->AddLayer(new gFlagsLine(flags[1],wxPURPLE,wxT("CA"),1,sfc));
SF->AddLayer(new gFlagsLine(flags[0],wxGREEN2,wxT("CSR"),0,sfc));
//l=new gBarChart(graphdata,wxHORIZONTAL); //l=new gBarChart(graphdata,wxHORIZONTAL);
//graph->AddLayer(l); //graph->AddLayer(l);
//graph->SetData(graphdata); //graph->SetData(graphdata);

4
SleepyHeadMain.h
View File

@ -33,6 +33,8 @@ public:
}; };
const int sfc=8;
class Daily:public DailyPanel class Daily:public DailyPanel
{ {
public: public:
@ -49,7 +51,7 @@ protected:
bool foobar_datehack; bool foobar_datehack;
gPointData *tap,*g_ahi,*frw,*prd,*leakdata,*pressure_iap,*pressure_eap; gPointData *tap,*g_ahi,*frw,*prd,*leakdata,*pressure_iap,*pressure_eap;
gPointData *flags[8]; gPointData *flags[9];
gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF; gGraphWindow *PRD,*FRW,*G_AHI,*TAP,*LEAK,*SF;

3
libs/sleeplib/prs1_loader.cpp
View File

@ -644,9 +644,6 @@ bool PRS1Loader::OpenWaveforms(Session *session,wxString filename)
} }
Waveform *w=new Waveform(start,CPAP_FlowRate,data,samples,duration,min,max); Waveform *w=new Waveform(start,CPAP_FlowRate,data,samples,duration,min,max);
session->AddWaveform(w); session->AddWaveform(w);
if (sequence==9) {
sequence=9;
}
//wxLogMessage(wxT("Done PRS1 Waveforms ")+filename); //wxLogMessage(wxT("Done PRS1 Waveforms ")+filename);
return true; return true;
} }

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 = 1300; static const long BUILD = 1304;
static const long REVISION = 1576; static const long REVISION = 1611;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 4913; static const long BUILDS_COUNT = 4921;
#define RC_FILEVERSION 0,7,1300,1576 #define RC_FILEVERSION 0,7,1304,1611
#define RC_FILEVERSION_STRING "0, 7, 1300, 1576\0" #define RC_FILEVERSION_STRING "0, 7, 1304, 1611\0"
static const char FULLVERSION_STRING[] = "0.7.1300.1576"; static const char FULLVERSION_STRING[] = "0.7.1304.1611";
//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;